Use manual action to refresh NetDB list instead of timer

res/values/strings.xml

@@ -43,6 +43,7 @@
     <string name="action_i2ptunnel_stop_all">Stop all tunnels</string>
     <string name="action_i2ptunnel_restart_all">Restart all tunnels</string>
     <string name="action_reload">Reload</string>
+    <string name="action_refresh">Refresh</string>
     <string name="hint_search_addressbook">Search addressbook</string>
 
     <string name="router_not_running">The router is not running.</string>

src/net/i2p/android/router/fragment/NetDbListFragment.java

@@ -13,8 +13,12 @@ import android.os.Bundle;
 import android.support.v4.app.ListFragment;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.ListView;
+import android.widget.Toast;
 
 public class NetDbListFragment extends ListFragment
         implements LoaderManager.LoaderCallbacks<List<NetDbEntry>> {
@@ -72,6 +76,12 @@ public class NetDbListFragment extends ListFragment
 
     }
 
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
@@ -127,6 +137,25 @@ public class NetDbListFragment extends ListFragment
         }
     }
 
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.fragment_netdb_list_actions, menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // 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);
+            return true;
+        default:
+            return super.onOptionsItemSelected(item);
+        }
+    }
+
     /**
      * Turns on activate-on-click mode. When this mode is on, list items will be
      * given the 'activated' state when touched.

src/net/i2p/android/router/loader/NetDbEntryLoader.java

@@ -13,21 +13,17 @@ import net.i2p.router.RouterContext;
 import net.i2p.router.TunnelPoolSettings;
 
 import android.content.Context;
-import android.os.Handler;
 import android.support.v4.content.AsyncTaskLoader;
 
 public class NetDbEntryLoader extends AsyncTaskLoader<List<NetDbEntry>> {
     private RouterContext mRContext;
     private boolean mRouters;
     private List<NetDbEntry> mData;
-    private Handler mHandler;
-    private NetDbMonitor mMonitor;
 
     public NetDbEntryLoader(Context context, RouterContext rContext, boolean routers) {
         super(context);
         mRContext = rContext;
         mRouters = routers;
-        mHandler = new Handler();
     }
 
     private static class RouterInfoComparator implements Comparator<RouterInfo> {
@@ -122,10 +118,6 @@ public class NetDbEntryLoader extends AsyncTaskLoader<List<NetDbEntry>> {
             deliverResult(mData);
         }
 
-        // Begin monitoring the underlying data source.
-        mMonitor = new NetDbMonitor();
-        mHandler.postDelayed(mMonitor, 50);
-
         if (takeContentChanged() || mData == null) {
             // When the observer detects a change, it should call onContentChanged()
             // on the Loader, which will cause the next call to takeContentChanged()
@@ -156,12 +148,6 @@ public class NetDbEntryLoader extends AsyncTaskLoader<List<NetDbEntry>> {
             releaseResources(mData);
             mData = null;
         }
-
-        // The Loader is being reset, so we should stop monitoring for changes.
-        if (mMonitor != null) {
-            mHandler.removeCallbacks(mMonitor);
-            mMonitor = null;
-        }
     }
 
     @Override
@@ -179,13 +165,4 @@ public class NetDbEntryLoader extends AsyncTaskLoader<List<NetDbEntry>> {
         // would close it in this method. All resources associated with the Loader
         // should be released here.
     }
-
-    private class NetDbMonitor implements Runnable {
-        public void run() {
-            // There is no way (yet) to monitor for changes to the NetDB,
-            // so just force a refresh every 10 seconds.
-            onContentChanged();
-            mHandler.postDelayed(this, 10 * 1000);
-        }
-    }
 }