MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Handle Google API Connection Problems

Browse Source
This commit is contained in:
Wang Han 2017-01-03 18:01:57 +08:00 committed by topjohnwu
parent 05c063b61d
commit bb2467d2ac
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/topjohnwu/magisk/StatusFragment.java
View File

@ -221,6 +221,16 @@ public class StatusFragment extends Fragment implements CallbackHandler.EventLis
int image, color; int image, color;
safetyNetProgress.setVisibility(View.GONE); safetyNetProgress.setVisibility(View.GONE);
switch (SNCheckResult) { switch (SNCheckResult) {
case -3:
color = colorNeutral;
image = R.drawable.ic_help;
safetyNetStatusText.setText(R.string.safetyNet_connection_suspended);
break;
case -2:
color = colorNeutral;
image = R.drawable.ic_help;
safetyNetStatusText.setText(R.string.safetyNet_connection_failed);
break;
case -1: case -1:
color = colorNeutral; color = colorNeutral;
image = R.drawable.ic_help; image = R.drawable.ic_help;

2
app/src/main/java/com/topjohnwu/magisk/utils/SafetyNetHelper.java
View File

@ -32,6 +32,7 @@ public abstract class SafetyNetHelper
@Override @Override
public void onConnectionFailed(@NonNull ConnectionResult result) { public void onConnectionFailed(@NonNull ConnectionResult result) {
Logger.dev("SN: Google API fail"); Logger.dev("SN: Google API fail");
handleResults(-2);
} }
@Override @Override
@ -43,6 +44,7 @@ public abstract class SafetyNetHelper
@Override @Override
public void onConnectionSuspended(int i) { public void onConnectionSuspended(int i) {
Logger.dev("SN: Google API Suspended"); Logger.dev("SN: Google API Suspended");
handleResults(-3);
} }
public void requestTest() { public void requestTest() {

2
app/src/main/res/values/strings.xml
View File

@ -26,6 +26,8 @@
<string name="not_rooted">Not rooted</string> <string name="not_rooted">Not rooted</string>
<string name="proper_root">Properly rooted</string> <string name="proper_root">Properly rooted</string>
<string name="checking_safetyNet_status">Checking SafetyNet status…</string> <string name="checking_safetyNet_status">Checking SafetyNet status…</string>
<string name="safetyNet_connection_failed">Cannot connect to Google API</string>
<string name="safetyNet_connection_suspended">Connection to Google API was suspended</string>
<string name="safetyNet_error">Cannot check SafetyNet, no Internet?</string> <string name="safetyNet_error">Cannot check SafetyNet, no Internet?</string>
<string name="safetyNet_fail">SafetyNet Failed: CTS profile mismatch</string> <string name="safetyNet_fail">SafetyNet Failed: CTS profile mismatch</string>
<string name="safetyNet_pass">SafetyNet Passed</string> <string name="safetyNet_pass">SafetyNet Passed</string>