From e8dd1b292f79eb76f422e06f2975daf7d48c9d06 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Tue, 19 Dec 2017 15:51:01 +0800
Subject: [PATCH] Update snet

---
 app                                                        | 2 +-
 build.py                                                   | 2 +-
 snet/build.gradle                                          | 4 ++--
 snet/proguard-rules.pro                                    | 1 +
 snet/src/main/java/com/topjohnwu/snet/SafetyNetHelper.java | 4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app b/app
index a1871e4bc..91337218b 160000
--- a/app
+++ b/app
@@ -1 +1 @@
-Subproject commit a1871e4bc3b11fa5e17275527f87b18ce7a475b7
+Subproject commit 91337218b314c853ad441aa38947394a68afcb08
diff --git a/build.py b/build.py
index 2ca597159..fa020954d 100755
--- a/build.py
+++ b/build.py
@@ -392,7 +392,7 @@ def cleanup(args):
 
 	if 'java' in args.target:
 		header('* Cleaning java')
-		subprocess.run('{} clean'.format(os.path.join('.', 'gradlew')), shell=True)
+		subprocess.run('{} app:clean snet:clean crypto:clean'.format(os.path.join('.', 'gradlew')), shell=True)
 		for f in os.listdir('out'):
 			if '.apk' in f:
 				rm(os.path.join('out', f))
diff --git a/snet/build.gradle b/snet/build.gradle
index 5267cb9ae..9824d1d94 100644
--- a/snet/build.gradle
+++ b/snet/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion "27.0.1"
+    buildToolsVersion "27.0.2"
 
     defaultConfig {
         applicationId "com.topjohnwu.snet"
@@ -26,5 +26,5 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.google.android.gms:play-services-safetynet:11.6.0'
+    implementation 'com.google.android.gms:play-services-safetynet:7.0.0'  /* The oldest version */
 }
diff --git a/snet/proguard-rules.pro b/snet/proguard-rules.pro
index d6e59f6f5..56bba17b4 100644
--- a/snet/proguard-rules.pro
+++ b/snet/proguard-rules.pro
@@ -22,3 +22,4 @@
 
 -keep class com.topjohnwu.snet.SafetyNet* { *; }
 -dontwarn java.lang.invoke**
+-dontwarn com.google.android.gms.common.GooglePlayServicesUtil**
diff --git a/snet/src/main/java/com/topjohnwu/snet/SafetyNetHelper.java b/snet/src/main/java/com/topjohnwu/snet/SafetyNetHelper.java
index a66634160..7bdc05e76 100644
--- a/snet/src/main/java/com/topjohnwu/snet/SafetyNetHelper.java
+++ b/snet/src/main/java/com/topjohnwu/snet/SafetyNetHelper.java
@@ -8,7 +8,7 @@ import android.support.annotation.Nullable;
 import android.util.Base64;
 
 import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GoogleApiAvailability;
+import com.google.android.gms.common.GooglePlayServicesUtil;
 import com.google.android.gms.common.api.GoogleApiClient;
 import com.google.android.gms.common.api.ResultCallback;
 import com.google.android.gms.common.api.Status;
@@ -79,7 +79,7 @@ public class SafetyNetHelper
             clazz.getMethod("swapResources", String.class, int.class).invoke(mActivity, dexPath,
                     isDarkTheme ? android.R.style.Theme_Material : android.R.style.Theme_Material_Light);
             try {
-                GoogleApiAvailability.getInstance().getErrorDialog(mActivity, result.getErrorCode(), 0).show();
+                GooglePlayServicesUtil.getErrorDialog(result.getErrorCode(), mActivity, 0).show();
             } catch (Exception e) {
                 e.printStackTrace();
             }