Merge pull request #378 from mysteriumnetwork/bugfix/Fix_reconnecting…

…_pop_ups Fix reconncting
mysteriumnetwork · Jun 7, 2021 · bca701c · bca701c
2 parents 1152fc2 + ef4e8ef
commit bca701c
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 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
@@ -179,6 +179,8 @@ abstract class BaseActivity : AppCompatActivity() {
             if (!isAvailable) {
                 wifiNetworkErrorPopUp()
             } else {
+                wifiErrorDialog?.dismiss()
+                wifiErrorDialog = null
                 retryLoading()
             }
         })

diff --git a/android/app/src/main/java/updated/mysterium/vpn/ui/base/BaseViewModel.kt b/android/app/src/main/java/updated/mysterium/vpn/ui/base/BaseViewModel.kt
@@ -40,6 +40,7 @@ class BaseViewModel(useCaseProvider: UseCaseProvider) : ViewModel() {
     private val connectionUseCase = useCaseProvider.connection()
     private val settingsUseCase = useCaseProvider.settings()
     private var isInternetChecking = false
+    private var isDoubleCheck = false
 
     fun checkCurrentConnection() {
         viewModelScope.launch {
@@ -58,7 +59,13 @@ class BaseViewModel(useCaseProvider: UseCaseProvider) : ViewModel() {
             isInternetChecking = true
             val handler = CoroutineExceptionHandler { _, _ ->
                 isInternetChecking = false
-                _isInternetNotAvailable.postValue(false)
+                if (!isDoubleCheck) {
+                    isDoubleCheck = true
+                    checkInternetConnection()
+                } else {
+                    isDoubleCheck = false
+                    _isInternetNotAvailable.postValue(false)
+                }
             }
             viewModelScope.launch(handler) {
                 val exitValue = withContext(Dispatchers.Default) {
@@ -69,7 +76,13 @@ class BaseViewModel(useCaseProvider: UseCaseProvider) : ViewModel() {
                 if (exitValue == 0) {
                     _isInternetNotAvailable.postValue(true)
                 } else {
-                    _isInternetNotAvailable.postValue(false)
+                    if (!isDoubleCheck) {
+                        isDoubleCheck = true
+                        checkInternetConnection()
+                    } else {
+                        isDoubleCheck = false
+                        _isInternetNotAvailable.postValue(false)
+                    }
                 }
             }
         }

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
@@ -66,7 +66,9 @@ class ConnectionActivity : BaseActivity() {
                     this.proposal = proposal
                     if (
                         viewModel.connectionState.value == ConnectionState.CONNECTED ||
-                        viewModel.connectionState.value == ConnectionState.CONNECTING
+                        viewModel.connectionState.value == ConnectionState.CONNECTING ||
+                        viewModel.connectionState.value == ConnectionState.ON_HOLD ||
+                        viewModel.connectionState.value == ConnectionState.IP_NOT_CHANGED
                     ) {
                         manualDisconnecting()
                         viewModel.disconnect().observe(this, { result ->
@@ -166,14 +168,14 @@ class ConnectionActivity : BaseActivity() {
 
     private fun handleConnectionChange(connection: ConnectionState) {
         when (connection) {
-            ConnectionState.NOTCONNECTED -> disconnect()
+            ConnectionState.NOTCONNECTED -> loadIpAddress()
             ConnectionState.CONNECTING -> inflateConnectingCardView()
             ConnectionState.CONNECTED -> {
-                isDisconnectedByUser = false
                 loadIpAddress()
                 inflateConnectedCardView()
             }
             ConnectionState.DISCONNECTING -> {
+                binding.connectedStatusImageView.visibility = View.INVISIBLE
                 binding.connectionState.showDisconnectingState()
                 checkDisconnectingReason()
             }
@@ -232,6 +234,9 @@ class ConnectionActivity : BaseActivity() {
             ConnectionState.ON_HOLD -> {
                 binding.titleTextView.text = getString(R.string.manual_connect_on_hold)
             }
+            ConnectionState.DISCONNECTING -> {
+                binding.titleTextView.text = getString(R.string.manual_connect_disconnecting)
+            }
         }
     }
 
@@ -264,7 +269,9 @@ class ConnectionActivity : BaseActivity() {
                 inflateConnectingCardView()
                 if (
                     viewModel.connectionState.value == ConnectionState.CONNECTED ||
-                    viewModel.connectionState.value == ConnectionState.CONNECTING
+                    viewModel.connectionState.value == ConnectionState.CONNECTING ||
+                    viewModel.connectionState.value == ConnectionState.ON_HOLD ||
+                    viewModel.connectionState.value == ConnectionState.IP_NOT_CHANGED
                 ) {
                     manualDisconnecting()
                     viewModel.disconnect().observe(this, {
@@ -284,7 +291,6 @@ class ConnectionActivity : BaseActivity() {
             result.onFailure {
                 Log.e(TAG, "Data loading failed")
                 binding.ipTextView.text = getString(R.string.manual_connect_unknown)
-                wifiNetworkErrorPopUp()
             }
         })
     }

diff --git a/android/app/src/main/java/updated/mysterium/vpn/ui/connection/ConnectionViewModel.kt b/android/app/src/main/java/updated/mysterium/vpn/ui/connection/ConnectionViewModel.kt
@@ -237,7 +237,8 @@ class ConnectionViewModel(useCaseProvider: UseCaseProvider) : ViewModel() {
     private suspend fun disconnectIfConnectedNode() {
         if (
             _connectionState.value == ConnectionState.CONNECTED ||
-            _connectionState.value == ConnectionState.ON_HOLD
+            _connectionState.value == ConnectionState.ON_HOLD ||
+            _connectionState.value == ConnectionState.IP_NOT_CHANGED
         ) {
             disconnectNode()
         }

diff --git a/fastlane/android_version_code b/fastlane/android_version_code
@@ -1 +1 @@
-107101
+107102