Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-01 | 121 | -630/+2186 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java | |||||
| * \ \ \ \ \ | Merge branch 'master' into improve-file-more | mar-v-in | 2014-06-24 | 21 | -86/+587 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'master' of github.com:mar-v-in/open-keychain into ↵ | mar-v-in | 2014-06-22 | 49 | -526/+997 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | improve-file-more | |||||
| * | | | | | | | | Improve file more, Part 1 | mar-v-in | 2014-06-22 | 15 | -496/+291 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use Uris where it makes sense, Use File class to clarify it's a file (and not whatever else a string could be) - Show sdcard in side menu in storage API #665 - Propose filename with gpg ending when storing it using the storage API #665 - Don't show output dialog on Android 4.4 #665 - Only show filename on Android < 4.4 #665 TODO: - File deletion for Android < 4.4 - Testing (especially with Android < 4.4) - Batch-encryption - UI - Temporary content provider (see #665 discussion) | |||||
* | | | | | | | | | small fix for MSG_MF_UID_ADD log entry | Vincent Breitmoser | 2014-08-01 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-01 | 14 | -147/+259 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | fix dumb mistake in modifySecretKey | Vincent Breitmoser | 2014-08-01 | 3 | -16/+10 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | remove debug output about security providers (cleaner unit tests) | Vincent Breitmoser | 2014-08-01 | 1 | -0/+2 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | make FileImportCache generic, iterable, and add unit test | Vincent Breitmoser | 2014-08-01 | 4 | -31/+89 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | move classes around a bit | Vincent Breitmoser | 2014-08-01 | 8 | -126/+184 | |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
* | | | | | | | | | Again update submodules | Dominik Schürmann | 2014-08-01 | 3 | -0/+0 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Add user id with dialog | Dominik Schürmann | 2014-08-01 | 18 | -228/+455 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Remve cacheing of keyrings (cleanup of #726) | Dominik Schürmann | 2014-08-01 | 1 | -5/+0 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-01 | 3 | -15/+72 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge pull request #726 from mar-v-in/fix-import-from-server | Dominik Schürmann | 2014-08-01 | 1 | -3/+14 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix import from server | |||||
| | * | | | | | | | | Undo import changes | mar-v-in | 2014-08-01 | 1 | -3/+27 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Fix import from server | mar-v-in | 2014-08-01 | 1 | -30/+17 | |
| | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was broken since 7bbe869c88c445b087e32a75572cf18efa2165b6 This also keeps the ACTION_IMPORT_KEYRING action stable | |||||
| * | | | | | | | | Merge pull request #727 from mar-v-in/fix-cachedpublickeyring | Dominik Schürmann | 2014-08-01 | 2 | -12/+58 | |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | Fix CachedPublicKeyring | |||||
| | * | | | | | | | Fix CachedPublicKeyring | mar-v-in | 2014-08-01 | 2 | -12/+58 | |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | I had this code already in my git, but it was in between the load of other things in there, just pulled it out. | |||||
* / / / / / / / | identity instead of credentials | Dominik Schürmann | 2014-08-01 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Start fixing CachedPublicKeyRing | Dominik Schürmann | 2014-08-01 | 3 | -23/+26 | |
| | | | | | | | ||||||
* | | | | | | | Certifying instead of signing | Dominik Schürmann | 2014-08-01 | 2 | -7/+7 | |
| | | | | | | | ||||||
* | | | | | | | Remove runtime check to fix passphrase service | Dominik Schürmann | 2014-08-01 | 1 | -6/+0 | |
| | | | | | | | ||||||
* | | | | | | | Use darker colors | Dominik Schürmann | 2014-08-01 | 3 | -9/+9 | |
| | | | | | | | ||||||
* | | | | | | | Show file tab only for import of existing keys | Dominik Schürmann | 2014-08-01 | 1 | -15/+42 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-31 | 8 | -53/+92 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | lowercase all key ids from keyserver | Vincent Breitmoser | 2014-07-31 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | move upload/update buttons from menu to buttons | Vincent Breitmoser | 2014-07-31 | 7 | -51/+90 | |
| | | | | | | | | ||||||
* | | | | | | | | Show revoked and expired for private keys | Dominik Schürmann | 2014-07-31 | 1 | -29/+28 | |
|/ / / / / / / | ||||||
* | | | | | | | Fix update from keyserver | Dominik Schürmann | 2014-07-31 | 1 | -0/+5 | |
| | | | | | | | ||||||
* | | | | | | | Remove private/secret key language from strings | Dominik Schürmann | 2014-07-31 | 1 | -9/+5 | |
| | | | | | | | ||||||
* | | | | | | | Fixes for upload | Dominik Schürmann | 2014-07-31 | 4 | -15/+20 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-31 | 5 | -46/+43 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | fix bug in UploadKeyActivity, minor work on uri handling | Vincent Breitmoser | 2014-07-31 | 3 | -25/+21 | |
| | | | | | | | | ||||||
| * | | | | | | | more fixes on canonicalization and progress | Vincent Breitmoser | 2014-07-31 | 2 | -21/+22 | |
| |/ / / / / / | ||||||
* / / / / / / | Create key: design fixes | Dominik Schürmann | 2014-07-31 | 9 | -23/+52 | |
|/ / / / / / | ||||||
* | | | | | | Fix animations in create key | Dominik Schürmann | 2014-07-31 | 5 | -47/+31 | |
| | | | | | | ||||||
* | | | | | | Add notify layouts to some activities | Dominik Schürmann | 2014-07-31 | 4 | -80/+104 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-31 | 4 | -19/+99 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | completely overengineer progress indication in {modify,create}SecretKeyRing ↵ | Vincent Breitmoser | 2014-07-31 | 4 | -19/+99 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | methods | |||||
* | | | | | | | Robots like coffee too... | Dominik Schürmann | 2014-07-31 | 17 | -36/+163 | |
|/ / / / / / | ||||||
* | | | | | | Parcelable data over 1MB can not be send through binder, parcel into a cache ↵ | Dominik Schürmann | 2014-07-31 | 3 | -16/+128 | |
| | | | | | | | | | | | | | | | | | | | | | | | | file, fix #592 | |||||
* | | | | | | avoid nullpointerexception in EditKeyResult | Vincent Breitmoser | 2014-07-31 | 1 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | fix fromStream method, properly recognize multiple concatenated streams | Vincent Breitmoser | 2014-07-31 | 1 | -17/+20 | |
| | | | | | | ||||||
* | | | | | | always return an EditKeyResult in modifyKey method | Vincent Breitmoser | 2014-07-31 | 1 | -25/+25 | |
| | | | | | | ||||||
* | | | | | | tests: adapt to new EditKeyResult return value | Vincent Breitmoser | 2014-07-31 | 7 | -397/+98 | |
| | | | | | | ||||||
* | | | | | | Handle result in create key | Dominik Schürmann | 2014-07-31 | 1 | -2/+7 | |
| | | | | | | ||||||
* | | | | | | Fix string | Dominik Schürmann | 2014-07-31 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Keyserver exception translateable | Dominik Schürmann | 2014-07-31 | 13 | -25/+36 | |
| | | | | | | ||||||
* | | | | | | Smaller notes | Dominik Schürmann | 2014-07-31 | 2 | -1/+9 | |
| | | | | | |