aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2015-07-081-0/+1
|\
| * fixed progress dialog not shown after enable orbot dialogAdithya Abraham Philip2015-07-081-0/+1
| |
* | hide keyboard on crypto error/successVincent Breitmoser2015-07-083-6/+21
|/
* some cleanup and fix for back button in ImportKeysActivity (fixes #1372)Vincent Breitmoser2015-07-081-3/+12
|
* use QueueingCryptoOperationFragment in all other placesVincent Breitmoser2015-07-072-1/+21
|
* introduce QueueingCryptoOperationFragment to queue result handling in ↵Vincent Breitmoser2015-07-072-4/+77
| | | | detached state
* try cache in certify operation (fixes #1242)Vincent Breitmoser2015-07-071-5/+2
|
* fix handling of progress dialog creation in CryptoOperationFragment (fixes ↵Vincent Breitmoser2015-07-073-25/+12
| | | | #1407)
* Save mTagHandlingEnabled in saved instanceDominik Schürmann2015-07-061-1/+16
|
* Better YubiKey UX flow for error handlingDominik Schürmann2015-07-061-2/+21
|
* Poll if yubikey has been taken awayDominik Schürmann2015-07-061-2/+3
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-07-063-65/+106
|\
| * forgot a couple lines to commitVincent Breitmoser2015-07-061-2/+6
| |
| * cleanup, NonNull annotation, never return null in PgpDecryptVerifyVincent Breitmoser2015-07-061-10/+7
| |
| * some cleanup and documentationVincent Breitmoser2015-07-062-39/+46
| |
| * reformatted codeAdithya Abraham Philip2015-07-032-6/+9
| |
| * added proxy support to OperationHelperAdithya Abraham Philip2015-07-031-11/+41
| |
* | In NfcOperationsActivity, show NFC errors inline, in others show as NotifyDominik Schürmann2015-07-061-90/+105
|/
* New NFC dialog design with indeterminate progress, do NFC stuff in backgroundDominik Schürmann2015-07-031-30/+70
|
* Change PIN and Admin PIN after move to key operationDominik Schürmann2015-07-021-14/+11
|
* fix CryptoOperationFragment infinite recursionAdithya Abraham Philip2015-07-021-1/+1
|
* Merge branch 'master' of github.com:open-keychain/open-keychainAdithya Abraham Philip2015-06-302-4/+4
|\
| * Connect YubiKey URL to OpenKeychainDominik Schürmann2015-06-291-2/+2
| |
| * Create key wizard for blank YubiKeyDominik Schürmann2015-06-292-2/+2
| |
* | made CryptoOperationFragment implement OperationHelper.CallbackAdithya Abraham Philip2015-06-303-41/+15
| |
* | changed to work with multi-decryptAdithya Abraham Philip2015-06-272-6/+34
| |
* | renamed KeychainNewService to KeychainServiceAdithya Abraham Philip2015-06-271-5/+5
| |
* | removed debug logs, added licensesAdithya Abraham Philip2015-06-272-7/+4
| |
* | fixed Certify opAdithya Abraham Philip2015-06-272-2/+2
| |
* | deleted KeychainServiceAdithya Abraham Philip2015-06-271-2/+1
| |
* | migrated delete op to KeychainNewServiceAdithya Abraham Philip2015-06-271-1/+6
| |
* | migrated key creation to KeychainNewServiceAdithya Abraham Philip2015-06-271-2/+12
| |
* | allow progress message to be set laterAdithya Abraham Philip2015-06-272-5/+14
| |
* | introduced CryptoOperationHelper in ImportKeysActivityAdithya Abraham Philip2015-06-272-169/+335
|/
* handle multiple input URIs and Intent.SEND_MULTIPLEVincent Breitmoser2015-06-181-7/+13
|
* Merge branch 'v/instrument' into v/multi-decryptVincent Breitmoser2015-06-173-76/+123
|\ | | | | | | | | | | | | Conflicts: .travis.yml OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
| * Merge pull request #1338 from josecastillo/developmentVincent2015-06-121-13/+122
| |\ | | | | | | Improved smart card error handling
| | * Replace AssertionErrors with snackbar notifications, fix style issues.Joey Castillo2015-06-111-42/+40
| | |
| | * Improved smart card error handlingJoey Castillo2015-06-101-13/+124
| | |
| * | some bugfixes for new CryptoOperationFragmentVincent Breitmoser2015-06-112-63/+1
| | |
* | | fix progress for decryptVincent Breitmoser2015-06-101-0/+12
| | |
* | | Merge branch 'v/eventbus' into v/multi-decryptVincent Breitmoser2015-06-102-61/+67
|\| | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java
| * | backport CryptoOperationFragment changes without eventbusVincent Breitmoser2015-06-102-57/+67
| | |
* | | multi-decrypt: fix progress with new CryptoFragment interfacesVincent Breitmoser2015-06-071-10/+13
|/ /
* / eventbus: initial attempt, replace messenger hack with eventbus communicationVincent Breitmoser2015-06-062-35/+160
|/
* revert some accidentally committed cruftVincent Breitmoser2015-05-311-8/+0
|
* handle empty passphrases in PassphraseDialogActivityVincent Breitmoser2015-05-311-0/+9
|
* externalize caching functionality from CertifyKeyFragmentVincent Breitmoser2015-05-301-0/+64
|
* Merge remote-tracking branch 'origin/master' into developmentVincent Breitmoser2015-05-281-4/+19
|\ | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java OpenKeychain/src/main/res/values/strings.xml
| * respect cache in yubikey pin data flowVincent Breitmoser2015-05-281-4/+19
| |