aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java
Commit message (Collapse)AuthorAgeFilesLines
* Shifted duplicate method implementations from KeyRing to openpgp-api submoduleAlex Fong2016-05-151-2/+3
|
* Fix Display Key in UploadKeyActivity, Issue #506Durgesh2016-03-311-0/+7
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-03-241-11/+10
| |\ | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-151-10/+15
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * | | minor changes, add convertFingerprintToKeyId methodVincent Breitmoser2015-03-081-1/+1
| | | |
* | | | preserve state in CertifyKeyFragmentVincent Breitmoser2015-05-291-5/+8
| |_|/ |/| |
* | | object oriented split user idDominik Schürmann2015-03-161-11/+10
| |/ |/|
* | Show main user id instead of key in certify screenDominik Schürmann2015-03-151-10/+15
|/
* rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-011-1/+1
| | | | | | | - introduce high-level SignEncryptOperation for uri to uri signing/encryption - use SignEncryptParcel for high-level operation parameters - use PgpSignEncryptInput plus streams for low-level operation parameters - get rid of all sign/encrypt logic in KeychainIntentService
* lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-251-3/+3
|
* Rename multi certify files to certifyDominik Schürmann2014-10-261-1/+1
|
* Make the Certify screen a little more self-explanatoryTim Bray2014-10-211-5/+6
|
* keylist: add safeslinger exchange button to secret keysVincent Breitmoser2014-10-101-3/+0
|
* rename certify_key_item to the more appropriate multi_certify_itemVincent Breitmoser2014-10-081-1/+1
|
* more layout neatificationVincent Breitmoser2014-10-051-1/+1
|
* merge key ids in getSelectedCertifyActionsVincent Breitmoser2014-10-041-3/+25
|
* implement preliminary MultiCertifyActivity (most heavy lifting is done)Vincent Breitmoser2014-10-041-0/+161
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-16 03:44:18 +0000