v1.0.4

ShawxingKwok · Sep 12, 2023 · 3abe582 · 3abe582
1 parent 95c12df
commit 3abe582
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 22 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/api/build.gradle b/api/build.gradle
@@ -63,7 +63,7 @@ tasks.withType(KotlinCompile).configureEach{
 // publish
 mavenPublishing {
     def artifactId = "mvb-android"
-    def version = "1.0.3"
+    def version = "1.0.4"
     def isSnapshot = false
 
     if (isSnapshot) version += "-SNAPSHOT"

diff --git a/api/src/main/java/pers/shawxingkwok/mvb/android/Saver.kt b/api/src/main/java/pers/shawxingkwok/mvb/android/Saver.kt
@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
 import android.os.Parcel
 import android.os.Parcelable
 import pers.shawxingkwok.ktutil.updateIf
-import java.util.*
 
 internal class Saver(
     var value: Any?,
@@ -23,7 +22,6 @@ internal class Saver(
 
     companion object CREATOR : Parcelable.Creator<Saver> {
         var parcelableLoader: ClassLoader? = null
-        var arrayClass: Class<Array<*>>? = null
         var recover: ((Any?) -> Any?)? = null
 
         override fun createFromParcel(parcel: Parcel): Saver {
@@ -35,9 +33,6 @@ internal class Saver(
                     UNINITIALIZED
                 else
                     parcel.readValue(parcelableLoader)
-                    .updateIf({ arrayClass != null }){
-                        Arrays.copyOf(it as Array<*>, it.size, arrayClass!!)
-                    }
                     .updateIf({ recover != null }){ recover!!(it) }
 
             return Saver(value)

diff --git a/api/src/main/java/pers/shawxingkwok/mvb/android/observe.kt b/api/src/main/java/pers/shawxingkwok/mvb/android/observe.kt
@@ -1,5 +1,6 @@
 package pers.shawxingkwok.mvb.android
 
+import androidx.fragment.app.Fragment
 import androidx.lifecycle.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow

diff --git a/api/src/main/java/pers/shawxingkwok/mvb/android/save.kt b/api/src/main/java/pers/shawxingkwok/mvb/android/save.kt
@@ -24,24 +24,22 @@ public class SavableMVBData<LV, T, C> @PublishedApi internal constructor(
     @PublishedApi internal var convert: ((Any?) -> Any?)? = null
     @PublishedApi internal var recover: ((Any?) -> Any?)? = null
 
-    @Suppress("UNCHECKED_CAST")
     override val saver by lazy(Saver.CREATOR){
         val state = vm.state
         when(val bundle = state.get<Bundle>(key)){
             null -> Saver(UNINITIALIZED, convert).also { state[key] = bundleOf("" to it) }
             else -> {
                 Saver.parcelableLoader = (parcelableComponent ?: savedType.parcelableComponent)?.java?.classLoader
-                Saver.arrayClass = savedType.java.takeIf { it.isArray && !it.componentType.isPrimitive } as Class<Array<*>>?
                 Saver.recover = recover
 
-                // update [convert] to remove any possible references to old [thisRef].
                 val saver =
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
                         bundle.getParcelable("", Saver::class.java)!!
                     else
                         bundle.getParcelable("")!!
 
                 Saver.recover = null
+                // update [convert] to remove any possible references to old [thisRef].
                 saver.convert = convert
                 saver
             }
@@ -141,15 +139,7 @@ public inline fun <LV, reified T> LV.saveMutableSharedFlow(
         convert = { it.replayCache },
         recover = { cache ->
             val flow = MutableSharedFlow<T>(replay, extraBufferCapacity, onBufferOverflow)
-
-            cache.map{
-                if(it is Array<*>)
-                    Arrays.copyOf(it as Array<*>, it.size, T::class.java as Class<out Array<T>>) as T
-                else
-                    it
-            }
-            .forEach(flow::tryEmit)
-
+            cache.forEach(flow::tryEmit)
             flow
         }
     )

diff --git a/restoretest/src/main/java/pers/shawxingkwok/restoretest/MainActivity.kt b/restoretest/src/main/java/pers/shawxingkwok/restoretest/MainActivity.kt
@@ -11,7 +11,12 @@ import pers.shawxingkwok.mvb.android.saveMutableStateFlow
 import java.math.BigDecimal
 
 class MainActivity : ComponentActivity() {
-    private val sharedFlow by saveMutableSharedFlow<_, List<Array<P>>>(
+    private val sharedFlow by saveMutableSharedFlow<_, Array<Any>>(
+        replay = 3,
+        parcelableComponent = P::class
+    )
+
+    private val _sharedFlow by saveMutableSharedFlow<_, Array<P>>(
         replay = 3,
         parcelableComponent = P::class
     )
@@ -35,8 +40,10 @@ class MainActivity : ComponentActivity() {
             assert(emptyLiveData.value == null)
             liveData.value = 1
             nullableLiveData.value = null
-            sharedFlow.tryEmit(listOf(arrayOf(P(2))))
-            sharedFlow.tryEmit(listOf(arrayOf(P(3))))
+            sharedFlow.tryEmit(arrayOf(P(2)))
+            sharedFlow.tryEmit(arrayOf(""))
+            _sharedFlow.tryEmit(arrayOf(P(2)))
+            _sharedFlow.tryEmit(arrayOf(P(3)))
             sparseArray.append(0, P(0))
             number += BigDecimal(1)
             ints[0]++
@@ -45,7 +52,8 @@ class MainActivity : ComponentActivity() {
             assert(emptyLiveData.value == null)
             assert(liveData.value == 1)
             assert(nullableLiveData.value == null)
-            assert(sharedFlow.replayCache.first().first().first().i == 2)
+            assert(sharedFlow.replayCache.first().first() is P)
+            assert(_sharedFlow.replayCache.first().first().i == 2)
             assert(sparseArray.valueAt(0) == P(0))
             assert(number.toInt() == 1)
             assert(ints.first() == 1)