aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
Commit message (Collapse)AuthorAgeFilesLines
* Shifted duplicate method implementations from KeyRing to openpgp-api submoduleAlex Fong2016-05-151-1/+2
|
* Revert usage of masked-edittext, back to plain edittexts for backup codesDominik Schürmann2016-04-121-27/+50
|
* Open keyboard for backup codeDominik Schürmann2016-03-081-22/+31
|
* Extend documentation, proper method naming, use of deprecated method annotationDominik Schürmann2016-02-221-0/+4
|
* Split remote methods from activities for better seperationDominik Schürmann2016-02-221-15/+9
|
* Backup format v2: redesign restore dialogDominik Schürmann2016-02-101-45/+23
|
* performance: avoid expensive getSecretKeyType call, use cached where possibleVincent Breitmoser2016-02-051-35/+45
|
* fix symmetric decryption with backup code (fixes #1677)Vincent Breitmoser2016-01-131-5/+6
|
* fix symmetric decryption (fixes #1672)Vincent Breitmoser2016-01-121-2/+2
|
* Use more generic 'Security Token' where possible, add sutitle to create key ↵Dominik Schürmann2016-01-101-2/+2
| | | | what tokens are supported
* add method to skip cachingVincent Breitmoser2016-01-061-90/+54
|
* inline-ttl: use ttl preference in ttl spinnerVincent Breitmoser2016-01-061-1/+1
|
* passphraseactivity: add inline spinner to password dialogVincent Breitmoser2016-01-061-2/+8
|
* passdialog: switch to ViewAnimatorVincent Breitmoser2016-01-051-11/+8
|
* Remove debug logDominik Schürmann2015-10-151-1/+0
|
* Display backup code UI instead of passphrase on decryptDominik Schürmann2015-10-151-1/+56
|
* Check if backup code in passphrase dialogDominik Schürmann2015-10-151-0/+21
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Linked Identities. Also includes an important fix for OperationHelper ids, which had an error in the bit mask logic. Conflicts: Graphics/update-drawables.sh OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.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/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java OpenKeychain/src/main/res/anim/fade_in.xml OpenKeychain/src/main/res/anim/fade_out.xml OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml OpenKeychain/src/main/res/layout/view_key_fragment.xml OpenKeychain/src/main/res/menu/key_view.xml OpenKeychain/src/main/res/values/strings.xml OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java README.md
| * 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
| * \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-241-6/+7
| |\ \ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | | 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
| * \ \ \ 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
| * | | | | certification of the first linked identity packet!Vincent Breitmoser2015-01-131-0/+3
| | | | | |
* | | | | | Remove dead codeDominik Schürmann2015-08-271-39/+30
| | | | | |
* | | | | | Refactor theme selection of dialogsThialfihar2015-07-211-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | This makes sure the dark theme also uses dark dialogs.
* | | | | | made mSignatureTime optional in CryptoOperationHelperAdithya Abraham Philip2015-07-151-1/+6
| | | | | |
* | | | | | made PassphraseDialogActivity compatible with null CryptoInputParcelAdithya Abraham Philip2015-07-131-0/+5
| | | | | |
* | | | | | prevented passphrase caching on revocationAdithya Abraham Philip2015-07-131-13/+35
| | | | | |
* | | | | | Use support.v7.app.AlertDialogDominik Schürmann2015-07-131-1/+1
| | | | | |
* | | | | | multi-decrypt: save currentInputUri stateVincent Breitmoser2015-07-091-0/+2
| | | | | |
* | | | | | use onResumeFragments instead of onResume for fragment initializationVincent Breitmoser2015-07-091-2/+2
| | | | | |
* | | | | | Better keyboard layout for PINsDominik Schürmann2015-07-021-4/+4
| | | | | |
* | | | | | instrument: change handling in PassphraseDialogActivity to work with espressoVincent Breitmoser2015-06-171-76/+32
| | | | | |
* | | | | | handle empty passphrases in PassphraseDialogActivityVincent Breitmoser2015-05-311-0/+25
| | | | | |
* | | | | | rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcelVincent Breitmoser2015-05-301-2/+0
| |_|_|_|/ |/| | | |
* | | | | 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
| * | | | New Passphrase class for safer passphrase handling in memoryDominik Schürmann2015-03-191-2/+3
| | | | |
* | | | | generalize NfcOperationParcel to RequiredInputParcel, including passphrasesVincent Breitmoser2015-03-191-1/+17
|/ / / /
* | | / object oriented split user idDominik Schürmann2015-03-161-3/+3
| |_|/ |/| |
* | | 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
| |/ |/|