aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java
Commit message (Expand)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 branch 'development' into linked-identitiesVincent Breitmoser2015-03-241-11/+10
| |\
| * \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-151-10/+15
| |\ \
| * | | 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
* 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