Compare commits

..

7 Commits

5 changed files with 39 additions and 6 deletions

View File

@ -1,3 +1,21 @@
2.8.0
* Update I2P Library
* Migrate to AndroidX
* Migrate to MagicIndicator
2.7.1
* Update I2P Library
* Roll back ViewPageIndicator version, fixes crash, causes other issues
2.7.0
* Update I2P Library
2.6.0
* Update I2P Library
2.5.0
* Update I2P Library
2.4.0 2.4.0
* Update I2P Library * Update I2P Library

View File

@ -64,6 +64,8 @@ public class TunnelListFragment extends Fragment implements
private TunnelEntryAdapter mAdapter; private TunnelEntryAdapter mAdapter;
private boolean mClientTunnels; private boolean mClientTunnels;
private static final String KEY_SELECTED_TUNNEL = "selected_tunnel";
// Container Activity must implement this interface // Container Activity must implement this interface
public interface OnTunnelSelectedListener { public interface OnTunnelSelectedListener {
void onTunnelSelected(int tunnelId, Pair<View, String>[] pairs); void onTunnelSelected(int tunnelId, Pair<View, String>[] pairs);
@ -107,6 +109,12 @@ public class TunnelListFragment extends Fragment implements
@Override @Override
public void onViewCreated(View view, Bundle savedInstanceState) { public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);
if (savedInstanceState != null) {
int tunnelId = savedInstanceState.getInt(KEY_SELECTED_TUNNEL, -1);
if (tunnelId != -1) {
mCallback.onTunnelSelected(tunnelId, null);
}
}
} }
@Override @Override

View File

@ -18,6 +18,8 @@ import androidx.fragment.app.FragmentPagerAdapter;
import androidx.core.util.Pair; import androidx.core.util.Pair;
//import android.support.v4.view.ViewPager; //import android.support.v4.view.ViewPager;
import androidx.viewpager.widget.ViewPager; import androidx.viewpager.widget.ViewPager;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
@ -293,9 +295,14 @@ public class TunnelsContainer extends Fragment implements
// In two-pane mode, show the detail view in this activity by // In two-pane mode, show the detail view in this activity by
// adding or replacing the detail fragment using a // adding or replacing the detail fragment using a
// fragment transaction. // fragment transaction.
try {
TunnelDetailFragment detailFrag = TunnelDetailFragment.newInstance(tunnelId); TunnelDetailFragment detailFrag = TunnelDetailFragment.newInstance(tunnelId);
getChildFragmentManager().beginTransaction() getChildFragmentManager().beginTransaction()
.replace(R.id.detail_fragment, detailFrag).commit(); .replace(R.id.detail_fragment, detailFrag)
.commitNow(); // Use commitNow() to execute synchronously
} catch (Exception e) {
Log.e("TunnelsContainer", "Failed to update detail fragment", e);
}
} else { } else {
// In single-pane mode, simply start the detail activity // In single-pane mode, simply start the detail activity
// for the selected item ID. // for the selected item ID.

View File

@ -2,7 +2,7 @@ package net.i2p.android.preferences.util;
import android.content.Context; import android.content.Context;
//import android.support.v7.preference.ListPreference; //import android.support.v7.preference.ListPreference;
import android.preference.ListPreference; import androidx.preference.ListPreference;
import android.util.AttributeSet; import android.util.AttributeSet;
public class IntListPreference extends ListPreference { public class IntListPreference extends ListPreference {

View File

@ -14,8 +14,8 @@
ANDROID_BUILD_SDK_VERSION=34 ANDROID_BUILD_SDK_VERSION=34
ANDROID_BUILD_TARGET_SDK_VERSION=34 ANDROID_BUILD_TARGET_SDK_VERSION=34
GROUP=net.i2p.android GROUP=net.i2p.android
I2P_ANDROID_VERSION=2.8.1 I2P_ANDROID_VERSION=2.8.0-1
I2P_ANDROID_VERSION_CODE=4745290 I2P_ANDROID_VERSION_CODE=4745292
I2P_VERSION=2.8.0-1 I2P_VERSION=2.8.0-1
POM_DEVELOPER_EMAIL=hankhill19580@gmail.com POM_DEVELOPER_EMAIL=hankhill19580@gmail.com
POM_DEVELOPER_ID=idk POM_DEVELOPER_ID=idk