Seperate Google proprietary code

app/src/main/java/com/topjohnwu/magisk/utils/SafetyNetHelper.java

@@ -1,114 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentActivity;
-import android.util.Base64;
-
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.api.GoogleApiClient;
-import com.google.android.gms.common.api.Status;
-import com.google.android.gms.safetynet.SafetyNet;
-import com.topjohnwu.magisk.R;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.security.SecureRandom;
-
-public abstract class SafetyNetHelper
-        implements GoogleApiClient.OnConnectionFailedListener, GoogleApiClient.ConnectionCallbacks {
-
-    private static boolean isRunning = false;
-
-    private GoogleApiClient mGoogleApiClient;
-    private Result ret;
-    protected FragmentActivity mActivity;
-
-    public SafetyNetHelper(FragmentActivity activity) {
-        ret = new Result();
-        mActivity = activity;
-    }
-
-    // Entry point to start test
-    public void requestTest() {
-        if (isRunning)
-            return;
-        // Connect Google Service
-        mGoogleApiClient = new GoogleApiClient.Builder(mActivity)
-                .enableAutoManage(mActivity, this)
-                .addApi(SafetyNet.API)
-                .addConnectionCallbacks(this)
-                .build();
-        mGoogleApiClient.connect();
-        isRunning = true;
-    }
-
-    @Override
-    public void onConnectionFailed(@NonNull ConnectionResult result) {
-        Logger.dev("SN: Google API fail");
-        ret.errmsg = result.getErrorMessage();
-        handleResults(ret);
-    }
-
-    @Override
-    public void onConnectionSuspended(int i) {
-        Logger.dev("SN: Google API Suspended");
-        switch (i) {
-            case CAUSE_NETWORK_LOST:
-                ret.errmsg = mActivity.getString(R.string.safetyNet_network_loss);
-                break;
-            case CAUSE_SERVICE_DISCONNECTED:
-                ret.errmsg = mActivity.getString(R.string.safetyNet_service_disconnected);
-                break;
-        }
-        handleResults(ret);
-    }
-
-    @Override
-    public void onConnected(@Nullable Bundle bundle) {
-        Logger.dev("SN: Google API Connected");
-        // Create nonce
-        byte[] nonce = new byte[24];
-        new SecureRandom().nextBytes(nonce);
-
-        Logger.dev("SN: Check with nonce: " + Base64.encodeToString(nonce, Base64.DEFAULT));
-
-        // Call SafetyNet
-        SafetyNet.SafetyNetApi.attest(mGoogleApiClient, nonce)
-                .setResultCallback(result -> {
-                    Status status = result.getStatus();
-                    if (status.isSuccess()) {
-                        String json = new String(Base64.decode(result.getJwsResult().split("\\.")[1], Base64.DEFAULT));
-                        Logger.dev("SN: Response: " + json);
-                        try {
-                            JSONObject decoded = new JSONObject(json);
-                            ret.ctsProfile = decoded.getBoolean("ctsProfileMatch");
-                            ret.basicIntegrity = decoded.getBoolean("basicIntegrity");
-                            ret.failed = false;
-                        } catch (JSONException e) {
-                            ret.errmsg = mActivity.getString(R.string.safetyNet_res_invalid);
-                        }
-                    } else {
-                        Logger.dev("SN: No response");
-                        ret.errmsg = mActivity.getString(R.string.safetyNet_no_response);
-                    }
-                    // Disconnect
-                    mGoogleApiClient.stopAutoManage(mActivity);
-                    mGoogleApiClient.disconnect();
-                    isRunning = false;
-                    handleResults(ret);
-                });
-    }
-
-    // Callback function to save the results
-    public abstract void handleResults(Result result);
-
-    public static class Result {
-        public boolean failed = true;
-        public String errmsg;
-        public boolean ctsProfile = false;
-        public boolean basicIntegrity = false;
-    }
-}

app/src/main/java/com/topjohnwu/magisk/utils/Topic.java

@@ -31,15 +31,19 @@ public class Topic {
     }
 
     public void publish() {
-        publish(true);
+        publish(true, null);
     }
 
     public void publish(boolean record) {
+        publish(record, null);
+    }
+
+    public void publish(boolean record, Object result) {
         hasPublished = record;
         if (subscribers != null) {
             for (WeakReference<Subscriber> subscriber : subscribers) {
                 if (subscriber.get() != null)
-                    subscriber.get().onTopicPublished(this);
+                    subscriber.get().onTopicPublished(this, result);
             }
         }
     }
@@ -60,9 +64,12 @@ public class Topic {
             }
         }
         default void onTopicPublished() {
-            onTopicPublished(null);
+            onTopicPublished(null, null);
         }
-        void onTopicPublished(Topic topic);
+        default void onTopicPublished(Topic topic) {
+            onTopicPublished(topic, null);
+        }
+        void onTopicPublished(Topic topic, Object result);
         Topic[] getSubscription();
     }
 }

app/src/main/java/com/topjohnwu/magisk/utils/Utils.java

@@ -22,7 +22,6 @@ import android.provider.OpenableColumns;
 import android.support.annotation.StringRes;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.TaskStackBuilder;
 import android.support.v4.content.ContextCompat;
@@ -150,16 +149,6 @@ public class Utils {
         return (MagiskManager) context.getApplicationContext();
     }
 
-    public static void checkSafetyNet(FragmentActivity activity) {
-        new SafetyNetHelper(activity) {
-            @Override
-            public void handleResults(Result result) {
-                getMagiskManager(mActivity).SNCheckResult = result;
-                getMagiskManager(mActivity).safetyNetDone.publish(false);
-            }
-        }.requestTest();
-    }
-
     public static void clearRepoCache(Context context) {
         MagiskManager mm = getMagiskManager(context);
         mm.prefs.edit().remove(UpdateRepos.ETAG_KEY).apply();