aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter
Commit message (Expand)AuthorAgeFilesLines
* Use darker colorsDominik Schürmann2014-08-011-2/+2
* Robots like coffee too...Dominik Schürmann2014-07-311-2/+2
* reduce memory usage while parsing multiple keyrings from a streamVincent Breitmoser2014-07-311-4/+6
* Better exception handling for import of keysDominik Schürmann2014-07-311-34/+14
* More file association hacks for AndroidManifest and key importDominik Schürmann2014-07-311-9/+20
* Use new icons in other key related activites, delete old iconsDominik Schürmann2014-07-281-12/+28
* Merge remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-112-51/+86
|\
| * Work on subkeys adapterDominik Schürmann2014-07-082-51/+86
* | SaveKeyringParcel: follow attribute m prefix coding guidelineVincent Breitmoser2014-07-111-4/+4
|/
* cleanupDominik Schürmann2014-07-031-0/+1
* edit key: subkey adapterDominik Schürmann2014-07-031-0/+360
* Work on editDominik Schürmann2014-07-032-32/+30
* smaller dropdown itemsDominik Schürmann2014-07-031-2/+2
* fix nullpointer, cleanupDominik Schürmann2014-07-021-3/+2
* remove init methods from adapterDominik Schürmann2014-07-022-80/+44
* edit key: work on savingDominik Schürmann2014-07-021-11/+11
* Edit key: adding user idsDominik Schürmann2014-07-023-146/+209
* edit key: part 3Dominik Schürmann2014-07-012-131/+146
* fix nullpointerexception in importkeyactivityVincent Breitmoser2014-06-281-0/+4
* new edit key: first version to add user idsDominik Schürmann2014-06-242-1/+133
* new edit key: diff for existing user idsDominik Schürmann2014-06-221-10/+41
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-221-1/+1
|\
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-06-221-0/+16
| |\
| * | use hashcode instead of keyid in import list (keyids may not be unique!)Vincent Breitmoser2014-06-221-1/+1
* | | Rename adapterDominik Schürmann2014-06-222-8/+19
| |/ |/|
* | Start new designed activityDominik Schürmann2014-06-211-0/+16
|/
* Work on Qr code importDominik Schürmann2014-06-202-2/+1
* Redesign Import, still some todos and regression bugsDominik Schürmann2014-06-181-1/+1
* Hide subkeys, certs tabs in key view, checkable menu item to show/hide themDominik Schürmann2014-06-061-0/+10
* Clean up keyimport.ImportKeysListEntryTim Bray2014-06-051-9/+8
* Merge pull request #645 from timbray/masterDominik Schürmann2014-06-051-6/+2
|\
| * Don't show full fingerprint in key search resultsTim Bray2014-06-051-6/+2
* | neatness refactoringVincent Breitmoser2014-06-044-7/+7
|/
* Merge remote-tracking branch 'origin/master' into edit-key-rewriteVincent Breitmoser2014-06-022-10/+4
|\
| * Finished cleaning up rebase conflicts post Keyserver exception refactorTim Bray2014-05-232-2/+2
| * Add Log.d for QueryFailedExceptionTim Bray2014-05-232-8/+2
* | wrapped-key-ring: move key data around in ParcelableKeyRing instead of Import...Vincent Breitmoser2014-06-022-7/+12
* | wrapped-key-ring: use UncachedKeyRing in ImportKeysListLoaderVincent Breitmoser2014-05-231-28/+8
|/
* Merge highlight keyserver pull requestDominik Schürmann2014-05-183-72/+16
|\
| * Use Highlighter instead of HighlightQueryCursorAdapterThialfihar2014-05-162-69/+11
| * Add highlighting to keyserver/keybase searchThialfihar2014-05-161-3/+5
| * Support mutliple search words and highlight themThialfihar2014-05-161-2/+2
* | Rename KeyServer to KeyserverDominik Schürmann2014-05-182-12/+12
|/
* Rename fingerPrint to fingerprintThialfihar2014-05-142-3/+3
* Don't guess keybase key algorithm and sizeThialfihar2014-05-141-1/+6
* Move logic classes for import into own sub-packageDominik Schürmann2014-05-065-273/+8
* ui: use primary icon color for certification statusVincent Breitmoser2014-05-061-11/+8
* ui: subkey view redesignVincent Breitmoser2014-05-051-31/+13
* Merge pull request #603 from timbray/masterDominik Schürmann2014-05-053-4/+107
|\
| * Per pull-request comments.Tim Bray2014-05-042-6/+0