aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider
Commit message (Collapse)AuthorAgeFilesLines
...
* flag revoked, epired and unavailable keys in selection spinnerVincent Breitmoser2014-09-071-0/+2
|
* work on passphrase caching, make use of cached SecretKeyType data (WIP!)Vincent Breitmoser2014-09-032-11/+17
|
* add getSecretKeyType method to CachedPublicKeyRingVincent Breitmoser2014-09-032-2/+32
|
* cache key s2k type in database, for later useVincent Breitmoser2014-09-021-15/+30
|
* ditch NullProgressableVincent Breitmoser2014-08-301-2/+2
|
* add ecc supportVincent Breitmoser2014-08-244-9/+20
|
* Copyright (C) 2014 Vincent BreitmoserVincent Breitmoser2014-08-216-0/+6
|
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-201-3/+1
|\
| * Fix key sharingDominik Schürmann2014-08-201-3/+1
| |
* | consolidate: small ui thingsVincent Breitmoser2014-08-201-0/+4
| |
* | consolidate: remove debug "breakpoint"Vincent Breitmoser2014-08-201-5/+0
|/
* consolidate: prevent concurrent calls of step 2Vincent Breitmoser2014-08-201-86/+103
|
* consolidate: implement (mostly) recovery modeVincent Breitmoser2014-08-201-0/+5
|
* consolidate: use KeychainProvider for deletion operationVincent Breitmoser2014-08-203-3/+7
|
* Fix stringsDominik Schürmann2014-08-191-1/+1
|
* consolidate: a lot more log output, better recoveryVincent Breitmoser2014-08-191-23/+63
|
* consolidate: split into two steps, can pick up at second step if anything failsVincent Breitmoser2014-08-191-15/+50
|
* consolidate: working implementation, lacking uiVincent Breitmoser2014-08-172-9/+174
|
* Remove old_apgDominik Schürmann2014-08-151-4/+4
|
* Pass through of master key id in SaveKeyringResultDominik Schürmann2014-08-141-19/+19
|
* Merge pull request #767 from mar-v-in/issue-763Dominik Schürmann2014-08-142-0/+12
|\ | | | | Use dropdown in CertifyActivity
| * small bug in has_certifymar-v-in2014-08-141-1/+1
| |
| * add HAS_CERTIFY (not sure why it's missing)mar-v-in2014-08-142-0/+12
| |
* | handle modify and save errors in KeychainIntentResultVincent Breitmoser2014-08-141-0/+4
| |
* | tests: add ProviderHelperSaveTest, with long key id collision testVincent Breitmoser2014-08-141-0/+5
|/
* move v3 key import prevention into canonicalization methodDominik Schürmann2014-08-141-10/+0
|
* Do not import v3 keys, they are insecure!Dominik Schürmann2014-08-141-0/+10
|
* 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-141-1/+4
|/
* API: User interaction when account keys are deletedDominik Schürmann2014-08-131-1/+1
|
* 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
* Optimize importsDominik Schürmann2014-08-052-5/+6
|
* KeychainContract: use longs instead of String, other fixesDominik Schürmann2014-08-053-20/+22
|
* Add license headersDominik Schürmann2014-08-042-0/+34
|
* Cleanup, prevent encrypt Intent inceptionDominik Schürmann2014-08-041-4/+4
|
* Fix debug backup/restore methodsDominik Schürmann2014-08-041-22/+17
|
* Merge branch 'master' into improve-file-moremar-v-in2014-07-312-89/+79
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
| * rename Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-311-67/+64
| |
| * couple of fixes in save*KeyRing methodsVincent Breitmoser2014-07-301-23/+13
| |
| * Fallback if no primary user id existsDominik Schürmann2014-07-161-0/+4
| |
| * move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId)Vincent Breitmoser2014-07-151-1/+1
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-151-1/+1
| |\
| | * merge: different msg if nothing was mergedVincent Breitmoser2014-07-151-1/+1
| | |
| * | some fixes for editDominik Schürmann2014-07-151-1/+1
| |/
| * some UncachedKeyRing fixes, primary user id mostlyVincent Breitmoser2014-07-111-6/+5
| |
* | - add multi select for storage api (kitkat)mar-v-in2014-07-311-0/+2
| | | | | | | | | | - UI fixes - refactoring
* | Merge branch 'master' into improve-file-moremar-v-in2014-07-061-1/+5
|\| | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/res/layout/encrypt_content.xml
| * don't use zero plural string for englishVincent Breitmoser2014-07-021-1/+5
| | | | | | | | closes #703
* | Many changes to file ... and still incompletemar-v-in2014-07-062-10/+56
| | | | | | | | | | - Multi file - Reworked UI