diff --git a/src/main/java/com/topjohnwu/magisk/MagiskFragment.java b/src/main/java/com/topjohnwu/magisk/MagiskFragment.java index a56a7b5c9..14c743c64 100644 --- a/src/main/java/com/topjohnwu/magisk/MagiskFragment.java +++ b/src/main/java/com/topjohnwu/magisk/MagiskFragment.java @@ -7,6 +7,7 @@ import android.support.annotation.Nullable; import android.support.annotation.StringRes; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.CardView; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -92,7 +93,14 @@ public class MagiskFragment extends Fragment new CheckSafetyNet(getActivity()).exec(); collapse(); }; - if (!CheckSafetyNet.dexPath.exists()) { + if (!TextUtils.equals(mm.getPackageName(), Const.ORIG_PKG_NAME)) { + new AlertDialogBuilder(getActivity()) + .setTitle(R.string.cannot_check_sn_title) + .setMessage(R.string.cannot_check_sn_notice) + .setCancelable(true) + .setPositiveButton(R.string.ok, null) + .show(); + } else if (!CheckSafetyNet.dexPath.exists()) { // Show dialog new AlertDialogBuilder(getActivity()) .setTitle(R.string.proprietary_title) diff --git a/src/main/java/com/topjohnwu/magisk/utils/Const.java b/src/main/java/com/topjohnwu/magisk/utils/Const.java index 983e8ac26..ec713c4b4 100644 --- a/src/main/java/com/topjohnwu/magisk/utils/Const.java +++ b/src/main/java/com/topjohnwu/magisk/utils/Const.java @@ -3,6 +3,7 @@ package com.topjohnwu.magisk.utils; import android.os.Environment; import android.os.Process; +import com.topjohnwu.magisk.BuildConfig; import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.superuser.io.SuFile; @@ -13,7 +14,7 @@ import java.util.List; public class Const { public static final String DEBUG_TAG = "MagiskManager"; - public static final String ORIG_PKG_NAME = "com.topjohnwu.magisk"; + public static final String ORIG_PKG_NAME = BuildConfig.APPLICATION_ID; public static final String SNET_PKG = "com.topjohnwu.snet"; public static final String MAGISKHIDE_PROP = "persist.magisk.hide"; diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index a3c662bf8..fad6a12b9 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -219,5 +219,7 @@ 檢查更新 在背景定期檢查更新 沒有指紋加入或是裝置不支援 + 無法檢查 SafetyNet + 由於一些 Google Play Service 的改變,重新包裝過的 Magisk Manager 無法進行 SafetyNet 檢查。 diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 7381f8c76..7b007793d 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -123,6 +123,8 @@ Download Proprietary Code Magisk Manager is FOSS, which doesn\'t contain Google\'s proprietary SafetyNet API code.\n\nDo you allow Magisk Manager to download an extension (contains GoogleApiClient) for SafetyNet checks? SU database is corrupted, will recreate new db + Cannot check SafetyNet + Due to some changes in Google Play Services, it is not possible to check SafetyNet on repackaged Magisk Manager General