Skip to content

fix: child account class cast exception #910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lmcmz merged 1 commit into from
Apr 30, 2025
Merged

fix: child account class cast exception #910

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions app/src/main/java/com/flowfoundation/wallet/manager/childaccount/ChildAccountList.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import com.flowfoundation.wallet.manager.flowjvm.CadenceScript
import com.flowfoundation.wallet.manager.flowjvm.executeCadence
import com.flowfoundation.wallet.utils.ioScope
import com.flowfoundation.wallet.utils.logd
import com.google.gson.reflect.TypeToken
import kotlinx.parcelize.Parcelize
import org.onflow.flow.infrastructure.Cadence
import java.lang.ref.WeakReference
Expand All @@ -21,7 +22,7 @@ class ChildAccountList(
private val accountList = mutableListOf<ChildAccount>()

init {
ioScope { accountList.addAll(cache().read().orEmpty()) }
ioScope { accountList.addAll(cache().read()?.accountList.orEmpty()) }
Comment thread
jaymengxy marked this conversation as resolved.
refresh()
}

Expand All @@ -34,7 +35,7 @@ class ChildAccountList(
} else {
localAccount.pinTime = System.currentTimeMillis()
}
cache().cache(ArrayList(accountList))
cache().cache(ChildAccountCache(accountList.toList()))
}

fun refresh() {
Expand All @@ -44,7 +45,7 @@ class ChildAccountList(
accounts.forEach { account -> account.pinTime = (oldAccounts.firstOrNull { it.address == account.address }?.pinTime ?: 0) }
accountList.clear()
accountList.addAll(accounts)
cache().cache(ArrayList(accountList))
cache().cache(ChildAccountCache(accountList.toList()))
dispatchAccountUpdateListener(address, accountList.toList())

logd(TAG, "refresh: $address, ${accountList.size}")
Expand All @@ -61,11 +62,10 @@ class ChildAccountList(
return result?.encode()?.parseAccountMetas()
}

private fun cache(): CacheManager<List<ChildAccount>> {
@Suppress("UNCHECKED_CAST")
private fun cache(): CacheManager<ChildAccountCache> {
return CacheManager(
"${address}.child_account_list".cacheFile(),
ArrayList::class.java as Class<List<ChildAccount>>,
ChildAccountCache::class.java,
)
}

Expand Down Expand Up @@ -101,3 +101,8 @@ data class ChildAccount(
@SerializedName("description")
val description: String? = null,
) : Parcelable

data class ChildAccountCache(
@SerializedName("accountList")
val accountList: List<ChildAccount> = emptyList(),
)