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

Bind to IRouterState using explicit intents (required for API 21 and up)

Browse Source
This commit is contained in:
str4d
2014-11-16 18:49:11 +00:00
parent 20d2dcd891
commit e632b35862
1 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
client/src/main/java/net/i2p/android/ui/I2PAndroidHelper.java
View File

@ -39,7 +39,8 @@ public class I2PAndroidHelper {
* {@link android.app.Activity#onStart()}. * {@link android.app.Activity#onStart()}.
*/ */
public void bind() { public void bind() {
Intent i2pIntent = new Intent(IRouterState.class.getName()); Intent i2pIntent = getI2PAndroidIntent();
if (i2pIntent != null) {
try { try {
mTriedBindState = mContext.bindService( mTriedBindState = mContext.bindService(
i2pIntent, mStateConnection, Context.BIND_AUTO_CREATE); i2pIntent, mStateConnection, Context.BIND_AUTO_CREATE);
@ -49,6 +50,21 @@ public class I2PAndroidHelper {
mTriedBindState = false; mTriedBindState = false;
} }
} }
}
private Intent getI2PAndroidIntent() {
String routerStateClass = IRouterState.class.getName();
Intent intent = new Intent();
if (isAppInstalled(URI_I2P_ANDROID))
intent.setClassName(URI_I2P_ANDROID, routerStateClass);
else if (isAppInstalled(URI_I2P_ANDROID_DONATE))
intent.setClassName(URI_I2P_ANDROID_DONATE, routerStateClass);
else if (isAppInstalled(URI_I2P_ANDROID_LEGACY))
intent.setClassName(URI_I2P_ANDROID_LEGACY, routerStateClass);
else
intent = null;
return intent;
}
/** /**
* Unbind from I2P Android. Call this method from * Unbind from I2P Android. Call this method from
@ -75,6 +91,7 @@ public class I2PAndroidHelper {
/** /**
* Check if I2P Android is installed. * Check if I2P Android is installed.
*
* @return true if I2P Android is installed, false otherwise. * @return true if I2P Android is installed, false otherwise.
*/ */
public boolean isI2PAndroidInstalled() { public boolean isI2PAndroidInstalled() {
@ -97,6 +114,7 @@ public class I2PAndroidHelper {
/** /**
* Show dialog - install I2P Android from market or F-Droid. * Show dialog - install I2P Android from market or F-Droid.
*
* @param activity the Activity this method has been called from. * @param activity the Activity this method has been called from.
*/ */
public void promptToInstall(final Activity activity) { public void promptToInstall(final Activity activity) {
@ -121,6 +139,7 @@ public class I2PAndroidHelper {
/** /**
* Check if I2P Android is running. If {@link net.i2p.android.ui.I2PAndroidHelper#bind()} * Check if I2P Android is running. If {@link net.i2p.android.ui.I2PAndroidHelper#bind()}
* has not been called previously, this will always return false. * has not been called previously, this will always return false.
*
* @return true if I2P Android is running, false otherwise. * @return true if I2P Android is running, false otherwise.
*/ */
public boolean isI2PAndroidRunning() { public boolean isI2PAndroidRunning() {
@ -137,6 +156,7 @@ public class I2PAndroidHelper {
/** /**
* Show dialog - request that I2P Android be started. * Show dialog - request that I2P Android be started.
*
* @param activity the Activity this method has been called from. * @param activity the Activity this method has been called from.
*/ */
public void requestI2PAndroidStart(final Activity activity) { public void requestI2PAndroidStart(final Activity activity) {