Merge branch 'v2.4' into q-beta

2019-04-14 13:06:12 +08:00
parent 219d868089 4b9edba173
commit b70abd6ffb
15 changed files with 96 additions and 93 deletions
--- a/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt
@@ -105,7 +105,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()