From c239ad1f61936a373f2b340d8fe948685deb2c12 Mon Sep 17 00:00:00 2001 From: Mygod Date: Sat, 13 Jan 2018 13:51:49 +0800 Subject: [PATCH] Refine string constant naming --- .../src/main/java/be/mygod/vpnhotspot/RepeaterFragment.kt | 2 +- mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterFragment.kt index 26406260..42f0c46a 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterFragment.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterFragment.kt @@ -134,7 +134,7 @@ class RepeaterFragment : Fragment(), ServiceConnection { this.binder = binder data.onStatusChanged() LocalBroadcastManager.getInstance(context!!) - .registerReceiver(data.statusListener, intentFilter(RepeaterService.STATUS_CHANGED)) + .registerReceiver(data.statusListener, intentFilter(RepeaterService.ACTION_STATUS_CHANGED)) } override fun onServiceDisconnected(name: ComponentName?) { diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt index 7ed38653..79cc9cb8 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt @@ -23,7 +23,7 @@ import java.util.regex.Pattern class RepeaterService : Service(), WifiP2pManager.ChannelListener, VpnListener.Callback { companion object { const val CHANNEL = "repeater" - const val STATUS_CHANGED = "be.mygod.vpnhotspot.RepeaterService.STATUS_CHANGED" + const val ACTION_STATUS_CHANGED = "be.mygod.vpnhotspot.RepeaterService.STATUS_CHANGED" private const val TAG = "RepeaterService" /** @@ -88,7 +88,7 @@ class RepeaterService : Service(), WifiP2pManager.ChannelListener, VpnListener.C private set(value) { if (field == value) return field = value - LocalBroadcastManager.getInstance(this).sendBroadcast(Intent(STATUS_CHANGED)) + LocalBroadcastManager.getInstance(this).sendBroadcast(Intent(ACTION_STATUS_CHANGED)) } private fun formatReason(reason: Int) = when (reason) { @@ -242,7 +242,7 @@ class RepeaterService : Service(), WifiP2pManager.ChannelListener, VpnListener.C Toast.makeText(this@RepeaterService, "Failed to remove P2P group (${formatReason(reason)})", Toast.LENGTH_SHORT).show() status = Status.ACTIVE - LocalBroadcastManager.getInstance(this@RepeaterService).sendBroadcast(Intent(STATUS_CHANGED)) + LocalBroadcastManager.getInstance(this@RepeaterService).sendBroadcast(Intent(ACTION_STATUS_CHANGED)) } } })