I2P_Developers/i2p.android.base
3
0
Fork 2
Code Issues 39 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

merge of '1d4693c3e133c94344da0418287d05613bfe34f5'

Browse Source 
and 'cab71a0c3af65109945e3b7e4f927825e8e7deb4'
This commit is contained in:
zzz
2019-10-28 15:05:50 +00:00
parent c41b064045 d86d3ad5ae
commit 1f79323d66
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/net/i2p/android/i2ptunnel/TunnelListFragment.java
View File

@ -27,7 +27,6 @@ import net.i2p.android.util.FragmentUtils;
import net.i2p.android.widget.DividerItemDecoration;
import net.i2p.android.widget.LoadingRecyclerView;
import net.i2p.i2ptunnel.TunnelControllerGroup;
import net.i2p.I2PAppContext;
import java.util.ArrayList;
import java.util.List;
@ -177,7 +176,7 @@ public class TunnelListFragment extends Fragment implements
private void initTunnels() {
if (mGroup == null) {
try {
mGroup = TunnelControllerGroup.getInstance(I2PAppContext.getGlobalContext());
mGroup = TunnelControllerGroup.getInstance();
} catch (IllegalArgumentException iae) {
Util.e("Could not load tunnels", iae);
mGroup = null;

23
app/src/main/java/net/i2p/android/i2ptunnel/TunnelsContainer.java
View File

@ -30,10 +30,14 @@ import net.i2p.app.ClientAppState;
import net.i2p.i2ptunnel.TunnelControllerGroup;
import net.i2p.i2ptunnel.ui.TunnelConfig;
import net.i2p.router.RouterContext;
import net.i2p.I2PAppContext;
import java.util.List;
/**
* The top level Fragment of the tunnels tabs.
* Creates client and server TunnelListFragments,
* the options menu, and the new tunnel wizard button.
*/
public class TunnelsContainer extends Fragment implements
FragmentUtils.TwoPaneProvider,
TunnelListFragment.OnTunnelSelectedListener,
@ -66,12 +70,11 @@ public class TunnelsContainer extends Fragment implements
setHasOptionsMenu(true);
}
private boolean showActions() {
private static boolean showActions() {
RouterContext rCtx = Util.getRouterContext();
TunnelControllerGroup tcg = TunnelControllerGroup.getInstance(I2PAppContext.getGlobalContext());
TunnelControllerGroup tcg = TunnelControllerGroup.getInstance();
return rCtx != null && tcg != null &&
(tcg.getState() == ClientAppState.STARTING ||
tcg.getState() == ClientAppState.RUNNING);
tcg.getState() == ClientAppState.RUNNING;
}
@Override
@ -178,7 +181,7 @@ public class TunnelsContainer extends Fragment implements
@Override
public boolean onOptionsItemSelected(MenuItem item) {
TunnelControllerGroup tcg = TunnelControllerGroup.getInstance(I2PAppContext.getGlobalContext());
TunnelControllerGroup tcg = TunnelControllerGroup.getInstance();
if (tcg == null)
return false;
@ -216,9 +219,13 @@ public class TunnelsContainer extends Fragment implements
if (tunnelData == null)
return;
// TODO fetch earlier
TunnelControllerGroup tcg = TunnelControllerGroup.getInstance(I2PAppContext.getGlobalContext());
if (tcg == null)
TunnelControllerGroup tcg = TunnelControllerGroup.getInstance();
if (tcg == null) {
// router went away
Toast.makeText(getActivity().getApplicationContext(),
R.string.router_not_running, Toast.LENGTH_LONG).show();
return;
}
TunnelConfig cfg = TunnelUtil.createConfigFromWizard(getActivity(), tcg, tunnelData);
TunnelEntry tunnel = TunnelEntry.createNewTunnel(getActivity(), tcg, cfg);

3
app/src/main/java/net/i2p/android/i2ptunnel/preferences/BaseTunnelPreferenceFragment.java
View File

@ -14,7 +14,6 @@ import net.i2p.android.router.R;
import net.i2p.android.router.util.Util;
import net.i2p.i2ptunnel.TunnelControllerGroup;
import net.i2p.i2ptunnel.ui.TunnelConfig;
import net.i2p.I2PAppContext;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.CancellationException;
@ -31,7 +30,7 @@ public abstract class BaseTunnelPreferenceFragment extends CustomPreferenceFragm
public void onCreatePreferences(Bundle paramBundle, String s) {
String error;
try {
mGroup = TunnelControllerGroup.getInstance(I2PAppContext.getGlobalContext());
mGroup = TunnelControllerGroup.getInstance();
error = mGroup == null ? getResources().getString(R.string.i2ptunnel_not_initialized) : null;
} catch (IllegalArgumentException iae) {
mGroup = null;