From 8eac4ab71818e3af18e1230287c92cb16b9822b7 Mon Sep 17 00:00:00 2001 From: Mpendulo Ndlovu Date: Thu, 30 May 2024 16:57:33 +0200 Subject: [PATCH 1/2] fix: Selected address fix --- .../main/java/com/metamask/dapp/EthereumViewModel.kt | 4 ++-- metamask-android-sdk/build.gradle | 4 ++-- .../io/metamask/androidsdk/CommunicationClient.kt | 12 +++--------- .../src/main/java/io/metamask/androidsdk/SDKInfo.kt | 2 +- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/metamask/dapp/EthereumViewModel.kt b/app/src/main/java/com/metamask/dapp/EthereumViewModel.kt index bf348c75..b808c7ec 100644 --- a/app/src/main/java/com/metamask/dapp/EthereumViewModel.kt +++ b/app/src/main/java/com/metamask/dapp/EthereumViewModel.kt @@ -24,8 +24,8 @@ class EthereumViewModel @Inject constructor( Logger.log("Ethereum connection error: ${result.error.message}") onError(result.error.message) } - is Result.Success.Item -> { - Logger.log("Ethereum connection result: ${result.value}") + is Result.Success.Items -> { + Logger.log("Ethereum connection result: ${result.value.first()}") onSuccess() } else -> { } diff --git a/metamask-android-sdk/build.gradle b/metamask-android-sdk/build.gradle index 7b4691ff..e6fd0c87 100644 --- a/metamask-android-sdk/build.gradle +++ b/metamask-android-sdk/build.gradle @@ -15,7 +15,7 @@ android { targetSdk 33 ext.versionCode = 1 - ext.versionName = "0.5.4" + ext.versionName = "0.5.5" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' consumerProguardFiles 'consumer-rules.pro' @@ -62,7 +62,7 @@ dependencies { ext { PUBLISH_GROUP_ID = 'io.metamask.androidsdk' - PUBLISH_VERSION = '0.5.4' + PUBLISH_VERSION = '0.5.5' PUBLISH_ARTIFACT_ID = 'metamask-android-sdk' } diff --git a/metamask-android-sdk/src/main/java/io/metamask/androidsdk/CommunicationClient.kt b/metamask-android-sdk/src/main/java/io/metamask/androidsdk/CommunicationClient.kt index 0d80d1ba..b0b43cb9 100644 --- a/metamask-android-sdk/src/main/java/io/metamask/androidsdk/CommunicationClient.kt +++ b/metamask-android-sdk/src/main/java/io/metamask/androidsdk/CommunicationClient.kt @@ -8,8 +8,6 @@ import android.content.pm.PackageManager import android.os.Build import android.os.Bundle import android.os.IBinder -import android.util.Log -import androidx.annotation.RequiresApi import com.google.gson.Gson import com.google.gson.reflect.TypeToken import io.metamask.nativesdk.IMessegeService @@ -258,6 +256,7 @@ internal class CommunicationClient(context: Context, callback: EthereumEventCall val account = accounts.firstOrNull() if (account != null) { + Logger.error("CommunicationClient:: Response: Updated to account $account") updateAccount(account) completeRequest(id, Result.Success.Item(account)) } @@ -272,14 +271,8 @@ internal class CommunicationClient(context: Context, callback: EthereumEventCall EthereumMethod.ETH_REQUEST_ACCOUNTS.value -> { val result = data.optString("result") val accounts: List = Gson().fromJson(result, object : TypeToken>() {}.type) - val account = accounts.getOrNull(0) - if (account != null) { - updateAccount(account) - completeRequest(id, Result.Success.Item(account)) - } else { - Logger.error("CommunicationClient:: Request accounts failure: $result") - } + completeRequest(id, Result.Success.Items(accounts)) } EthereumMethod.ETH_CHAIN_ID.value -> { val chainId = data.optString("result") @@ -345,6 +338,7 @@ internal class CommunicationClient(context: Context, callback: EthereumEventCall val accountsJson = event.optString("params") val accounts: List = Gson().fromJson(accountsJson, object : TypeToken>() {}.type) accounts.getOrNull(0)?.let { account -> + Logger.error("CommunicationClient:: Event Updated to account $account") updateAccount(account) } } diff --git a/metamask-android-sdk/src/main/java/io/metamask/androidsdk/SDKInfo.kt b/metamask-android-sdk/src/main/java/io/metamask/androidsdk/SDKInfo.kt index 897ac0c1..1dd26ecb 100644 --- a/metamask-android-sdk/src/main/java/io/metamask/androidsdk/SDKInfo.kt +++ b/metamask-android-sdk/src/main/java/io/metamask/androidsdk/SDKInfo.kt @@ -1,6 +1,6 @@ package io.metamask.androidsdk object SDKInfo { - const val VERSION = "0.5.4" + const val VERSION = "0.5.5" const val PLATFORM = "android" } \ No newline at end of file From f0abf94e401739c6514836ea5acd0aa622d20912 Mon Sep 17 00:00:00 2001 From: Mpendulo Ndlovu Date: Thu, 30 May 2024 17:02:20 +0200 Subject: [PATCH 2/2] Remove debug logs --- .../src/main/java/io/metamask/androidsdk/CommunicationClient.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/metamask-android-sdk/src/main/java/io/metamask/androidsdk/CommunicationClient.kt b/metamask-android-sdk/src/main/java/io/metamask/androidsdk/CommunicationClient.kt index b0b43cb9..86d00f0c 100644 --- a/metamask-android-sdk/src/main/java/io/metamask/androidsdk/CommunicationClient.kt +++ b/metamask-android-sdk/src/main/java/io/metamask/androidsdk/CommunicationClient.kt @@ -256,7 +256,6 @@ internal class CommunicationClient(context: Context, callback: EthereumEventCall val account = accounts.firstOrNull() if (account != null) { - Logger.error("CommunicationClient:: Response: Updated to account $account") updateAccount(account) completeRequest(id, Result.Success.Item(account)) }