修复部分机型循环请求通知栏权限

Author: xiaoborui

app/build.gradle.kts

@@ -248,7 +248,7 @@ dependencies {
     implementation(libs.rebound)
     implementation(libs.rxandroid)
     implementation(libs.rxjava)
-    implementation(libs.rxpermissions)
+    implementation(libs.xxpermissions)
     implementation(libs.sardine.android) {
         // https://github.com/thegrizzlylabs/sardine-android/issues/70
         // 上游已经exclude了，但是不知道为什么还是会有

app/src/main/java/remix/myplayer/App.kt

@@ -6,6 +6,7 @@ import android.os.Build
 import android.os.Process
 import androidx.multidex.MultiDex
 import androidx.multidex.MultiDexApplication
+import com.hjq.permissions.XXPermissions
 import com.tencent.bugly.crashreport.CrashReport
 import com.tencent.bugly.crashreport.CrashReport.UserStrategy
 import io.reactivex.Completable
@@ -63,11 +64,11 @@ class App : MultiDexApplication() {
       SPUtil.deleteFile(this, SPUtil.LYRIC_KEY.NAME)
       SPUtil.putValue(context, SPUtil.LYRIC_KEY.NAME, SPUtil.LYRIC_KEY.LYRIC_RESET_ON_16000, true)
       SPUtil.putValue(context, SPUtil.LYRIC_KEY.NAME, SPUtil.LYRIC_KEY.PRIORITY_LYRIC, SPUtil.LYRIC_KEY.DEFAULT_PRIORITY)
-      try {
-        DiskCache.getLrcDiskCache().delete()
-      } catch (e: Exception) {
-        Timber.v(e)
-      }
+//      try {
+//        DiskCache.getLrcDiskCache().delete()
+//      } catch (e: Exception) {
+//        Timber.v(e)
+//      }
     }
 
     val oldVersion = SPUtil.getValue(context, SETTING_KEY.NAME, SETTING_KEY.VERSION, 1)
@@ -84,6 +85,7 @@ class App : MultiDexApplication() {
   }
 
   private fun setUp() {
+    XXPermissions.setCheckMode(false)
     DiskCache.init(this, "lyric")
     setApplicationLanguage(this)
     Completable

app/src/main/java/remix/myplayer/misc/cache/DiskCache.java

@@ -8,7 +8,8 @@
 import android.os.Environment;
 import android.text.TextUtils;
 import java.io.File;
-import java.io.IOException;
+
+import timber.log.Timber;
 
 /**
  * Created by Remix on 2016/6/14.
@@ -24,8 +25,8 @@ public static void init(Context context, String name) {
         lrcCacheDir.mkdir();
       }
       mLrcCache = DiskLruCache.open(lrcCacheDir, getAppVersion(context), 1, 200 * MB);
-    } catch (IOException e) {
-      e.printStackTrace();
+    } catch (Exception e) {
+      Timber.e(e);
     }
   }
 

app/src/main/java/remix/myplayer/ui/activity/SettingActivity.kt

@@ -1,6 +1,5 @@
 package remix.myplayer.ui.activity
 
-import android.Manifest
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
@@ -25,8 +24,10 @@ import com.afollestad.materialdialogs.DialogAction
 import com.bumptech.glide.Glide
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
+import com.hjq.permissions.OnPermissionCallback
+import com.hjq.permissions.Permission
+import com.hjq.permissions.XXPermissions
 import com.soundcloud.android.crop.Crop
-import com.tbruyelle.rxpermissions2.RxPermissions
 import io.reactivex.Completable
 import io.reactivex.Single
 import io.reactivex.disposables.Disposable
@@ -256,17 +257,25 @@ class SettingActivity : ToolbarActivity(), ColorChooserDialog.ColorCallback,
             //经典通知栏
             R.id.setting_notify_switch -> {
               if (isChecked && Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                RxPermissions(this@SettingActivity)
-                  .request(Manifest.permission.POST_NOTIFICATIONS)
-                  .subscribe { has ->
-                    if (!has){
+                XXPermissions.with(this@SettingActivity)
+                  .permission(Permission.POST_NOTIFICATIONS)
+                  .request(object : OnPermissionCallback {
+                    override fun onGranted(p0: MutableList<String>, p1: Boolean) {
+                    }
+
+                    override fun onDenied(
+                      permissions: MutableList<String>,
+                      doNotAskAgain: Boolean
+                    ) {
                       ToastUtil.show(this@SettingActivity, R.string.need_permission)
                       SPUtil.putValue(this@SettingActivity, SETTING_KEY.NAME, keyWord[index], false)
                       buttonView.setOnCheckedChangeListener(null)
                       buttonView.isChecked = false
                       buttonView.setOnCheckedChangeListener(checkedChangedListener)
+
+                      XXPermissions.startPermissionActivity(this@SettingActivity, Permission.POST_NOTIFICATIONS)
                     }
-                  }
+                  })
               }
             }
           }

app/src/main/java/remix/myplayer/ui/activity/base/BaseActivity.kt

@@ -10,7 +10,9 @@ import android.os.Build
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
-import com.tbruyelle.rxpermissions2.RxPermissions
+import com.hjq.permissions.OnPermissionCallback
+import com.hjq.permissions.Permission
+import com.hjq.permissions.XXPermissions
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.MainScope
 import remix.myplayer.BuildConfig
@@ -24,7 +26,12 @@ import remix.myplayer.theme.ThemeStore.sColoredNavigation
 import remix.myplayer.theme.ThemeStore.statusBarColor
 import remix.myplayer.theme.ThemeStore.themeRes
 import remix.myplayer.ui.misc.AudioTag
-import remix.myplayer.util.*
+import remix.myplayer.util.ColorUtil
+import remix.myplayer.util.MediaStoreUtil
+import remix.myplayer.util.PermissionUtil
+import remix.myplayer.util.StatusBarUtil
+import remix.myplayer.util.ToastUtil
+import remix.myplayer.util.Util
 import timber.log.Timber
 
 /**
@@ -43,7 +50,7 @@ open class BaseActivity : AppCompatActivity(), CoroutineScope by MainScope() {
   var toDeleteSongs: ArrayList<Song>? = null
 
   private var dialog: Dialog? = null
-  
+
   private val loadingDialog by lazy {
     Theme.getBaseDialog(this)
       .title(R.string.loading)
@@ -86,6 +93,25 @@ open class BaseActivity : AppCompatActivity(), CoroutineScope by MainScope() {
 //      setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
 //    }
     setNavigationBarColor()
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU && !XXPermissions.isGranted(
+        this,
+        Manifest.permission.POST_NOTIFICATIONS
+      )
+    ) {
+      XXPermissions.with(this)
+        .permission(Permission.POST_NOTIFICATIONS)
+        .request(object : OnPermissionCallback {
+          override fun onGranted(permissions: MutableList<String>, allGranted: Boolean) {
+            Timber.v("request notification permission onGranted")
+          }
+
+          override fun onDenied(permissions: MutableList<String>, doNotAskAgain: Boolean) {
+            Timber.v("request notification permission onDenied: $doNotAskAgain")
+          }
+        })
+    }
+
   }
 
   override fun setContentView(layoutResID: Int) {
@@ -137,23 +163,19 @@ open class BaseActivity : AppCompatActivity(), CoroutineScope by MainScope() {
   override fun onResume() {
     super.onResume()
     isForeground = true
-    RxPermissions(this)
-      .request(*NECESSARY_PERMISSIONS)
-      .subscribe { has: Boolean ->
-        if (has != hasPermission) {
-          val intent = Intent(MusicService.PERMISSION_CHANGE)
-          intent.putExtra(BaseMusicActivity.EXTRA_PERMISSION, has)
-          Util.sendLocalBroadcast(intent)
-        }
-      }
-
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-      RxPermissions(this)
-        .request(Manifest.permission.POST_NOTIFICATIONS)
-        .subscribe { has ->
-          Timber.v("has: $has")
+    if (!hasPermission) {
+      XXPermissions.with(this)
+        .permission(*NECESSARY_PERMISSIONS)
+        .request { _, allGranted ->
+          Timber.v("request necessary permission: $allGranted")
+          if (allGranted != hasPermission) {
+            val intent = Intent(MusicService.PERMISSION_CHANGE)
+            intent.putExtra(BaseMusicActivity.EXTRA_PERMISSION, allGranted)
+            Util.sendLocalBroadcast(intent)
+          }
         }
     }
+
   }
 
   override fun onPause() {
@@ -204,27 +226,26 @@ open class BaseActivity : AppCompatActivity(), CoroutineScope by MainScope() {
       loadingDialog.dismiss()
     }
   }
-  
+
   protected fun showDialog(newDialog: Dialog) {
     dialog?.dismiss()
     if (!isFinishing && !isDestroyed && hasWindowFocus()) {
       dialog = newDialog
       newDialog.show()
     }
   }
-  
 
   companion object {
     val NECESSARY_PERMISSIONS =
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-        arrayOf(Manifest.permission.READ_MEDIA_AUDIO, Manifest.permission.READ_MEDIA_IMAGES)
+        arrayOf(Permission.READ_MEDIA_AUDIO, Permission.READ_MEDIA_IMAGES)
       } else if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
         arrayOf(
-          Manifest.permission.READ_EXTERNAL_STORAGE,
-          Manifest.permission.WRITE_EXTERNAL_STORAGE
+          Permission.READ_EXTERNAL_STORAGE,
+          Permission.WRITE_EXTERNAL_STORAGE
         )
       } else {
-        arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE)
+        arrayOf(Permission.READ_EXTERNAL_STORAGE)
       }
   }
 }

app/src/main/java/remix/myplayer/util/PermissionUtil.kt

@@ -1,6 +1,5 @@
 package remix.myplayer.util
 
-import android.Manifest
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -10,6 +9,7 @@ import android.os.Environment
 import android.provider.Settings
 import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat
+import com.hjq.permissions.Permission
 import remix.myplayer.App
 import remix.myplayer.BuildConfig
 
@@ -25,9 +25,9 @@ object PermissionUtil {
 
   fun hasNecessaryPermission(): Boolean {
     return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-      has(Manifest.permission.READ_MEDIA_AUDIO, Manifest.permission.READ_MEDIA_IMAGES)
+      has(Permission.READ_MEDIA_IMAGES, Permission.READ_MEDIA_IMAGES)
     } else {
-      has(Manifest.permission.READ_EXTERNAL_STORAGE)
+      has(Permission.READ_EXTERNAL_STORAGE)
     }
   }
 
@@ -39,9 +39,9 @@ object PermissionUtil {
   @RequiresApi(Build.VERSION_CODES.R)
   fun requestManageExternalStorage(context: Context) {
     context.startActivity(
-        Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION).setData(
-            Uri.fromParts("package", BuildConfig.APPLICATION_ID, null)
-        )
+      Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION).setData(
+        Uri.fromParts("package", BuildConfig.APPLICATION_ID, null)
+      )
     )
     // TODO: show toast when "a matching Activity not exists"
   }

gradle/libs.versions.toml

@@ -6,6 +6,7 @@ ksp = "1.9.23-1.0.19"
 glide = "4.16.0"
 retrofit = "2.11.0"
 room = "2.6.1"
+xxpermissions = "20.0"
 
 
 [plugins]
@@ -58,7 +59,7 @@ rebound = { group = "com.facebook.rebound", name = "rebound", version = "0.3.8"
 rxandroid = { group = "io.reactivex.rxjava2", name = "rxandroid", version = "2.1.1" }
 rxjava = { group = "io.reactivex.rxjava2", name = "rxjava", version = "2.2.19" }
 # noinspection GradleDependency
-rxpermissions = { group = "com.github.tbruyelle", name = "rxpermissions", version = "0.11" }
+xxpermissions = { module = "com.github.getActivity:XXPermissions", version.ref = "xxpermissions" }
 sardine-android = { group = "com.github.thegrizzlylabs", name = "sardine-android", version = "0.9" }
 slf4j = { group = "org.slf4j", name = "slf4j-api", version = "2.0.13" }
 timber = { group = "com.jakewharton.timber", name = "timber", version = "5.0.1" }