expo-notifications 0.16.1 → 0.17.0

package/CHANGELOG.md

@@ -10,6 +10,23 @@
 
 ### 💡 Others
 
+## 0.17.0 — 2022-10-25
+
+### 🛠 Breaking changes
+
+- [plugin] Upgrade minimum runtime requirement to Node 14 (LTS). ([#18204](https://github.com/expo/expo/pull/18204) by [@EvanBacon](https://github.com/EvanBacon))
+- Bumped iOS deployment target to 13.0 and deprecated support for iOS 12. ([#18873](https://github.com/expo/expo/pull/18873) by [@tsapeta](https://github.com/tsapeta))
+
+### 🐛 Bug fixes
+
+- Fixed build error for setting `compileSdkVersion` to 33. ([#19432](https://github.com/expo/expo/pull/19432) by [@kudo](https://github.com/kudo))
+- Fixed the `POST_NOTIFICATIONS` runtime permission integration when `targerSdkVersion` is set to 33. ([#19672](https://github.com/expo/expo/pull/19672) by [@kudo](https://github.com/kudo), [@kudo](https://github.com/kudo))
+
+### 💡 Others
+
+- [plugin] Migrate import from @expo/config-plugins to expo/config-plugins and @expo/config-types to expo/config. ([#18855](https://github.com/expo/expo/pull/18855) by [@brentvatne](https://github.com/brentvatne))
+- Drop `@expo/config-plugins` dependency in favor of peer dependency on `expo`. ([#18595](https://github.com/expo/expo/pull/18595) by [@EvanBacon](https://github.com/EvanBacon))
+
 ## 0.16.1 — 2022-07-16
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.16.1'
+version = '0.17.0'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -74,7 +74,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 21
-    versionName '0.16.1'
+    versionName '0.17.0'
   }
 
   lintOptions {

package/android/src/main/AndroidManifest.xml

@@ -2,6 +2,7 @@
   package="expo.modules.notifications">
 
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+  <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
   <application>
     <service

package/android/src/main/java/expo/modules/notifications/permissions/NotificationPermissionsModule.kt

@@ -0,0 +1,144 @@
+package expo.modules.notifications.permissions
+
+import android.app.NotificationManager
+import android.content.Context
+import android.os.Build
+import androidx.annotation.RequiresApi
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.os.bundleOf
+import expo.modules.core.ExportedModule
+import expo.modules.core.ModuleRegistry
+import expo.modules.core.Promise
+import expo.modules.core.arguments.ReadableArguments
+import expo.modules.core.interfaces.ExpoMethod
+import expo.modules.interfaces.permissions.Permissions
+import expo.modules.interfaces.permissions.PermissionsResponse
+import expo.modules.interfaces.permissions.PermissionsStatus
+
+class NotificationPermissionsModule(context: Context?) : ExportedModule(context) {
+  private lateinit var moduleRegistry: ModuleRegistry
+
+  override fun onCreate(moduleRegistry: ModuleRegistry) {
+    this.moduleRegistry = moduleRegistry
+  }
+
+  override fun getName(): String {
+    return EXPORTED_NAME
+  }
+
+  @ExpoMethod
+  fun getPermissionsAsync(promise: Promise) {
+    if (context.applicationContext.applicationInfo.targetSdkVersion >= 33 && Build.VERSION.SDK_INT >= 33) {
+      getPermissionsWithPromiseImplApi33(promise)
+    } else {
+      getPermissionsWithPromiseImplClassic(promise)
+    }
+  }
+
+  @ExpoMethod
+  fun requestPermissionsAsync(permissionsTypes: ReadableArguments?, promise: Promise) {
+    if (context.applicationContext.applicationInfo.targetSdkVersion >= 33 && Build.VERSION.SDK_INT >= 33) {
+      requestPermissionsWithPromiseImplApi33(promise)
+    } else {
+      getPermissionsWithPromiseImplClassic(promise)
+    }
+  }
+
+  @RequiresApi(33)
+  private fun getPermissionsWithPromiseImplApi33(promise: Promise) {
+    val permissionManager = moduleRegistry.getModule(Permissions::class.java)
+    if (permissionManager == null) {
+      promise.reject("E_NO_PERMISSIONS", "Permissions module is null. Are you sure all the installed Expo modules are properly linked?")
+      return
+    }
+
+    permissionManager.getPermissions(
+      { permissionsMap: Map<String, PermissionsResponse> ->
+        val managerCompat = NotificationManagerCompat.from(context)
+        val areEnabled = managerCompat.areNotificationsEnabled()
+        val platformBundle = bundleOf(
+          IMPORTANCE_KEY to managerCompat.importance,
+        ).apply {
+          val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && notificationManager != null) {
+            putInt(INTERRUPTION_FILTER_KEY, notificationManager.currentInterruptionFilter)
+          }
+        }
+
+        val areAllGranted = permissionsMap.all { (_, response) -> response.status == PermissionsStatus.GRANTED }
+        val areAllDenied = permissionsMap.all { (_, response) -> response.status == PermissionsStatus.DENIED }
+        val canAskAgain = permissionsMap.all { (_, response) -> response.canAskAgain }
+        val status = when {
+          areAllDenied -> PermissionsStatus.DENIED.status
+          !areEnabled -> PermissionsStatus.DENIED.status
+          areAllGranted -> PermissionsStatus.GRANTED.status
+          else -> PermissionsStatus.UNDETERMINED.status
+        }
+
+        promise.resolve(
+          bundleOf(
+            PermissionsResponse.EXPIRES_KEY to PermissionsResponse.PERMISSION_EXPIRES_NEVER,
+            PermissionsResponse.STATUS_KEY to status,
+            PermissionsResponse.CAN_ASK_AGAIN_KEY to canAskAgain,
+            PermissionsResponse.GRANTED_KEY to areAllGranted,
+            ANDROID_RESPONSE_KEY to platformBundle,
+          )
+        )
+      },
+      *PERMISSIONS
+    )
+  }
+
+  private fun getPermissionsWithPromiseImplClassic(promise: Promise) {
+    val managerCompat = NotificationManagerCompat.from(context)
+    val areEnabled = managerCompat.areNotificationsEnabled()
+    val status = if (areEnabled) PermissionsStatus.GRANTED else PermissionsStatus.DENIED
+    val platformBundle = bundleOf(
+      IMPORTANCE_KEY to managerCompat.importance,
+    ).apply {
+      val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && notificationManager != null) {
+        putInt(INTERRUPTION_FILTER_KEY, notificationManager.currentInterruptionFilter)
+      }
+    }
+
+    promise.resolve(
+      bundleOf(
+        PermissionsResponse.EXPIRES_KEY to PermissionsResponse.PERMISSION_EXPIRES_NEVER,
+        PermissionsResponse.STATUS_KEY to status.status,
+        PermissionsResponse.CAN_ASK_AGAIN_KEY to areEnabled,
+        PermissionsResponse.GRANTED_KEY to (status == PermissionsStatus.GRANTED),
+        ANDROID_RESPONSE_KEY to platformBundle,
+      )
+    )
+  }
+
+  @RequiresApi(33)
+  private fun requestPermissionsWithPromiseImplApi33(promise: Promise) {
+    val permissionManager = moduleRegistry.getModule(Permissions::class.java)
+    if (permissionManager == null) {
+      promise.reject("E_NO_PERMISSIONS", "Permissions module is null. Are you sure all the installed Expo modules are properly linked?")
+      return
+    }
+
+    permissionManager.askForPermissions(
+      {
+        getPermissionsWithPromiseImplApi33(promise)
+      },
+      *PERMISSIONS
+    )
+  }
+
+  companion object {
+    private const val EXPORTED_NAME = "ExpoNotificationPermissionsModule"
+    private const val ANDROID_RESPONSE_KEY = "android"
+    private const val IMPORTANCE_KEY = "importance"
+    private const val INTERRUPTION_FILTER_KEY = "interruptionFilter"
+
+    private val PERMISSIONS: Array<String>
+      /**
+       * TODO: Use {@link Android.Manifest.permission.POST_NOTIFICATIONS} when we support compileSdkVersion 33
+       */
+      get() = arrayOf("android.permission.POST_NOTIFICATIONS")
+  }
+}

package/android/src/main/java/expo/modules/notifications/service/NotificationsService.kt

@@ -502,7 +502,7 @@ open class NotificationsService : BroadcastReceiver() {
       val notification = intent.getParcelableExtra<Notification>(NOTIFICATION_KEY) ?: throw IllegalArgumentException("$NOTIFICATION_KEY not found in the intent extras.")
       val action = intent.getParcelableExtra<NotificationAction>(NOTIFICATION_ACTION_KEY) ?: throw IllegalArgumentException("$NOTIFICATION_ACTION_KEY not found in the intent extras.")
       val response = if (action is TextInputNotificationAction) {
-        val userText = action.placeholder ?: RemoteInput.getResultsFromIntent(intent).getString(USER_TEXT_RESPONSE_KEY)
+        val userText = action.placeholder ?: RemoteInput.getResultsFromIntent(intent)?.getString(USER_TEXT_RESPONSE_KEY) ?: ""
         TextInputNotificationResponse(action, notification, userText)
       } else {
         NotificationResponse(action, notification)

package/build/NotificationPermissions.d.ts

@@ -7,7 +7,7 @@ export declare function requestPermissionsAsync(permissions?: NotificationPermis
  *
  * @example
  * ```ts
- * const [status, requestPermission] = Notifications.usePermissions();
+ * const [permissionResponse, requestPermission] = Notifications.usePermissions();
  * ```
  */
 export declare const usePermissions: (options?: import("expo-modules-core").PermissionHookOptions<NotificationPermissionsRequest> | undefined) => [NotificationPermissionsStatus | null, () => Promise<NotificationPermissionsStatus>, () => Promise<NotificationPermissionsStatus>];

package/build/NotificationPermissions.js

@@ -27,7 +27,7 @@ export async function requestPermissionsAsync(permissions) {
  *
  * @example
  * ```ts
- * const [status, requestPermission] = Notifications.usePermissions();
+ * const [permissionResponse, requestPermission] = Notifications.usePermissions();
  * ```
  */
 export const usePermissions = createPermissionHook({

package/build/NotificationPermissions.js.map

@@ -1 +1 @@
-{"version":3,"file":"NotificationPermissions.js","sourceRoot":"","sources":["../src/NotificationPermissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAMxF,OAAO,6BAA6B,MAAM,iCAAiC,CAAC;AAE5E,MAAM,CAAC,KAAK,UAAU,mBAAmB;IACvC,IAAI,CAAC,6BAA6B,CAAC,mBAAmB,EAAE;QACtD,MAAM,IAAI,mBAAmB,CAAC,eAAe,EAAE,qBAAqB,CAAC,CAAC;KACvE;IAED,OAAO,MAAM,6BAA6B,CAAC,mBAAmB,EAAE,CAAC;AACnE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,WAA4C;IACxF,IAAI,CAAC,6BAA6B,CAAC,uBAAuB,EAAE;QAC1D,MAAM,IAAI,mBAAmB,CAAC,eAAe,EAAE,yBAAyB,CAAC,CAAC;KAC3E;IAED,MAAM,oBAAoB,GAAG,WAAW,IAAI;QAC1C,GAAG,EAAE;YACH,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE,IAAI;SACjB;KACF,CAAC;IACF,MAAM,4BAA4B,GAAG,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACvE,OAAO,MAAM,6BAA6B,CAAC,uBAAuB,CAAC,4BAA4B,CAAC,CAAC;AACnG,CAAC;AAED,cAAc;AACd;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,oBAAoB,CAGhD;IACA,aAAa,EAAE,uBAAuB;IACtC,SAAS,EAAE,mBAAmB;CAC/B,CAAC,CAAC","sourcesContent":["import { createPermissionHook, Platform, UnavailabilityError } from 'expo-modules-core';\n\nimport {\n  NotificationPermissionsRequest,\n  NotificationPermissionsStatus,\n} from './NotificationPermissions.types';\nimport NotificationPermissionsModule from './NotificationPermissionsModule';\n\nexport async function getPermissionsAsync() {\n  if (!NotificationPermissionsModule.getPermissionsAsync) {\n    throw new UnavailabilityError('Notifications', 'getPermissionsAsync');\n  }\n\n  return await NotificationPermissionsModule.getPermissionsAsync();\n}\n\nexport async function requestPermissionsAsync(permissions?: NotificationPermissionsRequest) {\n  if (!NotificationPermissionsModule.requestPermissionsAsync) {\n    throw new UnavailabilityError('Notifications', 'requestPermissionsAsync');\n  }\n\n  const requestedPermissions = permissions ?? {\n    ios: {\n      allowAlert: true,\n      allowBadge: true,\n      allowSound: true,\n    },\n  };\n  const requestedPlatformPermissions = requestedPermissions[Platform.OS];\n  return await NotificationPermissionsModule.requestPermissionsAsync(requestedPlatformPermissions);\n}\n\n// @needsAudit\n/**\n * Check or request permissions to send and receive push notifications.\n * This uses both `requestPermissionsAsync` and `getPermissionsAsync` to interact with the permissions.\n *\n * @example\n * ```ts\n * const [status, requestPermission] = Notifications.usePermissions();\n * ```\n */\nexport const usePermissions = createPermissionHook<\n  NotificationPermissionsStatus,\n  NotificationPermissionsRequest\n>({\n  requestMethod: requestPermissionsAsync,\n  getMethod: getPermissionsAsync,\n});\n"]}
+{"version":3,"file":"NotificationPermissions.js","sourceRoot":"","sources":["../src/NotificationPermissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAMxF,OAAO,6BAA6B,MAAM,iCAAiC,CAAC;AAE5E,MAAM,CAAC,KAAK,UAAU,mBAAmB;IACvC,IAAI,CAAC,6BAA6B,CAAC,mBAAmB,EAAE;QACtD,MAAM,IAAI,mBAAmB,CAAC,eAAe,EAAE,qBAAqB,CAAC,CAAC;KACvE;IAED,OAAO,MAAM,6BAA6B,CAAC,mBAAmB,EAAE,CAAC;AACnE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,WAA4C;IACxF,IAAI,CAAC,6BAA6B,CAAC,uBAAuB,EAAE;QAC1D,MAAM,IAAI,mBAAmB,CAAC,eAAe,EAAE,yBAAyB,CAAC,CAAC;KAC3E;IAED,MAAM,oBAAoB,GAAG,WAAW,IAAI;QAC1C,GAAG,EAAE;YACH,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE,IAAI;SACjB;KACF,CAAC;IACF,MAAM,4BAA4B,GAAG,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACvE,OAAO,MAAM,6BAA6B,CAAC,uBAAuB,CAAC,4BAA4B,CAAC,CAAC;AACnG,CAAC;AAED,cAAc;AACd;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,oBAAoB,CAGhD;IACA,aAAa,EAAE,uBAAuB;IACtC,SAAS,EAAE,mBAAmB;CAC/B,CAAC,CAAC","sourcesContent":["import { createPermissionHook, Platform, UnavailabilityError } from 'expo-modules-core';\n\nimport {\n  NotificationPermissionsRequest,\n  NotificationPermissionsStatus,\n} from './NotificationPermissions.types';\nimport NotificationPermissionsModule from './NotificationPermissionsModule';\n\nexport async function getPermissionsAsync() {\n  if (!NotificationPermissionsModule.getPermissionsAsync) {\n    throw new UnavailabilityError('Notifications', 'getPermissionsAsync');\n  }\n\n  return await NotificationPermissionsModule.getPermissionsAsync();\n}\n\nexport async function requestPermissionsAsync(permissions?: NotificationPermissionsRequest) {\n  if (!NotificationPermissionsModule.requestPermissionsAsync) {\n    throw new UnavailabilityError('Notifications', 'requestPermissionsAsync');\n  }\n\n  const requestedPermissions = permissions ?? {\n    ios: {\n      allowAlert: true,\n      allowBadge: true,\n      allowSound: true,\n    },\n  };\n  const requestedPlatformPermissions = requestedPermissions[Platform.OS];\n  return await NotificationPermissionsModule.requestPermissionsAsync(requestedPlatformPermissions);\n}\n\n// @needsAudit\n/**\n * Check or request permissions to send and receive push notifications.\n * This uses both `requestPermissionsAsync` and `getPermissionsAsync` to interact with the permissions.\n *\n * @example\n * ```ts\n * const [permissionResponse, requestPermission] = Notifications.usePermissions();\n * ```\n */\nexport const usePermissions = createPermissionHook<\n  NotificationPermissionsStatus,\n  NotificationPermissionsRequest\n>({\n  requestMethod: requestPermissionsAsync,\n  getMethod: getPermissionsAsync,\n});\n"]}

package/ios/EXNotifications.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.license        = package['license']
   s.author         = package['author']
   s.homepage       = package['homepage']
-  s.platform       = :ios, '12.0'
+  s.platform       = :ios, '13.0'
   s.source         = { git: 'https://github.com/expo/expo.git' }
   s.static_framework = true
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-notifications",
-  "version": "0.16.1",
+  "version": "0.17.0",
   "description": "Notifications module",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -37,26 +37,25 @@
     "preset": "expo-module-scripts/ios"
   },
   "dependencies": {
-    "@expo/config-plugins": "~5.0.0",
     "@expo/image-utils": "^0.3.18",
     "@ide/backoff": "^1.0.0",
     "abort-controller": "^3.0.0",
     "assert": "^2.0.0",
     "badgin": "^1.1.5",
-    "expo-application": "~4.2.0",
-    "expo-constants": "~13.2.0",
+    "expo-application": "~5.0.0",
+    "expo-constants": "~14.0.0",
     "fs-extra": "^9.1.0",
     "uuid": "^3.4.0"
   },
   "devDependencies": {
     "@types/node-fetch": "^2.5.7",
     "@types/uuid": "^3.4.7",
-    "expo-module-scripts": "^2.0.0",
+    "expo-module-scripts": "^3.0.0",
     "memfs": "^3.2.0",
     "node-fetch": "^2.6.7"
   },
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "c6678c65b68e45062d49a2deea8e822f69388278"
+  "gitHead": "eab2b09c735fb0fc2bf734a3f29a6593adba3838"
 }

package/plugin/build/withNotifications.d.ts

@@ -1,4 +1,4 @@
-import { ConfigPlugin } from '@expo/config-plugins';
+import { ConfigPlugin } from 'expo/config-plugins';
 export declare type NotificationsPluginProps = {
     /**
      * Local path to an image to use as the icon for push notifications.

package/plugin/build/withNotifications.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const config_plugins_1 = require("@expo/config-plugins");
+const config_plugins_1 = require("expo/config-plugins");
 const withNotificationsAndroid_1 = require("./withNotificationsAndroid");
 const withNotificationsIOS_1 = require("./withNotificationsIOS");
 const pkg = require('expo-notifications/package.json');

package/plugin/build/withNotificationsAndroid.d.ts

@@ -1,5 +1,5 @@
-import { AndroidConfig, ConfigPlugin } from '@expo/config-plugins';
-import { ExpoConfig } from '@expo/config-types';
+import { ExpoConfig } from 'expo/config';
+import { AndroidConfig, ConfigPlugin } from 'expo/config-plugins';
 import { NotificationsPluginProps } from './withNotifications';
 declare type DPIString = 'mdpi' | 'hdpi' | 'xhdpi' | 'xxhdpi' | 'xxxhdpi';
 declare type dpiMap = Record<DPIString, {

package/plugin/build/withNotificationsAndroid.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withNotificationsAndroid = exports.setNotificationSounds = exports.setNotificationIconAsync = exports.setNotificationIconColor = exports.getNotificationColor = exports.getNotificationIcon = exports.withNotificationSounds = exports.withNotificationManifest = exports.withNotificationIconColor = exports.withNotificationIcons = exports.NOTIFICATION_ICON_COLOR_RESOURCE = exports.NOTIFICATION_ICON_COLOR = exports.NOTIFICATION_ICON_RESOURCE = exports.NOTIFICATION_ICON = exports.META_DATA_NOTIFICATION_ICON_COLOR = exports.META_DATA_NOTIFICATION_ICON = exports.dpiValues = exports.ANDROID_RES_PATH = void 0;
-const config_plugins_1 = require("@expo/config-plugins");
 const image_utils_1 = require("@expo/image-utils");
+const config_plugins_1 = require("expo/config-plugins");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const { Colors } = config_plugins_1.AndroidConfig;
@@ -65,13 +65,11 @@ const withNotificationSounds = (config, { sounds }) => {
 };
 exports.withNotificationSounds = withNotificationSounds;
 function getNotificationIcon(config) {
-    var _a;
-    return ((_a = config.notification) === null || _a === void 0 ? void 0 : _a.icon) || null;
+    return config.notification?.icon || null;
 }
 exports.getNotificationIcon = getNotificationIcon;
 function getNotificationColor(config) {
-    var _a;
-    return ((_a = config.notification) === null || _a === void 0 ? void 0 : _a.color) || null;
+    return config.notification?.color || null;
 }
 exports.getNotificationColor = getNotificationColor;
 function setNotificationIconColor(color, colors) {

package/plugin/build/withNotificationsIOS.d.ts

@@ -1,4 +1,4 @@
-import { ConfigPlugin, XcodeProject } from '@expo/config-plugins';
+import { ConfigPlugin, XcodeProject } from 'expo/config-plugins';
 import { NotificationsPluginProps } from './withNotifications';
 export declare const withNotificationsIOS: ConfigPlugin<NotificationsPluginProps>;
 export declare const withNotificationSounds: ConfigPlugin<{

package/plugin/build/withNotificationsIOS.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setNotificationSounds = exports.withNotificationSounds = exports.withNotificationsIOS = void 0;
-const config_plugins_1 = require("@expo/config-plugins");
+const config_plugins_1 = require("expo/config-plugins");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const ERROR_MSG_PREFIX = 'An error occurred while configuring iOS notifications. ';

package/plugin/src/withNotifications.ts

@@ -1,4 +1,4 @@
-import { ConfigPlugin, createRunOncePlugin } from '@expo/config-plugins';
+import { ConfigPlugin, createRunOncePlugin } from 'expo/config-plugins';
 
 import { withNotificationsAndroid } from './withNotificationsAndroid';
 import { withNotificationsIOS } from './withNotificationsIOS';

package/plugin/src/withNotificationsAndroid.ts

@@ -1,12 +1,12 @@
+import { generateImageAsync } from '@expo/image-utils';
+import { ExpoConfig } from 'expo/config';
 import {
   AndroidConfig,
   ConfigPlugin,
   withDangerousMod,
   withAndroidColors,
   withAndroidManifest,
-} from '@expo/config-plugins';
-import { ExpoConfig } from '@expo/config-types';
-import { generateImageAsync } from '@expo/image-utils';
+} from 'expo/config-plugins';
 import { writeFileSync, unlinkSync, copyFileSync, existsSync, mkdirSync } from 'fs';
 import { basename, resolve } from 'path';
 

package/plugin/src/withNotificationsIOS.ts

@@ -4,7 +4,7 @@ import {
   IOSConfig,
   withXcodeProject,
   XcodeProject,
-} from '@expo/config-plugins';
+} from 'expo/config-plugins';
 import { copyFileSync } from 'fs';
 import { basename, resolve } from 'path';
 

package/src/NotificationPermissions.ts

@@ -37,7 +37,7 @@ export async function requestPermissionsAsync(permissions?: NotificationPermissi
  *
  * @example
  * ```ts
- * const [status, requestPermission] = Notifications.usePermissions();
+ * const [permissionResponse, requestPermission] = Notifications.usePermissions();
  * ```
  */
 export const usePermissions = createPermissionHook<

package/android/src/main/java/expo/modules/notifications/permissions/NotificationPermissionsModule.java

@@ -1,74 +0,0 @@
-package expo.modules.notifications.permissions;
-
-import android.app.NotificationManager;
-import android.content.Context;
-import android.os.Build;
-import android.os.Bundle;
-
-import expo.modules.core.ExportedModule;
-import expo.modules.core.Promise;
-import expo.modules.core.arguments.ReadableArguments;
-import expo.modules.core.interfaces.ExpoMethod;
-
-import androidx.core.app.NotificationManagerCompat;
-
-import expo.modules.interfaces.permissions.PermissionsStatus;
-
-import static expo.modules.interfaces.permissions.PermissionsResponse.CAN_ASK_AGAIN_KEY;
-import static expo.modules.interfaces.permissions.PermissionsResponse.EXPIRES_KEY;
-import static expo.modules.interfaces.permissions.PermissionsResponse.GRANTED_KEY;
-import static expo.modules.interfaces.permissions.PermissionsResponse.PERMISSION_EXPIRES_NEVER;
-import static expo.modules.interfaces.permissions.PermissionsResponse.STATUS_KEY;
-
-public class NotificationPermissionsModule extends ExportedModule {
-  private static final String EXPORTED_NAME = "ExpoNotificationPermissionsModule";
-
-  private static final String ANDROID_RESPONSE_KEY = "android";
-  private static final String IMPORTANCE_KEY = "importance";
-  private static final String INTERRUPTION_FILTER_KEY = "interruptionFilter";
-
-  public NotificationPermissionsModule(Context context) {
-    super(context);
-  }
-
-  @Override
-  public String getName() {
-    return EXPORTED_NAME;
-  }
-
-  @ExpoMethod
-  public void getPermissionsAsync(final Promise promise) {
-    promise.resolve(getPermissionsBundle());
-  }
-
-  @ExpoMethod
-  public void requestPermissionsAsync(@SuppressWarnings("unused") final ReadableArguments permissionsTypes, final Promise promise) {
-    promise.resolve(getPermissionsBundle());
-  }
-
-  private Bundle getPermissionsBundle() {
-    NotificationManagerCompat managerCompat = NotificationManagerCompat.from(getContext());
-    boolean areEnabled = managerCompat.areNotificationsEnabled();
-    PermissionsStatus status = areEnabled ? PermissionsStatus.GRANTED : PermissionsStatus.DENIED;
-
-    Bundle permissions = new Bundle();
-
-    permissions.putString(EXPIRES_KEY, PERMISSION_EXPIRES_NEVER);
-    permissions.putBoolean(CAN_ASK_AGAIN_KEY, areEnabled);
-    permissions.putString(STATUS_KEY, status.getStatus());
-    permissions.putBoolean(GRANTED_KEY, PermissionsStatus.GRANTED == status);
-
-    Bundle platformPermissions = new Bundle();
-
-    platformPermissions.putInt(IMPORTANCE_KEY, managerCompat.getImportance());
-
-    NotificationManager manager = (NotificationManager) getContext().getSystemService(Context.NOTIFICATION_SERVICE);
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && manager != null) {
-      platformPermissions.putInt(INTERRUPTION_FILTER_KEY, manager.getCurrentInterruptionFilter());
-    }
-
-    permissions.putBundle(ANDROID_RESPONSE_KEY, platformPermissions);
-
-    return permissions;
-  }
-}