Refactor to create a helper method

The main purpose is to reduce the amount of closures and indentation to
make the code more readable.

1 files changed, 5 insertions, 3 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
index 46f3aa135e..26131d9f39 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
@@ -54,9 +54,7 @@ open class MainActivity : FragmentActivity() {
                 serviceConnection?.onDestroy()
 
                 serviceConnection = service?.let { safeService ->
-                    ServiceConnection(safeService) { connection ->
-                        serviceNotifier.notify(connection)
-                    }
+                    ServiceConnection(safeService, ::handleNewServiceConnection)
                 }
 
                 if (service == null) {
@@ -201,6 +199,10 @@ open class MainActivity : FragmentActivity() {
         startActivityForResult(intent, 0)
     }
 
+    private fun handleNewServiceConnection(connection: ServiceConnection) {
+        serviceNotifier.notify(connection)
+    }
+
     private fun tryToConnect() {
         serviceConnection?.apply {
             connectionProxy.connect()