Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Fix key sharing | Dominik Schürmann | 2014-08-20 | 1 | -3/+1 | |
| | | ||||||
* | | consolidate: small ui things | Vincent Breitmoser | 2014-08-20 | 1 | -0/+4 | |
| | | ||||||
* | | consolidate: remove debug "breakpoint" | Vincent Breitmoser | 2014-08-20 | 1 | -5/+0 | |
|/ | ||||||
* | consolidate: prevent concurrent calls of step 2 | Vincent Breitmoser | 2014-08-20 | 1 | -86/+103 | |
| | ||||||
* | consolidate: implement (mostly) recovery mode | Vincent Breitmoser | 2014-08-20 | 1 | -0/+5 | |
| | ||||||
* | consolidate: use KeychainProvider for deletion operation | Vincent Breitmoser | 2014-08-20 | 3 | -3/+7 | |
| | ||||||
* | Fix strings | Dominik Schürmann | 2014-08-19 | 1 | -1/+1 | |
| | ||||||
* | consolidate: a lot more log output, better recovery | Vincent Breitmoser | 2014-08-19 | 1 | -23/+63 | |
| | ||||||
* | consolidate: split into two steps, can pick up at second step if anything fails | Vincent Breitmoser | 2014-08-19 | 1 | -15/+50 | |
| | ||||||
* | consolidate: working implementation, lacking ui | Vincent Breitmoser | 2014-08-17 | 2 | -9/+174 | |
| | ||||||
* | Remove old_apg | Dominik Schürmann | 2014-08-15 | 1 | -4/+4 | |
| | ||||||
* | Pass through of master key id in SaveKeyringResult | Dominik Schürmann | 2014-08-14 | 1 | -19/+19 | |
| | ||||||
* | Merge pull request #767 from mar-v-in/issue-763 | Dominik Schürmann | 2014-08-14 | 2 | -0/+12 | |
|\ | | | | | Use dropdown in CertifyActivity | |||||
| * | small bug in has_certify | mar-v-in | 2014-08-14 | 1 | -1/+1 | |
| | | ||||||
| * | add HAS_CERTIFY (not sure why it's missing) | mar-v-in | 2014-08-14 | 2 | -0/+12 | |
| | | ||||||
* | | handle modify and save errors in KeychainIntentResult | Vincent Breitmoser | 2014-08-14 | 1 | -0/+4 | |
| | | ||||||
* | | tests: add ProviderHelperSaveTest, with long key id collision test | Vincent Breitmoser | 2014-08-14 | 1 | -0/+5 | |
|/ | ||||||
* | move v3 key import prevention into canonicalization method | Dominik Schürmann | 2014-08-14 | 1 | -10/+0 | |
| | ||||||
* | Do not import v3 keys, they are insecure! | Dominik Schürmann | 2014-08-14 | 1 | -0/+10 | |
| | ||||||
* | Merge pull request #766 from mar-v-in/patch-1 | Dominik Schürmann | 2014-08-14 | 1 | -2/+2 | |
|\ | | | | | Handle keys without expiry date right | |||||
| * | Handle keys without expiry date right | mar-v-in | 2014-08-14 | 1 | -2/+2 | |
| | | | | | | Fixes #765 | |||||
* | | Dont write version header by default | Dominik Schürmann | 2014-08-14 | 1 | -1/+4 | |
|/ | ||||||
* | API: User interaction when account keys are deleted | Dominik Schürmann | 2014-08-13 | 1 | -1/+1 | |
| | ||||||
* | Add convenience method to unified keyrings to determine whether a keyring is ↵ | mar-v-in | 2014-08-12 | 2 | -1/+5 | |
| | | | | expired, fix is_revoked for certain usages | |||||
* | Optimize imports | Dominik Schürmann | 2014-08-05 | 2 | -5/+6 | |
| | ||||||
* | KeychainContract: use longs instead of String, other fixes | Dominik Schürmann | 2014-08-05 | 3 | -20/+22 | |
| | ||||||
* | Add license headers | Dominik Schürmann | 2014-08-04 | 2 | -0/+34 | |
| | ||||||
* | Cleanup, prevent encrypt Intent inception | Dominik Schürmann | 2014-08-04 | 1 | -4/+4 | |
| | ||||||
* | Fix debug backup/restore methods | Dominik Schürmann | 2014-08-04 | 1 | -22/+17 | |
| | ||||||
* | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 2 | -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 Breitmoser | 2014-07-31 | 1 | -67/+64 | |
| | | ||||||
| * | couple of fixes in save*KeyRing methods | Vincent Breitmoser | 2014-07-30 | 1 | -23/+13 | |
| | | ||||||
| * | Fallback if no primary user id exists | Dominik Schürmann | 2014-07-16 | 1 | -0/+4 | |
| | | ||||||
| * | move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId) | Vincent Breitmoser | 2014-07-15 | 1 | -1/+1 | |
| | | ||||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-15 | 1 | -1/+1 | |
| |\ | ||||||
| | * | merge: different msg if nothing was merged | Vincent Breitmoser | 2014-07-15 | 1 | -1/+1 | |
| | | | ||||||
| * | | some fixes for edit | Dominik Schürmann | 2014-07-15 | 1 | -1/+1 | |
| |/ | ||||||
| * | some UncachedKeyRing fixes, primary user id mostly | Vincent Breitmoser | 2014-07-11 | 1 | -6/+5 | |
| | | ||||||
* | | - add multi select for storage api (kitkat) | mar-v-in | 2014-07-31 | 1 | -0/+2 | |
| | | | | | | | | | | - UI fixes - refactoring | |||||
* | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-06 | 1 | -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 english | Vincent Breitmoser | 2014-07-02 | 1 | -1/+5 | |
| | | | | | | | | closes #703 | |||||
* | | Many changes to file ... and still incomplete | mar-v-in | 2014-07-06 | 2 | -10/+56 | |
| | | | | | | | | | | - Multi file - Reworked UI | |||||
* | | Encrypt/Decrypt UI work | mar-v-in | 2014-07-02 | 1 | -7/+7 | |
| | | ||||||
* | | Add temporary file storage as discussed in #665 | mar-v-in | 2014-07-01 | 1 | -0/+151 | |
|/ | | | | Writable from OpenKeychain, readable worldwide. Should be used to write shared files to it by first creating the file using TemporaryStorageProvider.createFile and then write to the Uri returned. | |||||
* | pass import results through to viewkeyactivity on update | Vincent Breitmoser | 2014-06-28 | 1 | -2/+2 | |
| | ||||||
* | code cleanup and plurals in import log entries | Vincent Breitmoser | 2014-06-28 | 2 | -65/+41 | |
| | | | | closes #698 | |||||
* | fix indentation in various key import methods | Vincent Breitmoser | 2014-06-22 | 1 | -60/+64 | |
| | ||||||
* | VERY basic test for save keyring | Art O Cathain | 2014-06-21 | 1 | -13/+2 | |
| | ||||||
* | generate public keyring from secret if not available | Vincent Breitmoser | 2014-06-18 | 1 | -18/+18 | |
| | ||||||
* | consolidate: almost sane logging | Vincent Breitmoser | 2014-06-18 | 1 | -42/+54 | |
| |