From d07fe5bb87b3a68e20484042d3c15fba3c6ccc86 Mon Sep 17 00:00:00 2001 From: Adithya Abraham Philip Date: Fri, 5 Jun 2015 05:39:12 +0530 Subject: added proxy/tor preferences --- OpenKeychain/src/main/res/values/strings.xml | 20 ++++++++++++++++ .../src/main/res/xml/preference_headers.xml | 3 +++ OpenKeychain/src/main/res/xml/proxy_prefs.xml | 27 ++++++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 OpenKeychain/src/main/res/xml/proxy_prefs.xml (limited to 'OpenKeychain/src/main/res') diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 5a43fda19..defa7d2a5 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -49,6 +49,7 @@ "Subkeys" "Cloud search" "Password/PIN Handling" + "Proxy Settings" "Confirm" "Actions" "Key" @@ -172,6 +173,16 @@ "keybase.io" "Search keys on keybase.io" + + "Don't use a proxy" + "Enable Tor" + "Requires Orbot to be installed" + "Enable other proxy" + "Proxy Host" + "Proxy host cannot be empty" + "Proxy Port" + "Invalid port number entered" + "<no name>" "<none>" @@ -187,6 +198,15 @@ "Secret Key:" + + "Install Orbot?" + "market://search?q=pname:org.torproject.android" + "You must have Orbot installed and activated to proxy traffic through it. Would you like to install it from Google Play?" + "Yes" + "No" + "Start Orbot?" + "Orbot doesn\'t appear to be running. Would you like to start it up and connect to Tor?" + "None" "15 secs" diff --git a/OpenKeychain/src/main/res/xml/preference_headers.xml b/OpenKeychain/src/main/res/xml/preference_headers.xml index e3447ff48..70e400567 100644 --- a/OpenKeychain/src/main/res/xml/preference_headers.xml +++ b/OpenKeychain/src/main/res/xml/preference_headers.xml @@ -5,4 +5,7 @@
+
diff --git a/OpenKeychain/src/main/res/xml/proxy_prefs.xml b/OpenKeychain/src/main/res/xml/proxy_prefs.xml new file mode 100644 index 000000000..e77ac6d71 --- /dev/null +++ b/OpenKeychain/src/main/res/xml/proxy_prefs.xml @@ -0,0 +1,27 @@ + + + + + + + -- cgit v1.2.3 From 3034db0f71f9dd8e2f4d8838c1803952702f7520 Mon Sep 17 00:00:00 2001 From: Adithya Abraham Philip Date: Sat, 6 Jun 2015 15:26:22 +0530 Subject: added proxy type --- OpenKeychain/src/main/res/values/arrays.xml | 8 ++++++++ OpenKeychain/src/main/res/values/strings.xml | 14 ++++++++++---- OpenKeychain/src/main/res/xml/proxy_prefs.xml | 13 ++++++++++--- 3 files changed, 28 insertions(+), 7 deletions(-) (limited to 'OpenKeychain/src/main/res') diff --git a/OpenKeychain/src/main/res/values/arrays.xml b/OpenKeychain/src/main/res/values/arrays.xml index 44bbe00cc..241f530d8 100644 --- a/OpenKeychain/src/main/res/values/arrays.xml +++ b/OpenKeychain/src/main/res/values/arrays.xml @@ -29,6 +29,14 @@ 28800 -1 + + @string/pref_proxy_type_choice_http + @string/pref_proxy_type_choice_socks + + + @string/pref_proxy_type_value_http + @string/pref_proxy_type_value_socks + @string/key_size_2048 @string/key_size_4096 diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index defa7d2a5..d8499ed06 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -174,14 +174,20 @@ "Search keys on keybase.io" - "Don't use a proxy" - "Enable Tor" + "Enable Tor" "Requires Orbot to be installed" "Enable other proxy" - "Proxy Host" + "Proxy Host" "Proxy host cannot be empty" - "Proxy Port" + "Proxy Port" "Invalid port number entered" + "Proxy Type" + + + "HTTP" + "SOCKS" + "proxyHttp" + "proxySocks" "<no name>" "<none>" diff --git a/OpenKeychain/src/main/res/xml/proxy_prefs.xml b/OpenKeychain/src/main/res/xml/proxy_prefs.xml index e77ac6d71..ab9c5a3e3 100644 --- a/OpenKeychain/src/main/res/xml/proxy_prefs.xml +++ b/OpenKeychain/src/main/res/xml/proxy_prefs.xml @@ -3,7 +3,7 @@ @@ -21,7 +21,14 @@ android:key="proxyPort" android:defaultValue="8118" android:persistent="true" - android:title="@string/pref_proxy_port" + android:title="@string/pref_proxy_port_label" android:textCursorDrawable="@null" android:inputType="number" /> + -- cgit v1.2.3 From 0883784ce1a2f85100ada0a84c1f604ad458dd96 Mon Sep 17 00:00:00 2001 From: Adithya Abraham Philip Date: Sat, 6 Jun 2015 19:13:16 +0530 Subject: added NetCipher as submodule --- OpenKeychain/src/main/res/values/strings.xml | 9 --------- 1 file changed, 9 deletions(-) (limited to 'OpenKeychain/src/main/res') diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index d8499ed06..d1380c4fe 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -204,15 +204,6 @@ "Secret Key:" - - "Install Orbot?" - "market://search?q=pname:org.torproject.android" - "You must have Orbot installed and activated to proxy traffic through it. Would you like to install it from Google Play?" - "Yes" - "No" - "Start Orbot?" - "Orbot doesn\'t appear to be running. Would you like to start it up and connect to Tor?" - "None" "15 secs" -- cgit v1.2.3 From 65ca77c3cbb5b8bece96e16ff4cd5040ad7884a3 Mon Sep 17 00:00:00 2001 From: Adithya Abraham Philip Date: Thu, 11 Jun 2015 01:34:35 +0530 Subject: orbot dialog fragments added --- OpenKeychain/src/main/res/values/strings.xml | 29 +++++++++++++++++++++------ OpenKeychain/src/main/res/xml/proxy_prefs.xml | 10 ++++----- 2 files changed, 28 insertions(+), 11 deletions(-) (limited to 'OpenKeychain/src/main/res') diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index d1380c4fe..12d222e6a 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -174,21 +174,38 @@ "Search keys on keybase.io" - "Enable Tor" + "Enable Tor" "Requires Orbot to be installed" - "Enable other proxy" - "Proxy Host" + "Enable other proxy" + "Proxy Host" "Proxy host cannot be empty" - "Proxy Port" + "Proxy Port" "Invalid port number entered" - "Proxy Type" + "Proxy Type" - + "HTTP" "SOCKS" "proxyHttp" "proxySocks" + + + Install Orbot to use Tor? + "Install" + You must have Orbot installed and activated to proxy traffic through it. Would you like to install it? + "Cancel" + "Don\'t use Tor" + + + Start Orbot? + "Orbot doesn\'t appear to be running. Would you like to start it up and connect to Tor?" + "Start Orbot" + "Start Orbot" + "Cancel" + "Don\'t use Tor" + + "<no name>" "<none>" diff --git a/OpenKeychain/src/main/res/xml/proxy_prefs.xml b/OpenKeychain/src/main/res/xml/proxy_prefs.xml index ab9c5a3e3..94e101cb6 100644 --- a/OpenKeychain/src/main/res/xml/proxy_prefs.xml +++ b/OpenKeychain/src/main/res/xml/proxy_prefs.xml @@ -3,17 +3,17 @@ + android:title="@string/pref_proxy_normal_title" /> @@ -21,7 +21,7 @@ android:key="proxyPort" android:defaultValue="8118" android:persistent="true" - android:title="@string/pref_proxy_port_label" + android:title="@string/pref_proxy_port_title" android:textCursorDrawable="@null" android:inputType="number" /> + android:title="@string/pref_proxy_type_title" /> -- cgit v1.2.3 From aa7ad4ac634123db73dbbd59930df49086c9395c Mon Sep 17 00:00:00 2001 From: Adithya Abraham Philip Date: Thu, 11 Jun 2015 03:40:20 +0530 Subject: added OperationResult support to upload to keyserver --- OpenKeychain/src/main/res/values/strings.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'OpenKeychain/src/main/res') diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 12d222e6a..fc392d6f8 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1197,6 +1197,7 @@ "Key not found!" "Certificate generation failed!" "Save operation failed!" + "Upload operation failed!" "Successfully uploaded key to server" @@ -1226,6 +1227,7 @@ "Exporting all keys" "Exporting public key %s" + "Uploading public key %s" "Exporting secret key %s" "No filename specified!" "Error opening file!" @@ -1235,7 +1237,9 @@ "Database error!" "Input/output error!" "Error preprocessing key data!" + "Error uploading key to server! Please check your internet connection" "Export operation successful" + "Upload to keyserver successful" "Nothing to delete!" "Secret keys can only be deleted individually!" -- cgit v1.2.3 From 79fc0f97eafd6a70bd40bb8cddd50de52ef84f7c Mon Sep 17 00:00:00 2001 From: Adithya Abraham Philip Date: Thu, 11 Jun 2015 05:33:31 +0530 Subject: added proxy to all import operations using KeychainService --- OpenKeychain/src/main/res/values/strings.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'OpenKeychain/src/main/res') diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index fc392d6f8..f6892c664 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -190,6 +190,8 @@ "proxySocks" + "Don\'t use Tor" + Install Orbot to use Tor? "Install" -- cgit v1.2.3 From 4d8be637de04a37c9fc47e616b41817fd8615094 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Sun, 5 Jul 2015 21:20:24 +0200 Subject: better getActivity and getSystemService null handling in encryptfilesfragment --- OpenKeychain/src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'OpenKeychain/src/main/res') diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index f6892c664..38ff8b5d7 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1424,5 +1424,6 @@ "No file deleted! (Already deleted?)" "Original file could not be deleted!" "Clipboard is empty!" + "Error copying data to clipboard!" -- cgit v1.2.3 From 42cd103355be30c3a985719a528bdeefe68d801c Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Mon, 6 Jul 2015 00:55:34 +0200 Subject: nicer error msg if input data cannot be read --- OpenKeychain/src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'OpenKeychain/src/main/res') diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 38ff8b5d7..8b224c37c 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1106,6 +1106,7 @@ "Missing integrity check! This can happen because the encrypting application is out of date, or from a downgrade attack." "No valid OpenPGP encrypted or signed data found!" "Encountered IO Exception during operation!" + "Error opening input data stream!" "No encrypted data found in stream!" "No encrypted data with known secret key found in stream!" "Encountered OpenPGP Exception during operation!" -- cgit v1.2.3 From f1a75a81e724566e8f4e9c0e264ca548bca03abb Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Mon, 6 Jul 2015 02:02:52 +0200 Subject: catch ArrayIndexOutOfBoundsException in decrypt operation, might be thrown from BouncyCastle --- OpenKeychain/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenKeychain/src/main/res') diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 8b224c37c..f31cac508 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1105,7 +1105,7 @@ "Integrity check error!" "Missing integrity check! This can happen because the encrypting application is out of date, or from a downgrade attack." "No valid OpenPGP encrypted or signed data found!" - "Encountered IO Exception during operation!" + "Encountered an error reading input data!" "Error opening input data stream!" "No encrypted data found in stream!" "No encrypted data with known secret key found in stream!" -- cgit v1.2.3