br0kenpixel/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-09-06 06:36:58 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Fixed rewritten java code being java-styled in kotlin

Browse Source 
Fixed accessing kotlin code illegally via companion helper
This commit is contained in:
Viktor De Pasquale
2019-05-05 12:09:22 +02:00
parent 63055818ec
commit 4eecaea601
6 changed files with 135 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/topjohnwu/magisk/utils/PatchAPK.java
+6 -6
View File
@@ -3,8 +3,6 @@ package com.topjohnwu.magisk.utils;
import android.content.ComponentName;
import android.widget.Toast;
import androidx.core.app.NotificationCompat;
import com.topjohnwu.magisk.App;
import com.topjohnwu.magisk.BuildConfig;
import com.topjohnwu.magisk.ClassMap;
@@ -29,6 +27,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.jar.JarEntry;
import androidx.core.app.NotificationCompat;
public class PatchAPK {
public static final String LOWERALPHA = "abcdefghijklmnopqrstuvwxyz";
@@ -56,7 +56,7 @@ public class PatchAPK {
return builder.toString();
}
private static boolean findAndPatch(byte xml[], String from, String to) {
private static boolean findAndPatch(byte[] xml, String from, String to) {
if (from.length() != to.length())
return false;
CharBuffer buf = ByteBuffer.wrap(xml).order(ByteOrder.LITTLE_ENDIAN).asCharBuffer();
@@ -83,7 +83,7 @@ public class PatchAPK {
return true;
}
private static boolean findAndPatch(byte xml[], int a, int b) {
private static boolean findAndPatch(byte[] xml, int a, int b) {
IntBuffer buf = ByteBuffer.wrap(xml).order(ByteOrder.LITTLE_ENDIAN).asIntBuffer();
int len = xml.length / 4;
for (int i = 0; i < len; ++i) {
@@ -112,7 +112,7 @@ public class PatchAPK {
Config.set(Config.Key.SU_MANAGER, pkg);
Config.export();
RootUtils.Companion.rmAndLaunch(BuildConfig.APPLICATION_ID,
RootUtils.rmAndLaunch(BuildConfig.APPLICATION_ID,
new ComponentName(pkg, ClassMap.get(SplashActivity.class).getName()));
return true;
@@ -122,7 +122,7 @@ public class PatchAPK {
try {
JarMap jar = new JarMap(in);
JarEntry je = jar.getJarEntry(Const.ANDROID_MANIFEST);
byte xml[] = jar.getRawData(je);
byte[] xml = jar.getRawData(je);
if (!findAndPatch(xml, BuildConfig.APPLICATION_ID, pkg) ||
!findAndPatch(xml, R.string.app_name, R.string.re_app_name))