cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,499 Commits 1 Branch 0 Tags
3a13cd5e4deebe283f8bfbc5122951e0a77b339d
Commit Graph
72 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
mar-v-in 3a13cd5e4d Fix first key is not used erroneously 2014-08-01 12:23:31 +02:00
mar-v-in 0568632f32 Merge branch 'master' into improve-file-more 2014-08-01 10:32:20 +02:00
mar-v-in 4b2b1a25e3 Fix CachedPublicKeyring 
I had this code already in my git, but it was in between the load of other things in there, just pulled it out.
 2014-08-01 05:37:21 +02:00
mar-v-in 00f5352ddc Fixes after merge 2014-08-01 05:31:04 +02:00
mar-v-in fc2a1f5838 Merge branch 'master' into improve-file-more 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
 2014-08-01 05:29:40 +02:00
mar-v-in 3a97c36d4a Undo import changes 2014-08-01 05:16:08 +02:00
mar-v-in 159c532ae2 Fix import from server 
Was broken since 7bbe869c88
This also keeps the ACTION_IMPORT_KEYRING action stable
 2014-08-01 05:11:24 +02:00
mar-v-in c71cdc1432 Fix string resources 2014-07-31 23:36:37 +02:00
mar-v-in 36d8c9f608 Fix merge 2014-07-31 23:20:43 +02:00
mar-v-in eae7c711a3 Merge branch 'master' into improve-file-more 
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
 2014-07-31 23:19:01 +02:00
mar-v-in 0c7eea225b - add multi select for storage api (kitkat) 
- UI fixes
- refactoring
 2014-07-31 22:21:46 +02:00
mar-v-in 1e4f0c6b00 Make DecryptFragment abstract, as it should be 2014-07-25 13:39:54 +02:00
mar-v-in 2913a78b18 Load of rework on EncryptActivity, still some TODOs 2014-07-20 17:09:34 +02:00
mar-v-in bc9922263c Add TokenAutoComplete to gradle 2014-07-15 01:53:46 +02:00
mar-v-in 5185492b04 Fix OperationResultParcel 
Naming conventions save lives... or atleast make addAll() work
 2014-07-09 00:10:09 +02:00
mar-v-in fdf6411d5f Merge branch 'master' into improve-file-more 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/res/layout/encrypt_content.xml
 2014-07-06 02:24:34 +02:00
mar-v-in 1b0666e9de Many changes to file ... and still incomplete 
- Multi file
- Reworked UI
 2014-07-06 02:10:35 +02:00
mar-v-in 51a4b0466b Add support for multiple input/output URIs to KeychainIntentService 2014-07-03 00:34:41 +02:00
mar-v-in 93eae114ea Encrypt/Decrypt UI work 2014-07-02 00:34:21 +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 50e72b196f Missing import after merge 2014-07-01 01:26:50 +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 38823b73a3 Merge branch 'master' into improve-file-more 2014-06-24 11:35:59 +02:00
mar-v-in 997faac90e Merge branch 'master' into hkps-by-default 2014-06-24 11:35:26 +02:00
mar-v-in 97de1592f0 Fix sks-keyservers.net sub pool 2014-06-24 11:27:35 +02:00
mar-v-in 04e64ac84e Update Keyservers to use hkps as needed 2014-06-24 11:26:52 +02:00
mar-v-in f039ef81ae Use URLEncoder instead of Uri.encode 2014-06-24 01:31:06 +02:00
mar-v-in 9a7fc6d464 Rewrote hkp add to work with hkps as well. 
Also removes HttpClient dependency (deprecated for android)
 2014-06-24 00:57:04 +02:00
mar-v-in ca3d77bae9 Merge branch 'hkps-by-default' of github.com:mar-v-in/open-keychain into hkps-by-default 2014-06-23 22:50:17 +02:00
mar-v-in e6629b53a2 Few fixes on hkps 
TODO: Fix add as well
 2014-06-23 22:46:59 +02:00
mar-v-in 3ebbaae253 Add hkps support for sks-keyservers.net 2014-06-23 22:27:58 +02:00
mar-v-in b92a389ebc Add TlsHelper (designed to be used with sks-keyservers.net) 
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
 2014-06-23 22:26:02 +02:00
mar-v-in 2b18dc741a Switch to dnsjava 2014-06-23 22:02:18 +02:00
mar-v-in 6c42fe58bd Add minidns submodule 2014-06-23 21:46:17 +02:00
mar-v-in 2cd4f7eb93 Remove dnsjava module 2014-06-23 21:44:49 +02:00
mar-v-in a14c041642 Add TlsHelper (designed to be used with sks-keyservers.net) 
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
 2014-06-23 01:59:20 +02:00
mar-v-in 9e7e0be82c Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-more 2014-06-22 16:45:07 +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 58706425d6 Merge branch 'master' of https://github.com/open-keychain/open-keychain into improve-file 2014-06-19 13:57:35 +02:00
mar-v-in d9c937bbe7 Merge branch 'master' into improve-file 2014-06-18 21:43:54 +02:00
mar-v-in a1c3c41073 Reset importDone at the beginning of sync 2014-06-18 17:06:46 +02:00
mar-v-in b9d88de286 Wait for import to be done before writing contacts 2014-06-18 17:01:36 +02:00
mar-v-in 4bbaf6faa1 Remove abandoned contacts 2014-06-18 16:47:33 +02:00
mar-v-in 39a68c30f8 Code style 2014-06-18 16:14:12 +02:00
mar-v-in 0bcf7a39bf Continue contact db sync 
- 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
 2014-06-18 16:14:11 +02:00
mar-v-in e106079b90 Delete using Document API (unsafe) 2014-06-10 21:53:02 +02:00
mar-v-in f55bc41682 Use Document API on KitKat for file encrypt/decrypt 2014-06-10 20:57:48 +02:00
mar-v-in 08d63340c9 Modify KeychainIntentService to support I/O with URIs, allow input and output to/from different types (eg. encrypt file and return byte array) 2014-06-08 21:30:11 +02:00
mar-v-in 5601f1b76f Fix TAG in account service as well 2014-06-06 17:42:28 +02:00
mar-v-in 55ca0841f6 Fixing TAG and string resource 2014-06-06 17:39:11 +02:00
mar-v-in 9d02bc85e2 Fix compile error introduced during merge 2014-06-06 00:51:24 +02:00
mar-v-in e2164f571e Merge branch 'master' into automatic-contact-discovery 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
 2014-06-05 23:56:29 +02:00
mar-v-in 36312b950a Add dnsjava as submodule 2014-06-05 23:46:14 +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 dc1e26f39c Make keylist case insensitive 
You want "michael" to be next to "Michael", don't you?
 2014-06-05 00:59:39 +02:00
mar-v-in cae0071342 Merge branch 'master' into automatic-contact-discovery 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
 2014-06-04 21:32:37 +02:00
mar-v-in 6a63746278 Fix regex for hkp parsing to support multiple uids 2014-06-04 18:07:28 +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
mar-v-in cc2ef0c17c Store expired state within ImportKeysListEntry 2014-06-04 18:05:16 +02:00
mar-v-in 34b97cb136 Merge ACTION_DOWNLOAD_AND_IMPORT_KEYS and ACTION_IMPORT_KEYBASE_KEYS 2014-05-29 11:43:41 +02:00
mar-v-in d4cdc36448 Merge branch 'hkps-support' into automatic-contact-discovery 2014-05-29 11:33:53 +02:00
mar-v-in 3417a7a2de Store nice origin with keybase keys (that can't be interpreted as HKP server) 2014-05-29 10:34:50 +02:00
mar-v-in 518f3e1763 Make abstract methods in Keyserver public (implementations make them public anyway) 2014-05-29 10:33:15 +02:00
mar-v-in be490307f9 Download from origin during ACTION_DOWNLOAD_AND_IMPORT_KEYS 2014-05-29 10:24:00 +02:00
mar-v-in c676e53479 Fix url building to support certificate check on hkps servers 
Note: the CA used by sks-keyservers.net is not valid for android, thus using hkps fails for them. pgp.mit.edu uses a perfectly valid cert.
 2014-05-28 20:44:01 +02:00
mar-v-in cb92c9ccc8 Add hkps support 2014-05-27 21:16:52 +02:00
mar-v-in 8e5767f967 Store origin with ImportKeysListEntry 2014-05-27 20:17:49 +02:00
mar-v-in 3110122a85 Add ability to resolve HkpKeyserver from _hkp._tcp SRV record 2014-05-27 19:45:58 +02:00
mar-v-in 7865b92285 ContactHelper can read email addresses from contact list 2014-05-26 20:24:13 +02:00
mar-v-in b0ca33da40 Change resource name and remove unneeded if from 44232af 2014-02-27 10:55:52 +01:00
mar-v-in 44232afe94 Show link to Market if no openpgp provider installed installed 
Issue #295
 2014-02-27 10:35:28 +01:00