expo-app-blocker 0.1.61 → 0.1.62

package/android/src/main/java/expo/modules/appblocker/AppBlockerService.kt

@@ -22,12 +22,23 @@ class AppBlockerService : Service() {
   private var lastForegroundPackage: String? = null
   private lateinit var overlayManager: OverlayManager
   private val unlockController by lazy { TemporaryUnlockController(this, handler) }
+  private var wasUnlocked = false
 
   private val pollRunnable = object : Runnable {
     override fun run() {
-      if (!unlockController.isUnlocked) {
+      if (unlockController.isUnlocked) {
+        wasUnlocked = true
+      } else {
         val foregroundPackage = getCurrentForegroundPackage()
-        if (foregroundPackage != null && foregroundPackage != lastForegroundPackage) {
+        val unlockJustExpired = wasUnlocked
+        wasUnlocked = false
+
+        if (unlockJustExpired && foregroundPackage != null && isBlocked(foregroundPackage)) {
+          // Earned time ran out while the user was still inside a blocked app.
+          Log.d(TAG, "Unlock expired in foreground app: $foregroundPackage")
+          lastForegroundPackage = foregroundPackage
+          block(foregroundPackage, BlockReason.EXPIRED)
+        } else if (foregroundPackage != null && foregroundPackage != lastForegroundPackage) {
           Log.d(TAG, "Foreground changed: $foregroundPackage")
           lastForegroundPackage = foregroundPackage
           handleForegroundChange(foregroundPackage)
@@ -48,18 +59,24 @@ class AppBlockerService : Service() {
     handler.post(pollRunnable)
   }
 
+  private fun isBlocked(packageName: String): Boolean =
+    packageName in AppBlockerPrefs.getBlockedPackages(this)
+
   private fun handleForegroundChange(foregroundPackage: String) {
-    val blocked = AppBlockerPrefs.getBlockedPackages(this)
-    if (foregroundPackage in blocked) {
+    if (isBlocked(foregroundPackage)) {
       Log.d(TAG, "Blocked app in foreground: $foregroundPackage")
-      overlayManager.show(foregroundPackage)
-      showBlockedNotification(foregroundPackage)
+      block(foregroundPackage, BlockReason.OPENED)
     } else {
       overlayManager.hide()
     }
   }
 
-  private fun showBlockedNotification(packageName: String) {
+  private fun block(packageName: String, reason: BlockReason) {
+    overlayManager.show(packageName, reason)
+    showBlockedNotification(packageName, reason)
+  }
+
+  private fun showBlockedNotification(packageName: String, reason: BlockReason) {
     val appName = try {
       val pm = this.packageManager
       val appInfo = pm.getApplicationInfo(packageName, 0)
@@ -74,7 +91,10 @@ class AppBlockerService : Service() {
     val scheme = getAppScheme()
     val deepLinkIntent = Intent(
       Intent.ACTION_VIEW,
-      Uri.parse("${scheme}://blocked?app=${Uri.encode(appName)}&package=${Uri.encode(packageName)}")
+      Uri.parse(
+        "${scheme}://blocked?app=${Uri.encode(appName)}" +
+          "&package=${Uri.encode(packageName)}&reason=${reason.slug}"
+      )
     ).apply {
       addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
     }

package/android/src/main/java/expo/modules/appblocker/BlockReason.kt

@@ -0,0 +1,14 @@
+package expo.modules.appblocker
+
+/**
+ * Why a blocked app is being intercepted right now. Carried into the deep link
+ * so the JS side can branch (e.g. a softer "time's up" interstitial when an
+ * earned-time window expires while the user is still inside the app).
+ */
+enum class BlockReason(val slug: String) {
+  /** A blocked app was freshly brought to the foreground. */
+  OPENED("opened"),
+
+  /** A temporary unlock expired while a blocked app was already in the foreground. */
+  EXPIRED("expired"),
+}

package/android/src/main/java/expo/modules/appblocker/OverlayManager.kt

@@ -24,11 +24,11 @@ class OverlayManager(private val context: Context) {
 
   private var overlayView: View? = null
 
-  fun show(blockedPackageName: String? = null) {
+  fun show(blockedPackageName: String? = null, reason: BlockReason = BlockReason.OPENED) {
     if (overlayView != null) {
       Log.d(TAG, "Overlay already visible")
       if (blockedPackageName != null) {
-        navigateToApp(blockedPackageName)
+        navigateToApp(blockedPackageName, reason)
       } else {
         bringAppToFront()
       }
@@ -47,7 +47,7 @@ class OverlayManager(private val context: Context) {
     }
 
     if (blockedPackageName != null) {
-      navigateToApp(blockedPackageName)
+      navigateToApp(blockedPackageName, reason)
     } else {
       bringAppToFront()
     }
@@ -72,14 +72,17 @@ class OverlayManager(private val context: Context) {
     packageName
   }
 
-  private fun navigateToApp(blockedPackageName: String) {
+  private fun navigateToApp(blockedPackageName: String, reason: BlockReason) {
     val appName = resolveAppName(blockedPackageName)
 
     // Use the app's own scheme for deep linking
     val scheme = getAppScheme()
     val deepLinkIntent = Intent(
       Intent.ACTION_VIEW,
-      Uri.parse("${scheme}://blocked?app=${Uri.encode(appName)}&package=${Uri.encode(blockedPackageName)}")
+      Uri.parse(
+        "${scheme}://blocked?app=${Uri.encode(appName)}" +
+          "&package=${Uri.encode(blockedPackageName)}&reason=${reason.slug}"
+      )
     ).apply {
       addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-app-blocker",
-  "version": "0.1.61",
+  "version": "0.1.62",
   "description": "Expo module for cross-platform app blocking. Android: UsageStatsManager + Overlay. iOS: Screen Time API (FamilyControls + ManagedSettings + DeviceActivity).",
   "main": "src/index.ts",
   "types": "src/index.ts",