| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-01 | 44 | -504/+1494 | |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 12 | -69/+493 | |
| | | |\ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ | Merge branch 'master' of github.com:mar-v-in/open-keychain into ↵ | mar-v-in | 2014-06-22 | 30 | -445/+795 | |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improve-file-more | |||||
| | | * | | | | | | | | Improve file more, Part 1 | mar-v-in | 2014-06-22 | 14 | -496/+290 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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' into yubikey | Dominik Schürmann | 2014-08-01 | 15 | -266/+583 | |
| |\| | | | | | | | | | ||||||
| | * | | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-01 | 7 | -108/+192 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | fix dumb mistake in modifySecretKey | Vincent Breitmoser | 2014-08-01 | 2 | -6/+2 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | 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 | 3 | -31/+35 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | move classes around a bit | Vincent Breitmoser | 2014-08-01 | 2 | -97/+179 | |
| | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | ||||||
| | * / | | | | | | | | Add user id with dialog | Dominik Schürmann | 2014-08-01 | 8 | -158/+391 | |
| | |/ / / / / / / / | ||||||
| * | | | | | | | | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-01 | 57 | -1955/+2171 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java | |||||
| | * | | | | | | | | Remve cacheing of keyrings (cleanup of #726) | Dominik Schürmann | 2014-08-01 | 1 | -5/+0 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | 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 | |||||
| | * | | | | | | | | 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. | |||||
| | * | | | | | | | Start fixing CachedPublicKeyRing | Dominik Schürmann | 2014-08-01 | 2 | -22/+26 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Certifying instead of signing | Dominik Schürmann | 2014-08-01 | 1 | -7/+6 | |
| | | | | | | | | | ||||||
| | * | | | | | | | 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 | 4 | -34/+45 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | 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 | 3 | -32/+43 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | 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 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Fixes for upload | Dominik Schürmann | 2014-07-31 | 3 | -15/+19 | |
| | | | | | | | | | ||||||
| | * | | | | | | | 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 | 1 | -1/+7 | |
| | |/ / / / / / | ||||||
| | * | | | | | | Fix animations in create key | Dominik Schürmann | 2014-07-31 | 3 | -22/+18 | |
| | | | | | | | | ||||||
| | * | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-31 | 3 | -19/+85 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | completely overengineer progress indication in {modify,create}SecretKeyRing ↵ | Vincent Breitmoser | 2014-07-31 | 3 | -19/+85 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | methods | |||||
| | * | | | | | | | Robots like coffee too... | Dominik Schürmann | 2014-07-31 | 6 | -21/+16 | |
| | |/ / / / / / | ||||||
| | * | | | | | | 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 | |
| | | | | | | | | ||||||
| | * | | | | | | Handle result in create key | Dominik Schürmann | 2014-07-31 | 1 | -2/+7 | |
| | | | | | | | | ||||||
| | * | | | | | | Keyserver exception translateable | Dominik Schürmann | 2014-07-31 | 4 | -4/+13 | |
| | | | | | | | | ||||||
| | * | | | | | | Smaller notes | Dominik Schürmann | 2014-07-31 | 1 | -0/+8 | |
| | | | | | | | | ||||||
| | * | | | | | | reduce memory usage while parsing multiple keyrings from a stream | Vincent Breitmoser | 2014-07-31 | 2 | -30/+71 | |
| | | | | | | | | ||||||
| | * | | | | | | Even better Exception handling with keyserver queries | Dominik Schürmann | 2014-07-31 | 1 | -8/+10 | |
| | | | | | | | | ||||||
| | * | | | | | | Exception handling with keyserver queries | Dominik Schürmann | 2014-07-31 | 1 | -5/+13 | |
| | | | | | | | | ||||||
| | * | | | | | | couple of logging fixes | Vincent Breitmoser | 2014-07-31 | 3 | -6/+4 | |
| | | | | | | | | ||||||
| | * | | | | | | rename Wrapped*Key* to Canonicalized*Key* | Vincent Breitmoser | 2014-07-31 | 21 | -209/+193 | |
| | | | | | | | | ||||||
| | * | | | | | | Better exception handling for import of keys | Dominik Schürmann | 2014-07-31 | 3 | -41/+21 | |
| | | | | | | | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |