aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge ACTION_DOWNLOAD_AND_IMPORT_KEYS and ACTION_IMPORT_KEYBASE_KEYSmar-v-in2014-05-291-54/+15
| | | | |
| * | | | Merge branch 'hkps-support' into automatic-contact-discoverymar-v-in2014-05-291-15/+54
| |\ \ \ \
| | * | | | Fix url building to support certificate check on hkps serversmar-v-in2014-05-281-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | Note: the CA used by sks-keyservers.net is not valid for android, thus using hkps fails for them. pgp.mit.edu uses a perfectly valid cert.
| | * | | | Add hkps supportmar-v-in2014-05-271-9/+37
| | | | | |
| * | | | | Store nice origin with keybase keys (that can't be interpreted as HKP server)mar-v-in2014-05-291-1/+2
| | | | | |
| * | | | | Make abstract methods in Keyserver public (implementations make them public ↵mar-v-in2014-05-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | anyway)
| * | | | | Download from origin during ACTION_DOWNLOAD_AND_IMPORT_KEYSmar-v-in2014-05-291-3/+4
| |/ / / /
| * | | | Store origin with ImportKeysListEntrymar-v-in2014-05-273-0/+13
| | | | |
| * | | | Add ability to resolve HkpKeyserver from _hkp._tcp SRV recordmar-v-in2014-05-271-0/+38
| | | | |
| * | | | ContactHelper can read email addresses from contact listmar-v-in2014-05-262-0/+22
| | | | |
* | | | | Move SlidingTabLayout and SlidingTabStrip into appropriate subpackageDominik Schürmann2014-06-066-6/+6
| | | | |
* | | | | Hide subkeys, certs tabs in key view, checkable menu item to show/hide themDominik Schürmann2014-06-064-10/+94
| |_|/ / |/| | |
* | | | Clean up keyimport.ImportKeysListEntryTim Bray2014-06-052-67/+66
| | | |
* | | | Merge pull request #645 from timbray/masterDominik Schürmann2014-06-052-7/+4
|\ \ \ \ | |_|_|/ |/| | | Don't show full fingerprint in key search result lists
| * | | Don't show full fingerprint in key search resultsTim Bray2014-06-051-6/+2
| | | |
| * | | fixed error messageTim Bray2014-06-042-4/+3
| | |/ | |/|
* | | ui: do show Certify identities button even for secret keysVincent Breitmoser2014-06-041-8/+0
| | | | | | | | | | | | Closes #636
* | | fix bug with bad verifying master keysVincent Breitmoser2014-06-041-3/+3
| | |
* | | do respect expectedFingerprint during key importVincent Breitmoser2014-06-042-9/+18
| | |
* | | neatness refactoringVincent Breitmoser2014-06-0433-241/+118
|/ /
* | Merge remote-tracking branch 'origin/master' into edit-key-rewriteVincent Breitmoser2014-06-0299-712/+1368
|\ \
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-317-63/+54
| |\|
| | * Finished cleaning up rebase conflicts post Keyserver exception refactorTim Bray2014-05-236-32/+33
| | |
| | * Add Log.d for QueryFailedExceptionTim Bray2014-05-231-0/+2
| | |
| | * Add Log.d for QueryFailedExceptionTim Bray2014-05-237-40/+28
| | |
| * | Pull from transifexDominik Schürmann2014-05-3192-649/+1314
| |/
* | wrapped-key-ring: add documentationVincent Breitmoser2014-06-027-7/+83
| |
* | make everything work againVincent Breitmoser2014-06-023-8/+22
| |
* | wrapped-key-ring: move key data around in ParcelableKeyRing instead of ↵Vincent Breitmoser2014-06-029-183/+119
| | | | | | | | ImportKeysListEntry
* | wrapped-key-ring: no UncachedSecretKeyRing after allVincent Breitmoser2014-06-029-61/+75
| |
* | new savekeyring operation (mostly stub)Vincent Breitmoser2014-05-2716-356/+595
| |
* | introduce new SaveKeyringParcelVincent Breitmoser2014-05-271-0/+113
| |
* | rename SaveKeyringParcel to OldSaveKeyringParcelVincent Breitmoser2014-05-274-14/+19
| |
* | update unit test support in build filesVincent Breitmoser2014-05-273-69/+12
| |
* | fix missing userIds in ImportKeysListEntryVincent Breitmoser2014-05-272-4/+9
| |
* | wrapped-key-ring: forgot a part in PgpDecryptVerifyVincent Breitmoser2014-05-231-2/+9
| |
* | introduce WrappedSignature for the ViewCert* ui codeVincent Breitmoser2014-05-233-31/+149
| |
* | wrapped-key-ring: use UncachedKeyRing in ImportKeysListLoaderVincent Breitmoser2014-05-231-28/+8
| |
* | wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic typeVincent Breitmoser2014-05-238-101/+126
| |
* | wrapped-key-ring: encapsulate key flagsVincent Breitmoser2014-05-223-18/+27
| |
* | Merge remote-tracking branch 'origin/master' into wrapped-key-ringVincent Breitmoser2014-05-2127-253/+375
|\| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * Layout fixes for key importDominik Schürmann2014-05-199-66/+58
| |
| * Add license header to FixedDrawerLayoutDominik Schürmann2014-05-181-0/+16
| |
| * Merge highlight keyserver pull requestDominik Schürmann2014-05-189-91/+128
| |\
| | * Rename mCurQuery to mQuery for consistencyThialfihar2014-05-161-5/+5
| | |
| | * Use Highlighter instead of HighlightQueryCursorAdapterThialfihar2014-05-163-79/+28
| | |
| | * Add highlighting to keyserver/keybase searchThialfihar2014-05-165-5/+75
| | |
| | * Support mutliple search words and highlight themThialfihar2014-05-163-6/+24
| | | | | | | | | | | | | | | | | | | | | For the regex matching it would be smart to sort the words by length, so the longest matches come first. This only matters for queries with words containing parts of each other, which is an unlikely event and even then it doesn't break anything.
| * | Rename KeyServer to KeyserverDominik Schürmann2014-05-189-38/+34
| |/
| * keybase cleanups for revised search output formatTim Bray2014-05-151-24/+7
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-02 14:59:08 +0000