From 14e1a2dca114850cf2e4e8dab1908e04a49f81b4 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sat, 11 Jan 2014 22:40:10 +0000
Subject: [PATCH] Notify user if router not running when opening graph settings
---
project.properties | 2 +-
src/net/i2p/android/router/SettingsActivity.java | 4 ++++
src/net/i2p/android/router/util/Util.java | 4 ++--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/project.properties b/project.properties
index 520859816..60a7d6fc8 100644
--- a/project.properties
+++ b/project.properties
@@ -17,4 +17,4 @@ android.library.reference.1=./routerjars
# If the relative path differs in your local environment,
# override this in the base local.properties
# (not routerjars/local.properties)
-android.library.reference.2=../android-sdk-linux/extras/android/support/v7/appcompat
+android.library.reference.2=../../../android/adt-bundle-linux-x86_64/sdk/extras/android/support/v7/appcompat
diff --git a/src/net/i2p/android/router/SettingsActivity.java b/src/net/i2p/android/router/SettingsActivity.java
index 1a5f7fd9a..f1cae352a 100644
--- a/src/net/i2p/android/router/SettingsActivity.java
+++ b/src/net/i2p/android/router/SettingsActivity.java
@@ -103,6 +103,10 @@ public class SettingsActivity extends PreferenceActivity {
groupPrefs.addPreference(statPref);
}
}
+ } else {
+ PreferenceCategory noRouter = new PreferenceCategory(context);
+ noRouter.setTitle(R.string.router_not_running);
+ ps.addPreference(noRouter);
}
}
diff --git a/src/net/i2p/android/router/util/Util.java b/src/net/i2p/android/router/util/Util.java
index 1902f9e34..849a3b179 100644
--- a/src/net/i2p/android/router/util/Util.java
+++ b/src/net/i2p/android/router/util/Util.java
@@ -81,9 +81,9 @@ public abstract class Util {
public static void i(String m, Throwable t) {
I2PAppContext ctx = I2PAppContext.getCurrentContext();
- if (ctx != null)
+ /*if (ctx != null)
ctx.logManager().getLog(Util.class).log(Log.INFO, m, t);
- else if (t != null)
+ else*/ if (t != null)
android.util.Log.i(ANDROID_TAG, m + ' ' + t + ' ' + android.util.Log.getStackTraceString(t));
else
android.util.Log.i(ANDROID_TAG, m);
--
GitLab