Remove key status listener from connect button

2 files changed, 1 insertions, 43 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectActionButton.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectActionButton.kt
index aaa8032542..b4d05bdefa 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectActionButton.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectActionButton.kt
@@ -10,40 +10,6 @@ import net.mullvad.mullvadvpn.model.TunnelState
 class ConnectActionButton(val parentView: View) {
     private val button: Button = parentView.findViewById(R.id.action_button)
 
-    private var enabled = true
-        set(value) {
-            if (field != value) {
-                field = value
-
-                button.setEnabled(value)
-                button.setAlpha(if (value) 1.0F else 0.5F)
-            }
-        }
-
-    private var canConnect = true
-        set(value) {
-            field = value
-            updateEnabled()
-        }
-
-    private var showingConnect = true
-        set(value) {
-            field = value
-            updateEnabled()
-        }
-
-    var keyState: KeygenEvent? = null
-        set(value) {
-            when (value) {
-                null -> canConnect = true
-                is KeygenEvent.NewKey -> canConnect = true
-                is KeygenEvent.TooManyKeys -> canConnect = false
-                is KeygenEvent.GenerationFailure -> canConnect = false
-            }
-
-            field = value
-        }
-
     var tunnelState: TunnelState = TunnelState.Disconnected()
         set(value) {
             when (value) {
@@ -84,22 +50,15 @@ class ConnectActionButton(val parentView: View) {
     private fun disconnected() {
         button.setBackgroundResource(R.drawable.green_button_background)
         button.setText(R.string.connect)
-        showingConnect = true
     }
 
     private fun connecting() {
         button.setBackgroundResource(R.drawable.transparent_red_button_background)
         button.setText(R.string.cancel)
-        showingConnect = false
     }
 
     private fun connected() {
         button.setBackgroundResource(R.drawable.transparent_red_button_background)
         button.setText(R.string.disconnect)
-        showingConnect = false
-    }
-
-    private fun updateEnabled() {
-        enabled = !showingConnect || canConnect
     }
 }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt
index 7e74c53066..af666f99e4 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt
@@ -135,7 +135,7 @@ class ConnectFragment : Fragment() {
         }
 
         tunnelStateListener?.let { listener ->
-            connectionProxy.awaitThen { 
+            connectionProxy.awaitThen {
                 onUiStateChange.unsubscribe(listener)
             }
         }
@@ -174,7 +174,6 @@ class ConnectFragment : Fragment() {
 
     private fun updateKeyStatus(keyStatus: KeygenEvent?) = GlobalScope.launch(Dispatchers.Main) {
         notificationBanner.keyState = keyStatus
-        actionButton.keyState = keyStatus
     }
 
     private fun openSwitchLocationScreen() {