From 2fa205daec8ede07ed86ddd389fb211caa33325e Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sun, 17 Nov 2013 05:58:32 +0000
Subject: [PATCH] Router-down fixes
---
.../android/router/fragment/AddressbookFragment.java | 3 +++
.../android/router/fragment/NetDbListFragment.java | 11 ++++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/net/i2p/android/router/fragment/AddressbookFragment.java b/src/net/i2p/android/router/fragment/AddressbookFragment.java
index d9cea4a90..130c0621b 100644
--- a/src/net/i2p/android/router/fragment/AddressbookFragment.java
+++ b/src/net/i2p/android/router/fragment/AddressbookFragment.java
@@ -98,6 +98,9 @@ public class AddressbookFragment extends ListFragment implements
// active Fragment when onRouterBind() was called.
if (mOnRouterBind || getRouterContext() != null)
onRouterConnectionReady();
+ else
+ setEmptyText(getResources().getString(
+ R.string.router_not_running));
}
public void onRouterConnectionReady() {
diff --git a/src/net/i2p/android/router/fragment/NetDbListFragment.java b/src/net/i2p/android/router/fragment/NetDbListFragment.java
index 8fb03e722..80ad07af6 100644
--- a/src/net/i2p/android/router/fragment/NetDbListFragment.java
+++ b/src/net/i2p/android/router/fragment/NetDbListFragment.java
@@ -112,6 +112,9 @@ public class NetDbListFragment extends ListFragment implements
// active Fragment when onRouterBind() was called.
if (mOnRouterBind || getRouterContext() != null)
onRouterConnectionReady();
+ else
+ setEmptyText(getResources().getString(
+ R.string.router_not_running));
}
public void onRouterConnectionReady() {
@@ -159,9 +162,11 @@ public class NetDbListFragment extends ListFragment implements
// Handle presses on the action bar items
switch (item.getItemId()) {
case R.id.action_refresh:
- setListShown(false);
- getLoaderManager().restartLoader(mRouters ? ROUTER_LOADER_ID
- : LEASESET_LOADER_ID, null, this);
+ if (getRouterContext() != null) {
+ setListShown(false);
+ getLoaderManager().restartLoader(mRouters ? ROUTER_LOADER_ID
+ : LEASESET_LOADER_ID, null, this);
+ }
return true;
default:
return super.onOptionsItemSelected(item);
--
GitLab