status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[FIX #709] "Your phone appears to be ROOTED" message shown less often.

This commit is contained in:
Audrius Molis 2017-11-12 19:50:42 +02:00 committed by Oskar Thorén
parent 319a770872
commit 3933ded384
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
android/app/src/main/java/im/status/ethereum/MainActivity.java
View File

@ -6,16 +6,13 @@ import android.app.ActivityManager;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.DialogInterface.OnCancelListener; import android.content.DialogInterface.OnCancelListener;
import android.content.DialogInterface.OnClickListener; import android.content.DialogInterface.OnClickListener;
import android.support.multidex.MultiDexApplication;
import android.os.Looper; import android.os.Looper;
import android.util.Log; import android.util.Log;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.DialogInterface.OnCancelListener;
import android.content.DialogInterface.OnClickListener;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.Bundle; import android.os.Bundle;
import com.facebook.react.ReactActivity; import com.facebook.react.ReactActivity;
import com.cboy.rn.splashscreen.SplashScreen; import com.cboy.rn.splashscreen.SplashScreen;
import com.testfairy.TestFairy; import com.testfairy.TestFairy;
@ -85,7 +82,7 @@ public class MainActivity extends ReactActivity {
TestFairy.begin(this, "969f6c921cb435cea1d41d1ea3f5b247d6026d55"); TestFairy.begin(this, "969f6c921cb435cea1d41d1ea3f5b247d6026d55");
} }
if (!RootUtil.isDeviceRooted()) { if (!shouldShowRootedNotification()) {
configureStatus(); configureStatus();
} else { } else {
AlertDialog dialog = new AlertDialog.Builder(MainActivity.this) AlertDialog dialog = new AlertDialog.Builder(MainActivity.this)
@ -93,6 +90,7 @@ public class MainActivity extends ReactActivity {
.setPositiveButton(getResources().getString(R.string.root_okay), new OnClickListener() { .setPositiveButton(getResources().getString(R.string.root_okay), new OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
rejectRootedNotification();
dialog.dismiss(); dialog.dismiss();
configureStatus(); configureStatus();
} }
@ -147,4 +145,29 @@ public class MainActivity extends ReactActivity {
intent.putExtra("newConfig", newConfig); intent.putExtra("newConfig", newConfig);
this.sendBroadcast(intent); this.sendBroadcast(intent);
} }
private static final String REJECTED_ROOTED_NOTIFICATION = "rejectedRootedNotification";
private static final Integer FREQUENCY_OF_REMINDER_IN_PERCENT = 5;
private boolean shouldShowRootedNotification() {
if (RootUtil.isDeviceRooted()) {
if (userRejectedRootedNotification()) {
return ((Math.random() * 100) < FREQUENCY_OF_REMINDER_IN_PERCENT);
} else return true;
} else {
return false;
}
}
private boolean userRejectedRootedNotification() {
SharedPreferences preferences = getPreferences(0);
return preferences.getBoolean(REJECTED_ROOTED_NOTIFICATION, false);
}
private void rejectRootedNotification() {
SharedPreferences preferences = getPreferences(0);
SharedPreferences.Editor editor = preferences.edit();
editor.putBoolean(REJECTED_ROOTED_NOTIFICATION, true);
editor.commit();
}
} }