From abd9908a210f4e064a98a65eb1358e253e12a99f Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Tue, 27 Aug 2013 23:54:34 +0000
Subject: [PATCH] Moved tunnel list help handler to correct class, removed
unused imports
---
.../android/i2ptunnel/fragment/TunnelDetailFragment.java | 9 ---------
.../android/i2ptunnel/fragment/TunnelListFragment.java | 6 ++++++
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/net/i2p/android/i2ptunnel/fragment/TunnelDetailFragment.java b/src/net/i2p/android/i2ptunnel/fragment/TunnelDetailFragment.java
index b1d73c6b5..bb35733cd 100644
--- a/src/net/i2p/android/i2ptunnel/fragment/TunnelDetailFragment.java
+++ b/src/net/i2p/android/i2ptunnel/fragment/TunnelDetailFragment.java
@@ -2,18 +2,14 @@ package net.i2p.android.i2ptunnel.fragment;
import java.util.List;
-import net.i2p.android.i2ptunnel.activity.TunnelWizardActivity;
-import net.i2p.android.i2ptunnel.fragment.TunnelListFragment.OnTunnelSelectedListener;
import net.i2p.android.i2ptunnel.loader.TunnelEntry;
import net.i2p.android.i2ptunnel.util.TunnelUtil;
import net.i2p.android.router.R;
-import net.i2p.android.router.activity.HelpActivity;
import net.i2p.i2ptunnel.TunnelControllerGroup;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
-import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
@@ -157,11 +153,6 @@ public class TunnelDetailFragment extends Fragment {
};
dg.show(getFragmentManager(), "delete_tunnel_dialog");
return true;
- case R.id.action_i2ptunnel_help:
- Intent hi = new Intent(getActivity(), HelpActivity.class);
- hi.putExtra(HelpActivity.REFERRER, "i2ptunnel");
- startActivity(hi);
- return true;
default:
return super.onOptionsItemSelected(item);
}
diff --git a/src/net/i2p/android/i2ptunnel/fragment/TunnelListFragment.java b/src/net/i2p/android/i2ptunnel/fragment/TunnelListFragment.java
index a5a1ba4a1..0603fe554 100644
--- a/src/net/i2p/android/i2ptunnel/fragment/TunnelListFragment.java
+++ b/src/net/i2p/android/i2ptunnel/fragment/TunnelListFragment.java
@@ -8,6 +8,7 @@ import net.i2p.android.i2ptunnel.loader.TunnelEntry;
import net.i2p.android.i2ptunnel.loader.TunnelEntryLoader;
import net.i2p.android.i2ptunnel.util.TunnelConfig;
import net.i2p.android.router.R;
+import net.i2p.android.router.activity.HelpActivity;
import net.i2p.i2ptunnel.TunnelControllerGroup;
import android.app.Activity;
import android.content.Intent;
@@ -148,6 +149,11 @@ public class TunnelListFragment extends ListFragment
case R.id.action_add_tunnel:
Intent wi = new Intent(getActivity(), TunnelWizardActivity.class);
startActivityForResult(wi, TUNNEL_WIZARD_REQUEST);
+ case R.id.action_i2ptunnel_help:
+ Intent hi = new Intent(getActivity(), HelpActivity.class);
+ hi.putExtra(HelpActivity.REFERRER, "i2ptunnel");
+ startActivity(hi);
+ return true;
default:
return super.onOptionsItemSelected(item);
}
--
GitLab