Skip to content

Commit 992d045

Browse files
committed
Revert "Update WalletConnect to 1.35.2"
This reverts commit 31668be.
1 parent 96b8c97 commit 992d045

File tree

2 files changed

+26
-31
lines changed

2 files changed

+26
-31
lines changed

app/build.gradle

+7-11
Original file line numberDiff line numberDiff line change
@@ -171,19 +171,15 @@ android {
171171

172172
configurations.all { c ->
173173
c.resolutionStrategy.dependencySubstitution {
174-
substitute module('org.bouncycastle:bcprov-jdk15on:1.65.01') using module('org.bouncycastle:bcprov-jdk18on:1.77')
175-
substitute module('org.bouncycastle:bcprov-jdk15on:1.70') using module('org.bouncycastle:bcprov-jdk18on:1.77')
176-
substitute module('org.bouncycastle:bcprov-jdk15on:1.66') using module('org.bouncycastle:bcprov-jdk18on:1.77')
177-
substitute module('org.bouncycastle:bcprov-jdk15to18:1.68') using module('org.bouncycastle:bcprov-jdk18on:1.77')
174+
substitute module('org.bouncycastle:bcprov-jdk15to18:1.68') using module('org.bouncycastle:bcprov-jdk15on:1.65')
178175
substitute module('com.google.protobuf:protobuf-java:3.6.1') using module('com.google.protobuf:protobuf-javalite:3.21.1')
179176
substitute module('net.jcip:jcip-annotations:1.0') using module('com.github.stephenc.jcip:jcip-annotations:1.0-1')
180177

181-
substitute module('com.tinder.scarlet:scarlet-core:0.1.12') using module('com.walletconnect.Scarlet:scarlet-core:1.0.1')
182-
substitute module('com.tinder.scarlet:scarlet:0.1.12') using module('com.walletconnect.Scarlet:scarlet:1.0.1')
183-
substitute module('com.tinder.scarlet:websocket-okhttp:0.1.12') using module('com.walletconnect.Scarlet:websocket-okhttp:1.0.1')
184-
substitute module('com.tinder.scarlet:stream-adapter-built-in:0.1.12') using module('com.walletconnect.Scarlet:stream-adapter-built-in:1.0.1')
185-
substitute module('com.tinder.scarlet:message-adapter-built-in:0.1.12') using module('com.walletconnect.Scarlet:message-adapter-built-in:1.0.1')
186-
substitute module('com.tinder.scarlet:lifecycle-android:0.1.12') using module('com.walletconnect.Scarlet:lifecycle-android:1.0.1')
178+
substitute module('com.tinder.scarlet:scarlet:0.1.12') using module('com.github.WalletConnect.Scarlet:scarlet:1.0.0')
179+
substitute module('com.tinder.scarlet:websocket-okhttp:0.1.12') using module('com.github.WalletConnect.Scarlet:websocket-okhttp:1.0.0')
180+
substitute module('com.tinder.scarlet:stream-adapter-rxjava2:0.1.12') using module('com.github.WalletConnect.Scarlet:stream-adapter-rxjava2:1.0.0')
181+
substitute module('com.tinder.scarlet:message-adapter-gson:0.1.12') using module('com.github.WalletConnect.Scarlet:message-adapter-gson:1.0.0')
182+
substitute module('com.tinder.scarlet:lifecycle-android:0.1.12') using module('com.github.WalletConnect.Scarlet:lifecycle-android:1.0.0')
187183
}
188184

189185
resolutionStrategy.eachDependency { details ->
@@ -297,7 +293,7 @@ dependencies {
297293
}
298294

299295
// WalletConnect V2
300-
implementation(platform("com.walletconnect:android-bom:1.35.2"))
296+
implementation(platform("com.walletconnect:android-bom:1.15.0"))
301297
implementation 'com.walletconnect:web3wallet'
302298
implementation 'com.walletconnect:android-core'
303299

app/src/main/java/io/horizontalsystems/bankwallet/modules/walletconnect/WCDelegate.kt

+19-20
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.horizontalsystems.bankwallet.modules.walletconnect
22

3-
import android.util.Log
43
import com.walletconnect.android.Core
54
import com.walletconnect.android.CoreClient
65
import com.walletconnect.web3.wallet.client.Wallet
@@ -130,25 +129,25 @@ object WCDelegate : Web3Wallet.WalletDelegate, CoreClient.CoreDelegate {
130129
}
131130
}
132131

133-
override fun onProposalExpired(proposal: Wallet.Model.ExpiredProposal) {
134-
Log.e("TAG", "onProposalExpired: ", )
135-
}
136-
137-
override fun onRequestExpired(request: Wallet.Model.ExpiredRequest) {
138-
Log.e("TAG", "onRequestExpired: ", )
139-
}
140-
141-
override fun onSessionExtend(session: Wallet.Model.Session) {
142-
Log.e("TAG", "onSessionExtend: ", )
143-
}
144-
145-
override fun onPairingExpired(expiredPairing: Core.Model.ExpiredPairing) {
146-
Log.e("TAG", "onPairingExpired: ", )
147-
}
148-
149-
override fun onPairingState(pairingState: Core.Model.PairingState) {
150-
Log.e("TAG", "onPairingState: $pairingState", )
151-
}
132+
// override fun onProposalExpired(proposal: Wallet.Model.ExpiredProposal) {
133+
// Log.e("TAG", "onProposalExpired: ", )
134+
// }
135+
//
136+
// override fun onRequestExpired(request: Wallet.Model.ExpiredRequest) {
137+
// Log.e("TAG", "onRequestExpired: ", )
138+
// }
139+
//
140+
// override fun onSessionExtend(session: Wallet.Model.Session) {
141+
// Log.e("TAG", "onSessionExtend: ", )
142+
// }
143+
//
144+
// override fun onPairingExpired(expiredPairing: Core.Model.ExpiredPairing) {
145+
// Log.e("TAG", "onPairingExpired: ", )
146+
// }
147+
//
148+
// override fun onPairingState(pairingState: Core.Model.PairingState) {
149+
// Log.e("TAG", "onPairingState: $pairingState", )
150+
// }
152151

153152
// fun deleteAccountAllPairings(currentAccountTopics: List<String>) {
154153
// Web3Wallet.getListOfActiveSessions()

0 commit comments

Comments
 (0)