Update ton-connect-kit

horizontalsystems · Nov 28, 2024 · 35f5bd3 · 35f5bd3
1 parent 257dab3
commit 35f5bd3
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -281,7 +281,7 @@ dependencies {
     debugImplementation leakCanary
 
     // Wallet kits
-    implementation 'com.github.horizontalsystems:ton-kit-android:763a5c3'
+    implementation 'com.github.horizontalsystems:ton-kit-android:969fe77'
     implementation 'com.github.horizontalsystems:bitcoin-kit-android:ced5801'
     implementation 'com.github.horizontalsystems:ethereum-kit-android:a5eff38'
     implementation 'com.github.horizontalsystems:blockchain-fee-rate-kit-android:1d3bd49'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -85,6 +85,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="tc" />
+                <data android:scheme="unstoppable.money" />
             </intent-filter>
             <intent-filter android:label="@string/App_Name">
                 <action android:name="android.intent.action.VIEW" />
@@ -123,6 +124,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="tc" />
+                <data android:scheme="unstoppable.money" />
             </intent-filter>
             <intent-filter android:label="@string/App_Name">
                 <action android:name="android.intent.action.VIEW" />
@@ -161,6 +163,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="tc" />
+                <data android:scheme="unstoppable.money" />
             </intent-filter>
             <intent-filter android:label="@string/App_Name">
                 <action android:name="android.intent.action.VIEW" />
@@ -199,6 +202,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="tc" />
+                <data android:scheme="unstoppable.money" />
             </intent-filter>
             <intent-filter android:label="@string/App_Name">
                 <action android:name="android.intent.action.VIEW" />
@@ -237,6 +241,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="tc" />
+                <data android:scheme="unstoppable.money" />
             </intent-filter>
             <intent-filter android:label="@string/App_Name">
                 <action android:name="android.intent.action.VIEW" />
@@ -275,6 +280,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="tc" />
+                <data android:scheme="unstoppable.money" />
             </intent-filter>
             <intent-filter android:label="@string/App_Name">
                 <action android:name="android.intent.action.VIEW" />
@@ -313,6 +319,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="tc" />
+                <data android:scheme="unstoppable.money" />
             </intent-filter>
             <intent-filter android:label="@string/App_Name">
                 <action android:name="android.intent.action.VIEW" />
@@ -351,6 +358,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="tc" />
+                <data android:scheme="unstoppable.money" />
             </intent-filter>
             <intent-filter android:label="@string/App_Name">
                 <action android:name="android.intent.action.VIEW" />
@@ -389,6 +397,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="tc" />
+                <data android:scheme="unstoppable.money" />
             </intent-filter>
             <intent-filter android:label="@string/App_Name">
                 <action android:name="android.intent.action.VIEW" />
@@ -427,6 +436,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="tc" />
+                <data android:scheme="unstoppable.money" />
             </intent-filter>
             <intent-filter android:label="@string/App_Name">
                 <action android:name="android.intent.action.VIEW" />
@@ -465,6 +475,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="tc" />
+                <data android:scheme="unstoppable.money" />
             </intent-filter>
             <intent-filter android:label="@string/App_Name">
                 <action android:name="android.intent.action.VIEW" />

diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/App.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/App.kt
@@ -453,7 +453,12 @@ class App : CoreApp(), WorkConfiguration.Provider, ImageLoaderFactory {
 
         spamManager = SpamManager(localStorage)
 
-        tonConnectManager = TonConnectManager(this, adapterFactory)
+        tonConnectManager = TonConnectManager(
+            context = this,
+            adapterFactory = adapterFactory,
+            appName = "Unstoppable Wallet",
+            appVersion = appConfigProvider.appVersion
+        )
         tonConnectManager.start()
 
         startTasks()

diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/TonConnectManager.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/TonConnectManager.kt
@@ -9,8 +9,13 @@ import io.horizontalsystems.tonkit.tonconnect.TonConnectKit
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 
-class TonConnectManager(context: Context, val adapterFactory: AdapterFactory) {
-    val kit = TonConnectKit.getInstance(context)
+class TonConnectManager(
+    context: Context,
+    val adapterFactory: AdapterFactory,
+    appName: String,
+    appVersion: String,
+) {
+    val kit = TonConnectKit.getInstance(context, appName, appVersion)
     val transactionSigner = TonKit.getTransactionSigner(TonKit.getTonApi(Network.MainNet))
 
     val sendRequestFlow by kit::sendRequestFlow

diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/BalanceViewModel.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/BalanceViewModel.kt
@@ -243,7 +243,10 @@ class BalanceViewModel(
 
     fun handleScannedData(scannedText: String) {
         viewModelScope.launch {
-            if (scannedText.startsWith("tc:")) {
+            if (
+                scannedText.startsWith("tc:") ||
+                scannedText.startsWith("https://unstoppable.money/ton-connect")
+            ) {
                 App.tonConnectManager.handle(scannedText)
             } else {
                 val wcUriVersion = WalletConnectListModule.getVersionFromUri(scannedText)

diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/main/MainViewModel.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/main/MainViewModel.kt
@@ -328,6 +328,7 @@ class MainViewModel(
                 }
             }
 
+            deeplinkString.startsWith("unstoppable.money:") ||
             deeplinkString.startsWith("tc:") -> {
                 deeplinkPage = DeeplinkPage(R.id.tcListFragment, TonConnectMainFragment.Input(deeplinkString))
                 tab = MainNavigation.Settings