Version 1.7.2206

android/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "org.ergoplatform.android"
         minSdkVersion 24
         targetSdkVersion 30
-        versionCode 2205
-        versionName "1.6.2205"
+        versionCode 2206
+        versionName "1.7.2206"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

android/src/main/java/org/ergoplatform/android/App.kt

@@ -2,7 +2,7 @@ package org.ergoplatform.android
 
 import android.app.Application
 import androidx.appcompat.app.AppCompatDelegate
-import org.ergoplatform.NodeConnector
+import org.ergoplatform.WalletStateSyncManager
 import org.ergoplatform.appkit.NetworkType
 import org.ergoplatform.isErgoMainNet
 import org.ergoplatform.utils.LogUtils
@@ -19,7 +19,7 @@ class App : Application() {
         isErgoMainNet = (StageConstants.NETWORK_TYPE == NetworkType.MAINNET)
         val preferences = Preferences(applicationContext)
         AppCompatDelegate.setDefaultNightMode(preferences.dayNightMode)
-        NodeConnector.getInstance().loadPreferenceValues(preferences)
+        WalletStateSyncManager.getInstance().loadPreferenceValues(preferences, AppDatabase.getInstance(applicationContext))
 
         LogUtils.stackTraceLogger = { lastStackTrace = it }
     }

android/src/main/java/org/ergoplatform/android/AppDatabase.kt

@@ -9,6 +9,10 @@ import androidx.room.withTransaction
 import androidx.sqlite.db.SupportSQLiteDatabase
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
+import org.ergoplatform.android.tokens.TokenDbDao
+import org.ergoplatform.android.tokens.TokenInformationDbEntity
+import org.ergoplatform.android.tokens.TokenPriceDbEntity
+import org.ergoplatform.android.tokens.toDbEntity
 import org.ergoplatform.android.wallet.*
 import org.ergoplatform.persistance.*
 
@@ -17,11 +21,14 @@ import org.ergoplatform.persistance.*
         WalletConfigDbEntity::class,
         WalletStateDbEntity::class,
         WalletAddressDbEntity::class,
-        WalletTokenDbEntity::class
-    ), version = 4
+        WalletTokenDbEntity::class,
+        TokenPriceDbEntity::class,
+        TokenInformationDbEntity::class
+    ), version = 6
 )
-abstract class AppDatabase : RoomDatabase() {
+abstract class AppDatabase : RoomDatabase(), IAppDatabase {
     abstract fun walletDao(): WalletDbDao
+    abstract fun tokenDao(): TokenDbDao
 
     companion object {
 
@@ -40,18 +47,20 @@ abstract class AppDatabase : RoomDatabase() {
                 .addMigrations(MIGRATION_1_2)
                 .addMigrations(MIGRATION_2_3)
                 .addMigrations(MIGRATION_3_4)
+                .addMigrations(MIGRATION_4_5)
+                .addMigrations(MIGRATION_5_6)
                 .build()
         }
 
-        val MIGRATION_1_2 = object : Migration(1, 2) {
+        private val MIGRATION_1_2 = object : Migration(1, 2) {
             override fun migrate(database: SupportSQLiteDatabase) {
                 database.execSQL("DROP TABLE `wallet_states`")
                 // taken from AppDatabase_Impl :-)
                 database.execSQL("CREATE TABLE IF NOT EXISTS `wallet_states` (`public_address` TEXT NOT NULL, `transactions` INTEGER, `balance` INTEGER, `unconfirmed_balance` INTEGER, PRIMARY KEY(`public_address`))")
             }
         }
 
-        val MIGRATION_2_3 = object : Migration(2, 3) {
+        private val MIGRATION_2_3 = object : Migration(2, 3) {
             override fun migrate(database: SupportSQLiteDatabase) {
                 database.execSQL("DROP TABLE `wallet_states`")
                 // taken from AppDatabase_Impl :-)
@@ -62,15 +71,31 @@ abstract class AppDatabase : RoomDatabase() {
             }
         }
 
-        val MIGRATION_3_4 = object : Migration(3, 4) {
+        private val MIGRATION_3_4 = object : Migration(3, 4) {
             override fun migrate(database: SupportSQLiteDatabase) {
                 database.execSQL("ALTER TABLE wallet_addresses ADD COLUMN `label` TEXT")
             }
         }
+
+        private val MIGRATION_4_5 = object : Migration(4, 5) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL("ALTER TABLE wallet_configs ADD COLUMN `xpubkey` TEXT")
+            }
+        }
+
+        private val MIGRATION_5_6 = object : Migration(5, 6) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL("CREATE TABLE IF NOT EXISTS `token_price` (`tokenId` TEXT NOT NULL, `display_name` TEXT, `source` TEXT NOT NULL, `erg_value` TEXT NOT NULL, PRIMARY KEY(`tokenId`))")
+                database.execSQL("CREATE TABLE IF NOT EXISTS `token_info` (`tokenId` TEXT NOT NULL, `issuing_box` TEXT NOT NULL, `minting_tx` TEXT NOT NULL, `display_name` TEXT NOT NULL, `description` TEXT NOT NULL, `decimals` INTEGER NOT NULL, `full_supply` INTEGER NOT NULL, `reg7` TEXT, `reg8` TEXT, `reg9` TEXT, `genuine_flag` INTEGER NOT NULL, `issuer_link` TEXT, `thumbnail_bytes` BLOB, `thunbnail_type` INTEGER NOT NULL, `updated_ms` INTEGER NOT NULL, PRIMARY KEY(`tokenId`))")
+            }
+        }
     }
+
+    override val tokenDbProvider get() = RoomTokenDbProvider(this)
+    override val walletDbProvider get() = RoomWalletDbProvider(this)
 }
 
-class RoomWalletDbProvider(val database: AppDatabase) : WalletDbProvider {
+class RoomWalletDbProvider(private val database: AppDatabase) : WalletDbProvider {
     override suspend fun <R> withTransaction(block: suspend () -> R): R {
         return database.withTransaction(block)
     }
@@ -153,4 +178,32 @@ class RoomWalletDbProvider(val database: AppDatabase) : WalletDbProvider {
         database.walletDao()
             .insertWalletTokens(*(walletTokens.map { it.toDbEntity() }.toTypedArray()))
     }
+}
+
+class RoomTokenDbProvider(private val database: AppDatabase) : TokenDbProvider {
+    override suspend fun loadTokenPrices(): List<TokenPrice> {
+        return database.tokenDao().getAllTokenPrices().map { it.toModel() }
+    }
+
+    override suspend fun updateTokenPrices(priceList: List<TokenPrice>) {
+        database.withTransaction {
+            database.tokenDao().deleteAllTokenPrices()
+            database.tokenDao()
+                .insertTokenPrices(*(priceList.map { it.toDbEntity() }.toTypedArray()))
+        }
+    }
+
+    override suspend fun loadTokenInformation(tokenId: String): TokenInformation? {
+        return database.tokenDao().getTokenInformation(tokenId)?.toModel()
+    }
+
+    override suspend fun insertOrReplaceTokenInformation(tokenInfo: TokenInformation) {
+        database.tokenDao().insertOrUpdateTokenInformation(tokenInfo.toDbEntity())
+    }
+
+    override suspend fun pruneUnusedTokenInformation() {
+        database.tokenDao()
+            .deleteOutdatedTokenInformation(System.currentTimeMillis() - TOKEN_INFO_MS_OUTDATED)
+    }
+
 }

android/src/main/java/org/ergoplatform/android/settings/ConnectionSettingsDialogFragment.kt

@@ -38,14 +38,16 @@ class ConnectionSettingsDialogFragment : BottomSheetDialogFragment() {
         val preferences = Preferences(requireContext())
         binding.editNodeUrl.editText?.setText(preferences.prefNodeUrl)
         binding.editExplorerApiUrl.editText?.setText(preferences.prefExplorerApiUrl)
+        binding.inputIpfsGateway.setText(preferences.prefIpfsGatewayUrl)
         binding.buttonApply.setOnClickListener { buttonApply() }
-        binding.editNodeUrl.editText?.setOnEditorActionListener { _, _, _ ->
+        binding.inputIpfsGateway.setOnEditorActionListener { _, _, _ ->
             buttonApply()
             true
         }
         binding.buttonDefaults.setOnClickListener {
             binding.editNodeUrl.editText?.setText(preferences.getDefaultNodeApiUrl())
             binding.editExplorerApiUrl.editText?.setText(getDefaultExplorerApiUrl())
+            binding.inputIpfsGateway.setText(preferences.defaultIpfsGatewayUrl)
         }
     }
 
@@ -56,6 +58,7 @@ class ConnectionSettingsDialogFragment : BottomSheetDialogFragment() {
         val preferences = Preferences(requireContext())
         preferences.prefExplorerApiUrl = explorerApiUrl
         preferences.prefNodeUrl = nodeUrl
+        preferences.prefIpfsGatewayUrl = binding.inputIpfsGateway.text?.toString() ?: ""
 
         // reset api service of NodeConnector to load new settings
         ErgoApiService.resetApiService()

android/src/main/java/org/ergoplatform/android/settings/DisplayCurrencyListDialogFragment.kt

@@ -13,7 +13,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
-import org.ergoplatform.NodeConnector
+import org.ergoplatform.WalletStateSyncManager
 import org.ergoplatform.android.Preferences
 import org.ergoplatform.android.R
 import org.ergoplatform.android.databinding.FragmentDisplayCurrencyDialogBinding
@@ -43,7 +43,7 @@ class DisplayCurrencyListDialogFragment : BottomSheetDialogFragment() {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        val nodeConnector = NodeConnector.getInstance()
+        val nodeConnector = WalletStateSyncManager.getInstance()
         nodeConnector.fetchCurrencies()
 
         binding.list.layoutManager =
@@ -75,7 +75,7 @@ class DisplayCurrencyListDialogFragment : BottomSheetDialogFragment() {
 
     private fun onChooseCurrency(currency: String) {
         Preferences(requireContext()).prefDisplayCurrency = currency
-        NodeConnector.getInstance().invalidateCache(resetFiatValue = true)
+        WalletStateSyncManager.getInstance().invalidateCache(resetFiatValue = true)
         (parentFragment as? SettingsFragment)?.showDisplayCurrency()
         dismiss()
     }

android/src/main/java/org/ergoplatform/android/settings/SettingsFragment.kt

@@ -73,6 +73,20 @@ class SettingsFragment : Fragment() {
                 showDialogWithCopyOption(requireContext(), it)
             }
         }
+
+        setButtonDownloadContentText()
+        binding.buttonDownloadContent.setOnClickListener {
+            val preferences = Preferences(requireContext())
+            preferences.downloadNftContent = !preferences.downloadNftContent
+            setButtonDownloadContentText()
+        }
+    }
+
+    private fun setButtonDownloadContentText() {
+        binding.buttonDownloadContent.setText(
+            if (Preferences(requireContext()).downloadNftContent) R.string.button_download_content_off
+            else R.string.button_download_content_on
+        )
     }
 
     private fun changeDayNightMode(mode: Int) {

android/src/main/java/org/ergoplatform/android/tokens/TokenDbDao.kt

@@ -0,0 +1,28 @@
+package org.ergoplatform.android.tokens
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+
+@Dao
+interface TokenDbDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertTokenPrices(vararg tokenPrices: TokenPriceDbEntity)
+
+    @Query("DELETE FROM token_price")
+    suspend fun deleteAllTokenPrices()
+
+    @Query("SELECT * FROM token_price")
+    suspend fun getAllTokenPrices(): List<TokenPriceDbEntity>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertOrUpdateTokenInformation(vararg tokenInfo: TokenInformationDbEntity)
+
+    @Query("DELETE FROM token_info WHERE updated_ms < :thresholdMs")
+    suspend fun deleteOutdatedTokenInformation(thresholdMs: Long)
+
+    @Query("SELECT * FROM token_info WHERE tokenId = :tokenId")
+    suspend fun getTokenInformation(tokenId: String): TokenInformationDbEntity?
+
+}

android/src/main/java/org/ergoplatform/android/tokens/TokenDbEntities.kt

@@ -0,0 +1,94 @@
+package org.ergoplatform.android.tokens
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import org.ergoplatform.persistance.GENUINE_UNKNOWN
+import org.ergoplatform.persistance.TokenInformation
+import org.ergoplatform.persistance.TokenPrice
+import java.math.BigDecimal
+
+@Entity(tableName = "token_price")
+data class TokenPriceDbEntity(
+    @PrimaryKey val tokenId: String,
+    @ColumnInfo(name = "display_name") val displayName: String?,
+    @ColumnInfo(name = "source") val priceSource: String,
+    @ColumnInfo(name = "erg_value") val ergValue: String
+) {
+    fun toModel(): TokenPrice {
+        return TokenPrice(
+            tokenId,
+            displayName,
+            priceSource,
+            BigDecimal(ergValue)
+        )
+    }
+}
+
+fun TokenPrice.toDbEntity(): TokenPriceDbEntity {
+    return TokenPriceDbEntity(
+        tokenId,
+        displayName,
+        priceSource,
+        ergValue.toString()
+    )
+}
+
+@Entity(tableName = "token_info")
+data class TokenInformationDbEntity(
+    @PrimaryKey val tokenId: String,
+    @ColumnInfo(name = "issuing_box") val issuingBoxId: String,
+    @ColumnInfo(name = "minting_tx") val mintingTxId: String,
+    @ColumnInfo(name = "display_name") val displayName: String,
+    @ColumnInfo(name = "description") val description: String,
+    @ColumnInfo(name = "decimals") val decimals: Int,
+    @ColumnInfo(name = "full_supply") val fullSupply: Long,
+    @ColumnInfo(name = "reg7") val reg7hex: String?,
+    @ColumnInfo(name = "reg8") val reg8hex: String?,
+    @ColumnInfo(name = "reg9") val reg9hex: String?,
+    @ColumnInfo(name = "genuine_flag") val genuineFlag: Int = GENUINE_UNKNOWN,
+    @ColumnInfo(name = "issuer_link") val issuerLink: String? = null,
+    @ColumnInfo(name = "thumbnail_bytes") val thumbnailBytes: ByteArray? = null,
+    @ColumnInfo(name = "thunbnail_type") val thumbnailType: Int,
+    @ColumnInfo(name = "updated_ms") val updatedMs: Long
+) {
+    fun toModel(): TokenInformation {
+        return TokenInformation(
+            tokenId,
+            issuingBoxId,
+            mintingTxId,
+            displayName,
+            description,
+            decimals,
+            fullSupply,
+            reg7hex,
+            reg8hex,
+            reg9hex,
+            genuineFlag,
+            issuerLink,
+            thumbnailBytes,
+            thumbnailType,
+            updatedMs
+        )
+    }
+}
+
+fun TokenInformation.toDbEntity(): TokenInformationDbEntity {
+    return TokenInformationDbEntity(
+        tokenId,
+        issuingBoxId,
+        mintingTxId,
+        displayName,
+        description,
+        decimals,
+        fullSupply,
+        reg7hex,
+        reg8hex,
+        reg9hex,
+        genuineFlag,
+        issuerLink,
+        thumbnailBytes,
+        thumbnailType,
+        updatedMs
+    )
+}