Remove SafetyNet default apps

This commit is contained in:
topjohnwu 2018-03-28 02:23:50 +08:00
parent 52d478df1a
commit 1b756e8d96
3 changed files with 12 additions and 32 deletions

View File

@ -8,7 +8,7 @@ android {
applicationId "com.topjohnwu.magisk" applicationId "com.topjohnwu.magisk"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion rootProject.ext.compileSdkVersion targetSdkVersion rootProject.ext.compileSdkVersion
versionCode 110 versionCode 111
versionName "5.6.3" versionName "5.6.3"
javaCompileOptions { javaCompileOptions {
annotationProcessorOptions { annotationProcessorOptions {
@ -21,7 +21,7 @@ android {
release { release {
minifyEnabled true minifyEnabled true
shrinkResources true shrinkResources true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} }
} }
compileOptions { compileOptions {

View File

@ -65,30 +65,17 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
holder.appName.setText(info.loadLabel(pm)); holder.appName.setText(info.loadLabel(pm));
holder.appPackage.setText(info.packageName); holder.appPackage.setText(info.packageName);
// Remove all listeners
holder.itemView.setOnClickListener(null);
holder.checkBox.setOnCheckedChangeListener(null); holder.checkBox.setOnCheckedChangeListener(null);
holder.checkBox.setChecked(mHideList.contains(info.packageName));
if (Const.SN_DEFAULTLIST.contains(info.packageName)) { holder.checkBox.setOnCheckedChangeListener((v, isChecked) -> {
holder.checkBox.setChecked(true); if (isChecked) {
holder.checkBox.setEnabled(false); Shell.Async.su("magiskhide --add " + info.packageName);
holder.itemView.setOnClickListener(v -> mHideList.add(info.packageName);
SnackbarMaker.make(holder.itemView, } else {
R.string.safetyNet_hide_notice, Snackbar.LENGTH_LONG).show() Shell.Async.su("magiskhide --rm " + info.packageName);
); mHideList.remove(info.packageName);
} else { }
holder.checkBox.setEnabled(true); });
holder.checkBox.setChecked(mHideList.contains(info.packageName));
holder.checkBox.setOnCheckedChangeListener((v, isChecked) -> {
if (isChecked) {
Shell.Async.su("magiskhide --add " + info.packageName);
mHideList.add(info.packageName);
} else {
Shell.Async.su("magiskhide --rm " + info.packageName);
mHideList.remove(info.packageName);
}
});
}
} }
@Override @Override

View File

@ -64,13 +64,6 @@ public class Const {
"com.google.android.gms" "com.google.android.gms"
); );
/* A list of apps that already uses SafetyNet
* They DO NOT need to be added to hide list */
public static final List<String> SN_DEFAULTLIST = Arrays.asList(
"com.google.android.apps.walletnfcrel",
"com.nianticlabs.pokemongo"
);
public static final int USER_ID = Process.myUid() / 100000; public static final int USER_ID = Process.myUid() / 100000;
public static class ID { public static class ID {