aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * 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
|
* Fix YubiKey naming, cleanupDominik Schürmann2015-04-151-5/+20
|
* Reformat nfcVerifyPINDominik Schürmann2015-04-151-6/+6
|
* Consolidate PIN verify operation in nfcVerifyPIN method.Joey Castillo2015-04-141-44/+28
|
* Move PIN verify inside sign/decrypt operation and set correct mode.Joey Castillo2015-04-141-19/+45
|
* work on passphrase data flowVincent Breitmoser2015-03-311-0/+6
|
* fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-301-1/+1
|
* further improve yubikey error handlingVincent Breitmoser2015-03-231-18/+17
|
* nicer handling of nfc errorsVincent Breitmoser2015-03-231-5/+8
|
* enable nfc in import dialog as wellVincent Breitmoser2015-03-221-2/+44
|
* move yubikey import into viewkeyfragmentVincent Breitmoser2015-03-221-3/+8
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 11:19:45 +0000