2 files changed, 15 insertions, 4 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputController.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputController.kt
index 48d4c61288..d80e6aae07 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputController.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputController.kt
@@ -71,12 +71,11 @@ class AccountInputController(val parentView: View, context: Context) {
             }
         }
 
-    var onLogin: ((String) -> Unit)? = null
+    var onLogin: ((String) -> Unit)?
+        get() = newInput.onLogin
+        set(value) { newInput.onLogin = value }
 
     init {
-        button.setOnClickListener {
-            onLogin?.invoke(input.text.toString())
-        }
         setButtonEnabled(false)
 
         input.apply {
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountInput.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountInput.kt
index 06011909bf..31edfd1704 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountInput.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountInput.kt
@@ -3,7 +3,9 @@ package net.mullvad.mullvadvpn.ui.widget
 import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
+import android.widget.ImageButton
 import android.widget.LinearLayout
+import android.widget.TextView
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.ui.LoginState
 
@@ -15,8 +17,18 @@ class AccountInput : LinearLayout {
             inflater.inflate(R.layout.account_input, this)
         }
 
+    private val input = container.findViewById<TextView>(R.id.login_input)
+
+    private val button = container.findViewById<ImageButton>(R.id.login_button).apply {
+        setOnClickListener {
+            onLogin?.invoke(input.text.toString())
+        }
+    }
+
     var loginState = LoginState.Initial
 
+    var onLogin: ((String) -> Unit)? = null
+
     constructor(context: Context) : super(context) {}
 
     constructor(context: Context, attributes: AttributeSet) : super(context, attributes) {}