From dc9f69bab0a8d5d4cc8ca0f673d968c4b313240c Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Wed, 30 Oct 2019 04:15:53 -0400
Subject: [PATCH] Minor changes

---
 shared/proguard-rules.pro                     |  2 +-
 .../java/com/topjohnwu/magisk/DynAPK.java     |  4 +--
 stub/src/main/AndroidManifest.xml             | 18 ++++++-------
 stub/src/main/java/a/{x.java => a.java}       |  2 +-
 stub/src/main/java/a/{z.java => c.java}       |  2 +-
 stub/src/main/java/a/{y.java => e.java}       |  2 +-
 stub/src/main/java/a/{w.java => h.java}       |  2 +-
 .../topjohnwu/magisk/DelegateApplication.java |  6 ++---
 .../topjohnwu/magisk/obfuscate/Mapping.java   | 26 ++++++++-----------
 9 files changed, 30 insertions(+), 34 deletions(-)
 rename stub/src/main/java/a/{x.java => a.java} (57%)
 rename stub/src/main/java/a/{z.java => c.java} (59%)
 rename stub/src/main/java/a/{y.java => e.java} (58%)
 rename stub/src/main/java/a/{w.java => h.java} (62%)

diff --git a/shared/proguard-rules.pro b/shared/proguard-rules.pro
index e0a7aa840..708dc21be 100644
--- a/shared/proguard-rules.pro
+++ b/shared/proguard-rules.pro
@@ -20,6 +20,6 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
--keepclassmembers class * implements javax.net.ssl.SSLSocketFactory {
+-keepclassmembers class * extends javax.net.ssl.SSLSocketFactory {
     ** delegate;
 }
diff --git a/shared/src/main/java/com/topjohnwu/magisk/DynAPK.java b/shared/src/main/java/com/topjohnwu/magisk/DynAPK.java
index e7b69633a..648e054e1 100644
--- a/shared/src/main/java/com/topjohnwu/magisk/DynAPK.java
+++ b/shared/src/main/java/com/topjohnwu/magisk/DynAPK.java
@@ -50,7 +50,7 @@ public class DynAPK {
 
     public static Object pack(Data data) {
         Object[] arr = new Object[2];
-        arr[STUB_VERSION_ENTRY] = STUB_VERSION;
+        arr[STUB_VERSION_ENTRY] = data.version;
         arr[COMPONENT_MAP] = data.componentMap;
         return arr;
     }
@@ -64,7 +64,7 @@ public class DynAPK {
     }
 
     public static class Data {
-        public int version;
+        public int version = STUB_VERSION;
         public Map<String, String> componentMap;
     }
 }
diff --git a/stub/src/main/AndroidManifest.xml b/stub/src/main/AndroidManifest.xml
index 729d39a19..6d3dcb4bd 100644
--- a/stub/src/main/AndroidManifest.xml
+++ b/stub/src/main/AndroidManifest.xml
@@ -16,8 +16,8 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <application
-        android:name="a.y"
-        android:appComponentFactory="a.x"
+        android:name="a.e"
+        android:appComponentFactory="a.a"
         android:allowBackup="true"
         android:usesCleartextTraffic="true"
         tools:ignore="UnusedAttribute,GoogleAppIndexingWarning" >
@@ -25,7 +25,7 @@
         <!-- Download Activity -->
 
         <activity
-            android:name="a.z"
+            android:name="a.c"
             android:configChanges="orientation|screenSize"
             android:theme="@style/SplashTheme">
             <intent-filter>
@@ -37,24 +37,24 @@
         <!-- Magisk Manager Components -->
 
         <activity
-            android:name="a.o"
+            android:name="a.b"
             android:configChanges="orientation|screenSize"
             android:exported="true" />
 
         <activity
-            android:name="a.x"
+            android:name="a.f"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="nosensor" />
 
         <activity
-            android:name="a.g"
+            android:name="a.m"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:directBootAware="true"
             android:excludeFromRecents="true"
             android:exported="false" />
 
         <receiver
-            android:name="a.w"
+            android:name="a.h"
             android:directBootAware="true">
             <intent-filter>
                 <action android:name="android.intent.action.REBOOT" />
@@ -70,7 +70,7 @@
         </receiver>
 
         <service
-            android:name="a.v"
+            android:name="a.j"
             android:exported="false" />
 
         <meta-data
@@ -80,7 +80,7 @@
         <!-- WorkManager SystemJobService -->
 
         <service
-            android:name="a.j"
+            android:name="a.x"
             android:directBootAware="false"
             android:enabled="true"
             android:exported="true"
diff --git a/stub/src/main/java/a/x.java b/stub/src/main/java/a/a.java
similarity index 57%
rename from stub/src/main/java/a/x.java
rename to stub/src/main/java/a/a.java
index 073f7f38b..3510c9096 100644
--- a/stub/src/main/java/a/x.java
+++ b/stub/src/main/java/a/a.java
@@ -2,5 +2,5 @@ package a;
 
 import com.topjohnwu.magisk.DelegateComponentFactory;
 
-public class x extends DelegateComponentFactory {
+public class a extends DelegateComponentFactory {
 }
diff --git a/stub/src/main/java/a/z.java b/stub/src/main/java/a/c.java
similarity index 59%
rename from stub/src/main/java/a/z.java
rename to stub/src/main/java/a/c.java
index 463eba48f..44b3521e1 100644
--- a/stub/src/main/java/a/z.java
+++ b/stub/src/main/java/a/c.java
@@ -2,5 +2,5 @@ package a;
 
 import com.topjohnwu.magisk.DownloadActivity;
 
-public class z extends DownloadActivity {
+public class c extends DownloadActivity {
 }
diff --git a/stub/src/main/java/a/y.java b/stub/src/main/java/a/e.java
similarity index 58%
rename from stub/src/main/java/a/y.java
rename to stub/src/main/java/a/e.java
index d0c3361cd..cd2e45a4c 100644
--- a/stub/src/main/java/a/y.java
+++ b/stub/src/main/java/a/e.java
@@ -2,5 +2,5 @@ package a;
 
 import com.topjohnwu.magisk.DelegateApplication;
 
-public class y extends DelegateApplication {
+public class e extends DelegateApplication {
 }
diff --git a/stub/src/main/java/a/w.java b/stub/src/main/java/a/h.java
similarity index 62%
rename from stub/src/main/java/a/w.java
rename to stub/src/main/java/a/h.java
index 61a2e1079..51120d19c 100644
--- a/stub/src/main/java/a/w.java
+++ b/stub/src/main/java/a/h.java
@@ -2,5 +2,5 @@ package a;
 
 import com.topjohnwu.magisk.dummy.DummyReceiver;
 
-public class w extends DummyReceiver {
+public class h extends DummyReceiver {
 }
diff --git a/stub/src/main/java/com/topjohnwu/magisk/DelegateApplication.java b/stub/src/main/java/com/topjohnwu/magisk/DelegateApplication.java
index c338c0658..30d7b89ca 100644
--- a/stub/src/main/java/com/topjohnwu/magisk/DelegateApplication.java
+++ b/stub/src/main/java/com/topjohnwu/magisk/DelegateApplication.java
@@ -55,11 +55,11 @@ public class DelegateApplication extends Application {
             ClassLoader cl = new DynamicClassLoader(MANAGER_APK, factory.loader);
             try {
                 // Create the delegate AppComponentFactory
-                Object df = cl.loadClass("a.a").newInstance();
+                AppComponentFactory df = (AppComponentFactory) cl.loadClass("a.a").newInstance();
 
                 // Create the delegate Application
                 delegate = (Application) cl.loadClass("a.e").getConstructor(Object.class)
-                        .newInstance(DynAPK.pack(Mapping.data));
+                        .newInstance(DynAPK.pack(Mapping.data()));
 
                 // Call attachBaseContext without ContextImpl to show it is being wrapped
                 Method m = ContextWrapper.class.getDeclaredMethod("attachBaseContext", Context.class);
@@ -67,7 +67,7 @@ public class DelegateApplication extends Application {
                 m.invoke(delegate, this);
 
                 // If everything went well, set our loader and delegate
-                factory.delegate = (AppComponentFactory) df;
+                factory.delegate = df;
                 factory.loader = cl;
             } catch (Exception e) {
                 Log.e(getClass().getSimpleName(), "", e);
diff --git a/stub/src/main/java/com/topjohnwu/magisk/obfuscate/Mapping.java b/stub/src/main/java/com/topjohnwu/magisk/obfuscate/Mapping.java
index 2630453ee..99186a0bc 100644
--- a/stub/src/main/java/com/topjohnwu/magisk/obfuscate/Mapping.java
+++ b/stub/src/main/java/com/topjohnwu/magisk/obfuscate/Mapping.java
@@ -8,22 +8,8 @@ import static com.topjohnwu.magisk.DynAPK.Data;
 public class Mapping {
     private static Map<String, String> map = new HashMap<>();
 
-    // This mapping will be sent into the guest app
-    public static Data data = new Data();
-
     static {
-        map.put(a.z.class.getName(), "a.c");
-        map.put("a.x", "a.f");
-        map.put("a.o", "a.b");
-        map.put("a.g", "a.m");
-        map.put(a.w.class.getName(), "a.h");
-        map.put("a.v", "a.j");
-        map.put("a.j", "androidx.work.impl.background.systemjob.SystemJobService");
-
-        data.componentMap = new HashMap<>(map.size());
-        for (Map.Entry<String, String> e : map.entrySet()) {
-            data.componentMap.put(e.getValue(), e.getKey());
-        }
+        map.put("a.x", "androidx.work.impl.background.systemjob.SystemJobService");
     }
 
     public static String get(String name) {
@@ -31,4 +17,14 @@ public class Mapping {
         return n != null ? n : name;
     }
 
+    public static Data data() {
+        Map<String, String> componentMap = new HashMap<>(map.size());
+        for (Map.Entry<String, String> e : map.entrySet()) {
+            componentMap.put(e.getValue(), e.getKey());
+        }
+        Data data = new Data();
+        data.componentMap = componentMap;
+        return data;
+    }
+
 }