cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,281 Commits 1 Branch 0 Tags
9b6416943b49d620c73bd24fb334ec338d95c5a8
Commit Graph

1143 Commits

Author SHA1 Message Date
Vincent Breitmoser
9b6416943b Merge remote-tracking branch 'origin/master' into v/eventbus 2015-06-10 14:49:02 +02:00
Vincent Breitmoser
0505af7520 select correct item in drawer on backstack change in main activity 2015-06-08 16:18:16 +02:00
Vincent Breitmoser
074b6633b0 eventbus: initial attempt, replace messenger hack with eventbus communication 2015-06-06 23:17:42 +02:00
Adithya Abraham Philip
82f3d70224 prevent null fragments on activity death 2015-06-03 19:01:01 +05:30
Vincent Breitmoser
7cfc0d80d0 Merge branch 'v/sticky-prefs' 2015-06-03 01:23:51 +02:00
Vincent Breitmoser
ecfbc743f3 keep prefernces individual per dialog (affects only compression) 2015-06-03 01:21:06 +02:00
Vincent Breitmoser
bd5a5c0138 Partially revert "switch to native DialogFragment, fix some nullpointers", but keep nullpointer fixes 
This reverts commit 403f74f558.

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
 2015-06-03 01:16:44 +02:00
Vincent Breitmoser
b3ebb64666 hide invoke nfc button in android < 5 2015-06-03 01:08:32 +02:00
Adithya Abraham Philip
6bc40d12ad renamed KeychainIntentService to KeychainService 2015-06-01 17:43:00 +05:30
Adithya Abraham Philip
14a08361e5 merged services 2015-06-01 17:41:44 +05:30
Vincent Breitmoser
403f74f558 switch to native DialogFragment, fix some nullpointers 2015-05-31 19:45:25 +02:00
Vincent Breitmoser
1bc14ab6ae revert some accidentally committed cruft 2015-05-31 05:22:14 +02:00
Vincent Breitmoser
cf5fadae76 implement sticky preferences 2015-05-31 05:18:58 +02:00
Vincent Breitmoser
3976eadf06 handle empty passphrases in PassphraseDialogActivity 2015-05-31 05:16:41 +02:00
Adithya Abraham Philip
cfeffef80d prevent NaN dialog on import with no selected keys 2015-05-31 02:36:45 +05:30
Vincent Breitmoser
ef209450c6 some decrypt/verify bug fixes 2015-05-30 13:52:56 +02:00
Vincent Breitmoser
0d8370be1d rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcel 2015-05-30 13:25:47 +02:00
Vincent Breitmoser
61a6346f89 show status indicators in EncryptFragment 2015-05-30 02:24:45 +02:00
Vincent Breitmoser
313b4ac7d3 rewrite data flow in EncryptFileFragment preserve state correctly 2015-05-30 00:20:11 +02:00
Vincent Breitmoser
b9563ff2ef externalize caching functionality from CertifyKeyFragment 2015-05-30 00:17:00 +02:00
Vincent Breitmoser
1406eec2dc make KeyItem serializble, for state in TokenTextCompleteView 2015-05-30 00:16:27 +02:00
Vincent Breitmoser
8be6450a36 preserve state in DecryptFilesActivity/-Fragment 2015-05-29 21:38:20 +02:00
Vincent Breitmoser
c9f9af6603 preserve state in CertifyKeyFragment 2015-05-29 21:07:56 +02:00
Vincent Breitmoser
38d8f4be52 Merge remote-tracking branch 'origin/master' into development 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
	OpenKeychain/src/main/res/values/strings.xml
 2015-05-28 23:05:41 +02:00
Vincent Breitmoser
007bbdda2b respect cache in yubikey pin data flow 2015-05-28 19:27:56 +02:00
Vincent Breitmoser
1deb5dbfda preserve state in DecryptTextActivity 2015-05-28 18:55:34 +02:00
Vincent Breitmoser
34c26fe5d1 shorten fp data to 20 bytes for convertFingerprintToHex in NfcBaseOperation 2015-05-28 17:33:42 +02:00
Vincent Breitmoser
ee02e110e7 don't keep an activity reference in CreateKeyFinalFragment 2015-05-28 16:35:03 +02:00
Vincent Breitmoser
1fb7477a5a correctly preserve state in EncryptTextFragment 2015-05-28 16:33:45 +02:00
Vincent Breitmoser
58583c0819 correctly preserve state in EncryptFilesFragment 2015-05-28 16:33:44 +02:00
Vincent Breitmoser
40ab96539c move synchronous encryption into activity, and preserve checkbox state 2015-05-28 16:33:44 +02:00
Vincent Breitmoser
7c20c8df93 preserve state in KeySpinner, and some lint fixes 2015-05-28 16:33:44 +02:00
Vincent Breitmoser
8f3e0a9110 rewrite EncryptActivity data flow 2015-05-28 16:33:44 +02:00
Vincent Breitmoser
e03e1e5cfc fix nullpointer in encrypttextactivity. fixes #1267 2015-05-28 16:33:44 +02:00
Yoshi64Bit
e378c47814 highlight currently selected item in navigation drawer 2015-05-28 16:33:44 +02:00
Dominik Schürmann
08afe42ea6 AssertionError instead of RuntimeException 2015-05-28 16:33:44 +02:00
Dominik Schürmann
79e356e04f Change convertFingerprintToHex to use RuntimeException 2015-05-28 16:33:43 +02:00
Dominik Schürmann
0b5c66ad0d Improve strings 2015-05-28 16:33:41 +02:00
Vincent Breitmoser
6e3ed1d2db do nfc dispatching in MainActivity 2015-05-28 16:33:14 +02:00
Vincent Breitmoser
4ecd4389b3 don't keep an activity reference in CreateKeyFinalFragment 2015-05-28 15:02:50 +02:00
Vincent Breitmoser
426d17bd0a correctly preserve state in EncryptTextFragment 2015-05-27 23:03:04 +02:00
Vincent Breitmoser
56a75774d0 correctly preserve state in EncryptFilesFragment 2015-05-27 22:55:36 +02:00
Vincent Breitmoser
8dc9773c1e move synchronous encryption into activity, and preserve checkbox state 2015-05-27 22:33:14 +02:00
Vincent Breitmoser
fed0e7db8d preserve state in KeySpinner, and some lint fixes 2015-05-27 22:07:34 +02:00
Vincent Breitmoser
6c17734e73 rewrite EncryptActivity data flow 2015-05-27 21:15:36 +02:00
Vincent Breitmoser
08e0357471 fix nullpointer in encrypttextactivity. fixes #1267 2015-05-27 18:18:34 +02:00
Yoshi64Bit
8a15d28ed9 highlight currently selected item in navigation drawer 2015-05-23 07:49:45 +02:00
Dominik Schürmann
1651f9fb61 AssertionError instead of RuntimeException 2015-05-21 13:32:22 +02:00
Dominik Schürmann
0456e04c1a Change convertFingerprintToHex to use RuntimeException 2015-05-21 11:00:52 +02:00
Dominik Schürmann
6b6ca4c18e Fix language based on feedback from transifex 2015-05-21 10:32:07 +02:00