cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,573 Commits 1 Branch 0 Tags
1210a80a96d9f862829ac1122e94b68fe8b8b5d7
Commit Graph
378 Commits
Author SHA1 Message Date
Vincent Breitmoser 377d0f09fa Merge branch 'ditch-appmsg' 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
 2014-07-29 13:53:18 +02:00
Dominik Schürmann 3d6edd1190 Use icons in key view 2014-07-28 11:11:23 +02:00
Dominik Schürmann dab540e121 Work on first time wizard design 2014-07-27 17:56:52 +02:00
Vincent Breitmoser f4ee71e3ef introduce EditKeyResult with transient UncachedKeyRing (half-baked!) 2014-07-27 01:22:10 +02:00
Vincent Breitmoser 8132b9ac74 Merge branch 'master' into ditch-appmsg 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
 2014-07-26 23:06:32 +02:00
Vincent Breitmoser ab2b90342e test and fix: adding an empty user id should fail 2014-07-26 03:47:29 +02:00
Vincent Breitmoser cd1511a4e6 canonicalize: fix for tests 2014-07-19 02:19:15 +02:00
Daniel Albert db002bde7c Fixed another unescaped apostrophe. 2014-07-17 21:17:39 +02:00
Daniel Albert 8a8d8c5a68 Fixed unescaped apostrophe 2014-07-17 20:53:10 +02:00
Daniel Albert 01046fc0e7 Added description to Setting, Changed title to suggested one 2014-07-17 20:01:53 +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
Vincent Breitmoser 29145e49c9 merge: different msg if nothing was merged 2014-07-15 19:17:08 +02:00
Vincent Breitmoser 858fe47d46 Merge remote-tracking branch 'origin/master' into external-test 
Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
 2014-07-15 17:39:36 +02:00
Daniel Albert c101ee0240 Merge remote-tracking branch 'upstream/master' into feature-conceal-software 2014-07-13 15:39:16 +02:00
Dominik Schürmann 0ce9c13132 Fix strings from 'keys' to 'passphrases' 2014-07-12 21:07:29 +02:00
Daniel Albert 92c66743e0 Added Preference for concealing the PgpApplication 2014-07-12 19:19:12 +02:00
Daniel Albert 066591dab1 Wello there, That's Java, not C^^ 2014-07-12 18:53:52 +02:00
Daniel Albert 079194abe5 Fixed issues discussed in #713 2014-07-12 18:12:03 +02:00
Daniel Albert 7a3fe61a1f Put text into strings.xml, for internationalization 2014-07-12 12:52:44 +02:00
Vincent Breitmoser 0e3327c65c createKey: better logging, handle empty user id case 2014-07-12 01:29:06 +02:00
Vincent Breitmoser 54bc874ce5 Merge remote-tracking branch 'origin/master' into external-test 
Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
 2014-07-11 21:00:26 +02:00
Vincent Breitmoser 26f6d58284 get rid of some inspection warnings 2014-07-11 13:45:06 +02:00
Vincent Breitmoser 4da273ac16 modifyKey: error out on nonexisting new primary user id 2014-07-11 13:35:48 +02:00
Vincent Breitmoser dce2df4113 add come createKey strings 2014-07-11 02:48:54 +02:00
Dominik Schürmann 5adcb7885c Work on subkeys adapter 2014-07-08 03:34:27 +02:00
Vincent Breitmoser 2c62aa90c0 use SuperToast instead of AppMsg in code, part 1 2014-07-07 17:34:41 +02:00
Vincent Breitmoser d044daeedd get rid of AppMsg library 2014-07-07 17:33:25 +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
Dominik Schürmann 3363507be4 Bett API string 2014-07-04 09:52:25 +02:00
Dominik Schürmann 709196f774 Use strings in edit key 2014-07-03 16:49:25 +02:00
Dominik Schürmann 3085f0d229 Small strings fix 2014-07-03 16:24:10 +02:00
Dominik Schürmann 55f067b063 Work on edit 2014-07-03 15:06:05 +02:00
Vincent Breitmoser 100b5f4c5f Merge branch 'create-keyring' 2014-07-02 16:05:28 +02:00
Vincent Breitmoser ebcd243e97 support changing primary user id in SaveKeyringParcel 
Closes #695
 2014-07-02 16:02:56 +02:00
Vincent Breitmoser 287b74885e don't use zero plural string for english 
closes #703
 2014-07-02 14:51:11 +02:00
mar-v-in 93eae114ea Encrypt/Decrypt UI work 2014-07-02 00:34:21 +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
Vincent Breitmoser de698b8955 add create key capabilities to SaveKeyringParcel 2014-06-29 22:34:53 +02:00
Vincent Breitmoser d6a2875816 code cleanup and plurals in import log entries 
closes #698
 2014-06-28 19:15:28 +02:00
Dominik Schürmann 9fe07478e7 Start work on a first-time wizard 2014-06-27 21:40:18 +02:00
Dominik Schürmann e84aa5a69d Rename registered apps to apps 2014-06-24 13:54:24 +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
Dominik Schürmann 9d20e68f11 Revert hint_keybase_search 2014-06-22 10:59:50 +02:00
Tim Bray 17f43ad21b Moved Keybase stuff into KeybaseLib submodule 2014-06-20 09:31:34 -07:00
Dominik Schürmann 717d66961b Fix onTouchEvent delegation, with workaround for Android bug 2014-06-20 15:39:27 +02:00
Vincent Breitmoser 4ad15739e2 canonicalize: missed two logging entries 2014-06-18 21:43:41 +02:00
Vincent Breitmoser 5f20b8de1a Merge branch 'new-edit' 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
	OpenKeychain/src/main/res/values/strings.xml
 2014-06-18 21:09:04 +02:00