修复崩溃

Author: rRemix

Diff for: app/src/main/java/remix/myplayer/misc/Ext.kt

@@ -1,5 +1,6 @@
 package remix.myplayer.misc
 
+import android.app.Activity
 import android.app.PendingIntent
 import android.content.Context
 import android.content.res.Configuration
@@ -171,3 +172,6 @@ fun DavResource.isAudio(): Boolean {
   return musicExt.contains(ext.lowercase(Locale.getDefault())) &&
       (contentType == "application/octet-stream" || contentType.startsWith("audio"))
 }
+
+// glide加载图片之前检查activity是否被销毁
+fun Context.isValidGlideContext() = this !is Activity || (!this.isDestroyed && !this.isFinishing)

Diff for: app/src/main/java/remix/myplayer/ui/activity/MainActivity.kt

@@ -43,6 +43,7 @@ import remix.myplayer.misc.cache.DiskCache
 import remix.myplayer.misc.handler.MsgHandler
 import remix.myplayer.misc.handler.OnHandleMessage
 import remix.myplayer.misc.interfaces.OnItemClickListener
+import remix.myplayer.misc.isValidGlideContext
 import remix.myplayer.misc.menu.LibraryListener.Companion.EXTRA_COVER
 import remix.myplayer.misc.receiver.ExitReceiver
 import remix.myplayer.misc.update.DownloadService
@@ -128,6 +129,7 @@ class MainActivity : MenuActivity(), View.OnClickListener {
 
   override fun onDestroy() {
     super.onDestroy()
+    handler.removeCallbacksAndMessages(null)
     unregisterLocalReceiver(receiver)
   }
 
@@ -169,7 +171,7 @@ class MainActivity : MenuActivity(), View.OnClickListener {
       SPUtil.putValue(this, SPUtil.OTHER_KEY.NAME, SPUtil.OTHER_KEY.LAST_OPEN_TIME, System.currentTimeMillis())
       if (System.currentTimeMillis() - lastOpenTime >= TimeUnit.DAYS.toMillis(2)) {
         handler.postDelayed({
-          Theme.getBaseDialog(this)
+          showDialog(Theme.getBaseDialog(this)
             .title(R.string.support_developer)
             .positiveText(R.string.go)
             .negativeText(R.string.cancel)
@@ -182,7 +184,7 @@ class MainActivity : MenuActivity(), View.OnClickListener {
             .onNeutral { _, _ ->
               SPUtil.putValue(this, SPUtil.OTHER_KEY.NAME, SPUtil.OTHER_KEY.SUPPORT_NO_MORE_PROMPT, true)
             }
-            .show()
+            .build())
         }, 1500)
       }
     }
@@ -639,13 +641,16 @@ class MainActivity : MenuActivity(), View.OnClickListener {
     val currentSong = MusicServiceRemote.getCurrentSong()
     if (currentSong != Song.EMPTY_SONG) {
       binding.navigationView.findViewById<TextView>(R.id.tv_header).text = getString(R.string.play_now, currentSong.title)
-      Glide.with(this)
+      if (isValidGlideContext()) {
+        Glide.with(this)
           .load(currentSong)
           .centerCrop()
           .signature(ObjectKey(UriFetcher.albumVersion))
           .placeholder(Theme.resolveDrawable(this, R.attr.default_album))
           .error(Theme.resolveDrawable(this, R.attr.default_album))
           .into(binding.navigationView.findViewById(R.id.iv_header))
+      }
+      
     }
   }
 

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

@@ -42,6 +42,8 @@ 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)
@@ -124,6 +126,7 @@ open class BaseActivity : AppCompatActivity(), CoroutineScope by MainScope() {
   override fun onDestroy() {
     super.onDestroy()
     isDestroyed = true
+    dialog?.dismiss()
   }
 
   override fun isDestroyed(): Boolean {
@@ -201,6 +204,15 @@ 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 =

Diff for: app/src/main/java/remix/myplayer/ui/misc/MultipleChoice.kt

@@ -5,6 +5,7 @@ import android.app.Activity
 import android.text.TextUtils
 import android.view.View
 import android.widget.PopupMenu
+import com.tencent.bugly.crashreport.CrashReport
 import io.reactivex.Single
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
@@ -413,7 +414,11 @@ class MultipleChoice<T>(activity: Activity, val type: Int) {
           true
         }
         if (!activity.isFinishing && !activity.isDestroyed && activity.hasWindowFocus()) {
-          show()
+          try {
+            show()
+          } catch (e: Exception) {
+            CrashReport.postCatchedException(Exception("ac: $activity", e))
+          }
         }
       }
     }