Index: blimp/client/core/android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreferences.java |
diff --git a/blimp/client/core/android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreferences.java b/blimp/client/core/android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreferences.java |
index 156160410039f75e9d7096e3ee05d6726f4420a7..7256aa692b6a1b38fc158275a40365fd3c66c91f 100644 |
--- a/blimp/client/core/android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreferences.java |
+++ b/blimp/client/core/android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreferences.java |
@@ -16,10 +16,12 @@ import android.preference.SwitchPreference; |
import android.support.v7.app.AlertDialog; |
import org.chromium.base.ContextUtils; |
+import org.chromium.base.ThreadUtils; |
import org.chromium.base.VisibleForTesting; |
import org.chromium.base.annotations.CalledByNative; |
import org.chromium.base.annotations.JNINamespace; |
import org.chromium.blimp.R; |
+import org.chromium.blimp.core.session.EngineInfo; |
import org.chromium.components.sync.signin.ChromeSigninController; |
/** |
@@ -27,6 +29,7 @@ import org.chromium.components.sync.signin.ChromeSigninController; |
*/ |
@JNINamespace("blimp::client") |
public class AboutBlimpPreferences extends PreferenceFragment { |
+ private static final String PREF_ENGINE_IP = "blimp_engine_ip"; |
/** |
* If this fragment is waiting for user sign in. |
*/ |
@@ -37,6 +40,8 @@ public class AboutBlimpPreferences extends PreferenceFragment { |
private long mNativeBlimpSettingsAndroid; |
+ private EngineInfo mEngineInfo = new EngineInfo(); |
+ |
/** |
* Attach the blimp setting preferences to a {@link PreferenceFragment}. |
* And Set the delegate. |
@@ -96,6 +101,7 @@ public class AboutBlimpPreferences extends PreferenceFragment { |
addPreferencesFromResource(R.xml.blimp_preferences); |
setupBlimpSwitch(); |
+ setupEngineInfo(); |
setupAssignerPreferences(); |
} |
@@ -119,6 +125,13 @@ public class AboutBlimpPreferences extends PreferenceFragment { |
} |
/** |
+ * Setup engine connection info summary. |
+ */ |
+ private void setupEngineInfo() { |
+ findPreference(PREF_ENGINE_IP).setSummary(mEngineInfo.getEngineIp()); |
+ } |
+ |
+ /** |
* Handles switch preference change. |
* @param switchValue The new value of the preference. |
* @return If the new value will be persisted. |
@@ -260,6 +273,21 @@ public class AboutBlimpPreferences extends PreferenceFragment { |
} |
} |
+ @CalledByNative |
+ private void onConnected(String ip) { |
David Trainor- moved to gerrit
2016/09/09 19:33:47
On that same note, should these all be hidden behi
xingliu
2016/09/10 22:45:46
Remove ip cahces.
Also changed the onResume logic
|
+ ThreadUtils.assertOnUiThread(); |
+ mEngineInfo.setConnected(true); |
+ mEngineInfo.setEngineIp(ip); |
+ updateSettingPage(); |
+ } |
+ |
+ @CalledByNative |
+ private void onDisconnected() { |
+ ThreadUtils.assertOnUiThread(); |
+ mEngineInfo.setConnected(false); |
+ updateSettingPage(); |
+ } |
+ |
@VisibleForTesting |
protected void initializeNative() { |
mNativeBlimpSettingsAndroid = nativeInit(); |