Merge remote-tracking branch 'origin/dev' into dev

rhunk · Jun 8, 2024 · f4726b3 · f4726b3
2 parents e399221 + c8819cf
commit f4726b3
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/common/src/main/assets/lang/en_US.json b/common/src/main/assets/lang/en_US.json
@@ -869,6 +869,10 @@
                         "name": "Default Volume Controls",
                         "description": "Forces Snapchat to use system volume controls"
                     },
+                    "disable_telecom_framework": {
+                        "name": "Disable Telecom Framework",
+                        "description": "Prevents Snapchat from using the Android Telecom framework\nThis allows you to listen to music while on a call"
+                    },
                     "hide_active_music": {
                         "name": "Hide Active Music",
                         "description": "Prevents Snapchat from knowing you're listening to music\nThis will allow you to take snaps using control volume buttons while listening to music"

diff --git a/common/src/main/kotlin/me/rhunk/snapenhance/common/config/impl/Global.kt b/common/src/main/kotlin/me/rhunk/snapenhance/common/config/impl/Global.kt
@@ -52,6 +52,7 @@ class Global : ConfigContainer() {
     val videoPlaybackRateSlider = boolean("video_playback_rate_slider") { requireRestart() }
     val disableGooglePlayDialogs = boolean("disable_google_play_dialogs") { requireRestart() }
     val defaultVolumeControls = boolean("default_volume_controls") { requireRestart() }
+    val disableTelecomFramework = boolean("disable_telecom_framework") { requireRestart() }
     val hideActiveMusic = boolean("hide_active_music") { requireRestart() }
     val disableSnapSplitting = boolean("disable_snap_splitting") { addNotices(FeatureNotice.INTERNAL_BEHAVIOR) }
 }
diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/core/features/FeatureManager.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/features/FeatureManager.kt
@@ -129,6 +129,7 @@ class FeatureManager(
             DisableCustomTabs(),
             BestFriendPinning(),
             ContextMenuFix(),
+            DisableTelecomFramework(),
         )
         initializeFeatures()
     }

diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/experiments/ComposerHooks.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/experiments/ComposerHooks.kt
@@ -3,20 +3,12 @@ package me.rhunk.snapenhance.core.features.impl.experiments
 import android.os.ParcelFileDescriptor
 import android.view.View
 import android.widget.FrameLayout
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.BugReport
-import androidx.compose.material3.Button
-import androidx.compose.material3.FilledIconButton
-import androidx.compose.material3.Icon
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextField
+import androidx.compose.material3.*
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -219,7 +211,6 @@ class ComposerHooks: Feature("ComposerHooks", loadParams = FeatureLoadParams.INI
         }
 
         findClass("com.snapchat.client.composer.NativeBridge").apply {
-            hook("createViewLoaderManager", HookStage.AFTER) { loadHooks() }
             hook("registerNativeModuleFactory", HookStage.BEFORE) { param ->
                 val moduleFactory = param.argNullable<Any>(1) ?: return@hook
                 if (moduleFactory.javaClass.getMethod("getModulePath").invoke(moduleFactory)?.toString() != "DeviceBridge") return@hook
@@ -230,6 +221,7 @@ class ComposerHooks: Feature("ComposerHooks", loadParams = FeatureLoadParams.INI
                         true
                     }
                 }
+                loadHooks()
             }
         }
     }

diff --git a/...src/main/kotlin/me/rhunk/snapenhance/core/features/impl/global/DisableTelecomFramework.kt b/...src/main/kotlin/me/rhunk/snapenhance/core/features/impl/global/DisableTelecomFramework.kt
@@ -0,0 +1,17 @@
+package me.rhunk.snapenhance.core.features.impl.global
+
+import android.content.ContextWrapper
+import me.rhunk.snapenhance.core.features.Feature
+import me.rhunk.snapenhance.core.features.FeatureLoadParams
+import me.rhunk.snapenhance.core.util.hook.HookStage
+import me.rhunk.snapenhance.core.util.hook.hook
+
+class DisableTelecomFramework: Feature("Disable Telecom Framework", loadParams = FeatureLoadParams.INIT_SYNC) {
+    override fun init() {
+        if (!context.config.global.disableTelecomFramework.get()) return
+
+        ContextWrapper::class.java.hook("getSystemService", HookStage.BEFORE) { param ->
+            if (param.arg<Any>(0).toString() == "telecom") param.setResult(null)
+        }
+    }
+}