aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Use fixed gradle versionsDominik Schürmann2014-06-042-2/+2
|
* Use fixed gradle versionsDominik Schürmann2014-06-042-3/+6
|
* Merge pull request #643 from open-keychain/v/devDominik Schürmann2014-06-0357-1790/+2727
|\ | | | | wrap bouncycastle objects and don't use them in android-related code
| * 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
|\ \
| * \ Merge pull request #632 from timbray/masterDominik Schürmann2014-05-257-63/+54
| |\ \ | | | | | | | | Refactor server query exceptions again
| | * | 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
|/ /
| * spongycastle: expose pskr constructorVincent Breitmoser2014-06-021-0/+0
| |
| * wrapped-key-ring: add documentationVincent Breitmoser2014-06-028-8/+85
| |
| * 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-275-105/+36
| |
| * 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-2137-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 branch 'thi-highlight-keyserver-search-results-as-well'Dominik Schürmann2014-05-189-91/+128
|\ \
| * | 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
|/ /
* | Merge pull request #630 from timbray/masterDominik Schürmann2014-05-162-24/+60
|\ \ | | | | | | Handle changed keybase.io search results format
| * | keybase cleanups for revised search output formatTim Bray2014-05-151-24/+7
| | |
| * | keybase now has key info in search outputTim Bray2014-05-151-0/+5
| | |
| * | JWalk javadocsTim Bray2014-05-141-0/+48
|/ /
* | New screenshotsDominik Schürmann2014-05-1410-0/+0
| |
* | Merge pull request #627 from thi/improve-keybase.io-supportDominik Schürmann2014-05-146-49/+94
|\ \ | | | | | | Improve keybase.io support
| * | Rename fingerPrint to fingerprintThialfihar2014-05-145-16/+16
| | |
| * | Add github, twitter, website info for keybase keysThialfihar2014-05-141-0/+17
| | | | | | | | | | | | | | | | | | | | | The very point of keybase.io is the identification and proven link to those identities, so it should be nice to have them. The display is a bit basic still, as it just adds them as userIds, I'm sure this can be prettified, perhaps with logos?
| * | Cleanup keybase query a bitThialfihar2014-05-141-15/+14
| | | | | | | | | | | | | | | | | | | | | Remove ctime and the cached key, making the query for the entire user object unnecessary. This should only be done when the user decides to import the key. Hopefully keybase.io can provide all info necessary in the search results.
| * | Don't guess keybase key algorithm and sizeThialfihar2014-05-142-5/+8
| | | | | | | | | | | | | | | Once keybase reports them, we can display them. Until then we simply don't know and shouldn't lie about it.
| * | Add extraData property in ImportKeyListEntryThialfihar2014-05-143-8/+20
| | | | | | | | | | | | | | | | | | This allows any KeyServer to store some extra data it might need. In the case of KeybaseKeyServer it is the username, which then can be grabbed directly, without the hack of storing it as userId.
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-16 03:35:29 +0000