aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-153-4/+9
| |\ \
| | * | fix keys with no expiry in ui codeVincent Breitmoser2014-08-143-4/+9
| | | |
| * | | Remove subkeys.pgp.net keyserver, often down and no hkpsDominik Schürmann2014-08-152-8/+21
| |/ /
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-141-1/+2
| |\ \
| | * | support changing expiry of subkeys to noneVincent Breitmoser2014-08-141-1/+2
| | | |
| * | | Pass through of master key id in SaveKeyringResultDominik Schürmann2014-08-143-25/+54
| |/ /
| * / fix subkey certification canonicalization (why did the test not catch this?!)Vincent Breitmoser2014-08-141-1/+1
| |/
| * Merge pull request #767 from mar-v-in/issue-763Dominik Schürmann2014-08-148-162/+362
| |\ | | | | | | Use dropdown in CertifyActivity
| | * Do not allow self certifyingmar-v-in2014-08-143-4/+20
| | |
| | * Fix KeySpinner on cursor changemar-v-in2014-08-141-1/+6
| | |
| | * Add and use CertifyKeySpinnermar-v-in2014-08-142-18/+62
| | |
| | * small bug in has_certifymar-v-in2014-08-141-1/+1
| | |
| | * add OnKeyChangedListener to KeySpinnermar-v-in2014-08-142-11/+41
| | |
| | * add HAS_CERTIFY (not sure why it's missing)mar-v-in2014-08-142-0/+12
| | |
| | * factor KeySpinner outmar-v-in2014-08-144-136/+229
| | |
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-144-16/+38
| |\ \
| | * | handle modify and save errors in KeychainIntentResultVincent Breitmoser2014-08-143-16/+33
| | | |
| | * | tests: add ProviderHelperSaveTest, with long key id collision testVincent Breitmoser2014-08-141-0/+5
| | | |
| * | | hacky fix to prevent key list from scrolling to top when opening nav drawerDominik Schürmann2014-08-141-7/+15
| |/ /
| * | dem logixVincent Breitmoser2014-08-141-1/+1
| | |
| * | merge: check fingerprints on merge operation! (this needs a testcase!)Vincent Breitmoser2014-08-141-1/+3
| | |
| * | Automcomplete names and emails in keyserver tabDominik Schürmann2014-08-142-2/+34
| |/
| * move v3 key import prevention into canonicalization methodDominik Schürmann2014-08-143-11/+8
| |
| * Do not import v3 keys, they are insecure!Dominik Schürmann2014-08-143-0/+15
| |
| * Remove MD5 supportDominik Schürmann2014-08-143-3/+7
| |
| * Remove support for v3 sig generationDominik Schürmann2014-08-146-112/+10
| |
* | Support for multiple hash algosDominik Schürmann2014-08-143-15/+28
| |
* | Merge branch 'master' into yubikeyDominik Schürmann2014-08-1428-333/+822
|\| | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
| * API: Return metadata only for v4 api clients and above...Dominik Schürmann2014-08-141-1/+1
| |
| * API: Return metadata only for v4 api clientsDominik Schürmann2014-08-141-3/+5
| |
| * Merge pull request #766 from mar-v-in/patch-1Dominik Schürmann2014-08-141-2/+2
| |\ | | | | | | Handle keys without expiry date right
| | * Handle keys without expiry date rightmar-v-in2014-08-141-2/+2
| | | | | | | | | Fixes #765
| * | Dont write version header by defaultDominik Schürmann2014-08-1410-29/+46
| |/
| * Add user info dialogDominik Schürmann2014-08-133-20/+128
| |
| * API: User interaction when account keys are deletedDominik Schürmann2014-08-134-25/+67
| |
| * Better error handling for passphrase cache if key is missingDominik Schürmann2014-08-137-71/+115
| |
| * remove bundle for symmetric/asymmetric fragment as it was uselessmar-v-in2014-08-132-31/+16
| |
| * fix message and uri from encrypt intentmar-v-in2014-08-132-18/+4
| |
| * Fix DECRYPT_METADATA apiDominik Schürmann2014-08-121-9/+21
| |
| * Merge pull request #758 from mar-v-in/encrypt-only-show-relevant-keysDominik Schürmann2014-08-124-23/+33
| |\ | | | | | | EncryptActivity: only show relevant keys
| | * Only show relevant keys in encrypt, fix #756 #757mar-v-in2014-08-122-13/+27
| | |
| | * Add convenience method to unified keyrings to determine whether a keyring is ↵mar-v-in2014-08-122-1/+5
| | | | | | | | | | | | expired, fix is_revoked for certain usages
| | * Only show keyrings that have a valid sign key in from field, fixes #756mar-v-in2014-08-121-10/+2
| | |
| * | Fix API version support, update api libDominik Schürmann2014-08-121-2/+4
| |/
| * Implement EXTRA_ORIGINAL_FILENAME for APIDominik Schürmann2014-08-111-1/+6
| |
| * Update api libDominik Schürmann2014-08-113-9/+9
| |
| * Support mime type in metadataDominik Schürmann2014-08-112-3/+27
| |
| * Decrypt metadata apiDominik Schürmann2014-08-113-10/+24
| |
| * Support API versions 3 and 4Dominik Schürmann2014-08-111-1/+4
| |
| * Get original filename for decryptionDominik Schürmann2014-08-114-20/+188
| |