Commit Graph

29 Commits

Author SHA1 Message Date
Dominik Schürmann fc32f5f9d4 Minor code cleanup 2014-11-21 12:41:39 +01:00
Dominik Schürmann ecfa2288eb Fix crash on Android 5 2014-10-22 23:28:13 +02:00
Dominik Schürmann b09d222f34 package reordering: merge util and helper, there were no real difference; created ui.util for everything related to formatting 2014-09-17 21:51:25 +02:00
Dominik Schürmann 7c67f7a715 Consolidate on database upgrade 2014-09-09 09:26:03 +02:00
Dominik Schürmann fe2c17cdeb Pull from transifex 2014-09-02 14:11:10 +02:00
Dominik Schürmann 0c437acd43 Catch security exception, known problem... 2014-09-02 13:51:09 +02:00
Dominik Schürmann 152cd10b70 Revert "No need for setSyncAutomatically, this is only for network tickles"
This reverts commit 0c1e65bc8b.

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
2014-08-22 08:53:16 +02:00
Dominik Schürmann 3c46c3c2df Add account only on jelly bean and above 2014-08-21 11:36:47 +02:00
Dominik Schürmann 0c1e65bc8b No need for setSyncAutomatically, this is only for network tickles 2014-08-21 11:33:42 +02:00
Dominik Schürmann 2930f83b2a Change account type 2014-08-21 11:19:44 +02:00
Dominik Schürmann 418e922c78 Enable sync adapter, changelog 2014-08-20 23:26:01 +02:00
Vincent Breitmoser 475293a116 consolidate: prevent concurrent calls of step 2 2014-08-20 19:59:45 +02:00
Vincent Breitmoser 9aaaac068e consolidate: use KeychainProvider for deletion operation 2014-08-20 19:31:51 +02:00
Dominik Schürmann c42f6a04ed Start consolidate activity 2014-08-19 16:49:48 +02:00
Vincent Breitmoser 9fb1050fed stub for consolidate recovery in KeychainApplication 2014-08-19 15:56:53 +02:00
Dominik Schürmann e4974ac409 Use CompressionAlgorithmTags instead of homebrew constants 2014-08-05 23:50:59 +02:00
Dominik Schürmann f4802157dd Optimize imports 2014-08-05 22:46:00 +02:00
Dominik Schürmann c2ca841ac9 Merge pull request #728 from mar-v-in/improve-file-more
Improve file encrypt
2014-08-04 00:21:59 +02:00
Vincent Breitmoser 827a958e12 remove debug output about security providers (cleaner unit tests) 2014-08-01 17:00:08 +02:00
mar-v-in 3564773410 Add temporary file storage as discussed in #665
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.
2014-07-01 14:50:15 +02:00
mar-v-in d1d414c006 Merge branch 'master' into improve-file-more
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
2014-07-01 00:15:30 +02:00
mar-v-in f97ac83a89 Move sks-keyservers.net CA into assets folder 2014-06-25 00:37:01 +02:00
mar-v-in 04e64ac84e Update Keyservers to use hkps as needed 2014-06-24 11:26:52 +02:00
mar-v-in 79fb23b095 Improve file more, Part 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)
2014-06-22 16:31:28 +02:00
mar-v-in 80e9998640 Show keys with android contacts
This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid.
2014-06-05 23:22:21 +02:00
mar-v-in dd959876f4 First version of automatic contact discovery.
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)
2014-06-04 18:05:16 +02:00
Vincent Breitmoser 96125b1976 ui: purplize edge overscroll glow effect 2014-05-07 01:39:28 +02:00
Dominik Schürmann 1e22b28c2e Optimize imports 2014-04-15 22:52:21 +02:00
Dominik Schürmann 6d11371905 Rename folder structure from OpenPGP Keychain to OpenKeychain 2014-04-06 12:57:42 +02:00