expo-app-blocker 0.1.28 → 0.1.30

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

@@ -1,24 +1,19 @@
 package expo.modules.appblocker
 
-import android.Manifest
 import android.app.AppOpsManager
 import android.content.Context
 import android.content.Intent
 import android.content.pm.ApplicationInfo
-import android.content.pm.PackageManager
 import android.net.Uri
-import android.os.Build
 import android.os.Process
 import android.provider.Settings
 import android.util.Log
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
+import androidx.core.app.NotificationManagerCompat
 import expo.modules.kotlin.exception.Exceptions
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 
 private const val TAG = "ExpoAppBlocker"
-private const val NOTIFICATION_PERMISSION_REQUEST_CODE = 9003
 
 class ExpoAppBlockerModule : Module() {
   private val context: Context
@@ -28,7 +23,6 @@ class ExpoAppBlockerModule : Module() {
     Name("ExpoAppBlocker")
 
     OnCreate {
-      requestNotificationPermissionIfNeeded()
       AppBlockerService.start(context)
       Log.d(TAG, "Module OnCreate: started AppBlockerService")
     }
@@ -47,6 +41,10 @@ class ExpoAppBlockerModule : Module() {
       mode == AppOpsManager.MODE_ALLOWED
     }
 
+    AsyncFunction("checkNotificationPermission") {
+      NotificationManagerCompat.from(context).areNotificationsEnabled()
+    }
+
     Function("openOverlaySettings") {
       val intent = Intent(
         Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
@@ -109,18 +107,4 @@ class ExpoAppBlockerModule : Module() {
     }
   }
 
-  private fun requestNotificationPermissionIfNeeded() {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) return
-    val granted = ContextCompat.checkSelfPermission(
-      context,
-      Manifest.permission.POST_NOTIFICATIONS
-    ) == PackageManager.PERMISSION_GRANTED
-    if (granted) return
-    val activity = appContext.currentActivity ?: return
-    ActivityCompat.requestPermissions(
-      activity,
-      arrayOf(Manifest.permission.POST_NOTIFICATIONS),
-      NOTIFICATION_PERMISSION_REQUEST_CODE
-    )
-  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-app-blocker",
-  "version": "0.1.28",
+  "version": "0.1.30",
   "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",

package/src/ExpoAppBlocker.types.ts

@@ -11,6 +11,7 @@ export interface AndroidPermissions {
   platform: "android";
   overlay: boolean;
   usageStats: boolean;
+  notifications: boolean;
 }
 
 export interface IOSPermissions {

package/src/index.ts

@@ -52,8 +52,9 @@ export async function getPermissionStatus(): Promise<PermissionStatus> {
   if (Platform.OS === "android") {
     const overlay = await NativeModule.checkOverlayPermission();
     const usageStats = await NativeModule.checkUsageStatsPermission();
-    const details: AndroidPermissions = { platform: "android", overlay, usageStats };
-    return { allGranted: overlay && usageStats, details };
+    const notifications = await NativeModule.checkNotificationPermission();
+    const details: AndroidPermissions = { platform: "android", overlay, usageStats, notifications };
+    return { allGranted: overlay && usageStats && notifications, details };
   }
 
   if (Platform.OS === "ios") {