修复序列化引起的崩溃

Author: rRemix

app/build.gradle.kts

@@ -41,8 +41,8 @@ android {
         minSdk = 19
         targetSdk = 33
 
-        versionCode = 16400
-        versionName = "1.6.4.0"
+        versionCode = 16500
+        versionName = "1.6.5.0"
 
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true

app/src/main/java/remix/myplayer/bean/mp3/Album.kt

@@ -4,6 +4,7 @@ import android.content.ContentUris
 import android.net.Uri
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
+import java.io.Serial
 
 /**
  * Created by Remix on 2017/10/22.
@@ -21,4 +22,9 @@ data class Album(val albumID: Long,
   override fun getKey(): String {
     return albumID.toString()
   }
+
+  companion object {
+    @Serial
+    private const val serialVersionUID: Long = 1214925651243602701L
+  }
 }

app/src/main/java/remix/myplayer/bean/mp3/Artist.kt

@@ -2,6 +2,7 @@ package remix.myplayer.bean.mp3
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
+import java.io.Serial
 
 /**
  * Created by Remix on 2017/10/22.
@@ -15,4 +16,9 @@ data class Artist(val artistID: Long,
   override fun getKey(): String {
     return artistID.toString()
   }
+
+  companion object {
+    @Serial
+    private const val serialVersionUID: Long = -8314996381751820478L
+  }
 }

app/src/main/java/remix/myplayer/bean/mp3/Folder.kt

@@ -2,6 +2,7 @@ package remix.myplayer.bean.mp3
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
+import java.io.Serial
 
 /**
  * Created by Remix on 2018/1/9.
@@ -17,9 +18,7 @@ data class Folder(val name: String?,
 
     other as Folder
 
-    if (path != other.path) return false
-
-    return true
+    return path == other.path
   }
 
   override fun hashCode(): Int {
@@ -29,4 +28,9 @@ data class Folder(val name: String?,
   override fun getKey(): String {
     return path
   }
+
+  companion object {
+    @Serial
+    private const val serialVersionUID: Long = -7333769143033322264L
+  }
 }

app/src/main/java/remix/myplayer/bean/mp3/Genre.kt

@@ -2,11 +2,17 @@ package remix.myplayer.bean.mp3
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
+import java.io.Serial
 
 @Parcelize
 class Genre(val id: Long, val genre: String, val count: Int) : Parcelable, APlayerModel {
 
   override fun getKey(): String {
     return id.toString()
   }
+
+  companion object {
+    @Serial
+    private const val serialVersionUID: Long = -2424542670832627129L
+  }
 }

app/src/main/java/remix/myplayer/bean/mp3/Song.kt

@@ -8,6 +8,7 @@ import okhttp3.Credentials
 import remix.myplayer.App
 import remix.myplayer.util.SPUtil
 import timber.log.Timber
+import java.io.Serial
 
 /**
  * Created by Remix on 2015/11/30.
@@ -180,9 +181,7 @@ sealed class Song(
 
       other as Song
 
-      if (id != other.id) return false
-
-      return true
+      return id == other.id
     }
 
     override fun hashCode(): Int {
@@ -192,6 +191,11 @@ sealed class Song(
     override fun toString(): String {
       return "LocalSong(id='$id', data='$data')"
     }
+
+    companion object {
+      @Serial
+      private val serialVersionUID: Long = -6482253600425978196
+    }
   }
 
   class Remote(
@@ -241,9 +245,7 @@ sealed class Song(
 
       other as Song
 
-      if (data != other.data) return false
-
-      return true
+      return data == other.data
     }
 
     override fun hashCode(): Int {
@@ -253,9 +255,17 @@ sealed class Song(
     override fun toString(): String {
       return "RemoteSong(data='$data')"
     }
+
+    companion object {
+      @Serial
+      private const val serialVersionUID: Long = 13111653236476560L
+    }
   }
 
   companion object {
+    @Serial
+    private const val serialVersionUID: Long = 6842734564265523984
+
     @JvmStatic
     val EMPTY_SONG = Local(-1, "", "", "", -1, "", -1, -1, "", -1, "", "", "", -1)
 

app/src/main/java/remix/myplayer/db/room/model/PlayList.kt

@@ -4,7 +4,7 @@ import androidx.room.*
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import remix.myplayer.bean.mp3.APlayerModel
-import java.io.Serializable
+import java.io.Serial
 
 /**
  * Created by remix on 2019/1/12
@@ -34,6 +34,8 @@ data class PlayList(
   }
 
   companion object {
+    @Serial
+    private const val serialVersionUID: Long = 7380279450459904510L
     const val TABLE_NAME = "PlayList"
   }
 

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

@@ -237,7 +237,12 @@ class PlayerActivity : BaseMusicActivity() {
 
     song = getCurrentSong()
     if (song == Song.EMPTY_SONG && intent.hasExtra(EXTRA_SONG)) {
-      song = intent.getSerializableExtra(EXTRA_SONG) as Song
+      song = try {
+        intent.getSerializableExtra(EXTRA_SONG) as Song
+      } catch (e: Exception) {
+        Timber.w("failed to load song: $e")
+        Song.EMPTY_SONG
+      }
     }
 
     setUpBottom()