Refactor to use mmrl.compat and update platform intent usage

Replaced direct usage of platform intent extensions from model with Platform.Companion methods across app and webui modules. Updated dependencies to include mmrl.compat, removed local MediaStoreCompat in favor of mmrl.compat, and adjusted related imports. Also updated mmrl library version.

Author: DerGoogler

app/build.gradle.kts

@@ -168,7 +168,9 @@ dependencies {
     implementation(libs.mmrl.ui)
     implementation(libs.mmrl.platform)
     implementation(libs.mmrl.datastore)
+    implementation(libs.mmrl.compat)
     compileOnly(libs.mmrl.hiddenApi)
+
     implementation(libs.libsu.core)
     implementation(libs.libsu.service)
     implementation(libs.libsu.io)

app/src/main/java/com/dergoogler/mmrl/wx/service/PlatformService.kt

@@ -10,8 +10,8 @@ import androidx.core.app.ServiceCompat
 import androidx.lifecycle.LifecycleService
 import androidx.lifecycle.lifecycleScope
 import com.dergoogler.mmrl.platform.Platform
-import com.dergoogler.mmrl.platform.model.PlatformIntent.Companion.getPlatform
-import com.dergoogler.mmrl.platform.model.createPlatformIntent
+import com.dergoogler.mmrl.platform.Platform.Companion.createPlatformIntent
+import com.dergoogler.mmrl.platform.Platform.Companion.getPlatform
 import com.dergoogler.mmrl.wx.R
 import com.dergoogler.mmrl.wx.app.utils.NotificationUtils.CHANNEL_ID_PLATFORM
 import com.dergoogler.mmrl.wx.app.utils.NotificationUtils.GROUP_KEY_PLATFORM
@@ -41,7 +41,7 @@ class PlatformService : LifecycleService() {
         }
 
         lifecycleScope.launch {
-            isActive = initPlatform(baseContext, intent.getPlatform())
+            isActive = initPlatform(baseContext, intent.getPlatform() ?: return@launch)
         }
 
         return START_STICKY

app/src/main/java/com/dergoogler/mmrl/wx/util/BaseActivity.kt

@@ -16,8 +16,7 @@ import androidx.navigation.compose.rememberNavController
 import com.dergoogler.mmrl.datastore.UserPreferencesRepository
 import com.dergoogler.mmrl.datastore.model.UserPreferences
 import com.dergoogler.mmrl.datastore.providable.LocalUserPreferences
-import com.dergoogler.mmrl.platform.Platform
-import com.dergoogler.mmrl.platform.model.PlatformIntent.Companion.getPlatform
+import com.dergoogler.mmrl.platform.Platform.Companion.getPlatform
 import com.dergoogler.mmrl.ui.providable.LocalNavController
 import com.dergoogler.mmrl.ui.theme.MMRLAppTheme
 import com.dergoogler.mmrl.wx.App.Companion.TAG
@@ -90,7 +89,7 @@ fun BaseActivity.setBaseContent(
 }
 
 fun ComponentActivity.initPlatform(userPreferences: UserPreferences) {
-    val platform = (intent.getPlatform() as Platform?) ?: userPreferences.workingMode.toPlatform()
+    val platform = intent.getPlatform() ?: userPreferences.workingMode.toPlatform()
 
     if (!PlatformService.isActive) {
         try {

app/src/main/java/com/dergoogler/mmrl/wx/util/NonRootProvider.kt

@@ -4,8 +4,8 @@ import android.app.Service
 import android.content.Context
 import android.content.ServiceConnection
 import com.dergoogler.mmrl.platform.Platform
+import com.dergoogler.mmrl.platform.Platform.Companion.createPlatformIntent
 import com.dergoogler.mmrl.platform.model.IProvider
-import com.dergoogler.mmrl.platform.model.createPlatformIntent
 
 class NonRootProvider(
     private val context: Context,

app/src/main/java/com/dergoogler/mmrl/wx/util/NonRootService.kt

@@ -3,11 +3,11 @@ package com.dergoogler.mmrl.wx.util
 import android.app.Service
 import android.content.Intent
 import android.os.IBinder
-import com.dergoogler.mmrl.platform.model.PlatformIntent.Companion.getPlatform
+import com.dergoogler.mmrl.platform.Platform.Companion.getPlatform
 
 class NonRootService : Service() {
     override fun onBind(intent: Intent): IBinder {
-        val mode = intent.getPlatform()
+        val mode = intent.getPlatform() ?: throw Exception("Platform not found")
         return NonServiceManager(mode)
     }
 }

app/src/main/java/com/dergoogler/mmrl/wx/util/RootProvider.kt

@@ -3,8 +3,8 @@ package com.dergoogler.mmrl.wx.util
 import android.content.Context
 import android.content.ServiceConnection
 import com.dergoogler.mmrl.platform.Platform
+import com.dergoogler.mmrl.platform.Platform.Companion.createPlatformIntent
 import com.dergoogler.mmrl.platform.model.IProvider
-import com.dergoogler.mmrl.platform.model.createPlatformIntent
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.ipc.RootService
 import kotlinx.coroutines.suspendCancellableCoroutine

app/src/main/java/com/dergoogler/mmrl/wx/util/SuService.kt

@@ -2,13 +2,13 @@ package com.dergoogler.mmrl.wx.util
 
 import android.content.Intent
 import android.os.IBinder
-import com.dergoogler.mmrl.platform.model.PlatformIntent.Companion.getPlatform
+import com.dergoogler.mmrl.platform.Platform.Companion.getPlatform
 import com.dergoogler.mmrl.platform.service.ServiceManager
 import com.topjohnwu.superuser.ipc.RootService
 
 class SuService : RootService() {
     override fun onBind(intent: Intent): IBinder {
-        val mode = intent.getPlatform()
+        val mode = intent.getPlatform() ?: throw Exception("Platform not found")
         return ServiceManager(mode)
     }
 }

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-mmrl = "52140b4c92"
+mmrl = "7d178829fe"
 adaptiveAndroid = "1.1.0-rc01"
 androidGradlePlugin = "8.9.1"
 androidxActivity = "1.9.3"
@@ -62,6 +62,7 @@ mmrl-platform = { group = "com.github.MMRLApp.MMRL", name = "platform", version.
 mmrl-hiddenApi = { group = "com.github.MMRLApp.MMRL", name = "hidden-api", version.ref = "mmrl" }
 mmrl-ui = { group = "com.github.MMRLApp.MMRL", name = "ui", version.ref = "mmrl" }
 mmrl-ext = { group = "com.github.MMRLApp.MMRL", name = "ext", version.ref = "mmrl" }
+mmrl-compat = { group = "com.github.MMRLApp.MMRL", name = "compat", version.ref = "mmrl" }
 mmrl-datastore = { group = "com.github.MMRLApp.MMRL", name = "datastore", version.ref = "mmrl" }
 androidx-swiperefreshlayout = { group = "androidx.swiperefreshlayout", name = "swiperefreshlayout", version.ref = "swiperefreshlayout" }
 androidx-adaptive = { module = "androidx.compose.material3.adaptive:adaptive", version.ref = "adaptiveAndroid" }

webui/build.gradle.kts

@@ -45,6 +45,7 @@ dependencies {
     compileOnly(libs.mmrl.ext)
     compileOnly(libs.mmrl.ui)
     compileOnly(libs.mmrl.platform)
+    compileOnly(libs.mmrl.compat)
     compileOnly(libs.mmrl.hiddenApi)
     implementation(libs.libsu.core)
     implementation(libs.androidx.core.ktx)

webui/src/main/kotlin/com/dergoogler/mmrl/webui/activity/WXActivity.kt

@@ -18,7 +18,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.graphics.toArgb
-import com.dergoogler.mmrl.ext.BuildCompat
+import com.dergoogler.mmrl.compat.BuildCompat
 import com.dergoogler.mmrl.ext.nullply
 import com.dergoogler.mmrl.platform.model.ModId
 import com.dergoogler.mmrl.platform.model.ModId.Companion.getModId