From 4f24517de9b5f4f1141321dadb1b300d1a9a96bd Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sun, 26 Jan 2014 05:12:45 +0000
Subject: [PATCH] Hide status ScrollView if router not running
---
res/layout/fragment_main.xml | 1 +
src/net/i2p/android/router/MainFragment.java | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/res/layout/fragment_main.xml b/res/layout/fragment_main.xml
index 4ef856b3e..39759f084 100644
--- a/res/layout/fragment_main.xml
+++ b/res/layout/fragment_main.xml
@@ -20,6 +20,7 @@
android:textOn="@string/button_router_on" />
<ScrollView
+ android:id="@+id/main_status_scrollview"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:fillViewport="true"
diff --git a/src/net/i2p/android/router/MainFragment.java b/src/net/i2p/android/router/MainFragment.java
index 66c434ce6..602ebb535 100644
--- a/src/net/i2p/android/router/MainFragment.java
+++ b/src/net/i2p/android/router/MainFragment.java
@@ -6,6 +6,7 @@ import android.os.Handler;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.ScrollView;
import android.widget.ToggleButton;
import android.widget.ImageView;
import android.widget.TextView;
@@ -236,13 +237,14 @@ public class MainFragment extends I2PFragmentBase {
private void updateStatus() {
RouterContext ctx = getRouterContext();
+ ScrollView sv = (ScrollView) getActivity().findViewById(R.id.main_status_scrollview);
TextView tv = (TextView) getActivity().findViewById(R.id.main_status_text);
if(!Util.isConnected(getActivity())) {
// Manually set state, RouterService won't be running
updateState("WAITING");
tv.setText("No Internet connection is available");
- tv.setVisibility(View.VISIBLE);
+ sv.setVisibility(View.VISIBLE);
} else if(ctx != null) {
if(_startPressed) {
_startPressed = false;
@@ -324,11 +326,11 @@ public class MainFragment extends I2PFragmentBase {
_savedStatus = status + participate + details;
tv.setText(_savedStatus);
- tv.setVisibility(View.VISIBLE);
+ sv.setVisibility(View.VISIBLE);
} else {
// network but no router context
tv.setText("Not running");
- //tv.setVisibility(View.INVISIBLE);
+ sv.setVisibility(View.INVISIBLE);
/**
* **
* RouterService svc = _routerService; String status = "connected? "
--
GitLab