From fb73c3a1c630102837e537ad97949f220029c233 Mon Sep 17 00:00:00 2001
From: IrynaTsymbaliuk <Iryna.Tsymbaliuk.dev@gmail.com>
Date: Tue, 22 Mar 2022 04:52:06 +0400
Subject: [PATCH 1/2] Fixed retry loading

---
 .../updated/mysterium/vpn/ui/base/BaseActivity.kt     |  7 ++++---
 .../mysterium/vpn/ui/connection/ConnectionActivity.kt | 11 +++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/android/app/src/main/java/updated/mysterium/vpn/ui/base/BaseActivity.kt b/android/app/src/main/java/updated/mysterium/vpn/ui/base/BaseActivity.kt
index 0ef6972f7..754e9c637 100644
--- a/android/app/src/main/java/updated/mysterium/vpn/ui/base/BaseActivity.kt
+++ b/android/app/src/main/java/updated/mysterium/vpn/ui/base/BaseActivity.kt
@@ -66,7 +66,7 @@ abstract class BaseActivity : AppCompatActivity() {
 
     override fun finish() {
         super.finish()
-        overridePendingTransition(R.anim.slide_in_left,R.anim.slide_out_right)
+        overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_right)
     }
 
     open fun retryLoading() {
@@ -225,10 +225,11 @@ abstract class BaseActivity : AppCompatActivity() {
             insufficientFundsPopUp()
         }
         baseViewModel.isInternetAvailable.observe(this) { isAvailable ->
-            isInternetAvailable = isAvailable
             if (!isAvailable) {
+                isInternetAvailable = isAvailable
                 wifiNetworkErrorPopUp()
-            } else {
+            } else if (!isInternetAvailable) {
+                isInternetAvailable = isAvailable
                 wifiErrorDialog?.dismiss()
                 wifiErrorDialog = null
                 retryLoading()
diff --git a/android/app/src/main/java/updated/mysterium/vpn/ui/connection/ConnectionActivity.kt b/android/app/src/main/java/updated/mysterium/vpn/ui/connection/ConnectionActivity.kt
index cc93b425a..c2afa2812 100644
--- a/android/app/src/main/java/updated/mysterium/vpn/ui/connection/ConnectionActivity.kt
+++ b/android/app/src/main/java/updated/mysterium/vpn/ui/connection/ConnectionActivity.kt
@@ -108,6 +108,7 @@ class ConnectionActivity : BaseActivity() {
             navigateBack()
         }
         viewModel.successConnectEvent.observe(this) {
+            proposal = it
             analytic.trackEvent(
                 eventName = AnalyticEvent.CONNECT_SUCCESS.eventName,
                 proposal = proposal
@@ -279,10 +280,8 @@ class ConnectionActivity : BaseActivity() {
         )
         val countryCode = intent?.extras?.getString(COUNTRY_CODE_KEY)
         val proposalExtra = intent.extras?.getParcelable<Proposal>(EXTRA_PROPOSAL_MODEL)
-        if ((connectionType == ConnectionType.MANUAL_CONNECT && proposal?.providerID != proposalExtra?.providerID) || (connectionType == ConnectionType.SMART_CONNECT && proposal?.providerID == null && proposalExtra?.providerID == null)) {
-            if (viewModel.connectionStatus.value?.state != ConnectionState.CONNECTED) {
-                initViewModel(connectionType, countryCode, proposalExtra)
-            }
+        if (viewModel.connectionStatus.value?.state != ConnectionState.CONNECTED) {
+            initViewModel(connectionType, countryCode, proposalExtra)
         }
         manualDisconnecting()
         proposal = proposalExtra
@@ -310,7 +309,7 @@ class ConnectionActivity : BaseActivity() {
                             proposalExtra,
                             exchangeRateViewModel.usdEquivalent
                         )
-                    } else {
+                    } else if (connectionType == ConnectionType.SMART_CONNECT) {
                         viewModel.smartConnect(countryCode)
                     }
                 }
@@ -528,7 +527,7 @@ class ConnectionActivity : BaseActivity() {
     }
 
     private fun navigateBack() {
-         if (connectionType == ConnectionType.SMART_CONNECT) {
+        if (connectionType == ConnectionType.SMART_CONNECT) {
             navigateToSelectNode(true)
         } else {
             backToFilter()

From 9733f7330db60b2c15021faa77214dcafb563f92 Mon Sep 17 00:00:00 2001
From: IrynaTsymbaliuk <Iryna.Tsymbaliuk.dev@gmail.com>
Date: Tue, 22 Mar 2022 12:05:47 +0400
Subject: [PATCH 2/2] Refactoring

---
 .../main/java/updated/mysterium/vpn/ui/base/BaseActivity.kt    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/android/app/src/main/java/updated/mysterium/vpn/ui/base/BaseActivity.kt b/android/app/src/main/java/updated/mysterium/vpn/ui/base/BaseActivity.kt
index 754e9c637..b6af5d626 100644
--- a/android/app/src/main/java/updated/mysterium/vpn/ui/base/BaseActivity.kt
+++ b/android/app/src/main/java/updated/mysterium/vpn/ui/base/BaseActivity.kt
@@ -226,14 +226,13 @@ abstract class BaseActivity : AppCompatActivity() {
         }
         baseViewModel.isInternetAvailable.observe(this) { isAvailable ->
             if (!isAvailable) {
-                isInternetAvailable = isAvailable
                 wifiNetworkErrorPopUp()
             } else if (!isInternetAvailable) {
-                isInternetAvailable = isAvailable
                 wifiErrorDialog?.dismiss()
                 wifiErrorDialog = null
                 retryLoading()
             }
+            isInternetAvailable = isAvailable
         }
     }