From ae4e7cb65cbd3d4b6a19286c23f18488af0e3621 Mon Sep 17 00:00:00 2001
From: pokkst <pokkst@tutanota.de>
Date: Sat, 9 Dec 2023 12:23:20 -0600
Subject: [PATCH] 0.5.6: More bug fixes for built-in Tor stuff.

---
 app/build.gradle                                      |  4 ++--
 .../net/mynero/wallet/fragment/home/HomeFragment.kt   |  5 ++++-
 .../wallet/fragment/settings/SettingsFragment.kt      | 11 +++--------
 .../wallet/fragment/settings/SettingsViewModel.kt     |  5 -----
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f342545..d0a81e1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "net.mynero.wallet"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 50500
-        versionName "0.5.5 'Fluorine Fermi'"
+        versionCode 50600
+        versionName "0.5.6 'Fluorine Fermi'"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
diff --git a/app/src/main/java/net/mynero/wallet/fragment/home/HomeFragment.kt b/app/src/main/java/net/mynero/wallet/fragment/home/HomeFragment.kt
index 1f751ed..ae83e2f 100644
--- a/app/src/main/java/net/mynero/wallet/fragment/home/HomeFragment.kt
+++ b/app/src/main/java/net/mynero/wallet/fragment/home/HomeFragment.kt
@@ -26,6 +26,7 @@ import net.mynero.wallet.adapter.TransactionInfoAdapter
 import net.mynero.wallet.adapter.TransactionInfoAdapter.TxInfoAdapterListener
 import net.mynero.wallet.model.EnumTorState
 import net.mynero.wallet.model.TransactionInfo
+import net.mynero.wallet.model.Wallet
 import net.mynero.wallet.model.WalletManager
 import net.mynero.wallet.service.BalanceService
 import net.mynero.wallet.service.BlockchainService
@@ -181,7 +182,9 @@ class HomeFragment : Fragment(), TxInfoAdapterListener {
                     val proxyString = socketAddress.toString().substring(1)
                     val address = proxyString.split(":")[0]
                     val port = proxyString.split(":")[1]
-                    refreshProxy(address, port)
+
+                    if(WalletManager.instance?.proxy != proxyString)
+                        refreshProxy(address, port)
                 }
             }
         }
diff --git a/app/src/main/java/net/mynero/wallet/fragment/settings/SettingsFragment.kt b/app/src/main/java/net/mynero/wallet/fragment/settings/SettingsFragment.kt
index b3fbc50..c4eb485 100644
--- a/app/src/main/java/net/mynero/wallet/fragment/settings/SettingsFragment.kt
+++ b/app/src/main/java/net/mynero/wallet/fragment/settings/SettingsFragment.kt
@@ -157,13 +157,6 @@ class SettingsFragment : Fragment(), PasswordListener, NodeSelectionDialogListen
         torSwitch?.setOnCheckedChangeListener { _: CompoundButton?, b: Boolean ->
             mViewModel?.setUseProxy(b)
         }
-
-        walletProxyPortEditText?.addTextChangedListener {
-            mViewModel?.edited = true
-        }
-        walletProxyAddressEditText?.addTextChangedListener {
-            mViewModel?.edited = true
-        }
     }
 
     private fun bindObservers() {
@@ -228,8 +221,10 @@ class SettingsFragment : Fragment(), PasswordListener, NodeSelectionDialogListen
     private fun refreshProxy() {
         val proxyAddress = walletProxyAddressEditText?.text.toString()
         val proxyPort = walletProxyPortEditText?.text.toString()
+        val savedProxyAddress = ProxyService.instance?.proxyAddress
+        val savedProxyPort = ProxyService.instance?.proxyPort
 
-        if(mViewModel?.edited == true)
+        if(proxyAddress != savedProxyAddress || proxyPort != savedProxyPort)
             ProxyService.instance?.updateProxy(proxyAddress, proxyPort)
     }
 
diff --git a/app/src/main/java/net/mynero/wallet/fragment/settings/SettingsViewModel.kt b/app/src/main/java/net/mynero/wallet/fragment/settings/SettingsViewModel.kt
index 581d6ea..b236c02 100644
--- a/app/src/main/java/net/mynero/wallet/fragment/settings/SettingsViewModel.kt
+++ b/app/src/main/java/net/mynero/wallet/fragment/settings/SettingsViewModel.kt
@@ -15,7 +15,6 @@ class SettingsViewModel : ViewModel() {
     val useProxy: LiveData<Boolean> = _useProxy
     private val _useBundledTor = MutableLiveData(false)
     val useBundledTor: LiveData<Boolean> = _useBundledTor
-    var edited = false
 
     init {
         _useProxy.value = ProxyService.instance?.usingProxy
@@ -32,8 +31,6 @@ class SettingsViewModel : ViewModel() {
         } else {
             samouraiTorManager?.stop()
         }
-
-        edited = true
     }
 
     fun setUseBundledTor(use: Boolean) {
@@ -46,7 +43,5 @@ class SettingsViewModel : ViewModel() {
         } else {
             samouraiTorManager?.stop()
         }
-
-        edited = true
     }
 }
\ No newline at end of file