TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-12-03 11:12:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Shrink snet APK, and prevent crashing

Browse Source
This commit is contained in:
topjohnwu
2018-07-28 23:40:41 +08:00
parent a747fdd27d
commit b8eaff66fa
5 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
snet/src/main/java/com/topjohnwu/snet/ModdedGPSUtil.java
View File

@@ -5,13 +5,14 @@ import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.ContextWrapper;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.res.AssetManager;
import android.content.res.Resources;
import android.util.Log;
import com.google.android.gms.common.GooglePlayServicesUtil;
import com.google.android.gms.common.internal.zzg;
import com.google.android.gms.internal.zzlu;
/* Decompiled and modified from GooglePlayServiceUtil.class */
@@ -20,7 +21,7 @@ public class ModdedGPSUtil {
private static final String TAG = "GooglePlayServicesUtil";
static String dexPath;
static Dialog getErrorDialog(int errCode, Activity activity, int requestCode) {
static Dialog getErrorDialog(int errCode, final Activity activity, final int requestCode) {
SwapResContext ctx = new SwapResContext(activity, dexPath);
Resources res = ctx.getResources();
if (zzlu.zzQ(ctx) && errCode == 2) {
@@ -33,8 +34,16 @@ public class ModdedGPSUtil {
String btnMsg = GooglePlayServicesUtil.zzf(ctx, errCode);
if (btnMsg != null) {
Intent intent = GooglePlayServicesUtil.zzan(errCode);
builder.setPositiveButton(btnMsg, new zzg(activity, intent, requestCode));
final Intent intent = GooglePlayServicesUtil.zzan(errCode);
builder.setPositiveButton(btnMsg, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int i) {
PackageManager pm = activity.getPackageManager();
if (intent != null && intent.resolveActivity(pm) != null)
activity.startActivityForResult(intent, requestCode);
dialog.dismiss();
}
});
}
switch(errCode) {
@@ -116,20 +125,14 @@ public class ModdedGPSUtil {
public SwapResContext(Context base, String apk) {
super(base);
asset = getAssets(apk);
Resources res = base.getResources();
resources = new Resources(asset, res.getDisplayMetrics(), res.getConfiguration());
}
private AssetManager getAssets(String apk) {
try {
AssetManager asset = AssetManager.class.newInstance();
asset = AssetManager.class.newInstance();
AssetManager.class.getMethod("addAssetPath", String.class).invoke(asset, apk);
return asset;
} catch (Exception e) {
e.printStackTrace();
return null;
}
Resources res = base.getResources();
resources = new Resources(asset, res.getDisplayMetrics(), res.getConfiguration());
}
@Override

8
snet/src/main/java/com/topjohnwu/snet/SafetyNetHelper.java
View File

@@ -2,8 +2,6 @@ package com.topjohnwu.snet;
import android.app.Activity;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.util.Base64;
import com.google.android.gms.common.ConnectionResult;
@@ -31,7 +29,7 @@ public class SafetyNetHelper implements InvocationHandler, GoogleApiClient.Conne
public static final int BASIC_PASS = 0x10;
public static final int CTS_PASS = 0x20;
public static final int SNET_EXT_VER = 9;
public static final int SNET_EXT_VER = 10;
private GoogleApiClient mGoogleApiClient;
private Activity mActivity;
@@ -81,14 +79,14 @@ public class SafetyNetHelper implements InvocationHandler, GoogleApiClient.Conne
}
@Override
public void onConnectionFailed(@NonNull ConnectionResult result) {
public void onConnectionFailed(ConnectionResult result) {
if (GooglePlayServicesUtil.isUserRecoverableError(result.getErrorCode()))
ModdedGPSUtil.getErrorDialog(result.getErrorCode(), mActivity, 0).show();
invokeCallback(CONNECTION_FAIL);
}
@Override
public void onConnected(@Nullable Bundle bundle) {
public void onConnected(Bundle bundle) {
// Create nonce
byte[] nonce = new byte[24];
new SecureRandom().nextBytes(nonce);