aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
Commit message (Collapse)AuthorAgeFilesLines
* Fix Display Key in UploadKeyActivity, Issue #506Durgesh2016-03-311-3/+3
|
* Display Key moved to FragmentDurgesh2016-03-291-170/+6
| | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-241-0/+2
| |
* | Make header text and tertiary text color themeableThialfihar2015-07-211-1/+2
| |
* | made mSignatureTime optional in CryptoOperationHelperAdithya Abraham Philip2015-07-151-1/+3
| |
* | introduce QueueingCryptoOperationFragment to queue result handling in ↵Vincent Breitmoser2015-07-071-3/+7
| | | | | | | | detached state
* | try cache in certify operation (fixes #1242)Vincent Breitmoser2015-07-071-5/+0
| |
* | added proxy support to OperationHelperAdithya Abraham Philip2015-07-031-2/+3
| |
* | added keyserver/proxy support to certify operationAdithya Abraham Philip2015-07-031-0/+5
| |
* | made CryptoOperationFragment implement OperationHelper.CallbackAdithya Abraham Philip2015-06-301-3/+3
| |
* | deleted KeychainServiceAdithya Abraham Philip2015-06-271-7/+0
| |
* | eventbus: initial attempt, replace messenger hack with eventbus communicationVincent Breitmoser2015-06-061-87/+25
| |
* | renamed KeychainIntentService to KeychainServiceAdithya Abraham Philip2015-06-011-12/+11
| |
* | merged servicesAdithya Abraham Philip2015-06-011-2/+3
| |
* | externalize caching functionality from CertifyKeyFragmentVincent Breitmoser2015-05-301-20/+11
| |
* | preserve state in CertifyKeyFragmentVincent Breitmoser2015-05-291-25/+65
| |
* | preserve state in KeySpinner, and some lint fixesVincent Breitmoser2015-05-271-2/+1
| |
* | rewrite EncryptActivity data flowVincent Breitmoser2015-05-271-11/+5
|/
* More cleanupDominik Schürmann2015-04-151-0/+1
|
* Fix certify with CryptoInputParcelDominik Schürmann2015-03-251-1/+1
|
* Remove backward compat in CertifyKeyFragmentDominik Schürmann2015-03-251-17/+1
|
* Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-241-4/+9
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.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/ImportKeysActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
| * shifted multi-threading to own serviceAdithya Abraham Philip2015-03-231-3/+8
| | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import
* | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcelVincent Breitmoser2015-03-211-4/+4
|\| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
| * Reworked Notify classManoj Khanna2015-03-201-4/+4
| |
* | fix more unit tests (syntax)Vincent Breitmoser2015-03-201-1/+2
| |
* | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-201-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+2
| |
* | generalize NfcOperationParcel to RequiredInputParcel, including passphrasesVincent Breitmoser2015-03-191-10/+1
| |
* | yubikey certifications!Vincent Breitmoser2015-03-181-57/+23
| |
* | introduce CryptoOperationParcel for nfc dataVincent Breitmoser2015-03-181-1/+3
|/
* object oriented split user idDominik Schürmann2015-03-161-4/+3
|
* Created enum MessageStatus in KeychainIntentServiceHandler and enum IOTypedanielnelz2015-03-091-1/+1
| | | | | in KeychainIntentService and replaced int constants with them. Fixed some typos.
* pass through messenger to certify service from ViewKeyActivityVincent Breitmoser2015-02-281-35/+51
| | | | | | the idea here is to handle progress and result of the CertifyActivity directly in ViewKeyActivity by passing a messenger through to it. this allows smoother transition from an uncertified to certified state.
* lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-251-1/+1
|
* make user_ids table typed, with attribute_data supportVincent Breitmoser2015-01-141-11/+11
| | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
* retrofit getBlob method of matrixcursor for android 2.3Vincent Breitmoser2014-10-271-1/+20
|
* Rename multi certify files to certifyDominik Schürmann2014-10-261-0/+393
|
* Remove old certify activityDominik Schürmann2014-10-251-422/+0
|
* move around package structure a bitVincent Breitmoser2014-10-101-3/+3
|
* certify: get rid of fingerprint checkVincent Breitmoser2014-10-041-4/+3
| | | | | | Master key ids are unambiguous by database design, and only keys which are in the database are signed. There is no reason to check the fingerprint again during the certify operation.
* redesign certify action to work with parcel input and resultVincent Breitmoser2014-10-041-13/+16
|
* DecryptTextActivity reworkDominik Schürmann2014-09-231-2/+2
|
* passphrasecache: cache by master key, introduce preference for cache by subkeyVincent Breitmoser2014-09-231-1/+1
|
* key spinner fixesDominik Schürmann2014-09-211-1/+1
|
* package reordering: merge util and helper, there were no real difference; ↵Dominik Schürmann2014-09-171-7/+6
| | | | created ui.util for everything related to formatting
* work on OperationResultParcelVincent Breitmoser2014-09-141-11/+10
|
* promote all result parcels to top level classes in their own packageVincent Breitmoser2014-09-131-1/+1
|
* fix key upload after certification (hopefully?)Vincent Breitmoser2014-09-121-4/+1
|