aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* import-log: properly distinguish return statesVincent Breitmoser2014-06-121-3/+3
* import-log: use holder pattern in log fragmentVincent Breitmoser2014-06-111-16/+24
* import-log: work on log fragment uiVincent Breitmoser2014-06-102-14/+98
* import-log: switch to flags instead of statuses for result intVincent Breitmoser2014-06-101-46/+45
* import-log: more interface workVincent Breitmoser2014-06-102-17/+20
* import-log: some cosmeticsVincent Breitmoser2014-06-102-2/+3
* import-log: add LogDisplay activityVincent Breitmoser2014-06-103-4/+107
* import-log: use supertoast in ImportKeyActivityVincent Breitmoser2014-06-101-26/+87
* ui: do show Certify identities button even for secret keysVincent Breitmoser2014-06-041-8/+0
* neatness refactoringVincent Breitmoser2014-06-0421-49/+34
* Merge remote-tracking branch 'origin/master' into edit-key-rewriteVincent Breitmoser2014-06-023-29/+15
|\
| * Finished cleaning up rebase conflicts post Keyserver exception refactorTim Bray2014-05-233-9/+9
| * Add Log.d for QueryFailedExceptionTim Bray2014-05-231-0/+2
| * Add Log.d for QueryFailedExceptionTim Bray2014-05-233-25/+9
* | wrapped-key-ring: move key data around in ParcelableKeyRing instead of Import...Vincent Breitmoser2014-06-024-15/+36
* | new savekeyring operation (mostly stub)Vincent Breitmoser2014-05-272-1/+5
* | rename SaveKeyringParcel to OldSaveKeyringParcelVincent Breitmoser2014-05-271-2/+2
* | introduce WrappedSignature for the ViewCert* ui codeVincent Breitmoser2014-05-232-31/+25
* | wrapped-key-ring: use UncachedKeyRing in ImportKeysListLoaderVincent Breitmoser2014-05-231-28/+8
* | wrapped-key-ring: encapsulate key flagsVincent Breitmoser2014-05-222-18/+20
* | Merge remote-tracking branch 'origin/master' into wrapped-key-ringVincent Breitmoser2014-05-218-115/+88
|\|
| * Merge highlight keyserver pull requestDominik Schürmann2014-05-185-89/+58
| |\
| | * Rename mCurQuery to mQuery for consistencyThialfihar2014-05-161-5/+5
| | * Use Highlighter instead of HighlightQueryCursorAdapterThialfihar2014-05-163-79/+28
| | * Add highlighting to keyserver/keybase searchThialfihar2014-05-161-3/+5
| | * Support mutliple search words and highlight themThialfihar2014-05-163-6/+24
| * | Rename KeyServer to KeyserverDominik Schürmann2014-05-184-22/+21
| |/
| * Rename fingerPrint to fingerprintThialfihar2014-05-142-3/+3
| * Don't guess keybase key algorithm and sizeThialfihar2014-05-141-1/+6
* | wrapped-key-ring: use CachedKeyRing where possibleVincent Breitmoser2014-05-213-10/+14
* | use long rather than String to build uris by keyVincent Breitmoser2014-05-216-14/+13
* | wrapped-key-ring: split up CachedKeyRing and WrappedKeyRingVincent Breitmoser2014-05-214-21/+27
* | Merge remote-tracking branch 'origin/master' into wrapped-key-ringVincent Breitmoser2014-05-1449-1068/+1406
|\|
| * Fixed wrong AppMsg-StyleDaniel Haß2014-05-111-2/+2
| * ui: purplize dialog headers (huge hack inside)Vincent Breitmoser2014-05-0812-28/+63
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-081-3/+0
| |\
| | * use setEncryptToSigner for asymmetric encryptionVincent Breitmoser2014-05-081-3/+0
| * | Use flat buttons where appropriateDominik Schürmann2014-05-083-14/+10
| |/
| * use LoaderFragment in ViewKey tabsVincent Breitmoser2014-05-084-44/+32
| * extract generic LoaderFragment superclass from KeyListVincent Breitmoser2014-05-082-61/+88
| * Don't allow certification using keys where primary subkey is strippedVincent Breitmoser2014-05-071-4/+7
| * Add applications section to helpDominik Schürmann2014-05-073-3/+3
| * Remove code for sharing whole key via qr codeDominik Schürmann2014-05-072-129/+16
| * GET_KEY: also return PendingIntent to key viewDominik Schürmann2014-05-071-1/+1
| * Better handling of actionbars backDominik Schürmann2014-05-075-27/+50
| * Design fixes for certification activityDominik Schürmann2014-05-071-44/+43
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-074-52/+82
| |\
| | * ui: use SlidingTabLayout in help activityVincent Breitmoser2014-05-071-20/+30
| | * small fix for 6aafb3, forgot to commit this lineVincent Breitmoser2014-05-071-0/+1
| | * ui: purplize searchtext in keylistVincent Breitmoser2014-05-071-0/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 16:23:05 +0000