Move default string to string xml and reference

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainActivity.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainActivity.java
index 7169fc3aa41fae65f03dd667226c53105f437be6..a5e17a67c1ab94abafdc3306876baa75de7c1a47 100644 (file)
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainActivity.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainActivity.java
@@ -19,10 +19,6 @@ import android.view.View;
 import android.widget.TextView;
 
 public class MainActivity extends AppCompatActivity {
-
-    // TODO surely this belongs somewhere else
-    private static final String defserver = "tcp://ctfws-mqtt.ietfng.org:1883";
-
     private final MainActivityBuildHooks mabh = new MainActivityBuildHooksImpl();
 
     private MainService.LocalBinder mSrvBinder; // set once connection completed
@@ -68,7 +64,7 @@ public class MainActivity extends AppCompatActivity {
 
         SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
         if (sp.getString("server", null) == null) {
-            sp.edit().putString("server", defserver).apply();
+            sp.edit().putString("server", getString(R.string.server_default)).apply();
         }
         if (BuildConfig.DEBUG && sp.getString("server", null) == null) {
             throw new AssertionError("Shared Preferences not sticking!");

diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index e035cef73cde5c484bd289bdbe19f37e798dad87..d737a533dab762841505be916351f6d783b4b440 100644 (file)
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -1,4 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="server_default">tcp://ctfws-mqtt.acmetensortoys.com:1883</string>
+
     <string name="app_name">CMUKGB CtFwS Timer</string>
 
     <string name="ctfws_gameend">Game\nEnd</string>

diff --git a/mobile/src/main/res/xml/preferences.xml b/mobile/src/main/res/xml/preferences.xml
index a3734ac0a48b7c554a6b1f52afcd67ba4f03bacf..67bf097565d150abc16c4c70c3368ea2eda39b04 100644 (file)
--- a/mobile/src/main/res/xml/preferences.xml
+++ b/mobile/src/main/res/xml/preferences.xml
@@ -5,10 +5,10 @@
         android:selectAllOnFocus="true"\r
         android:singleLine="true"\r
         android:key="server"\r
-        android:defaultValue="tcp://ctfws-mqtt.ietfng.org:1883"\r
+        android:defaultValue="@string/server_default"\r
         android:title="@string/preftext_mqtt" />\r
     <CheckBoxPreference\r
         android:defaultValue="true"\r
         android:title="@string/preftext_vibrate"\r
         android:key="prf_vibr" />\r
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>\r