From 39827ec894ca3c8c9ca60a620aaf2cdf4e960f6f Mon Sep 17 00:00:00 2001
From: Andy2 <andy2@trand.private.network>
Date: Tue, 28 Sep 2010 06:43:04 -0700
Subject: [PATCH] add new pref for relay's proxy/device port

---
 .../android/XWords4/res/values/common_rsrc.xml   |  1 +
 xwords4/android/XWords4/res/values/strings.xml   |  3 ++-
 xwords4/android/XWords4/res/xml/xwprefs.xml      |  5 +++++
 .../org/eehouse/android/xw4/jni/CommonPrefs.java | 16 ++++++++++++++--
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/xwords4/android/XWords4/res/values/common_rsrc.xml b/xwords4/android/XWords4/res/values/common_rsrc.xml
index 0c3a969b9..e8757841a 100644
--- a/xwords4/android/XWords4/res/values/common_rsrc.xml
+++ b/xwords4/android/XWords4/res/values/common_rsrc.xml
@@ -28,6 +28,7 @@
   <string name="key_clr_crosshairs">key_clr_crosshairs</string>
   <string name="key_relay_host">key_relay_host</string>
   <string name="key_relay_port">key_relay_port</string>
+  <string name="key_proxy_port">key_proxy_port</string>
   <string name="key_sms_port">key_sms_port</string>
   <string name="key_dict_host">key_dict_host</string>
   <string name="key_board_size">key_board_size</string>
diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml
index 7a755251a..c630539e4 100644
--- a/xwords4/android/XWords4/res/values/strings.xml
+++ b/xwords4/android/XWords4/res/values/strings.xml
@@ -287,7 +287,8 @@
     <string name="advanced_summary">You may never need these...</string>
     <string name="relay_host">Relay address</string>
     <string name="dict_host">Dictionary download URL</string>
-    <string name="relay_port">Relay port</string>
+    <string name="relay_port">Relay game port</string>
+    <string name="proxy_port">Relay device port</string>
     <string name="sms_port">SMS port</string>
 
     <string name="sms_phone_label">sms_phone_label</string>
diff --git a/xwords4/android/XWords4/res/xml/xwprefs.xml b/xwords4/android/XWords4/res/xml/xwprefs.xml
index 726a486e3..866214b89 100644
--- a/xwords4/android/XWords4/res/xml/xwprefs.xml
+++ b/xwords4/android/XWords4/res/xml/xwprefs.xml
@@ -182,6 +182,11 @@
                         android:defaultValue="10999"
                         android:numeric="decimal"
                         />
+    <EditTextPreference android:key="@string/key_proxy_port"
+                        android:title="@string/proxy_port"
+                        android:defaultValue="10998"
+                        android:numeric="decimal"
+                        />
     <!-- <EditTextPreference android:key="@string/key_sms_port" -->
          <!--                     android:title="@string/sms_port" -->
          <!--                     android:defaultValue="5432" -->
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommonPrefs.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommonPrefs.java
index 25d43b8b3..f22686f19 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommonPrefs.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommonPrefs.java
@@ -145,10 +145,22 @@ public class CommonPrefs {
         String val = getString( context, R.string.key_relay_port );
         int result = 0;
         try {
-            return Integer.parseInt( val );
+            result = Integer.parseInt( val );
         } catch ( Exception ex ) {
-            return 0;
         } 
+        return result;
+    }
+
+    public static int getDefaultProxyPort( Context context )
+    {
+        String val = getString( context, R.string.key_proxy_port );
+        int result = 0;
+        try {
+            result = Integer.parseInt( val );
+        } catch ( Exception ex ) {
+        } 
+        Utils.logf( "getDefaultProxyPort=>%d", result );
+        return result;
     }
 
     public static String getDefaultDictURL( Context context )