Commit Graph

4259 Commits

Author SHA1 Message Date
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
Dominik Schürmann
1fcd9d3fde zxing lib is now on jcenter, see https://github.com/journeyapps/zxing-android-embedded/issues/39 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
62e65a8240 create keys with fixed timestamp 2015-05-28 14:41:26 +02:00
Vincent Breitmoser
724726a4fd warn on signature earlier than key creation, err on significantly earlier 2015-05-28 11:40:35 +02:00
Vincent Breitmoser
a8e95f676e don't show allowed key list if no key exists, and some minor PgpDecryptVerify changes 2015-05-28 02:27:44 +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
Vincent
c4b774f7b8 Merge pull request #1293 from Yoshi64Bit/development
highlight currently selected item in navigation drawer
2015-05-23 11:14:20 +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
95875d727e Version 3.2.2 2015-05-21 10:35:31 +02:00
Dominik Schürmann
43d9e2ba76 Version 3.2.2 2015-05-21 10:34:39 +02:00
Dominik Schürmann
7e55ba1b36 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-05-21 10:32:15 +02:00
Dominik Schürmann
6b6ca4c18e Fix language based on feedback from transifex 2015-05-21 10:32:07 +02:00
Dominik Schürmann
ab63fa8091 Fix language based on feedback from transifex 2015-05-21 10:31:46 +02:00
Vincent Breitmoser
f30900d085 add user id flags to UserAttribute self signatures 2015-05-20 12:47:23 +02:00
Vincent Breitmoser
46cc7f8174 tests: add attribute to PgpKeyOperationTest 2015-05-20 12:47:23 +02:00
Dominik Schürmann
0df51b6140 Fix fingerprint length check in QR Code import 2015-05-19 19:09:39 +02:00
Dominik Schürmann
79b7cec94a Use Mode.ALPHANUMERIC for QR codes to save space 2015-05-19 19:09:32 +02:00
Dominik Schürmann
2cdaa75b01 Fix fingerprint length check in QR Code import 2015-05-19 19:07:58 +02:00
Dominik Schürmann
c8266203f8 Use Mode.ALPHANUMERIC for QR codes to save space 2015-05-19 18:27:04 +02:00
Dominik Schürmann
0f520975e4 Improve strings 2015-05-19 16:12:04 +02:00
Vincent Breitmoser
4885361cd2 check fingerprint length after scanning qr code
Fixes #1281
2015-05-17 10:37:03 +02:00
Vincent Breitmoser
b62ad4d79c check fingerprint length after scanning qr code
Fixes #1281
2015-05-17 10:36:30 +02:00
Vincent Breitmoser
fb96b6dfa9 open ViewKeyActivity by subkey in NfcBaseActivity 2015-05-17 02:14:27 +02:00
Vincent Breitmoser
a79d7bd1c2 simplify MainActivity and fix backstack issues 2015-05-17 02:13:51 +02:00
Vincent Breitmoser
b430ba51eb do nfc dispatching in MainActivity 2015-05-17 02:09:58 +02:00
Vincent Breitmoser
bd8e45b556 open ViewKeyActivity by subkey in NfcBaseActivity 2015-05-17 01:57:26 +02:00
Vincent Breitmoser
cd0d84d10d simplify MainActivity and fix backstack issues 2015-05-17 01:46:00 +02:00
Vincent Breitmoser
064c9d461f re-parcel log in LogDisplayFragment 2015-05-17 01:17:01 +02:00
Vincent Breitmoser
3a27a28c0a re-parcel log in LogDisplayFragment 2015-05-17 01:13:41 +02:00
Vincent Breitmoser
765990ed13 fingerprints are 20 bytes, not 40. duh. 2015-05-17 01:04:34 +02:00
Vincent Breitmoser
9a6f581400 load yubikey fragment after mMasterKeyId is available 2015-05-17 01:04:32 +02:00
Vincent Breitmoser
158263f255 apply promote operation to specific subkeys present on yubikey only 2015-05-17 01:04:31 +02:00
Vincent Breitmoser
71818934ca pass masterKeyId to yubikey fragment 2015-05-17 01:04:27 +02:00
Vincent Breitmoser
f6643962af allow state loss when yubikey fragment is loaded 2015-05-17 01:04:25 +02:00
Vincent Breitmoser
d06ae7f691 yubikey: don't assume signing key is masterKeyId in ViewKeyActivity
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
2015-05-17 01:04:22 +02:00
Vincent Breitmoser
b509c3ed39 fix fragment handling in ViewKeyActivity
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
2015-05-17 01:04:19 +02:00
Vincent Breitmoser
7e5e0df0bc fingerprints are 20 bytes, not 40. duh. 2015-05-17 00:59:50 +02:00
Vincent Breitmoser
48f6e20f6c load yubikey fragment after mMasterKeyId is available 2015-05-17 00:54:14 +02:00
Vincent Breitmoser
c1e7fcf024 apply promote operation to specific subkeys present on yubikey only 2015-05-17 00:35:10 +02:00
Vincent Breitmoser
f554cc9c93 pass masterKeyId to yubikey fragment 2015-05-16 23:59:04 +02:00
Vincent Breitmoser
4b2c8a1309 allow state loss when yubikey fragment is loaded 2015-05-16 23:30:32 +02:00