moparisthebest
/
open-keychain
mirror of https://github.com/moparisthebest/open-keychain
1
0
Fork 0
Code Issues Releases Wiki Activity
2,666 Commits 12 Branches 24 Tags 116 MiB
Commit Graph

27 Commits

Author SHA1 Message Date
Dominik Schürmann b1fa5d9922 Remove subkeys.pgp.net keyserver from defaults 2014-08-15 11:00:45 +02:00
Dominik Schürmann cf450d24fb Remove subkeys.pgp.net keyserver, often down and no hkps 2014-08-15 10:19:46 +02:00
Dominik Schürmann e72e47d92e Remove support for v3 sig generation 2014-08-14 15:24:37 +02:00
Dominik Schürmann d0987edab9 Dont write version header by default 2014-08-14 11:44:47 +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 f8a222983e Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry selection for adding new subkeys 2014-08-05 20:52:29 +02:00
Dominik Schürmann 839294d27c Cleanup, prevent encrypt Intent inception 2014-08-04 14:42:03 +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
Daniel Albert d63534d655 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
 2014-07-16 18:49:16 +02:00
Dominik Schürmann c1c831e52b New first time screen 2014-07-16 09:49:37 +02:00
Daniel Albert 92c66743e0 Added Preference for concealing the PgpApplication 2014-07-12 19:19:12 +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 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 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 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 f55bc41682 Use Document API on KitKat for file encrypt/decrypt 2014-06-10 20:57:48 +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
Dominik Schürmann e80d070aa9 Some comments to Constants 2014-04-14 13:52:09 +02:00
Dominik Schürmann b04e6816f4 Removing remaining uses of Id, closing one of the oldest bugs #9 2014-04-14 13:48:20 +02:00
Thialfihar f2d8378d81 Change license from ASLv2 to GPLv3 where possible 2014-04-08 11:59:35 +02:00
Thialfihar 42faf0eb07 Update copyright timespan for Thialfihar 2014-04-08 11:59:35 +02:00
Dominik Schürmann 6d11371905 Rename folder structure from OpenPGP Keychain to OpenKeychain 2014-04-06 12:57:42 +02:00