cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,278 Commits 1 Branch 0 Tags
47f98493e291d6769b52c35c13443570650b0d2f
Commit Graph
918 Commits
Author SHA1 Message Date
Dominik Schürmann 47f98493e2 Improve FAQ entry for file manager 2015-06-08 22:44:26 +02:00
Stéphane Lavergne 1045deb0e3 Explicit mention of dependency on 3rd party tool 
I had the darnest time remembering my old APG days where something was said in passing about, unlike any other application I know, the need here for OI File Manager (or others, later on) to be able to select local files.  I'm sure I'm not the only person who could benefit from this reminder. :)
 2015-06-08 16:31:48 -04:00
Vincent Breitmoser 7cfc0d80d0 Merge branch 'v/sticky-prefs' 2015-06-03 01:23:51 +02:00
Vincent Breitmoser cf5fadae76 implement sticky preferences 2015-05-31 05:18:58 +02:00
Adithya Abraham Philip 93f3a98eae prevent keybase key replacing keyserver key 2015-05-31 02:49:11 +05:30
Adithya Abraham Philip cfeffef80d prevent NaN dialog on import with no selected keys 2015-05-31 02:36:45 +05:30
Vincent Breitmoser 36ecd60c1b better error handling for bad encrypted data checksum 2015-05-30 13:09:09 +02:00
Vincent Breitmoser 61a6346f89 show status indicators in EncryptFragment 2015-05-30 02:24:45 +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 1deb5dbfda preserve state in DecryptTextActivity 2015-05-28 18:55:34 +02:00
Vincent Breitmoser 1463bae1b4 fix merge problems (derp) 2015-05-28 17:32:21 +02:00
Vincent Breitmoser eb830c6786 warn on signature earlier than key creation, err on significantly earlier 2015-05-28 16:33:45 +02:00
Vincent Breitmoser 5c8af1c5a5 don't show allowed key list if no key exists, and some minor PgpDecryptVerify changes 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
Dominik SchürmannandVincent Breitmoser 0b5c66ad0d Improve strings 2015-05-28 16:33:41 +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 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
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
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 158263f255 apply promote operation to specific subkeys present on yubikey only 2015-05-17 01:04:31 +02:00
Vincent Breitmoser c1e7fcf024 apply promote operation to specific subkeys present on yubikey only 2015-05-17 00:35:10 +02:00
Joey Castillo aa75534e5b Moving blank smart card messages to strings.xml 2015-05-13 17:56:17 -04:00
Joey Castillo bc48ce4210 Add check for exporting two keys to same smart card slot. 2015-05-13 17:56:17 -04:00
Joey Castillo d21fb77336 Moving keytocard process into PgpKeyOperation. 2015-05-13 14:36:30 -04:00
Joey Castillo 76241e90ad Adding NFC Key to Card operation, accessible from Edit Key activity. 2015-05-12 14:44:26 -04:00
Dominik Schürmann 63022aa96a Version 3.2 2015-05-06 14:32:17 +02:00
Dominik Schürmann dad19454e9 Pull from transifex 2015-05-06 14:04:03 +02:00
Dominik Schürmann 8de6589c9d Renaming for consisitency 2015-05-06 03:29:04 +02:00
Dominik Schürmann f102ae5da5 Move error overlay into generalized DecryptFragment, better error handling in DecryptTextActivity 2015-05-06 03:26:42 +02:00
Dominik Schürmann f87d21a661 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-05-05 09:27:07 +02:00
Dominik Schürmann 855b8c4ef9 Fix nullpointer in file decryption 2015-05-05 09:05:39 +02:00
William Faulk b06e7cd737 Fix Bluetooth share without breaking others 2015-05-04 16:46:15 -04:00
Dominik Schürmann 291f95db5a Fix revoked/expired state in decrypt activity 2015-05-04 21:13:07 +02:00
Dominik Schürmann 520f9abea3 Merge branch 'development' of https://github.com/Hiperzone/open-keychain into Hiperzone-development 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
 2015-05-04 14:42:21 +02:00
Dominik Schürmann aa68c41f5a Fix yubikey strings 2015-05-01 14:48:57 +02:00
Dominik Schürmann c88d2e42b7 Fix key creation string and display 2015-04-30 18:57:51 +02:00
Dominik Schürmann 7c275fed9d API: Allow selection of decryption keys when decryption fails 2015-04-30 18:45:43 +02:00
Daniel Ramos e159e619d2 -removed unneeded inputType attribute from xml files (+1 squashed commits) 
Squashed commits:

[ef54e68] -code style fixing
 2015-04-30 00:54:56 +01:00
Vincent Breitmoser 4ba2e4bcdd display creation dates for ambiguous user ids 2015-04-27 17:46:10 +02:00
Vincent Breitmoser 40834d1fcd add distinct status for messages signed by "your" key 2015-04-27 17:46:07 +02:00
Daniel Ramos 674f377bd4 Merge branch 'development' of https://github.com/open-keychain/open-keychain into development 2015-04-26 18:27:07 +01:00
Dominik Schürmann 4c74dbe11e UI fixes for Android < 5 2015-04-26 01:28:29 +02:00
Dominik Schürmann 4732bc5744 Remove unused decrypt result layout 2015-04-26 00:36:37 +02:00
Dominik Schürmann c442d3bd0d Put decrypt result in toolbar, some ui fixes for decrypt 2015-04-26 00:33:26 +02:00