aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* Add missing fragments for YubiKey PINsDominik Schürmann2015-07-012-0/+280
* Add create key fragments for YubiKey PINsDominik Schürmann2015-07-017-23/+60
* Merge logs in create keyDominik Schürmann2015-07-011-9/+9
* Use operation helper for move to cardDominik Schürmann2015-07-011-37/+64
* Merge branch 'master' of github.com:open-keychain/open-keychainAdithya Abraham Philip2015-06-3013-286/+425
|\
| * Better settings workaroundsDominik Schürmann2015-06-301-3/+4
| * Cleanup preference codeDominik Schürmann2015-06-301-41/+3
| * instrument: add test for empty clipboard, fix empty clipboard errorVincent Breitmoser2015-06-301-2/+4
| * earlier error on empty clipboardVincent Breitmoser2015-06-301-3/+19
| * fail more gracefully on empty clipboard in DecryptActivityVincent Breitmoser2015-06-301-0/+7
| * Revert "Disable YubiKey key creation for release"Dominik Schürmann2015-06-301-14/+5
| * Disable YubiKey key creation for releaseDominik Schürmann2015-06-301-5/+14
| * Connect YubiKey URL to OpenKeychainDominik Schürmann2015-06-292-6/+26
| * Create key wizard for blank YubiKeyDominik Schürmann2015-06-298-50/+202
| * cleanup share fragment, fix sharing of fingerprintVincent Breitmoser2015-06-292-166/+120
* | made CryptoOperationFragment implement OperationHelper.CallbackAdithya Abraham Philip2015-06-3011-59/+33
* | changed to work with multi-decryptAdithya Abraham Philip2015-06-2715-228/+94
* | split import and export opsAdithya Abraham Philip2015-06-271-2/+3
* | fixed package importAdithya Abraham Philip2015-06-271-1/+1
* | renamed KeychainNewService to KeychainServiceAdithya Abraham Philip2015-06-273-10/+10
* | removed debug logs, added licensesAdithya Abraham Philip2015-06-273-9/+7
* | fixed Certify opAdithya Abraham Philip2015-06-272-2/+2
* | deleted KeychainServiceAdithya Abraham Philip2015-06-2714-62/+229
* | migrated Keybase verificationAdithya Abraham Philip2015-06-271-100/+125
* | migrated consolidationAdithya Abraham Philip2015-06-272-96/+72
* | migrated promote op to KeychainNewServiceAdithya Abraham Philip2015-06-271-39/+19
* | migrated delete op to KeychainNewServiceAdithya Abraham Philip2015-06-272-43/+71
* | migrated key creation to KeychainNewServiceAdithya Abraham Philip2015-06-272-71/+52
* | added export and upload to KeychainNewServiceAdithya Abraham Philip2015-06-272-84/+90
* | allow progress message to be set laterAdithya Abraham Philip2015-06-273-47/+17
* | migrated import to KeychainNewServiceAdithya Abraham Philip2015-06-275-248/+218
* | introduced OpHelper for import in DecryptFragmentAdithya Abraham Philip2015-06-271-40/+44
* | introduced CryptoOperationHelper in ImportKeysActivityAdithya Abraham Philip2015-06-273-221/+404
|/
* Merge remote-tracking branch 'origin/master' into v/multi-decryptVincent Breitmoser2015-06-262-2/+94
|\
| * use KeyAdapter for AllowedKeysListFragmentVincent Breitmoser2015-06-262-2/+94
* | fix: save fileVincent Breitmoser2015-06-231-5/+5
* | fix original file deletion (and instrumentation)Vincent Breitmoser2015-06-231-6/+21
* | implement deletion of filesVincent Breitmoser2015-06-231-4/+17
* | implement saving of filesVincent Breitmoser2015-06-231-2/+23
* | instrument: adapt to new decrypt file dialog, and some minor fixesVincent Breitmoser2015-06-233-8/+6
* | move select file logic into EncryptDecryptOverviewFragmentVincent Breitmoser2015-06-223-195/+50
* | don't expose dataset for FileAdapter in encrypt view, small improvements to e...Vincent Breitmoser2015-06-222-27/+35
* | multi-decrypt: use indeterminate progress onlyVincent Breitmoser2015-06-221-4/+3
* | instrument: some updates to asymmetric decrypt testsVincent Breitmoser2015-06-222-7/+7
* | add failure state to DecryptListFragmentVincent Breitmoser2015-06-221-56/+91
* | add extra for initial fragment in MainActivityVincent Breitmoser2015-06-221-6/+20
* | update keychain intents submodule (for travis)Vincent Breitmoser2015-06-201-1/+1
* | don't show "delete original file" for non-file input urisVincent Breitmoser2015-06-201-6/+4
* | fix display of signed-only contentVincent Breitmoser2015-06-201-4/+7
* | instrument: update symmetric testsVincent Breitmoser2015-06-202-2/+3