Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add cancelable mechanism and support in key import | Vincent Breitmoser | 2014-08-31 | 1 | -8/+1 |
| | | | | Closes #323 | ||||
* | remember "show advanced tabs" setting | Vincent Breitmoser | 2014-08-31 | 1 | -0/+10 |
| | | | | Closes #669 | ||||
* | Fix possible nullpointer in Preferences | Dominik Schürmann | 2014-08-29 | 1 | -0/+3 |
| | |||||
* | Fix contact sync | Dominik Schürmann | 2014-08-22 | 1 | -5/+5 |
| | |||||
* | Add account only on jelly bean and above | Dominik Schürmann | 2014-08-21 | 1 | -0/+3 |
| | |||||
* | consolidate: a lot more log output, better recovery | Vincent Breitmoser | 2014-08-19 | 1 | -2/+2 |
| | |||||
* | consolidate: split into two steps, can pick up at second step if anything fails | Vincent Breitmoser | 2014-08-19 | 1 | -0/+31 |
| | |||||
* | Remove subkeys.pgp.net keyserver, often down and no hkps | Dominik Schürmann | 2014-08-15 | 1 | -7/+20 |
| | |||||
* | Automcomplete names and emails in keyserver tab | Dominik Schürmann | 2014-08-14 | 1 | -0/+18 |
| | |||||
* | Remove MD5 support | Dominik Schürmann | 2014-08-14 | 1 | -0/+5 |
| | |||||
* | Remove support for v3 sig generation | Dominik Schürmann | 2014-08-14 | 1 | -10/+0 |
| | |||||
* | Dont write version header by default | Dominik Schürmann | 2014-08-14 | 1 | -4/+4 |
| | |||||
* | Use CompressionAlgorithmTags instead of homebrew constants | Dominik Schürmann | 2014-08-05 | 1 | -3/+10 |
| | |||||
* | Optimize imports | Dominik Schürmann | 2014-08-05 | 5 | -9/+25 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-05 | 1 | -1/+5 |
|\ | |||||
| * | Use size of input uris for progress bar in encrypt/decrypt | mar-v-in | 2014-08-04 | 1 | -1/+5 |
| | | |||||
* | | KeychainContract: use longs instead of String, other fixes | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
|/ | |||||
* | Fixing lint complaints, removing unused resources | Dominik Schürmann | 2014-08-04 | 1 | -1/+2 |
| | |||||
* | Cleanup, prevent encrypt Intent inception | Dominik Schürmann | 2014-08-04 | 1 | -9/+12 |
| | |||||
* | Cache contact photos to make UI more fluid | mar-v-in | 2014-08-01 | 1 | -0/+10 |
| | |||||
* | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 1 | -0/+20 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Program flow fixes | Dominik Schürmann | 2014-07-25 | 1 | -1/+1 |
| | | |||||
| * | Merge remote-tracking branch 'upstream/master' | Daniel Albert | 2014-07-16 | 1 | -0/+10 |
| |\ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java | ||||
| | * | New first time screen | Dominik Schürmann | 2014-07-16 | 1 | -0/+10 |
| | | | |||||
| * | | Added Preference for concealing the PgpApplication | Daniel Albert | 2014-07-12 | 1 | -0/+10 |
| |/ | |||||
* | | - add multi select for storage api (kitkat) | mar-v-in | 2014-07-31 | 1 | -8/+9 |
| | | | | | | | | | | - UI fixes - refactoring | ||||
* | | Load of rework on EncryptActivity, still some TODOs | mar-v-in | 2014-07-20 | 1 | -8/+13 |
| | | |||||
* | | Many changes to file ... and still incomplete | mar-v-in | 2014-07-06 | 2 | -0/+55 |
| | | | | | | | | | | - Multi file - Reworked UI | ||||
* | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-01 | 3 | -2/+282 |
|\| | | | | | | | | | | | | | | | 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 | ||||
| * | Magic to find possible mails and names of device owner | Dominik Schürmann | 2014-06-28 | 1 | -2/+135 |
| | | |||||
| * | Move sks-keyservers.net CA into assets folder | mar-v-in | 2014-06-25 | 1 | -0/+46 |
| | | |||||
| * | Update Keyservers to use hkps as needed | mar-v-in | 2014-06-24 | 1 | -0/+18 |
| | | |||||
| * | Add TlsHelper (designed to be used with sks-keyservers.net) | mar-v-in | 2014-06-23 | 1 | -0/+83 |
| | | | | | | | | We can't use the AndroidPinning library for this, because it requires the certificate to be signed using a system CA, sks-keyservers.net uses there own CA | ||||
* | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-06-24 | 1 | -5/+7 |
|\| | |||||
| * | Switch to dnsjava | mar-v-in | 2014-06-23 | 1 | -5/+7 |
| | | |||||
* | | Improve file more, Part 1 | mar-v-in | 2014-06-22 | 2 | -105/+107 |
|/ | | | | | | | | | | | | | | | - 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) | ||||
* | Merge branch 'master' into improve-file | mar-v-in | 2014-06-18 | 2 | -51/+187 |
|\ | |||||
| * | Merge pull request #661 from mar-v-in/improve-contacts | Dominik Schürmann | 2014-06-18 | 1 | -51/+178 |
| |\ | | | | | | | Improve contact sync | ||||
| | * | Remove abandoned contacts | mar-v-in | 2014-06-18 | 1 | -26/+90 |
| | | | |||||
| | * | Code style | mar-v-in | 2014-06-18 | 1 | -13/+26 |
| | | | |||||
| | * | Continue contact db sync | mar-v-in | 2014-06-18 | 1 | -39/+89 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Only add keyrings to contact db that are not expired nor revoked - Merge all user ids of a key into one contact (#659) - Update contacts: Changes in keyrings (user id add, user id revoke, change of primary id) will be updated into contact db TODO: - delete contact once keyring is removed from OK - sync: wait for key downloads to complete before changing contact db | ||||
| * | | Redesign Import, still some todos and regression bugs | Dominik Schürmann | 2014-06-18 | 1 | -0/+9 |
| |/ | |||||
* / | Use Document API on KitKat for file encrypt/decrypt | mar-v-in | 2014-06-10 | 1 | -0/+35 |
|/ | |||||
* | Fix compile error introduced during merge | mar-v-in | 2014-06-06 | 1 | -1/+2 |
| | |||||
* | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-05 | 1 | -3/+0 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | neatness refactoring | Vincent Breitmoser | 2014-06-04 | 1 | -3/+0 |
| | | |||||
* | | Show keys with android contacts | mar-v-in | 2014-06-05 | 1 | -2/+87 |
| | | | | | | | | This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid. | ||||
* | | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-04 | 1 | -2/+4 |
|\| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | wrapped-key-ring: use CachedKeyRing where possible | Vincent Breitmoser | 2014-05-21 | 1 | -2/+4 |
| | | |||||
* | | First version of automatic contact discovery. | mar-v-in | 2014-06-04 | 1 | -0/+97 |
| | | | | | | | | | | | | | | | | | | TODO: - Configuration (much of it) - Enabled by default? - Which keys to import? Current state: All non-revoked and non-expired with matching userid - Search for keys if already known? Current state: yes, may cause traffic (configuration: only when wifi?) - Update interval: Currently Android handles it, might be good (causes automatic refresh on new contact and stuff like that) or bad (too many of refreshes) |