Merge remote-tracking branch 'upstream/master'

app/src/common/res/values-night-v31/colors.xml → app/src/main/res/values-night-v31/colors.xml

@@ -15,7 +15,7 @@
   ~ You should have received a copy of the GNU General Public License
   ~ along with LSPosed.  If not, see <https://www.gnu.org/licenses/>.
   ~
-  ~ Copyright (C) 2022 LSPosed Contributors
+  ~ Copyright (C) 2023 LSPosed Contributors
   -->
 
 <resources>

app/src/main/res/values-night/colors.xml

@@ -14,7 +14,7 @@
   ~ You should have received a copy of the GNU General Public License
   ~ along with LSPosed.  If not, see <https://www.gnu.org/licenses/>.
   ~
-  ~ Copyright (C) 2021 LSPosed Contributors
+  ~ Copyright (C) 2023 LSPosed Contributors
   -->
 
 <resources>
@@ -26,4 +26,7 @@
 
     <color name="primary_text_material">@color/abc_primary_text_material_dark</color>
     <color name="secondary_text_material">@color/abc_secondary_text_material_dark</color>
+
+    <color name="ic_launcher_foreground">#F06292</color>
+    <color name="ic_launcher_background">#E1F5FE</color>
 </resources>

app/src/common/res/values-v31/colors.xml → app/src/main/res/values-v31/colors.xml

@@ -15,7 +15,7 @@
   ~ You should have received a copy of the GNU General Public License
   ~ along with LSPosed.  If not, see <https://www.gnu.org/licenses/>.
   ~
-  ~ Copyright (C) 2022 LSPosed Contributors
+  ~ Copyright (C) 2023 LSPosed Contributors
   -->
 
 <resources>

app/src/main/res/values/colors.xml

@@ -15,7 +15,7 @@
   ~ along with LSPosed.  If not, see <https://www.gnu.org/licenses/>.
   ~
   ~ Copyright (C) 2020 EdXposed Contributors
-  ~ Copyright (C) 2021 LSPosed Contributors
+  ~ Copyright (C) 2023 LSPosed Contributors
   -->
 
 <resources>
@@ -27,4 +27,7 @@
 
     <color name="primary_text_material">@color/abc_primary_text_material_light</color>
     <color name="secondary_text_material">@color/abc_secondary_text_material_light</color>
+
+    <color name="ic_launcher_foreground">#FFFFFF</color>
+    <color name="ic_launcher_background">#F48FB1</color>
 </resources>

core/proguard-rules.pro

@@ -1,55 +1,28 @@
 -keep class de.robv.android.xposed.** {*;}
 -keep class io.github.libxposed.** {*;}
+-keepattributes RuntimeVisibleAnnotations
 -keep class android.** { *; }
 -keepclasseswithmembers,includedescriptorclasses class * {
     native <methods>;
 }
 -keepclassmembers class org.lsposed.lspd.impl.LSPosedContext {
-    getAssets(...);
-    getResources(...);
-    getPackageManager(...);
-    getMainLooper(...);
-    setTheme(...);
-    getTheme(...);
-    getClassLoader(...);
-    getPackageName(...);
-    getApplicationInfo(...);
-    getPackageResourcePath(...);
-    getPackageCodePath(...);
-    getSharedPreferences(...);
-    moveSharedPreferencesFrom(...);
-    deleteSharedPreferences(...);
-    openFileInput(...);
-    deleteFile(...);
-    getFileStreamPath(...);
-    getDataDir(...);
-    getFilesDir(...);
-    getNoBackupFilesDir(...);
-    getCacheDir(...);
-    getCodeCacheDir(...);
-    fileList(...);
-    getDir(...);
-    openOrCreateDatabase(...);
-    moveDatabaseFrom(...);
-    deleteDatabase(...);
-    getDatabasePath(...);
-    databaseList(...);
-    getSystemService(...);
-    getSystemServiceName(...);
-    createPackageContext(...);
-    createConfigurationContext(...);
-    getFrameworkName(...);
-    getFrameworkVersion(...);
-    getFrameworkVersionCode(...);
-    getFrameworkPrivilege(...);
-    hook(...);
-    deoptimize(...);
-    invokeOrigin(...);
-    invokeSpecial(...);
-    newInstanceOrigin(...);
-    newInstanceSpecial(...);
-    log(...);
-    parseDex(...);
+    public <methods>;
+}
+-keepclassmembers class org.lsposed.lspd.impl.LSPosedHookCallback {
+    public <methods>;
+}
+-keep,allowoptimization,allowobfuscation @io.github.libxposed.api.annotations.* class * {
+    @io.github.libxposed.api.annotations.BeforeInvocation <methods>;
+    @io.github.libxposed.api.annotations.AfterInvocation <methods>;
+}
+-keepclassmembers class org.lsposed.lspd.impl.LSPosedBridge$NativeHooker {
+    <init>(java.lang.reflect.Executable);
+    callback(...);
+}
+-keepclassmembers class org.lsposed.lspd.impl.LSPosedBridge$HookerCallback {
+    final *** beforeInvocation;
+    final *** afterInvocation;
+    HookerCallback(...);
 }
 -assumenosideeffects class android.util.Log {
     public static *** v(...);

core/src/main/java/de/robv/android/xposed/XC_MethodHook.java

@@ -119,8 +119,8 @@ public MethodHookParam() {
          */
         public Object[] args;
 
-        private Object result = null;
-        private Throwable throwable = null;
+        public Object result = null;
+        public Throwable throwable = null;
         public boolean returnEarly = false;
 
         private final HashMap<String, Object> extras = new HashMap<>();