aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base
Commit message (Expand)AuthorAgeFilesLines
...
* | 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
|\ \
| * \ Merge pull request #1338 from josecastillo/developmentVincent2015-06-121-13/+122
| |\ \
| | * | 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
|\| | |
| * | | 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
|\ \
| * | respect cache in yubikey pin data flowVincent Breitmoser2015-05-281-4/+19
| * | do nfc dispatching in MainActivityVincent Breitmoser2015-05-282-7/+5
| * | open ViewKeyActivity by subkey in NfcBaseActivityVincent Breitmoser2015-05-171-3/+4
| |/
* | do nfc dispatching in MainActivityVincent Breitmoser2015-05-172-7/+5
* | open ViewKeyActivity by subkey in NfcBaseActivityVincent Breitmoser2015-05-171-3/+4
* | Moving keytocard process into PgpKeyOperation.Joey Castillo2015-05-131-24/+2
* | Adding NFC Key to Card operation, accessible from Edit Key activity.Joey Castillo2015-05-122-7/+247
|/
* Switch to new support lib version 22.1Dominik Schürmann2015-04-251-2/+2
* Fix for initialization failure when card returns FCI in data field.Joey Castillo2015-04-201-1/+1
* Track state of PIN verification on smart card; only verify when needed.Joey Castillo2015-04-201-2/+33
* Temporarily fix devices without nfcDominik Schürmann2015-04-181-0/+6
* More cleanupDominik Schürmann2015-04-152-2/+133
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 15:52:42 +0000