TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-02-17 22:18:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent crashing when requesting SN check while checking

Browse Source 
Fixed #208, fixed #212
This commit is contained in:
topjohnwu 2017-07-13 15:12:43 +08:00
parent b0ab55b0bf
commit aaa12853ad
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,8 @@ import java.security.SecureRandom;
public abstract class SafetyNetHelper public abstract class SafetyNetHelper
implements GoogleApiClient.OnConnectionFailedListener, GoogleApiClient.ConnectionCallbacks { implements GoogleApiClient.OnConnectionFailedListener, GoogleApiClient.ConnectionCallbacks {
private static boolean isRunning = false;
private GoogleApiClient mGoogleApiClient; private GoogleApiClient mGoogleApiClient;
private Result ret; private Result ret;
protected FragmentActivity mActivity; protected FragmentActivity mActivity;
@ -27,17 +29,20 @@ public abstract class SafetyNetHelper
public SafetyNetHelper(FragmentActivity activity) { public SafetyNetHelper(FragmentActivity activity) {
ret = new Result(); ret = new Result();
mActivity = activity; mActivity = activity;
mGoogleApiClient = new GoogleApiClient.Builder(activity)
.enableAutoManage(activity, this)
.addApi(SafetyNet.API)
.addConnectionCallbacks(this)
.build();
} }
// Entry point to start test // Entry point to start test
public void requestTest() { public void requestTest() {
if (isRunning)
return;
// Connect Google Service // Connect Google Service
mGoogleApiClient = new GoogleApiClient.Builder(mActivity)
.enableAutoManage(mActivity, this)
.addApi(SafetyNet.API)
.addConnectionCallbacks(this)
.build();
mGoogleApiClient.connect(); mGoogleApiClient.connect();
isRunning = true;
} }
@Override @Override
@ -92,6 +97,7 @@ public abstract class SafetyNetHelper
// Disconnect // Disconnect
mGoogleApiClient.stopAutoManage(mActivity); mGoogleApiClient.stopAutoManage(mActivity);
mGoogleApiClient.disconnect(); mGoogleApiClient.disconnect();
isRunning = false;
handleResults(ret); handleResults(ret);
}); });
} }