aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-241-18/+37
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: Graphics/update-drawables.sh OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * Fix YubiKey naming, cleanupDominik Schürmann2015-04-151-1/+1
| |
| * IMplement CryptoInputParcelCacheServiceDominik Schürmann2015-04-131-4/+2
| |
| * Cache CryptoInputParcel in OpenPgpServiceDominik Schürmann2015-04-101-3/+4
| |
| * fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename)Vincent Breitmoser2015-04-011-3/+12
| |
| * Merge branch 'v/crypto-input-parcel' of ↵Dominik Schürmann2015-03-311-2/+1
| |\ | | | | | | | | | github.com:open-keychain/open-keychain into v/crypto-input-parcel
| | * work on passphrase data flowVincent Breitmoser2015-03-311-2/+1
| | |
| * | Simplify passphrase dialog designDominik Schürmann2015-03-311-2/+3
| |/
| * fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-301-12/+9
| |
| * Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-201-2/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
| * | generalize NfcOperationParcel to RequiredInputParcel, including passphrasesVincent Breitmoser2015-03-191-1/+17
| | |
* | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-241-6/+7
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | New Passphrase class for safer passphrase handling in memoryDominik Schürmann2015-03-191-2/+3
| |/
| * object oriented split user idDominik Schürmann2015-03-161-3/+3
| |
* | return key ids from PassphraseDialogActivity, accept null useridsVincent Breitmoser2015-03-081-0/+3
| |
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-051-25/+33
|\| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * Show name only in passphrase dialogDominik Schürmann2015-03-031-1/+8
| |
| * Prettify passphrase dialog, it no longer resizes on unlocking the keyDominik Schürmann2015-03-031-24/+25
| |
* | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-021-13/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java OpenKeychain/src/main/res/layout/view_key_main_fragment.xml OpenKeychain/src/main/res/values/strings.xml extern/spongycastle
| * Remove old pattern lib, add new pattern libDominik Schürmann2015-02-231-13/+11
| |
* | certification of the first linked identity packet!Vincent Breitmoser2015-01-131-0/+3
|/
* fix small merge conflict oversightVincent Breitmoser2014-12-301-3/+0
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2014-12-301-32/+85
|\ | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/res/values/strings.xml
| * New work on PIN and lock pattern UIDominik Schürmann2014-12-291-32/+85
| |
* | add PIN as a SecretKeyTypeVincent Breitmoser2014-12-301-0/+3
|/
* Added option for num keypad for YubiKeyJerzy Kołosowski2014-10-131-1/+13
|
* Replace many PgpGeneralExceptions with PgpKeyNotFoundExceptionDominik Schürmann2014-10-091-3/+4
|
* Revert "Replace PgpGeneralException with NotFoundException where appropriate"Dominik Schürmann2014-10-091-2/+2
| | | | This reverts commit 49b4ff63122988dc1587844e6b4b2ee5d0855385.
* Replace PgpGeneralException with NotFoundException where appropriateDominik Schürmann2014-10-091-2/+2
|
* more getActivity() checksVincent Breitmoser2014-10-031-2/+11
|
* passphrasecache: cache by master key, introduce preference for cache by subkeyVincent Breitmoser2014-09-231-5/+6
|
* PassphraseDialogActivity usage in Remote APIDominik Schürmann2014-09-171-19/+29
|
* Fix cleartext verifyDominik Schürmann2014-09-171-0/+7
|
* Passphrase handling in encryptDominik Schürmann2014-09-171-17/+22
|
* Work on new result handling (WIP)Dominik Schürmann2014-09-171-4/+4
|
* deactivate screenshots in new PassphraseDialogActivityDominik Schürmann2014-09-131-0/+10
|
* Add new PassphraseDialogActivity, a transparent activity that only holds the ↵Dominik Schürmann2014-09-131-0/+357
passphrase dialog
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 19:02:44 +0000