fix module

Author: programminghoch10

VolumeStepsIncrease/src/main/java/com/programminghoch10/VolumeStepsIncrease/Common.kt

@@ -18,14 +18,25 @@ object Common {
         "ro.config.alarm_vol_steps" to STREAM_ALARM,
         "ro.config.system_vol_steps" to STREAM_SYSTEM,
     )
+    val streamsToSystemProperties = systemPropertyToStream.entries.associate { it.value to it.key }
 
     val moduleDefaultVolumeSteps = mapOf(
         STREAM_MUSIC to MAX_STREAM_VOLUME[STREAM_MUSIC] * 2,
         STREAM_VOICE_CALL to MAX_STREAM_VOLUME[STREAM_VOICE_CALL] * 2,
     )
 
     fun getSystemMaxVolumeSteps(stream: Int): Int {
-        return MAX_STREAM_VOLUME[stream]
+        val default = MAX_STREAM_VOLUME[stream]
+        if (streamsToSystemProperties.contains(stream)) {
+            val systemProperty = streamsToSystemProperties[stream]
+            try {
+                val SystemPropertiesClass = Class.forName("android.os.SystemProperties")
+                val getIntMethod = SystemPropertiesClass.getMethod("getInt", String::class.java, Int::class.java)
+                return getIntMethod.invoke(null, systemProperty, default) as Int
+            } catch (_: Exception) {
+            }
+        }
+        return default
     }
 
     fun getModuleDefaultVolumeSteps(stream: Int): Int {

VolumeStepsIncrease/src/main/java/com/programminghoch10/VolumeStepsIncrease/Hook.kt

@@ -1,6 +1,5 @@
 package com.programminghoch10.VolumeStepsIncrease
 
-import android.util.Log
 import com.programminghoch10.VolumeStepsIncrease.Common.SHARED_PREFERENCES_NAME
 import com.programminghoch10.VolumeStepsIncrease.Common.STREAMS
 import com.programminghoch10.VolumeStepsIncrease.Common.getPreferenceKey
@@ -14,7 +13,30 @@ import de.robv.android.xposed.XC_MethodHook as MethodHook
 
 class Hook : IXposedHookLoadPackage {
     override fun handleLoadPackage(lpparam: XC_LoadPackage.LoadPackageParam) {
-        if (lpparam.packageName == BuildConfig.APPLICATION_ID) return
+        when (lpparam.packageName) {
+            BuildConfig.APPLICATION_ID -> return
+            "android" -> hookAndroid(lpparam)
+            else -> hookApp(lpparam)
+        }
+    }
+    
+    fun hookAndroid(lpparam: XC_LoadPackage.LoadPackageParam) {
+        
+        val AudioServiceClass = XposedHelpers.findClass("com.android.server.audio.AudioService", lpparam.classLoader)
+        XposedBridge.hookAllConstructors(AudioServiceClass, object : MethodHook() {
+            override fun afterHookedMethod(param: MethodHookParam) {
+                val MAX_STREAM_VOLUME = XposedHelpers.getObjectField(param.thisObject, "MAX_STREAM_VOLUME") as IntArray
+                val preferences = XSharedPreferences(BuildConfig.APPLICATION_ID, SHARED_PREFERENCES_NAME)
+                STREAMS.filter { preferences.contains(getPreferenceKey(it.value)) }
+                    .map { it.value to preferences.getInt(getPreferenceKey(it.value), MAX_STREAM_VOLUME[it.value]) }
+                    .forEach { MAX_STREAM_VOLUME[it.first] = it.second }
+            }
+        })
+        
+        hookApp(lpparam)
+    }
+    
+    fun hookApp(lpparam: XC_LoadPackage.LoadPackageParam) {
 
         val SystemPropertiesClass = XposedHelpers.findClass("android.os.SystemProperties", lpparam.classLoader)
 
@@ -26,8 +48,7 @@ class Hook : IXposedHookLoadPackage {
                 val streamInt = systemPropertyToStream[key] ?: return
                 val preferences = XSharedPreferences(BuildConfig.APPLICATION_ID, SHARED_PREFERENCES_NAME)
                 if (!preferences.contains(getPreferenceKey(streamInt))) return
-                param.result = preferences.getInt(key, result)
-                Log.d("Logger", "beforeHookedMethod: replace $key with ${param.result}")
+                param.result = preferences.getInt(getPreferenceKey(streamInt), result)
             }
         })
 
@@ -37,16 +58,5 @@ class Hook : IXposedHookLoadPackage {
                 if (key == "audio.safemedia.bypass") param.result = true
             }
         })
-        
-        val AudioServiceClass = XposedHelpers.findClass("com.android.server.audio.AudioService", lpparam.classLoader)
-        XposedBridge.hookAllConstructors(AudioServiceClass, object : MethodHook() {
-            override fun afterHookedMethod(param: MethodHookParam) {
-                val MAX_STREAM_VOLUME = XposedHelpers.getObjectField(param.thisObject, "MAX_STREAM_VOLUME") as Array<Int>
-                val preferences = XSharedPreferences(BuildConfig.APPLICATION_ID, SHARED_PREFERENCES_NAME)
-                STREAMS.filter { preferences.contains(getPreferenceKey(it.value)) }
-                    .map { it.value to preferences.getInt(getPreferenceKey(it.value), MAX_STREAM_VOLUME[it.value]) }
-                    .forEach { MAX_STREAM_VOLUME[it.first] = it.second }
-            }
-        })
     }
 }