Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix crash on Android 5 | Dominik Schürmann | 2014-10-22 | 1 | -11/+16 |
| | |||||
* | package reordering: merge util and helper, there were no real difference; ↵ | Dominik Schürmann | 2014-09-17 | 1 | -2/+2 |
| | | | | created ui.util for everything related to formatting | ||||
* | Consolidate on database upgrade | Dominik Schürmann | 2014-09-09 | 1 | -1/+1 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2014-09-02 | 1 | -1/+1 |
| | |||||
* | Catch security exception, known problem... | Dominik Schürmann | 2014-09-02 | 1 | -13/+23 |
| | |||||
* | Revert "No need for setSyncAutomatically, this is only for network tickles" | Dominik Schürmann | 2014-08-22 | 1 | -0/+1 |
| | | | | | | | This reverts commit 0c1e65bc8bbfed59d299e2f0ca7a6a30eef22664. Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java | ||||
* | Add account only on jelly bean and above | Dominik Schürmann | 2014-08-21 | 1 | -8/+12 |
| | |||||
* | No need for setSyncAutomatically, this is only for network tickles | Dominik Schürmann | 2014-08-21 | 1 | -3/+5 |
| | |||||
* | Change account type | Dominik Schürmann | 2014-08-21 | 1 | -2/+2 |
| | |||||
* | Enable sync adapter, changelog | Dominik Schürmann | 2014-08-20 | 1 | -2/+6 |
| | |||||
* | consolidate: prevent concurrent calls of step 2 | Vincent Breitmoser | 2014-08-20 | 1 | -4/+9 |
| | |||||
* | consolidate: use KeychainProvider for deletion operation | Vincent Breitmoser | 2014-08-20 | 1 | -2/+0 |
| | |||||
* | Start consolidate activity | Dominik Schürmann | 2014-08-19 | 1 | -1/+8 |
| | |||||
* | stub for consolidate recovery in KeychainApplication | Vincent Breitmoser | 2014-08-19 | 1 | -1/+8 |
| | |||||
* | Use CompressionAlgorithmTags instead of homebrew constants | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
| | |||||
* | Optimize imports | Dominik Schürmann | 2014-08-05 | 1 | -1/+0 |
| | |||||
* | Merge pull request #728 from mar-v-in/improve-file-more | Dominik Schürmann | 2014-08-04 | 1 | -3/+4 |
|\ | | | | | Improve file encrypt | ||||
| * | Add temporary file storage as discussed in #665 | mar-v-in | 2014-07-01 | 1 | -0/+3 |
| | | | | | | | | 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. | ||||
| * | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-01 | 1 | -0/+7 |
| |\ | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | Improve file more, Part 1 | mar-v-in | 2014-06-22 | 1 | -4/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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) | ||||
* | | | remove debug output about security providers (cleaner unit tests) | Vincent Breitmoser | 2014-08-01 | 1 | -0/+2 |
| |/ |/| | |||||
* | | Move sks-keyservers.net CA into assets folder | mar-v-in | 2014-06-25 | 1 | -0/+3 |
| | | |||||
* | | Update Keyservers to use hkps as needed | mar-v-in | 2014-06-24 | 1 | -1/+4 |
|/ | |||||
* | Show keys with android contacts | mar-v-in | 2014-06-05 | 1 | -5/+6 |
| | | | | This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid. | ||||
* | First version of automatic contact discovery. | mar-v-in | 2014-06-04 | 1 | -0/+13 |
| | | | | | | | | | 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) | ||||
* | ui: purplize edge overscroll glow effect | Vincent Breitmoser | 2014-05-07 | 1 | -0/+20 |
| | |||||
* | Optimize imports | Dominik Schürmann | 2014-04-15 | 1 | -1/+0 |
| | |||||
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 1 | -0/+75 |