diff options
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt')
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt | 9 |
1 files changed, 4 insertions, 5 deletions
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 | |||
2 | 2 | ||
3 | import android.app.ProgressDialog | 3 | import android.app.ProgressDialog |
4 | import android.content.Intent | 4 | import android.content.Intent |
5 | import android.content.IntentFilter | ||
6 | import android.os.Bundle | 5 | import android.os.Bundle |
7 | import android.support.v4.widget.SwipeRefreshLayout | 6 | import android.support.v4.widget.SwipeRefreshLayout |
8 | import android.support.v7.app.AlertDialog | 7 | import android.support.v7.app.AlertDialog |
@@ -23,7 +22,7 @@ import org.pacien.tincapp.data.VpnInterfaceConfiguration | |||
23 | import org.pacien.tincapp.extensions.Android.setElements | 22 | import org.pacien.tincapp.extensions.Android.setElements |
24 | import org.pacien.tincapp.extensions.Android.setText | 23 | import org.pacien.tincapp.extensions.Android.setText |
25 | import org.pacien.tincapp.intent.Actions | 24 | import org.pacien.tincapp.intent.Actions |
26 | import org.pacien.tincapp.intent.SimpleBroadcastReceiver | 25 | import org.pacien.tincapp.intent.BroadcastMapper |
27 | import org.pacien.tincapp.service.TincVpnService | 26 | import org.pacien.tincapp.service.TincVpnService |
28 | import java.util.* | 27 | import java.util.* |
29 | import kotlin.concurrent.timerTask | 28 | import kotlin.concurrent.timerTask |
@@ -32,7 +31,7 @@ import kotlin.concurrent.timerTask | |||
32 | * @author pacien | 31 | * @author pacien |
33 | */ | 32 | */ |
34 | class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRefreshLayout.OnRefreshListener { | 33 | class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRefreshLayout.OnRefreshListener { |
35 | private val shutdownBroadcastReceiver = SimpleBroadcastReceiver(IntentFilter(Actions.EVENT_DISCONNECTED), this::onVpnShutdown) | 34 | private val broadcastMapper = BroadcastMapper(mapOf(Actions.EVENT_DISCONNECTED to this::onVpnShutdown)) |
36 | private var shutdownDialog: ProgressDialog? = null | 35 | private var shutdownDialog: ProgressDialog? = null |
37 | private var nodeListAdapter: ArrayAdapter<String>? = null | 36 | private var nodeListAdapter: ArrayAdapter<String>? = null |
38 | private var refreshTimer: Timer? = null | 37 | private var refreshTimer: Timer? = null |
@@ -82,12 +81,12 @@ class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRef | |||
82 | 81 | ||
83 | override fun onResume() { | 82 | override fun onResume() { |
84 | super.onResume() | 83 | super.onResume() |
85 | shutdownBroadcastReceiver.register() | 84 | broadcastMapper.register() |
86 | updateView() | 85 | updateView() |
87 | } | 86 | } |
88 | 87 | ||
89 | override fun onPause() { | 88 | override fun onPause() { |
90 | shutdownBroadcastReceiver.unregister() | 89 | broadcastMapper.unregister() |
91 | super.onPause() | 90 | super.onPause() |
92 | } | 91 | } |
93 | 92 | ||