From 97569ae6d094f8a2967bb3f7c197a96acb8c7cfb Mon Sep 17 00:00:00 2001
From: eehouse <eehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Thu, 8 Apr 2010 04:12:08 +0000
Subject: [PATCH] add advanced pref to hold dict download url; use it.

---
 xwords4/android/XWords4/res/values/strings.xml           | 2 ++
 xwords4/android/XWords4/res/xml/xwprefs.xml              | 4 ++++
 .../XWords4/src/org/eehouse/android/xw4/Utils.java       | 3 ++-
 .../src/org/eehouse/android/xw4/jni/CommonPrefs.java     | 9 +++++++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml
index f59c390b2..abed46a45 100644
--- a/xwords4/android/XWords4/res/values/strings.xml
+++ b/xwords4/android/XWords4/res/values/strings.xml
@@ -212,6 +212,7 @@
     <string name="focus">Focus color</string>
     <string name="advanced">Advanced</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="sms_port">SMS port</string>
 
@@ -292,6 +293,7 @@
     <string name="key_relay_host">key_relay_host</string>
     <string name="key_relay_port">key_relay_port</string>
     <string name="key_sms_port">key_sms_port</string>
+    <string name="key_dict_host">key_dict_host</string>
 
     <string name="key_anti_alias">key_anti_alias</string>
     <string name="key_subpixel">key_subpixel</string>
diff --git a/xwords4/android/XWords4/res/xml/xwprefs.xml b/xwords4/android/XWords4/res/xml/xwprefs.xml
index 01d4231c0..5a702ad30 100644
--- a/xwords4/android/XWords4/res/xml/xwprefs.xml
+++ b/xwords4/android/XWords4/res/xml/xwprefs.xml
@@ -101,5 +101,9 @@
                           android:defaultValue="5432"
                           android:numeric="decimal"
                           />
+      <EditTextPreference android:key="@string/key_dict_host"
+                          android:title="@string/dict_host"
+                          android:defaultValue="@string/dict_url"
+                          />
     </PreferenceScreen>
 </PreferenceScreen>
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/Utils.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/Utils.java
index 5f0bfc0d0..1440da7ce 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/Utils.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/Utils.java
@@ -356,7 +356,8 @@ public class Utils {
 
     public static Intent mkDownloadActivity( Context context )
     {
-        Uri uri = Uri.parse( context.getString( R.string.dict_url ));
+        String dict_url = CommonPrefs.getDefaultDictURL();
+        Uri uri = Uri.parse( dict_url );
         Intent intent = new Intent( Intent.ACTION_VIEW, uri );
         intent.setFlags( Intent.FLAG_ACTIVITY_NEW_TASK );
         return intent;
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 ab66c9ea8..8599d8b56 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
@@ -146,4 +146,13 @@ public class CommonPrefs {
         result = Integer.decode( val );
         return result;
     }
+
+    public static String getDefaultDictURL()
+    {
+        SharedPreferences sp = 
+            PreferenceManager.getDefaultSharedPreferences( s_context );
+        String key = s_context.getString( R.string.key_dict_host );
+        return sp.getString( key, "" );
+    }
+
 }