fake app changes

Author: Funkatronics

android/fakedapp/src/main/java/com/solana/mobilewalletadapter/fakedapp/MainViewModel.kt

@@ -462,7 +462,9 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         signInPayload: SignInWithSolana.Payload? = null
     ): MobileWalletAdapterClient.AuthorizationResult {
         val result = try {
-            client.authorize(identity, chain, signInPayload, uiState.value.sessionProtocolVersion!!)
+            client.authorize(identity, chain, signInPayload,
+                uiState.value.accounts?.map { it.publicKey },
+                uiState.value.sessionProtocolVersion!!)
         } catch (e: MobileWalletAdapterUseCase.MobileWalletAdapterOperationFailedException) {
             _uiState.update {
                 it.copy(

android/fakedapp/src/main/java/com/solana/mobilewalletadapter/fakedapp/usecase/MobileWalletAdapterUseCase.kt

@@ -53,14 +53,15 @@ object MobileWalletAdapterUseCase {
             identity: DappIdentity,
             chain: String?,
             signInPayload: SignInWithSolana.Payload?,
+            publicKeys: List<ByteArray>?,
             protocolVersion: ProtocolVersion = ProtocolVersion.V1
         ): MobileWalletAdapterClient.AuthorizationResult = coroutineScope {
             try {
                 runInterruptible(Dispatchers.IO) {
                     if (protocolVersion == ProtocolVersion.V1) {
                         client.authorize(
                             identity.uri, identity.iconRelativeUri, identity.name, chain,
-                            null, null, null, signInPayload
+                            null, null, publicKeys?.toTypedArray(), signInPayload
                         ).get()!!
                     } else {
                         val cluster = when (chain) {

android/fakewallet/src/main/java/com/solana/mobilewalletadapter/fakewallet/MobileWalletAdapterViewModel.kt

@@ -11,6 +11,7 @@ import android.util.Log
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
 import com.funkatronics.encoders.Base58
+import com.funkatronics.encoders.Base64
 import com.solana.mobilewalletadapter.common.ProtocolContract
 import com.solana.mobilewalletadapter.common.protocol.SessionProperties
 import com.solana.mobilewalletadapter.common.signin.SignInWithSolana
@@ -118,10 +119,19 @@ class MobileWalletAdapterViewModel(application: Application) : AndroidViewModel(
         viewModelScope.launch {
             if (authorized) {
                 val accounts = (0 until numAccounts).map {
-                    val keypair = getApplication<FakeWalletApplication>().keyRepository.generateKeypair()
-                    val publicKey = keypair.public as Ed25519PublicKeyParameters
-                    Log.d(TAG, "Generated a new keypair (pub=${publicKey.encoded.contentToString()}) for authorize request")
-                    buildAccount(publicKey.encoded, "fakewallet account $it")
+                    val publicKeyBytes = request.request.addresses?.get(it)?.let { address ->
+                        val keypair = getApplication<FakeWalletApplication>().keyRepository
+                            .getKeypair(Base64.decode(address)) ?: return@let null
+                        val publicKey = keypair.public as Ed25519PublicKeyParameters
+                        Log.d(TAG, "Reusing known keypair (pub=${publicKey.encoded.contentToString()}) for authorize request")
+                        publicKey.encoded
+                    } ?: run {
+                        val keypair = getApplication<FakeWalletApplication>().keyRepository.generateKeypair()
+                        val publicKey = keypair.public as Ed25519PublicKeyParameters
+                        Log.d(TAG, "Generated a new keypair (pub=${publicKey.encoded.contentToString()}) for authorize request")
+                        publicKey.encoded
+                    }
+                    buildAccount(publicKeyBytes, "fakewallet account $it")
                 }
                 request.request.completeWithAuthorize(accounts.toTypedArray(), null,
                     request.sourceVerificationState.authorizationScope.encodeToByteArray(), null)