Merge branch 'master' into v2.4

2019-04-14 10:27:46 +08:00
parent e6ff746d2f f034abfa07
commit 484e868f1a
12 changed files with 84 additions and 85 deletions
--- a/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt
+++ b/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()