3 files changed, 13 insertions, 15 deletions

diff --git a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
index 2dd1c46..6e74891 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
@@ -3,7 +3,6 @@ package org.pacien.tincapp.activities
 import android.app.Activity
 import android.app.ProgressDialog
 import android.content.Intent
-import android.content.IntentFilter
 import android.net.VpnService
 import android.os.Bundle
 import android.support.v4.widget.SwipeRefreshLayout
@@ -22,7 +21,7 @@ import org.pacien.tincapp.R
 import org.pacien.tincapp.context.AppPaths
 import org.pacien.tincapp.extensions.Android.setElements
 import org.pacien.tincapp.intent.Actions
-import org.pacien.tincapp.intent.SimpleBroadcastReceiver
+import org.pacien.tincapp.intent.BroadcastMapper
 import org.pacien.tincapp.service.TincVpnService
 import org.pacien.tincapp.utils.TincKeyring
 
@@ -116,8 +115,9 @@ class StartActivity : BaseActivity() {
     }
   }
 
-  private val startupBroadcastReceiver = SimpleBroadcastReceiver(IntentFilter(Actions.EVENT_CONNECTED), this::onVpnStart)
-  private val errorBroadcastReceiver = SimpleBroadcastReceiver(IntentFilter(Actions.EVENT_ABORTED), this::onVpnStartError)
+  private val broadcastMapper = BroadcastMapper(mapOf(
+    Actions.EVENT_CONNECTED to this::onVpnStart,
+    Actions.EVENT_ABORTED to this::onVpnStartError))
 
   private var connectDialog: ProgressDialog? = null
 
@@ -148,13 +148,11 @@ class StartActivity : BaseActivity() {
   override fun onResume() {
     super.onResume()
     if (TincVpnService.isConnected()) openStatusActivity()
-    startupBroadcastReceiver.register()
-    errorBroadcastReceiver.register()
+    broadcastMapper.register()
   }
 
   override fun onPause() {
-    startupBroadcastReceiver.unregister()
-    errorBroadcastReceiver.unregister()
+    broadcastMapper.unregister()
     super.onPause()
   }
 
diff --git a/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
index dc45947..c4873d8 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
@@ -2,7 +2,6 @@ package org.pacien.tincapp.activities
 
 import android.app.ProgressDialog
 import android.content.Intent
-import android.content.IntentFilter
 import android.os.Bundle
 import android.support.v4.widget.SwipeRefreshLayout
 import android.support.v7.app.AlertDialog
@@ -23,7 +22,7 @@ import org.pacien.tincapp.data.VpnInterfaceConfiguration
 import org.pacien.tincapp.extensions.Android.setElements
 import org.pacien.tincapp.extensions.Android.setText
 import org.pacien.tincapp.intent.Actions
-import org.pacien.tincapp.intent.SimpleBroadcastReceiver
+import org.pacien.tincapp.intent.BroadcastMapper
 import org.pacien.tincapp.service.TincVpnService
 import java.util.*
 import kotlin.concurrent.timerTask
@@ -32,7 +31,7 @@ import kotlin.concurrent.timerTask
  * @author pacien
  */
 class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRefreshLayout.OnRefreshListener {
-  private val shutdownBroadcastReceiver = SimpleBroadcastReceiver(IntentFilter(Actions.EVENT_DISCONNECTED), this::onVpnShutdown)
+  private val broadcastMapper = BroadcastMapper(mapOf(Actions.EVENT_DISCONNECTED to this::onVpnShutdown))
   private var shutdownDialog: ProgressDialog? = null
   private var nodeListAdapter: ArrayAdapter<String>? = null
   private var refreshTimer: Timer? = null
@@ -82,12 +81,12 @@ class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRef
 
   override fun onResume() {
     super.onResume()
-    shutdownBroadcastReceiver.register()
+    broadcastMapper.register()
     updateView()
   }
 
   override fun onPause() {
-    shutdownBroadcastReceiver.unregister()
+    broadcastMapper.unregister()
     super.onPause()
   }
 
diff --git a/app/src/main/java/org/pacien/tincapp/intent/SimpleBroadcastReceiver.kt b/app/src/main/java/org/pacien/tincapp/intent/BroadcastMapper.kt
index fb77174..1382f0a 100644
--- a/app/src/main/java/org/pacien/tincapp/intent/SimpleBroadcastReceiver.kt
+++ b/app/src/main/java/org/pacien/tincapp/intent/BroadcastMapper.kt
@@ -10,10 +10,11 @@ import org.pacien.tincapp.context.App
 /**
  * @author pacien
  */
-class SimpleBroadcastReceiver(private val intentFilter: IntentFilter, private val eventHandler: () -> Unit) : BroadcastReceiver() {
+class BroadcastMapper(private val actionHandlers: Map<String, () -> Unit>) : BroadcastReceiver() {
   private val broadcastManager = LocalBroadcastManager.getInstance(App.getContext())
+  private val intentFilter = actionHandlers.keys.fold(IntentFilter(), { filter, action -> filter.apply { addAction(action) } })
 
   fun register() = broadcastManager.registerReceiver(this, intentFilter)
   fun unregister() = broadcastManager.unregisterReceiver(this)
-  override fun onReceive(context: Context?, intent: Intent?) = eventHandler()
+  override fun onReceive(context: Context?, intent: Intent?) = actionHandlers[intent?.action]?.invoke() ?: Unit
 }