Commit e8dd1b29 authored by topjohnwu's avatar topjohnwu

Update snet

parent d21264d0
Subproject commit a1871e4bc3b11fa5e17275527f87b18ce7a475b7
Subproject commit 91337218b314c853ad441aa38947394a68afcb08
......@@ -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))
......
......@@ -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 */
}
......@@ -22,3 +22,4 @@
-keep class com.topjohnwu.snet.SafetyNet* { *; }
-dontwarn java.lang.invoke**
-dontwarn com.google.android.gms.common.GooglePlayServicesUtil**
......@@ -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();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment