Merge branch 'multisig/05-data-models' into multisig/06-account-pages-support

* multisig/05-data-models:
  fix: Address PR #515 review comments
  fix: Remove redundant methods and use injected use cases

Author: yasin-ce

app/src/main/kotlin/com/algorand/android/core/transaction/JointAccountTransactionSignHelper.kt

@@ -127,20 +127,16 @@ class JointAccountTransactionSignHelper @Inject constructor(
     ): ByteArray? {
         val signerAccount = getLocalAccount(signerAddress) ?: return null
         return when (signerAccount) {
-            is LocalAccount.Algo25 -> signWithAlgo25Account(transactionBytes, signerAddress)
-            is LocalAccount.HdKey -> signWithHdKeyAccount(transactionBytes, signerAccount)
+            is LocalAccount.Algo25 -> {
+                localAccountSigningHelper.signWithAlgo25AccountReturnSignature(transactionBytes, signerAddress)
+            }
+            is LocalAccount.HdKey -> {
+                localAccountSigningHelper.signWithHdKeyAccountReturnSignature(transactionBytes, signerAccount)
+            }
             else -> null
         }
     }
 
-    private suspend fun signWithAlgo25Account(transactionBytes: ByteArray, signerAddress: String): ByteArray? {
-        return localAccountSigningHelper.signWithAlgo25AccountReturnSignature(transactionBytes, signerAddress)
-    }
-
-    private suspend fun signWithHdKeyAccount(transactionBytes: ByteArray, hdKey: LocalAccount.HdKey): ByteArray? {
-        return localAccountSigningHelper.signWithHdKeyAccountReturnSignature(transactionBytes, hdKey)
-    }
-
     private data class PreparedJointAccountData(
         val jointAccount: LocalAccount.Joint,
         val proposerAddress: String,

app/src/main/kotlin/com/algorand/android/modules/accounts/ui/viewmodel/AccountPreviewProcessor.kt

@@ -32,6 +32,7 @@ import com.algorand.wallet.account.custom.domain.usecase.GetAccountsCustomInfo
 import com.algorand.wallet.account.detail.domain.model.AccountRegistrationType
 import com.algorand.wallet.account.detail.domain.model.AccountType
 import com.algorand.wallet.account.detail.domain.usecase.GetAccountRegistrationType
+import com.algorand.wallet.account.detail.domain.usecase.GetAccountType
 import com.algorand.wallet.account.local.domain.model.LocalAccount
 import com.algorand.wallet.account.local.domain.usecase.GetLocalAccount
 import com.algorand.wallet.account.local.domain.usecase.GetLocalAccounts
@@ -56,6 +57,7 @@ class AccountPreviewProcessor @Inject constructor(
     private val getLocalAccounts: GetLocalAccounts,
     private val getAccountsCustomInfo: GetAccountsCustomInfo,
     private val getAccountRegistrationType: GetAccountRegistrationType,
+    private val getAccountType: GetAccountType,
     private val sortAccountsBySortingPreference: SortAccountsBySortingPreference,
     private val amountRendererTypeMapper: AmountRendererTypeMapper,
     private val getCompactPrimaryAmountRenderer: GetCompactPrimaryAmountRenderer,
@@ -121,8 +123,8 @@ class AccountPreviewProcessor @Inject constructor(
         val localAccounts = getLocalAccounts()
         val customInfos = getAccountsCustomInfo(localAccounts.map { it.algoAddress })
         val accountErrorItems = localAccounts
-            .map { localAccount ->
-                val accountType = getLocalAccountType(localAccount)
+            .mapNotNull { localAccount ->
+                val accountType = getAccountType(localAccount.algoAddress) ?: return@mapNotNull null
                 val registrationType = getAccountRegistrationType(localAccount)
                 val customInfo = customInfos[localAccount.algoAddress]
                 val displayName = getAccountDisplayName(
@@ -202,14 +204,4 @@ class AccountPreviewProcessor @Inject constructor(
             )
         )
     }
-
-    private fun getLocalAccountType(localAccount: LocalAccount): AccountType {
-        return when (localAccount) {
-            is LocalAccount.Algo25 -> AccountType.Algo25
-            is LocalAccount.LedgerBle -> AccountType.LedgerBle
-            is LocalAccount.NoAuth -> AccountType.NoAuth
-            is LocalAccount.HdKey -> AccountType.HdKey
-            is LocalAccount.Joint -> AccountType.Joint
-        }
-    }
 }

common-sdk/src/main/kotlin/com/algorand/wallet/inbox/asset/data/repository/AssetInboxRepositoryImpl.kt

@@ -12,24 +12,26 @@
 
 package com.algorand.wallet.inbox.asset.data.repository
 
+import com.algorand.wallet.foundation.cache.InMemoryCachedObject
 import com.algorand.wallet.inbox.asset.domain.model.AssetInboxRequest
 import com.algorand.wallet.inbox.asset.domain.repository.AssetInboxRepository
-import com.algorand.wallet.inbox.data.cache.InboxInMemoryCache
+import com.algorand.wallet.inbox.domain.model.InboxMessages
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
 internal class AssetInboxRepositoryImpl(
-    private val inboxInMemoryCache: InboxInMemoryCache
+    private val inboxCache: InMemoryCachedObject<InboxMessages>,
+    private val inboxCacheFlow: Flow<InboxMessages?>
 ) : AssetInboxRepository {
 
     override fun getRequestCountFlow(): Flow<Int> {
-        return inboxInMemoryCache.observe().map { inboxMessages ->
+        return inboxCacheFlow.map { inboxMessages ->
             inboxMessages?.assetInboxes?.sumOf { it.requestCount } ?: 0
         }
     }
 
     override suspend fun getRequest(address: String): AssetInboxRequest? {
-        val inboxMessages = inboxInMemoryCache.get()
+        val inboxMessages = inboxCache.get()
         return inboxMessages?.assetInboxes?.find { it.address == address }?.let {
             AssetInboxRequest(address = it.address, requestCount = it.requestCount)
         }

common-sdk/src/main/kotlin/com/algorand/wallet/inbox/asset/di/AssetInboxModule.kt

@@ -12,23 +12,29 @@
 
 package com.algorand.wallet.inbox.asset.di
 
+import com.algorand.wallet.foundation.cache.InMemoryCachedObject
 import com.algorand.wallet.inbox.asset.data.repository.AssetInboxRepositoryImpl
 import com.algorand.wallet.inbox.asset.domain.repository.AssetInboxRepository
 import com.algorand.wallet.inbox.asset.domain.usecase.GetAssetInboxRequest
 import com.algorand.wallet.inbox.asset.domain.usecase.GetAssetInboxRequestCountFlow
-import com.algorand.wallet.inbox.data.cache.InboxInMemoryCache
+import com.algorand.wallet.inbox.domain.model.InboxMessages
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.flow.MutableStateFlow
+import javax.inject.Named
 
 @Module
 @InstallIn(SingletonComponent::class)
 internal object AssetInboxModule {
 
     @Provides
-    fun provideAssetInboxRepository(inboxInMemoryCache: InboxInMemoryCache): AssetInboxRepository {
-        return AssetInboxRepositoryImpl(inboxInMemoryCache)
+    fun provideAssetInboxRepository(
+        @Named("inboxCache") inboxCache: InMemoryCachedObject<InboxMessages>,
+        @Named("inboxCacheFlow") inboxCacheFlow: MutableStateFlow<InboxMessages?>
+    ): AssetInboxRepository {
+        return AssetInboxRepositoryImpl(inboxCache, inboxCacheFlow)
     }
 
     @Provides

common-sdk/src/main/kotlin/com/algorand/wallet/inbox/data/cache/DefaultInboxInMemoryCache.kt

@@ -13,11 +13,11 @@
 package com.algorand.wallet.inbox.di
 
 import com.algorand.wallet.foundation.cache.InMemoryCacheProvider
-import com.algorand.wallet.inbox.data.cache.DefaultInboxInMemoryCache
-import com.algorand.wallet.inbox.data.cache.InboxInMemoryCache
+import com.algorand.wallet.foundation.cache.InMemoryCachedObject
 import com.algorand.wallet.inbox.data.repository.InboxApiRepositoryImpl
 import com.algorand.wallet.inbox.domain.InboxCacheManager
 import com.algorand.wallet.inbox.domain.InboxCacheManagerImpl
+import com.algorand.wallet.inbox.domain.model.InboxMessages
 import com.algorand.wallet.inbox.domain.repository.InboxApiRepository
 import com.algorand.wallet.inbox.domain.usecase.CacheInboxMessages
 import com.algorand.wallet.inbox.domain.usecase.ClearInboxCache
@@ -35,6 +35,7 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.flow.MutableStateFlow
 import retrofit2.Retrofit
 import javax.inject.Named
 import javax.inject.Singleton
@@ -43,6 +44,9 @@ import javax.inject.Singleton
 @InstallIn(SingletonComponent::class)
 internal object InboxModule {
 
+    private const val INBOX_CACHE_NAME = "inboxCache"
+    private const val INBOX_CACHE_FLOW_NAME = "inboxCacheFlow"
+
     @Provides
     @Singleton
     fun provideInboxApiService(
@@ -52,8 +56,6 @@ internal object InboxModule {
     }
 
     @Provides
-    @Singleton
-    @Named(InboxApiRepository.INJECTION_NAME)
     fun provideInboxApiRepository(
         repository: InboxApiRepositoryImpl
     ): InboxApiRepository = repository
@@ -64,31 +66,53 @@ internal object InboxModule {
 
     @Provides
     @Singleton
-    fun provideInboxInMemoryCache(inMemoryCacheProvider: InMemoryCacheProvider): InboxInMemoryCache {
-        return DefaultInboxInMemoryCache(inMemoryCacheProvider)
-    }
+    @Named(INBOX_CACHE_NAME)
+    fun provideInboxCache(
+        inMemoryCacheProvider: InMemoryCacheProvider
+    ): InMemoryCachedObject<InboxMessages> = inMemoryCacheProvider.getInMemoryCache()
+
+    @Provides
+    @Singleton
+    @Named(INBOX_CACHE_FLOW_NAME)
+    fun provideInboxCacheFlow(): MutableStateFlow<InboxMessages?> = MutableStateFlow(null)
 
     @Provides
     fun provideInboxSearchMapper(impl: InboxSearchMapperImpl): InboxSearchMapper = impl
 
     @Provides
-    fun provideCacheInboxMessages(cache: InboxInMemoryCache): CacheInboxMessages {
-        return CacheInboxMessages(cache::put)
+    fun provideCacheInboxMessages(
+        @Named(INBOX_CACHE_NAME) cache: InMemoryCachedObject<InboxMessages>,
+        @Named(INBOX_CACHE_FLOW_NAME) cacheFlow: MutableStateFlow<InboxMessages?>
+    ): CacheInboxMessages {
+        return CacheInboxMessages { inboxMessages ->
+            cache.put(inboxMessages)
+            cacheFlow.value = inboxMessages
+        }
     }
 
     @Provides
-    fun provideClearInboxCache(cache: InboxInMemoryCache): ClearInboxCache {
-        return ClearInboxCache(cache::clear)
+    fun provideClearInboxCache(
+        @Named(INBOX_CACHE_NAME) cache: InMemoryCachedObject<InboxMessages>,
+        @Named(INBOX_CACHE_FLOW_NAME) cacheFlow: MutableStateFlow<InboxMessages?>
+    ): ClearInboxCache {
+        return ClearInboxCache {
+            cache.clear()
+            cacheFlow.value = null
+        }
     }
 
     @Provides
-    fun provideGetInboxMessagesFlow(cache: InboxInMemoryCache): GetInboxMessagesFlow {
-        return GetInboxMessagesFlow(cache::observe)
+    fun provideGetInboxMessagesFlow(
+        @Named(INBOX_CACHE_FLOW_NAME) cacheFlow: MutableStateFlow<InboxMessages?>
+    ): GetInboxMessagesFlow {
+        return GetInboxMessagesFlow { cacheFlow }
     }
 
     @Provides
-    fun provideGetInboxMessages(cache: InboxInMemoryCache): GetInboxMessages {
-        return GetInboxMessages(cache::get)
+    fun provideGetInboxMessages(
+        @Named(INBOX_CACHE_NAME) cache: InMemoryCachedObject<InboxMessages>
+    ): GetInboxMessages {
+        return GetInboxMessages { cache.get() }
     }
 
     @Provides

common-sdk/src/main/kotlin/com/algorand/wallet/inbox/data/cache/InboxInMemoryCache.kt

@@ -26,7 +26,6 @@ import com.algorand.wallet.inbox.domain.usecase.GetInboxValidAddresses
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.collectLatest
 import javax.inject.Inject
-import javax.inject.Named
 
 internal class InboxCacheManagerImpl @Inject constructor(
     private val cacheManager: LifecycleAwareCacheManager,
@@ -36,7 +35,6 @@ internal class InboxCacheManagerImpl @Inject constructor(
     private val getInboxValidAddresses: GetInboxValidAddresses,
     private val getAllAccountInformationFlow: GetAllAccountInformationFlow,
     private val getSelectedNodeDeviceId: GetSelectedNodeDeviceId,
-    @param:Named(InboxApiRepository.INJECTION_NAME)
     private val inboxApiRepository: InboxApiRepository
 ) : InboxCacheManager, LifecycleAwareCacheManager.CacheManagerListener {
 

common-sdk/src/main/kotlin/com/algorand/wallet/inbox/di/InboxModule.kt

@@ -27,8 +27,4 @@ interface InboxApiRepository {
         deviceId: Long,
         jointAddress: String
     ): PeraResult<Unit>
-
-    companion object {
-        const val INJECTION_NAME = "inboxApiRepositoryInjectionName"
-    }
 }