Optimize code by removing redundant logic

Signed-off-by: ghhccghk <2137610394@qq.com>

Author: ghhccghk

app/src/main/java/org/akanework/gramophone/logic/utils/exoplayer/oem/MiPlayAudioSupport.kt

@@ -27,9 +27,8 @@ import android.content.Intent
 import android.content.pm.PackageManager
 
 /**
- * 小米妙播适配
+ *  MiPlay Audio Support
  */
-@UnstableMediaKitApi
 object MiPlayAudioSupport {
     private const val ACTION_MIPLAY_DETAIL = "miui.intent.action.ACTIVITY_MIPLAY_DETAIL"
     private const val AUDIO_RECORD_CLASS = "miui.media.MiuiAudioPlaybackRecorder"
@@ -38,7 +37,7 @@ object MiPlayAudioSupport {
     private const val WHITE_TARGET = "com.milink.service:hide_foreground"
 
     /**
-     * 查询是否支持妙播服务
+     * Check if MiaoBo service is supported
      *
      * https://dev.mi.com/xiaomihyperos/documentation/detail?pId=1944
      */
@@ -62,7 +61,7 @@ object MiPlayAudioSupport {
     }
 
     /**
-     * 是否为国际版
+     * Is it the international version
      */
     private fun isInternationalBuild(): Boolean =
         try {
@@ -75,7 +74,7 @@ object MiPlayAudioSupport {
         }
 
     /**
-     * 检查 SystemUI 是否包含处理妙播意图的 Activity
+     * Check whether SystemUI contains an Activity that handles the Miaobo intent.
      */
     private fun systemUIReady(context: Context): Boolean {
         val intent =
@@ -92,7 +91,7 @@ object MiPlayAudioSupport {
     }
 
     /**
-     * 检查妙播服务是否在 SystemUI 的前台服务通知白名单中
+     * Check whether the Miaobo service is included in the SystemUI foreground service notification whitelist.
      */
     private fun notificationReady(context: Context): Boolean =
         try {

app/src/main/java/org/akanework/gramophone/logic/utils/exoplayer/oem/SystemMediaControlResolver.kt

@@ -12,9 +12,8 @@ import androidx.annotation.RequiresApi
 import org.akanework.gramophone.R
 import org.akanework.gramophone.logic.utils.exoplayer.oem.MiPlayAudioSupport.supportMiPlay
 
-class SystemMediaControlResolver(val context: Context) {
-    @OptIn(UnstableMediaKitApi::class)
-    fun intentSystemMediaDialog() {
+object SystemMediaControlResolver {
+    fun intentSystemMediaDialog(context: Context) {
 //        val manufacturer = Build.MANUFACTURER.lowercase()
         when {
             supportMiPlay(context) -> {
@@ -25,68 +24,60 @@ class SystemMediaControlResolver(val context: Context) {
                         "miui.systemui.miplay.MiPlayDetailActivity"
                     )
                 }
-                if (!startIntent(intent)) {
-                    startSystemMediaControl()
+                if (!startIntent(intent,context = context,)) {
+                    startSystemMediaControl(context = context)
+                }
+            }
+            (getOneUIVersionReadable() != null) -> {
+                val intent = Intent().apply {
+                    flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                    setClassName(
+                        "com.samsung.android.mdx.quickboard",
+                        "com.samsung.android.mdx.quickboard.view.MediaActivity"
+                    )
+                }
+                if (!startIntent(intent,context = context)) {
+                    startSystemMediaControl(context = context,)
                 }
             }
-            //zh：临时禁用OneUI MediaActivity调用，等待未来确定不会被删除再添加回去
-//            (getOneUIVersionReadable() != null) -> {
-//                val intent = Intent().apply {
-//                    flags = Intent.FLAG_ACTIVITY_NEW_TASK
-//                    setClassName(
-//                        "com.samsung.android.mdx.quickboard",
-//                        "com.samsung.android.mdx.quickboard.view.MediaActivity"
-//                    )
-//                }
-//                if (!startIntent(intent)) {
-//                    startSystemMediaControl()
-//                }
-//            }
 
             else -> {
-                startSystemMediaControl()
+                startSystemMediaControl(context = context,)
             }
         }
     }
 
-    private fun startSystemMediaControl(){
+    private fun startSystemMediaControl(context: Context){
         if (Build.VERSION.SDK_INT >= 34) {
             // zh: Android 14 及以上
+            // en:Android 14 and above
             val tag = startNativeMediaDialogForAndroid14(context)
             if (!tag) {
                 Toast.makeText(context, R.string.media_control_text_error, Toast.LENGTH_SHORT).show()
             }
         } else if (Build.VERSION.SDK_INT >= 31) {
             // zh: Android 12 及以上
+            // en: Android 14 and above
             val intent = Intent().apply {
                 action = "com.android.systemui.action.LAUNCH_MEDIA_OUTPUT_DIALOG"
                 setPackage("com.android.systemui")
                 putExtra("package_name", context.packageName)
             }
-            val tag =  startNativeMediaDialog(intent)
+            val tag =  startNativeMediaDialog(context = context,intent)
             if (!tag) {
                 Toast.makeText(context, R.string.media_control_text_error, Toast.LENGTH_SHORT).show()
             }
-        } else if (Build.VERSION.SDK_INT == 30) {
-            // Android 11
+        } else{
+            // zh: Android 11 及以下
+            // en: Android 11 and below
             val tag = startNativeMediaDialogForAndroid11(context)
             if (!tag) {
                 Toast.makeText(context, R.string.media_control_text_error, Toast.LENGTH_SHORT).show()
             }
-        } else {
-            val intent = Intent().apply {
-                flags = Intent.FLAG_ACTIVITY_NEW_TASK
-                action = "com.android.settings.panel.action.MEDIA_OUTPUT"
-                putExtra("com.android.settings.panel.extra.PACKAGE_NAME", context.packageName)
-            }
-            val tag = startNativeMediaDialog(intent)
-            if (!tag) {
-                Toast.makeText(context, R.string.media_control_text_error, Toast.LENGTH_SHORT).show()
-            }
         }
     }
 
-    private fun startNativeMediaDialog(intent: Intent): Boolean {
+    private fun startNativeMediaDialog(context: Context,intent: Intent): Boolean {
         val resolveInfoList: List<ResolveInfo> =
             context.packageManager.queryIntentActivities(intent, 0)
         for (resolveInfo in resolveInfoList) {
@@ -125,7 +116,7 @@ class SystemMediaControlResolver(val context: Context) {
         return mediaRouter2.showSystemOutputSwitcher()
     }
 
-    private fun startIntent(intent: Intent): Boolean {
+    private fun startIntent(intent: Intent,context: Context): Boolean {
        return try {
             context.startActivity(intent)
             true
@@ -134,24 +125,72 @@ class SystemMediaControlResolver(val context: Context) {
         }
     }
 
-//    /**
-//     * zh: 获取 One UI 版本字符串（如 6.0.0），非三星或无此属性则返回 null
-//     * en: Get One UI version string (e.g. 6.0.0), return null if not Samsung or no such property
-//     */
-//    @SuppressLint("PrivateApi")
-//    private fun getOneUIVersionReadable(): String? {
-//        return try {
-//            val systemProperties = Class.forName("android.os.SystemProperties")
-//            val get = systemProperties.getMethod("get", String::class.java)
-//            val value = (get.invoke(null, "ro.build.version.oneui") as String).trim()
-//            if (value.isEmpty()) return null
-//            val code = value.toIntOrNull() ?: return null
-//            val major = code / 10000
-//            val minor = (code / 100) % 100
-//            val patch = code % 100
-//            "$major.$minor.$patch"
-//        } catch (e: Exception) {
-//            null
-//        }
-//    }
+    /**
+     * zh: 获取 One UI 版本字符串（如 6.0.0），非三星或无此属性则返回 null
+     * en: Get One UI version string (e.g. 6.0.0), return null if not Samsung or no such property
+     */
+    @SuppressLint("PrivateApi")
+    private fun getOneUIVersionReadable(): String? {
+        return try {
+            val systemProperties = Class.forName("android.os.SystemProperties")
+            val get = systemProperties.getMethod("get", String::class.java)
+            val value = (get.invoke(null, "ro.build.version.oneui") as String).trim()
+            if (value.isEmpty()) return null
+            val code = value.toIntOrNull() ?: return null
+            val major = code / 10000
+            val minor = (code / 100) % 100
+            val patch = code % 100
+            "$major.$minor.$patch"
+        } catch (e: Exception) {
+            null
+        }
+    }
+
+    fun isMediaOutputPanelSupported(context: Context): Boolean {
+        return when {
+            Build.VERSION.SDK_INT >= 34 -> {
+                // Android 14+ is support
+                true
+            }
+            Build.VERSION.SDK_INT >= 31 -> {
+                // Android 12~13
+                val intent = Intent().apply {
+                    action = "com.android.systemui.action.LAUNCH_MEDIA_OUTPUT_DIALOG"
+                    setPackage("com.android.systemui")
+                    putExtra("package_name", context.packageName)
+                }
+                isSystemIntentAvailable(context, intent)
+            }
+            Build.VERSION.SDK_INT == 30 -> {
+                // Android 11
+                val intent = Intent().apply {
+                    flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                    action = "com.android.settings.panel.action.MEDIA_OUTPUT"
+                    putExtra("com.android.settings.panel.extra.PACKAGE_NAME", context.packageName)
+                }
+                isSystemIntentAvailable(context, intent)
+            }
+            else -> {
+                // Android 10 and below
+                val intent = Intent().apply {
+                    flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                    action = "com.android.settings.panel.action.MEDIA_OUTPUT"
+                    putExtra("com.android.settings.panel.extra.PACKAGE_NAME", context.packageName)
+                }
+                isSystemIntentAvailable(context, intent)
+            }
+        }
+    }
+
+    private fun isSystemIntentAvailable(context: Context, intent: Intent): Boolean {
+        val resolveInfoList = context.packageManager.queryIntentActivities(intent, 0)
+        for (resolveInfo in resolveInfoList) {
+            val activityInfo = resolveInfo.activityInfo
+            val applicationInfo: ApplicationInfo? = activityInfo?.applicationInfo
+            if (applicationInfo != null && (applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM) != 0) {
+                return true
+            }
+        }
+        return false
+    }
 }

app/src/main/java/org/akanework/gramophone/logic/utils/exoplayer/oem/UnstableMediaKitApi.kt

@@ -416,9 +416,9 @@ class FullBottomSheet
 
         bottomSheetFavoriteButton.addOnCheckedChangeListener(this)
 
-        if (isMediaOutputPanelSupported(context)){
+        if (SystemMediaControlResolver.isMediaOutputPanelSupported(context)){
             bottomSheetMediaControl.setOnClickListener {
-                SystemMediaControlResolver(context).intentSystemMediaDialog()
+                SystemMediaControlResolver.intentSystemMediaDialog(context)
             }
         } else {
             bottomSheetMediaControl.visibility = GONE
@@ -1315,55 +1315,6 @@ class FullBottomSheet
         }
     }
 
-    fun isMediaOutputPanelSupported(context: Context): Boolean {
-        return when {
-            Build.VERSION.SDK_INT >= 34 -> {
-                // Android 14+ 系统一定支持
-                true
-            }
-            Build.VERSION.SDK_INT >= 31 -> {
-                // Android 12~13
-                val intent = Intent().apply {
-                    action = "com.android.systemui.action.LAUNCH_MEDIA_OUTPUT_DIALOG"
-                    setPackage("com.android.systemui")
-                    putExtra("package_name", context.packageName)
-                }
-                isSystemIntentAvailable(context, intent)
-            }
-            Build.VERSION.SDK_INT == 30 -> {
-                // Android 11
-                val intent = Intent().apply {
-                    flags = Intent.FLAG_ACTIVITY_NEW_TASK
-                    action = "com.android.settings.panel.action.MEDIA_OUTPUT"
-                    putExtra("com.android.settings.panel.extra.PACKAGE_NAME", context.packageName)
-                }
-                isSystemIntentAvailable(context, intent)
-            }
-            else -> {
-                // Android 10 及以下
-                val intent = Intent().apply {
-                    flags = Intent.FLAG_ACTIVITY_NEW_TASK
-                    action = "com.android.settings.panel.action.MEDIA_OUTPUT"
-                    putExtra("com.android.settings.panel.extra.PACKAGE_NAME", context.packageName)
-                }
-                isSystemIntentAvailable(context, intent)
-            }
-        }
-    }
-
-    private fun isSystemIntentAvailable(context: Context, intent: Intent): Boolean {
-        val resolveInfoList = context.packageManager.queryIntentActivities(intent, 0)
-        for (resolveInfo in resolveInfoList) {
-            val activityInfo = resolveInfo.activityInfo
-            val applicationInfo: ApplicationInfo? = activityInfo?.applicationInfo
-            if (applicationInfo != null && (applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM) != 0) {
-                return true
-            }
-        }
-        return false
-    }
-
-
 
 
 }