FIX: Minor crashes.

oasisfeng · Oct 17, 2023 · a694bd0 · a694bd0
1 parent 7580ac8
commit a694bd0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/mobile/src/main/java/com/oasisfeng/island/model/MainViewModel.kt b/mobile/src/main/java/com/oasisfeng/island/model/MainViewModel.kt
@@ -36,7 +36,7 @@ class MainViewModel(app: Application, state: SavedStateHandle): AppListViewModel
 		tabs.addTab(tabs.newTab().setText(R.string.tab_discovery),/* setSelected = */false)
 		val currentProfile = currentProfile
 		tabs.addTab(tabs.newTab().setText(com.oasisfeng.island.shared.R.string.mainland_name),
-			/* setSelected = */Users.isParentProfile(currentProfile))
+			/* setSelected */currentProfile?.let { Users.isParentProfile(it) } == true)
 
 		for ((profile, name) in IslandNameManager.getAllNames(activity)) {
 			val tab = tabs.newTab().setTag(profile).setText(name)

diff --git a/mobile/src/main/java/com/oasisfeng/island/shortcut/IslandAppShortcut.kt b/mobile/src/main/java/com/oasisfeng/island/shortcut/IslandAppShortcut.kt
@@ -92,7 +92,7 @@ object IslandAppShortcut {
 		ShortcutManagerCompat.removeLongLivedShortcuts(context, listOf(id))
 
 		if (! Users.isParentProfile()) Shuttle(context, to = Users.parentProfile).launchNoThrows(with = Users.currentId()) {
-			ShortcutManagerCompat.removeLongLivedShortcuts(context, listOf(getShortcutId(pkg, it, isCrossProfile = true))) }
+			ShortcutManagerCompat.removeLongLivedShortcuts(this, listOf(getShortcutId(pkg, it, isCrossProfile = true))) }
 	}
 
 	@OwnerUser @ProfileUser @RequiresApi(O) fun updateIfNeeded(context: Context, app: ApplicationInfo, isCrossProfile: Boolean) {
@@ -106,7 +106,7 @@ object IslandAppShortcut {
 		val dynamic = isDynamicLabelEnabled(context)
 		updateAll(context, dynamic)
 		Users.getProfilesManagedByIsland().forEach {
-			Shuttle(context, to = it).launchNoThrows { updateAll(context, dynamic) }}
+			Shuttle(context, to = it).launchNoThrows { updateAll(this, dynamic) }}
 	}
 
 	@RequiresApi(O) fun updateAll(context: Context, dynamic: Boolean) {

diff --git a/watcher/src/main/java/com/oasisfeng/island/watcher/IslandAppWatcher.kt b/watcher/src/main/java/com/oasisfeng/island/watcher/IslandAppWatcher.kt
@@ -17,6 +17,8 @@ import android.os.Build.VERSION_CODES.Q
 import android.util.Log
 import androidx.annotation.ColorRes
 import androidx.annotation.RequiresApi
+import androidx.core.content.ContextCompat
+import androidx.core.content.ContextCompat.RECEIVER_NOT_EXPORTED
 import com.oasisfeng.android.util.Apps
 import com.oasisfeng.island.api.Api
 import com.oasisfeng.island.notification.NotificationIds
@@ -90,8 +92,9 @@ import java.util.*
 	/** This provider tracks all freezing and unfreezing events triggered by other modules within the default process of Island  */
 	class AppStateTracker : PseudoContentProvider() {
 
-		override fun onCreate() = false.also { context().registerReceiver(IslandAppWatcher(), IntentFilter().apply {
-			addAction(DevicePolicies.ACTION_PACKAGE_UNFROZEN); addAction(ACTION_PACKAGE_REMOVED); addDataScheme(("package")) }) }
+		override fun onCreate() = false.also { ContextCompat.registerReceiver(context(), IslandAppWatcher(),
+			IntentFilter(DevicePolicies.ACTION_PACKAGE_UNFROZEN).apply { addAction(ACTION_PACKAGE_REMOVED); addDataScheme(("package")) },
+			RECEIVER_NOT_EXPORTED) }
 	}
 
 	companion object {