aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
Commit message (Expand)AuthorAgeFilesLines
* Improve NFC exception handling, fixes RuntimeExceptionsDominik Schürmann2015-09-301-1/+1
* linked: fix "navigate up" in LinkedIdWizard (imperfect)Vincent Breitmoser2015-09-061-1/+2
* linked: basic shared element transitionVincent Breitmoser2015-09-061-6/+15
* Show linked identity menu item and linked identities only when feature is ena...Dominik Schürmann2015-08-291-1/+2
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-5/+30
|\
| * yubikey: don't assume signing key is masterKeyId in ViewKeyActivityVincent Breitmoser2015-05-161-40/+46
| * fix fragment handling in ViewKeyActivityVincent Breitmoser2015-05-161-37/+12
| * use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-241-3/+3
| * Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-241-41/+139
| |\
| * \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-091-4/+4
| |\ \
| * \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-241-194/+71
| |\ \ \
| * \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-151-3/+10
| |\ \ \ \
| * | | | | rearrange linked id layouts, add CertListWidgetVincent Breitmoser2015-03-091-13/+15
| * | | | | use loader in LinkedIdViewFragmentVincent Breitmoser2015-03-091-1/+3
| * | | | | successfully certify linked idsVincent Breitmoser2015-03-081-9/+16
| * | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-081-44/+80
| |\ \ \ \ \
| * | | | | | first steps in ui towards confirmation of linked idsVincent Breitmoser2015-03-061-163/+162
| * | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-051-33/+28
| |\ \ \ \ \ \
| * | | | | | | do a TON of UI workVincent Breitmoser2015-03-051-1/+1
| * | | | | | | add linked it to view key context menuVincent Breitmoser2015-03-021-0/+11
* | | | | | | | Make keybase an experimental featureDominik Schürmann2015-08-281-0/+7
* | | | | | | | introduce text protection and fix color change after confirmDominik Schürmann2015-08-281-1/+10
* | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-08-281-1/+3
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-08-271-2/+10
| |\ \ \ \ \ \ \ \
| * | | | | | | | | use nicer filenames during exportVincent Breitmoser2015-08-271-1/+3
* | | | | | | | | | Collapsing ToolbarDominik Schürmann2015-08-281-35/+32
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Experimental word comparisonDominik Schürmann2015-08-271-2/+10
|/ / / / / / / /
* | | | | | | | Fix key view toolbar and status colourThialfihar2015-07-211-4/+24
* | | | | | | | Fix drawer background color for ViewKeyActivityThialfihar2015-07-211-2/+2
* | | | | | | | Give key flag colors their own color namesThialfihar2015-07-211-4/+4
* | | | | | | | added licenses, cleaned up code, fixed warningsAdithya Abraham Philip2015-07-131-3/+2
* | | | | | | | use only one DeleteDialogActivityAdithya Abraham Philip2015-07-131-18/+10
* | | | | | | | implemented revocation on deletionAdithya Abraham Philip2015-07-131-23/+27
* | | | | | | | add pseudo-static id property to CryptoOperationHelperVincent Breitmoser2015-07-091-2/+2
* | | | | | | | change wording of export dialog, remove "export secret" checkboxVincent Breitmoser2015-07-081-21/+7
* | | | | | | | Do not ask for passphrase on deleteDominik Schürmann2015-07-081-9/+3
* | | | | | | | Rudimentary backup featureDominik Schürmann2015-07-081-0/+2
* | | | | | | | try cache in certify operation (fixes #1242)Vincent Breitmoser2015-07-071-61/+45
* | | | | | | | fix passphrase->deletion ui flow for secret keys, and disregard cacheVincent Breitmoser2015-07-071-38/+24
* | | | | | | | fix handling of progress dialog creation in CryptoOperationFragment (fixes #1...Vincent Breitmoser2015-07-071-33/+32
* | | | | | | | don't cache exporthelper, keep type for KeyItem in KeySpinnerVincent Breitmoser2015-07-061-9/+5
* | | | | | | | Rename package back to orbot because these are orbot utilsDominik Schürmann2015-07-031-1/+1
* | | | | | | | Cleanup tor codeDominik Schürmann2015-07-031-1/+1
* | | | | | | | ensuring code style is preservedAdithya Abraham Philip2015-07-031-8/+15
* | | | | | | | added proxy to all import operations using KeychainServiceAdithya Abraham Philip2015-07-031-5/+1
* | | | | | | | New NFC dialog design with indeterminate progress, do NFC stuff in backgroundDominik Schürmann2015-07-031-13/+20
* | | | | | | | changed to work with multi-decryptAdithya Abraham Philip2015-06-271-0/+5
* | | | | | | | renamed KeychainNewService to KeychainServiceAdithya Abraham Philip2015-06-271-2/+2
* | | | | | | | deleted KeychainServiceAdithya Abraham Philip2015-06-271-3/+2
* | | | | | | | migrated import to KeychainNewServiceAdithya Abraham Philip2015-06-271-43/+44