Merge branch 'master' into v2.4

mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt

@@ -36,18 +36,15 @@ import be.mygod.vpnhotspot.room.AppDatabase
 import be.mygod.vpnhotspot.room.ClientStats
 import be.mygod.vpnhotspot.room.TrafficRecord
 import be.mygod.vpnhotspot.room.macToString
-import be.mygod.vpnhotspot.util.MainScope
 import be.mygod.vpnhotspot.util.SpanFormatter
 import be.mygod.vpnhotspot.util.computeIfAbsentCompat
 import be.mygod.vpnhotspot.util.toPluralInt
 import be.mygod.vpnhotspot.widget.SmartSnackbar
 import kotlinx.android.parcel.Parcelize
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
 import java.text.NumberFormat
 
-class ClientsFragment : Fragment(), MainScope by MainScope.Supervisor() {
+class ClientsFragment : Fragment() {
     @Parcelize
     data class NicknameArg(val mac: Long, val nickname: CharSequence) : Parcelable
     class NicknameDialogFragment : AlertDialogFragment<NicknameArg, Empty>() {
@@ -140,7 +137,9 @@ class ClientsFragment : Fragment(), MainScope by MainScope.Supervisor() {
                     val wasWorking = TrafficRecorder.isWorking(client.mac)
                     client.obtainRecord().apply {
                         blocked = !blocked
-                        launch(Dispatchers.Unconfined) { AppDatabase.instance.clientRecordDao.update(this@apply) }
+                        GlobalScope.launch(Dispatchers.Unconfined) {
+                            AppDatabase.instance.clientRecordDao.update(this@apply)
+                        }
                     }
                     IpNeighbourMonitor.instance?.flush()
                     if (!wasWorking && item.itemId == R.id.block) {
@@ -150,7 +149,7 @@ class ClientsFragment : Fragment(), MainScope by MainScope.Supervisor() {
                 }
                 R.id.stats -> {
                     binding.client?.let { client ->
-                        launch(Dispatchers.Unconfined) {
+                        scope.launch {
                             StatsDialogFragment().withArg(StatsArg(
                                     client.title.value ?: return@launch,
                                     AppDatabase.instance.trafficRecordDao.queryStats(client.mac)
@@ -205,6 +204,7 @@ class ClientsFragment : Fragment(), MainScope by MainScope.Supervisor() {
         }
     }
 
+    private val scope = MainScope() + Dispatchers.Unconfined
     private lateinit var binding: FragmentClientsBinding
     private val adapter = ClientAdapter()
     private var rates = HashMap<Pair<String, Long>, TrafficRate>()
@@ -237,7 +237,7 @@ class ClientsFragment : Fragment(), MainScope by MainScope.Supervisor() {
     }
 
     override fun onDestroy() {
-        job.cancel()
+        scope.cancel()
         super.onDestroy()
     }
 }

mobile/src/main/java/be/mygod/vpnhotspot/manage/TetherManager.kt

@@ -163,7 +163,7 @@ sealed class TetherManager(protected val parent: TetheringFragment) : Manager(),
         override val type get() = VIEW_TYPE_BLUETOOTH
         override val isStarted get() = tethering.active == true
 
-        override fun onException() = ManageBar.start(parent.requireContext())
+        override fun onException() = ManageBar.start(parent.context ?: app)
 
         override fun start() = BluetoothTethering.start(this)
         override fun stop() {

mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt

@@ -103,7 +103,7 @@ class TetheringFragment : Fragment(), ServiceConnection, Toolbar.OnMenuItemClick
     }
 
     private fun updateMonitorList(canMonitor: List<String> = emptyList()) {
-        val item = requireActivity().toolbar.menu.findItem(R.id.monitor) ?: return  // assuming no longer foreground
+        val item = activity?.toolbar?.menu?.findItem(R.id.monitor) ?: return    // assuming no longer foreground
         item.isNotGone = canMonitor.isNotEmpty()
         item.subMenu.apply {
             clear()

mobile/src/main/java/be/mygod/vpnhotspot/util/MainScope.kt

@@ -1,14 +0,0 @@
-package be.mygod.vpnhotspot.util
-
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.SupervisorJob
-
-interface MainScope : CoroutineScope {
-    class Supervisor : MainScope {
-        override val job = SupervisorJob()
-    }
-    val job: Job
-    override val coroutineContext get() = Dispatchers.Main + job
-}