I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit a00c08bb authored by str4d's avatar str4d
Browse files

Moved I2PTunnel code into separate package

parent 449627be
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 38 additions and 35 deletions
AndroidManifest.xml.in
+ 3
− 3
View file @ a00c08bb
......@@ -69,13 +69,13 @@
<meta-data android:name="android.app.searchable"
android:resource="@xml/searchable_addressbook"/>
</activity>
<activity android:name=".activity.I2PTunnelActivity"
<activity android:name="net.i2p.android.i2ptunnel.activity.TunnelListActivity"
android:label="I2PTunnel"
android:launchMode="singleTop" >
</activity>
<activity android:name=".activity.I2PTunnelDetailActivity"
<activity android:name="net.i2p.android.i2ptunnel.activity.TunnelDetailActivity"
android:label="I2PTunnel"
android:parentActivityName=".activity.I2PTunnelActivity" >
android:parentActivityName="net.i2p.android.i2ptunnel.activity.TunnelListActivity" >
</activity>
<activity android:name=".activity.LogActivity"
android:label="I2P Logs"
......
src/net/i2p/android/router/activity/I2PTunnelDetailActivity.java → src/net/i2p/android/i2ptunnel/activity/TunnelDetailActivity.java
+ 6
− 5
View file @ a00c08bb
package net.i2p.android.router.activity;
package net.i2p.android.i2ptunnel.activity;
import net.i2p.android.i2ptunnel.fragment.TunnelDetailFragment;
import net.i2p.android.router.R;
import net.i2p.android.router.fragment.I2PTunnelDetailFragment;
import net.i2p.android.router.activity.I2PActivityBase;
import android.os.Bundle;
public class I2PTunnelDetailActivity extends I2PActivityBase {
public class TunnelDetailActivity extends I2PActivityBase {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mDrawerToggle.setDrawerIndicatorEnabled(false);
if (savedInstanceState == null) {
int tunnelId = getIntent().getIntExtra(I2PTunnelDetailFragment.TUNNEL_ID, 0);
I2PTunnelDetailFragment detailFrag = I2PTunnelDetailFragment.newInstance(tunnelId);
int tunnelId = getIntent().getIntExtra(TunnelDetailFragment.TUNNEL_ID, 0);
TunnelDetailFragment detailFrag = TunnelDetailFragment.newInstance(tunnelId);
getSupportFragmentManager().beginTransaction()
.add(R.id.main_fragment, detailFrag).commit();
}
......
src/net/i2p/android/router/activity/I2PTunnelActivity.java → src/net/i2p/android/i2ptunnel/activity/TunnelListActivity.java
+ 13
− 12
View file @ a00c08bb
package net.i2p.android.router.activity;
package net.i2p.android.i2ptunnel.activity;
import net.i2p.android.i2ptunnel.fragment.TunnelDetailFragment;
import net.i2p.android.i2ptunnel.fragment.TunnelListFragment;
import net.i2p.android.router.R;
import net.i2p.android.router.fragment.I2PTunnelDetailFragment;
import net.i2p.android.router.fragment.I2PTunnelListFragment;
import net.i2p.android.router.activity.I2PActivityBase;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.app.ActionBar.Tab;
public class I2PTunnelActivity extends I2PActivityBase
implements I2PTunnelListFragment.OnTunnelSelectedListener {
public class TunnelListActivity extends I2PActivityBase
implements TunnelListFragment.OnTunnelSelectedListener {
/**
* Whether or not the activity is in two-pane mode, i.e. running on a tablet
* device.
......@@ -30,9 +31,9 @@ public class I2PTunnelActivity extends I2PActivityBase
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
// Client tunnels tab
I2PTunnelListFragment cf = new I2PTunnelListFragment();
TunnelListFragment cf = new TunnelListFragment();
Bundle args = new Bundle();
args.putBoolean(I2PTunnelListFragment.SHOW_CLIENT_TUNNELS, true);
args.putBoolean(TunnelListFragment.SHOW_CLIENT_TUNNELS, true);
cf.setArguments(args);
Tab tab = actionBar.newTab()
.setText(R.string.label_i2ptunnel_client)
......@@ -40,9 +41,9 @@ public class I2PTunnelActivity extends I2PActivityBase
actionBar.addTab(tab);
// Server tunnels tab
I2PTunnelListFragment sf = new I2PTunnelListFragment();
TunnelListFragment sf = new TunnelListFragment();
args = new Bundle();
args.putBoolean(I2PTunnelListFragment.SHOW_CLIENT_TUNNELS, false);
args.putBoolean(TunnelListFragment.SHOW_CLIENT_TUNNELS, false);
sf.setArguments(args);
tab = actionBar.newTab()
.setText(R.string.label_i2ptunnel_server)
......@@ -70,14 +71,14 @@ public class I2PTunnelActivity extends I2PActivityBase
// In two-pane mode, show the detail view in this activity by
// adding or replacing the detail fragment using a
// fragment transaction.
I2PTunnelDetailFragment detailFrag = I2PTunnelDetailFragment.newInstance(tunnelId);
TunnelDetailFragment detailFrag = TunnelDetailFragment.newInstance(tunnelId);
getSupportFragmentManager().beginTransaction()
.replace(R.id.detail_fragment, detailFrag).commit();
} else {
// In single-pane mode, simply start the detail activity
// for the selected item ID.
Intent detailIntent = new Intent(this, I2PTunnelDetailActivity.class);
detailIntent.putExtra(I2PTunnelDetailFragment.TUNNEL_ID, tunnelId);
Intent detailIntent = new Intent(this, TunnelDetailActivity.class);
detailIntent.putExtra(TunnelDetailFragment.TUNNEL_ID, tunnelId);
startActivity(detailIntent);
}
}
......
src/net/i2p/android/router/adapter/TunnelEntryAdapter.java → src/net/i2p/android/i2ptunnel/adapter/TunnelEntryAdapter.java
+ 2
− 2
View file @ a00c08bb
package net.i2p.android.router.adapter;
package net.i2p.android.i2ptunnel.adapter;
import java.util.List;
import net.i2p.android.i2ptunnel.loader.TunnelEntry;
import net.i2p.android.router.R;
import net.i2p.android.router.loader.TunnelEntry;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
......
src/net/i2p/android/router/fragment/I2PTunnelDetailFragment.java → src/net/i2p/android/i2ptunnel/fragment/TunnelDetailFragment.java
+ 5
− 5
View file @ a00c08bb
package net.i2p.android.router.fragment;
package net.i2p.android.i2ptunnel.fragment;
import net.i2p.android.i2ptunnel.loader.TunnelEntry;
import net.i2p.android.router.R;
import net.i2p.android.router.loader.TunnelEntry;
import net.i2p.i2ptunnel.TunnelControllerGroup;
import android.os.Bundle;
import android.support.v4.app.Fragment;
......@@ -10,13 +10,13 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
public class I2PTunnelDetailFragment extends Fragment {
public class TunnelDetailFragment extends Fragment {
public static final String TUNNEL_ID = "tunnel_id";
private TunnelEntry mTunnel;
public static I2PTunnelDetailFragment newInstance(int tunnelId) {
I2PTunnelDetailFragment f = new I2PTunnelDetailFragment();
public static TunnelDetailFragment newInstance(int tunnelId) {
TunnelDetailFragment f = new TunnelDetailFragment();
Bundle args = new Bundle();
args.putInt(TUNNEL_ID, tunnelId);
f.setArguments(args);
......
src/net/i2p/android/router/fragment/I2PTunnelListFragment.java → src/net/i2p/android/i2ptunnel/fragment/TunnelListFragment.java
+ 5
− 5
View file @ a00c08bb
package net.i2p.android.router.fragment;
package net.i2p.android.i2ptunnel.fragment;
import java.util.List;
import net.i2p.android.i2ptunnel.adapter.TunnelEntryAdapter;
import net.i2p.android.i2ptunnel.loader.TunnelEntry;
import net.i2p.android.i2ptunnel.loader.TunnelEntryLoader;
import net.i2p.android.router.R;
import net.i2p.android.router.adapter.TunnelEntryAdapter;
import net.i2p.android.router.loader.TunnelEntryLoader;
import net.i2p.android.router.loader.TunnelEntry;
import net.i2p.i2ptunnel.TunnelControllerGroup;
import android.app.Activity;
import android.os.Bundle;
......@@ -18,7 +18,7 @@ import android.view.MenuItem;
import android.view.View;
import android.widget.ListView;
public class I2PTunnelListFragment extends ListFragment
public class TunnelListFragment extends ListFragment
implements LoaderManager.LoaderCallbacks<List<TunnelEntry>> {
public static final String SHOW_CLIENT_TUNNELS = "show_client_tunnels";
......
src/net/i2p/android/router/loader/TunnelEntry.java → src/net/i2p/android/i2ptunnel/loader/TunnelEntry.java
+ 1
− 1
View file @ a00c08bb
package net.i2p.android.router.loader;
package net.i2p.android.i2ptunnel.loader;
import android.content.Context;
import android.graphics.drawable.Drawable;
......
src/net/i2p/android/router/loader/TunnelEntryLoader.java → src/net/i2p/android/i2ptunnel/loader/TunnelEntryLoader.java
+ 1
− 1
View file @ a00c08bb
package net.i2p.android.router.loader;
package net.i2p.android.i2ptunnel.loader;
import java.util.ArrayList;
import java.util.List;
......
src/net/i2p/android/router/activity/I2PActivityBase.java
+ 2
− 1
View file @ a00c08bb
package net.i2p.android.router.activity;
import net.i2p.android.i2ptunnel.activity.TunnelListActivity;
import net.i2p.android.router.R;
import net.i2p.android.router.fragment.I2PFragmentBase;
import android.app.Activity;
......@@ -128,7 +129,7 @@ public class I2PActivityBase extends ActionBarActivity {
startActivity(ab);
break;
case 2:
Intent itb = new Intent(I2PActivityBase.this, I2PTunnelActivity.class);
Intent itb = new Intent(I2PActivityBase.this, TunnelListActivity.class);
startActivity(itb);
break;
case 3:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Base32 Address: [http://7qeve4v2chmjdqlwpa3vl7aojf3nodbku7vepnjwrsxljzqipz6a.b32.i2p] Onion Address: [http://47ggr2fa3vnwfyhvgskzdmr3i32eijwymxohtxsls45dulmriwxszjad.onion]