Skip to content

chore: sync dapp state after async fetching cached state #135

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
merged 3 commits into from
Jul 29, 2024
Merged

chore: sync dapp state after async fetching cached state #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd91a99
chore: sync dapp state after async fetching cached state
elefantel Jul 29, 2024
4587c48
wait for fetching cached session
elefantel Jul 29, 2024
3c9c970
Remove debug code
elefantel Jul 29, 2024
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
4 changes: 4 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions metamask-android-sdk/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ android {
targetSdk 33

ext.versionCode = 1
ext.versionName = "0.6.0"
ext.versionName = "0.6.1"

testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
consumerProguardFiles 'consumer-rules.pro'
Expand Down Expand Up @@ -65,7 +65,7 @@ dependencies {

ext {
PUBLISH_GROUP_ID = 'io.metamask.androidsdk'
PUBLISH_VERSION = '0.6.0'
PUBLISH_VERSION = '0.6.1'
PUBLISH_ARTIFACT_ID = 'metamask-android-sdk'
}

Expand Down
49 changes: 35 additions & 14 deletions metamask-android-sdk/src/main/java/io/metamask/androidsdk/Ethereum.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext
import java.lang.ref.WeakReference

private const val METAMASK_DEEPLINK = "https://metamask.app.link"
Expand Down Expand Up @@ -46,9 +48,12 @@ class Ethereum (

// Expose plain variables for developers who prefer not using observing live data via ethereumState
val chainId: String
get() = currentEthereumState.chainId
get() = if (currentEthereumState.chainId.isEmpty()) { currentEthereumState.chainId } else { cachedChainId }
val selectedAddress: String
get() = currentEthereumState.selectedAddress
get() = if (currentEthereumState.selectedAddress.isEmpty()) { currentEthereumState.selectedAddress } else { cachedAccount }
Comment on lines 49 to +53
Copy link

@zmeytee zmeytee Jul 30, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Allways returns cached or empty.

Maybe:

val chainId: String
        get() = currentEthereumState.chainId.ifEmpty { cachedChainId }
val selectedAddress: String
        get() = currentEthereumState.selectedAddress.ifEmpty { cachedAccount }


private var cachedChainId = ""
private var cachedAccount = ""

// Toggle SDK tracking
var enableDebug: Boolean = true
Expand All @@ -58,23 +63,30 @@ class Ethereum (
}

init {
updateSessionDuration()
initializeEthereumState()
runBlocking { fetchCachedSession() }
}

private fun initializeEthereumState() {
coroutineScope.launch(Dispatchers.IO) {
private suspend fun fetchCachedSession() {
withContext(Dispatchers.IO) {
try {
val account = storage.getValue(key = SessionManager.SESSION_ACCOUNT_KEY, file = SessionManager.SESSION_CONFIG_FILE)
val chainId = storage.getValue(key = SessionManager.SESSION_CHAIN_ID_KEY, file = SessionManager.SESSION_CONFIG_FILE)
_ethereumState.postValue(
currentEthereumState.copy(
selectedAddress = account ?: "",
chainId = chainId ?: ""
if (account != null && chainId != null) {
cachedChainId = chainId
cachedAccount = account

_ethereumState.postValue(
currentEthereumState.copy(
selectedAddress = account,
chainId = chainId,
sessionId = communicationClient?.sessionId ?: ""
)
)
)
} else {

}
} catch (e: Exception) {
logger.error(e.localizedMessage)
e.localizedMessage?.let { logger.error(it) }
}
}
}
Expand Down Expand Up @@ -125,6 +137,7 @@ class Ethereum (

fun connect(callback: ((Result) -> Unit)? = null) {
connectRequestSent = true

val error = dappMetadata.validationError
if (error != null) {
callback?.invoke((Result.Error(error)))
Expand Down Expand Up @@ -207,11 +220,19 @@ class Ethereum (
}

fun getChainId(callback: ((Result) -> Unit)?) {
ethereumRequest(method = EthereumMethod.ETH_CHAIN_ID, params = null, callback)
if(connectRequestSent) {
ethereumRequest(method = EthereumMethod.ETH_CHAIN_ID, params = null, callback)
} else {
callback?.invoke((Result.Success.Item(cachedChainId)))
}
}

fun getEthAccounts(callback: ((Result) -> Unit)?) {
ethereumRequest(method = EthereumMethod.ETH_ACCOUNTS, params = null, callback)
if (connectRequestSent) {
ethereumRequest(method = EthereumMethod.ETH_ACCOUNTS, params = null, callback)
} else {
callback?.invoke((Result.Success.Item(cachedAccount)))
}
}

fun getEthBalance(address: String, block: String, callback: ((Result) -> Unit)? = null) {
Expand Down
2 changes: 1 addition & 1 deletion metamask-android-sdk/src/main/java/io/metamask/androidsdk/SDKInfo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.metamask.androidsdk

object SDKInfo {
const val VERSION = "0.6.0"
const val VERSION = "0.6.1"
const val PLATFORM = "android"
}