Commit Graph

2494 Commits

Author SHA1 Message Date
Dominik Schürmann
e172f132e4 Pull from transifex 2015-07-06 16:57:49 +02:00
Dominik Schürmann
38ebff81f5 Changelog 3.4 2015-07-06 16:56:50 +02:00
Dominik Schürmann
841d3caee5 Disable YubiKey creation 2015-07-06 16:43:02 +02:00
Dominik Schürmann
7f20a84eaf Merge branch 'master' of github.com:open-keychain/open-keychain 2015-07-06 16:39:48 +02:00
Dominik Schürmann
b81e28c3f7 Better error string for too short PIN 2015-07-06 16:39:45 +02:00
Vincent Breitmoser
e9e9cf2374 also catch DecoderException in decryptverify 2015-07-06 16:37:47 +02:00
Dominik Schürmann
60df5a4edf Merge branch 'master' of github.com:open-keychain/open-keychain 2015-07-06 16:30:13 +02:00
Dominik Schürmann
74173b1794 Save mTagHandlingEnabled in saved instance 2015-07-06 16:29:18 +02:00
Vincent Breitmoser
8b439be1f5 don't cache exporthelper, keep type for KeyItem in KeySpinner 2015-07-06 16:24:26 +02:00
Dominik Schürmann
1eb438576d Better YubiKey UX flow for error handling 2015-07-06 16:21:48 +02:00
Dominik Schürmann
0c6ef6aed4 Change signed by to sign with 2015-07-06 14:13:27 +02:00
Dominik Schürmann
45f85bcfdf Poll if yubikey has been taken away 2015-07-06 14:12:33 +02:00
Dominik Schürmann
9c0ec1f496 Fix account key selection for API 2015-07-06 13:36:28 +02:00
Dominik Schürmann
801566bdb1 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-07-06 11:27:57 +02:00
Dominik Schürmann
baf059843e In NfcOperationsActivity, show NFC errors inline, in others show as Notify 2015-07-06 11:27:45 +02:00
Dominik Schürmann
e4bd25613c Exclude more files to satisfy proguard 2015-07-06 11:06:10 +02:00
Vincent Breitmoser
7648602fc8 encrypt to all encryption subkeys, rather than just the first 2015-07-06 02:18:34 +02:00
Vincent Breitmoser
f1a75a81e7 catch ArrayIndexOutOfBoundsException in decrypt operation, might be thrown from BouncyCastle 2015-07-06 02:02:52 +02:00
Vincent Breitmoser
922d4c6a96 fix PromoteKeyOperationTest 2015-07-06 01:20:55 +02:00
Vincent Breitmoser
e70d06603a forgot a couple lines to commit 2015-07-06 00:59:28 +02:00
Vincent Breitmoser
42cd103355 nicer error msg if input data cannot be read 2015-07-06 00:55:34 +02:00
Vincent Breitmoser
17defe556a cleanup, NonNull annotation, never return null in PgpDecryptVerify 2015-07-06 00:52:53 +02:00
Vincent Breitmoser
539379a629 some cleanup and documentation 2015-07-06 00:10:54 +02:00
Vincent Breitmoser
7e83900d6c make sure clipboard service retrieval is always null-proof 2015-07-05 21:49:02 +02:00
Vincent Breitmoser
bd78166c66 don't show notification in MainActivity when state is restored 2015-07-05 21:21:34 +02:00
Vincent Breitmoser
4d8be637de better getActivity and getSystemService null handling in encryptfilesfragment 2015-07-05 21:20:57 +02:00
Vincent Breitmoser
f306722276 set data for query intent (fix #1389) 2015-07-05 20:37:21 +02:00
Adithya Abraham Philip
aca106e808 fixed OrbotRequiredDialogActivity not finishing, orbot install dialog style 2015-07-03 20:46:16 +05:30
Adithya Abraham Philip
89f017aa9c reformatted code 2015-07-03 20:46:16 +05:30
Adithya Abraham Philip
4d81a83baa added proxy support to OperationHelper 2015-07-03 20:46:16 +05:30
Adithya Abraham Philip
1856ca385d fixed middleButton parameter being ignored 2015-07-03 20:46:16 +05:30
Adithya Abraham Philip
c95fa9fdc1 renamed to clarify necessity for two install dialog fragments 2015-07-03 20:46:16 +05:30
Adithya Abraham Philip
7cf695dbae reduce code duplication 2015-07-03 20:46:16 +05:30
Adithya Abraham Philip
6d9da28ead removed e.printStackTrace from several places 2015-07-03 20:46:16 +05:30
Adithya Abraham Philip
ad00a511d6 fixed orbot preference install dialog 2015-07-03 20:46:16 +05:30
Dominik Schürmann
c74d6fc710 Rename package back to orbot because these are orbot utils 2015-07-03 20:46:16 +05:30
Dominik Schürmann
c419885434 Cleanup tor code 2015-07-03 20:46:16 +05:30
Dominik Schürmann
e909d7a4d5 Fix crash on settings by adding proxy fragment to isValidFragment 2015-07-03 20:46:16 +05:30
Adithya Abraham Philip
bf2d9eda7c added proxy logging, removed test function in KeybaseLib 2015-07-03 20:46:15 +05:30
Adithya Abraham Philip
bde187b9bf code cleanup 2015-07-03 20:46:15 +05:30
Adithya Abraham Philip
ab5763e2fa added proxy support to YubiKey search 2015-07-03 20:46:15 +05:30
Adithya Abraham Philip
2402c6d3c7 ensuring code style is preserved 2015-07-03 20:46:15 +05:30
Adithya Abraham Philip
f8da3d784b added keyserver/proxy support to certify operation 2015-07-03 20:46:15 +05:30
Adithya Abraham Philip
ec8c57b780 added proxy support to KeybaseLib 2015-07-03 20:46:15 +05:30
Adithya Abraham Philip
592b128596 added proxy support to keyserver verification 2015-07-03 20:46:15 +05:30
Adithya Abraham Philip
389fd7d46d modify ImportKeysActivity to match new pattern 2015-07-03 20:46:15 +05:30
Adithya Abraham Philip
79fc0f97ea added proxy to all import operations using KeychainService 2015-07-03 20:46:15 +05:30
Adithya Abraham Philip
aa7ad4ac63 added OperationResult support to upload to keyserver 2015-07-03 20:46:15 +05:30
Adithya Abraham Philip
65ca77c3cb orbot dialog fragments added 2015-07-03 20:46:15 +05:30
Adithya Abraham Philip
31fac3080e removed NetCipher submodule, copied classes 2015-07-03 20:46:15 +05:30