From 256f03abf4cf7d81a97cb3fdfae52490e74a9513 Mon Sep 17 00:00:00 2001
From: Yaroslav Berezanskyi <yarikfreerun@gmail.com>
Date: Mon, 17 Aug 2015 18:49:40 +0300
Subject: [PATCH] When Full client mode- preference with Json-RPC server
 becomes disabled

---
 .../java/io/syng/activity/BaseActivity.java     |  1 +
 .../java/io/syng/activity/SettingsActivity.java |  9 +++++----
 app/src/main/res/values/strings_settings.xml    | 17 ++++++++++-------
 app/src/main/res/xml/pref_general.xml           | 17 ++++++++---------
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/io/syng/activity/BaseActivity.java b/app/src/main/java/io/syng/activity/BaseActivity.java
index 0745a78..891bffd 100644
--- a/app/src/main/java/io/syng/activity/BaseActivity.java
+++ b/app/src/main/java/io/syng/activity/BaseActivity.java
@@ -588,4 +588,5 @@ public abstract class BaseActivity extends AppCompatActivity implements
         populateProfiles();
         Glide.with(this).load(PrefsUtil.getBackgroundResourceId(ProfileManager.getCurrentProfile().getId())).into(mHeaderImageView);
     }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/syng/activity/SettingsActivity.java b/app/src/main/java/io/syng/activity/SettingsActivity.java
index 56b2d4f..f7f1481 100644
--- a/app/src/main/java/io/syng/activity/SettingsActivity.java
+++ b/app/src/main/java/io/syng/activity/SettingsActivity.java
@@ -109,10 +109,11 @@ public class SettingsActivity extends PreferenceActivity {
                         int index = listPreference.findIndexOfValue(stringValue);
 
                         // Set the summary to reflect the new value.
-                        preference.setSummary(
-                                index >= 0
-                                        ? listPreference.getEntries()[index]
-                                        : null);
+                        preference.setSummary(index >= 0 ? listPreference.getEntries()[index] : null);
+
+                        Preference jsonRPC = findPreference(getString(R.string.pref_json_rpc_server_key));
+                        jsonRPC.setEnabled(!stringValue.equals(getString(R.string.pref_running_mode_full_value)));
+
                     } else if (key.equals(getString(R.string.pref_json_rpc_server_key))) {
                         preference.setSummary("Current server address is " + stringValue);
                     } else {
diff --git a/app/src/main/res/values/strings_settings.xml b/app/src/main/res/values/strings_settings.xml
index cc6b5bb..44e0651 100644
--- a/app/src/main/res/values/strings_settings.xml
+++ b/app/src/main/res/values/strings_settings.xml
@@ -17,16 +17,19 @@
 
     <string name="pref_title_running_mode">Running Mode</string>
 
+    <string name="pref_running_mode_full_name">Full Client</string>
+    <string name="pref_running_mode_light_name">Light Client</string>
+    <string name="pref_running_mode_full_value">1</string>
+    <string name="pref_running_mode_light_value">2</string>
+
     <string-array name="pref_running_modes_titles">
-        <item>Full Client</item>
-        <item>Light Client</item>
-        <item>Json RPC Client</item>
+        <item>@string/pref_running_mode_full_name</item>
+        <item>@string/pref_running_mode_light_name</item>
     </string-array>
 
     <string-array name="pref_running_modes_values">
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
+        <item>@string/pref_running_mode_full_value</item>
+        <item>@string/pref_running_mode_light_value</item>
     </string-array>
 
     <!-- Example settings for Data & Sync -->
@@ -55,7 +58,7 @@
     <string name="pref_json_rpc_server_default" translate="false">rpc0.syng.io:8545</string>
     <string name="pref_json_rpc_server_key" translate="false">pref_json_rpc_server_key</string>
     <string name="pref_json_rpc_server_title" translate="false">JSON-RPC server address</string>
-    <string name="pref_running_mode_key" translate="false">runningMode</string>
+    <string name="pref_running_mode_key" translate="false">running_mode</string>
 
 
 </resources>
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index f852de1..02d01ee 100644
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -1,6 +1,14 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
 
+    <ListPreference
+        android:entries="@array/pref_running_modes_titles"
+        android:entryValues="@array/pref_running_modes_values"
+        android:key="@string/pref_running_mode_key"
+        android:negativeButtonText="@null"
+        android:positiveButtonText="@null"
+        android:title="@string/pref_title_running_mode"/>
+
     <EditTextPreference
         android:defaultValue="@string/pref_json_rpc_server_default"
         android:inputType="text"
@@ -8,15 +16,6 @@
         android:singleLine="true"
         android:title="@string/pref_json_rpc_server_title"/>
 
-    <ListPreference
-        android:defaultValue="3"
-        android:entries="@array/pref_running_modes_titles"
-        android:entryValues="@array/pref_running_modes_values"
-        android:key="@string/pref_running_mode_key"
-        android:negativeButtonText="@null"
-        android:positiveButtonText="@null"
-        android:title="@string/pref_title_running_mode"/>
-
     <CheckBoxPreference
         android:defaultValue="true"
         android:key="syncInBackground"