From d07fe5bb87b3a68e20484042d3c15fba3c6ccc86 Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Fri, 5 Jun 2015 05:39:12 +0530
Subject: added proxy/tor preferences

---
 OpenKeychain/src/main/res/xml/proxy_prefs.xml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 OpenKeychain/src/main/res/xml/proxy_prefs.xml

(limited to 'OpenKeychain/src/main/res/xml/proxy_prefs.xml')

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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <CheckBoxPreference
+            android:key="useTorProxy"
+            android:persistent="true"
+            android:title="@string/pref_proxy_tor"
+            android:summary="@string/pref_proxy_tor_summary" />
+    <CheckBoxPreference
+            android:key="useNormalProxy"
+            android:persistent="true"
+            android:title="@string/pref_proxy_normal" />
+    <EditTextPreference
+        android:key="proxyHost"
+        android:persistent="true"
+        android:defaultValue="127.0.0.1"
+        android:title="@string/pref_proxy_host"
+        android:cursorVisible="true"
+        android:textCursorDrawable="@null"
+        android:inputType="textEmailAddress"/>
+    <EditTextPreference
+            android:key="proxyPort"
+            android:defaultValue="8118"
+            android:persistent="true"
+            android:title="@string/pref_proxy_port"
+            android:textCursorDrawable="@null"
+            android:inputType="number" />
+</PreferenceScreen>
-- 
cgit v1.2.3


From 3034db0f71f9dd8e2f4d8838c1803952702f7520 Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Sat, 6 Jun 2015 15:26:22 +0530
Subject: added proxy type

---
 OpenKeychain/src/main/res/xml/proxy_prefs.xml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'OpenKeychain/src/main/res/xml/proxy_prefs.xml')

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 @@
     <CheckBoxPreference
             android:key="useTorProxy"
             android:persistent="true"
-            android:title="@string/pref_proxy_tor"
+            android:title="@string/pref_proxy_tor_label"
             android:summary="@string/pref_proxy_tor_summary" />
     <CheckBoxPreference
             android:key="useNormalProxy"
@@ -13,7 +13,7 @@
         android:key="proxyHost"
         android:persistent="true"
         android:defaultValue="127.0.0.1"
-        android:title="@string/pref_proxy_host"
+        android:title="@string/pref_proxy_host_label"
         android:cursorVisible="true"
         android:textCursorDrawable="@null"
         android:inputType="textEmailAddress"/>
@@ -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" />
+    <ListPreference
+            android:entries="@array/pref_proxy_type_entries"
+            android:entryValues="@array/pref_proxy_type_values"
+            android:defaultValue="@string/pref_proxy_type_value_http"
+            android:key="proxyType"
+            android:persistent="true"
+            android:title="@string/pref_proxy_type_label" />
 </PreferenceScreen>
-- 
cgit v1.2.3


From 65ca77c3cbb5b8bece96e16ff4cd5040ad7884a3 Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Thu, 11 Jun 2015 01:34:35 +0530
Subject: orbot dialog fragments added

---
 OpenKeychain/src/main/res/xml/proxy_prefs.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'OpenKeychain/src/main/res/xml/proxy_prefs.xml')

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 @@
     <CheckBoxPreference
             android:key="useTorProxy"
             android:persistent="true"
-            android:title="@string/pref_proxy_tor_label"
+            android:title="@string/pref_proxy_tor_title"
             android:summary="@string/pref_proxy_tor_summary" />
     <CheckBoxPreference
             android:key="useNormalProxy"
             android:persistent="true"
-            android:title="@string/pref_proxy_normal" />
+            android:title="@string/pref_proxy_normal_title" />
     <EditTextPreference
         android:key="proxyHost"
         android:persistent="true"
         android:defaultValue="127.0.0.1"
-        android:title="@string/pref_proxy_host_label"
+        android:title="@string/pref_proxy_host_title"
         android:cursorVisible="true"
         android:textCursorDrawable="@null"
         android:inputType="textEmailAddress"/>
@@ -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" />
     <ListPreference
@@ -30,5 +30,5 @@
             android:defaultValue="@string/pref_proxy_type_value_http"
             android:key="proxyType"
             android:persistent="true"
-            android:title="@string/pref_proxy_type_label" />
+            android:title="@string/pref_proxy_type_title" />
 </PreferenceScreen>
-- 
cgit v1.2.3