@onesignal/capacitor-plugin 1.0.6 → 1.1.0

package/OneSignalCapacitorPlugin.podspec

@@ -1,6 +1,9 @@
 require 'json'
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
+onesignal_xcframework_version = '5.5.2'
+onesignal_disable_location_env = ENV['ONESIGNAL_DISABLE_LOCATION'].to_s.strip.downcase
+onesignal_disable_location = ['true', '1'].include?(onesignal_disable_location_env)
 
 Pod::Spec.new do |s|
   s.name = 'OnesignalCapacitorPlugin'
@@ -20,5 +23,10 @@ Pod::Spec.new do |s|
   s.swift_version = '5.9'
 
   s.dependency 'Capacitor'
-  s.dependency 'OneSignalXCFramework', '5.5.2'
+  if onesignal_disable_location
+    s.dependency 'OneSignalXCFramework/OneSignal', onesignal_xcframework_version
+    s.dependency 'OneSignalXCFramework/OneSignalInAppMessages', onesignal_xcframework_version
+  else
+    s.dependency 'OneSignalXCFramework', onesignal_xcframework_version
+  end
 end

package/Package.swift

@@ -1,6 +1,34 @@
 // swift-tools-version: 5.9
 
 import PackageDescription
+import Foundation
+
+func oneSignalEnvFlag(_ name: String) -> Bool {
+    let value = Context.environment[name]?.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
+    return value == "true" || value == "1"
+}
+
+let oneSignalDisableLocation = oneSignalEnvFlag("ONESIGNAL_DISABLE_LOCATION")
+
+// InAppMessages, Location, and Extension are separate library products in
+// OneSignal-XCFramework and must be linked explicitly under SPM. Location can
+// be omitted for apps that do not use OneSignal.Location.
+var oneSignalDependencies: [Target.Dependency] = [
+    .product(name: "OneSignalFramework", package: "OneSignal-XCFramework"),
+    .product(name: "OneSignalInAppMessages", package: "OneSignal-XCFramework"),
+    .product(name: "OneSignalExtension", package: "OneSignal-XCFramework"),
+]
+
+if !oneSignalDisableLocation {
+    oneSignalDependencies.append(.product(name: "OneSignalLocation", package: "OneSignal-XCFramework"))
+}
+
+var capacitorPluginDependencies: [Target.Dependency] = [
+    .product(name: "Capacitor", package: "capacitor-swift-pm"),
+    .product(name: "Cordova", package: "capacitor-swift-pm"),
+]
+capacitorPluginDependencies.append(contentsOf: oneSignalDependencies)
+capacitorPluginDependencies.append("OSCapacitorLaunchOptions")
 
 let package = Package(
     name: "OnesignalCapacitorPlugin",
@@ -28,19 +56,7 @@ let package = Package(
         ),
         .target(
             name: "OnesignalCapacitorPlugin",
-            dependencies: [
-                .product(name: "Capacitor", package: "capacitor-swift-pm"),
-                .product(name: "Cordova", package: "capacitor-swift-pm"),
-                // InAppMessages and Location are separate library products in
-                // OneSignal-XCFramework and must be linked explicitly under SPM,
-                // otherwise their xcframeworks aren't loaded and the namespaces
-                // are silent no-ops at runtime.
-                .product(name: "OneSignalFramework", package: "OneSignal-XCFramework"),
-                .product(name: "OneSignalInAppMessages", package: "OneSignal-XCFramework"),
-                .product(name: "OneSignalLocation", package: "OneSignal-XCFramework"),
-                .product(name: "OneSignalExtension", package: "OneSignal-XCFramework"),
-                "OSCapacitorLaunchOptions"
-            ],
+            dependencies: capacitorPluginDependencies,
             path: "ios/Sources/OneSignalCapacitorPlugin"
         )
     ]

package/README.md

@@ -4,11 +4,93 @@ The pure [Capacitor](https://capacitorjs.com/) plugin for [OneSignal](https://on
 
 ## Install
 
+Install with your package manager of choice:
+
 ```bash
+# with vp
+vp add @onesignal/capacitor-plugin
+
+# with bun
+bun add @onesignal/capacitor-plugin
+
+# with npm
 npm install @onesignal/capacitor-plugin
+```
+
+Then sync Capacitor:
+
+```bash
+# with vp
+vpx cap sync
+
+# with bun
+bunx cap sync
+
+# with npm
 npx cap sync
 ```
 
+## Disabling OneSignal Location
+
+If your app does not use `OneSignal.Location`, you can exclude the native OneSignal location module from iOS and Android builds.
+
+Set `ONESIGNAL_DISABLE_LOCATION=true` in the environment before resolving or building native dependencies. The value is case-insensitive, and `1` is also accepted.
+
+```bash
+ONESIGNAL_DISABLE_LOCATION=true npx cap sync
+```
+
+For day-to-day native builds and runs, keep the same environment variable set so Capacitor, Swift Package Manager, CocoaPods, and Gradle do not re-resolve with the location module included:
+
+```bash
+ONESIGNAL_DISABLE_LOCATION=true npx cap run ios
+ONESIGNAL_DISABLE_LOCATION=true npx cap run android
+```
+
+In GitHub Actions, set it once at the job or step level so Swift Package Manager, CocoaPods, and Gradle builds inherit it:
+
+```yaml
+env:
+  ONESIGNAL_DISABLE_LOCATION: true
+```
+
+With the location module disabled, calls to `OneSignal.Location` are ignored on Android and `OneSignal.Location.isShared()` resolves `false`.
+
+### Applying the change
+
+The environment variable is read when native dependencies are resolved. If you change the variable in an existing project, clear the relevant cache and re-resolve in a shell where the variable is exported.
+
+> [!IMPORTANT]
+> When using Xcode or Android Studio, launch the IDE from a terminal that has `ONESIGNAL_DISABLE_LOCATION` exported. An IDE launched from the Dock/Finder does not inherit variables set only in your shell profile.
+
+Swift Package Manager:
+
+```bash
+rm -rf ~/Library/Caches/org.swift.swiftpm ~/Library/Developer/Xcode/DerivedData/*
+ONESIGNAL_DISABLE_LOCATION=true npx cap sync ios
+```
+
+In Xcode, you can instead use **File -> Packages -> Reset Package Caches** with the variable exported, then build.
+
+CocoaPods:
+
+```bash
+cd ios/App
+pod deintegrate
+rm -rf Pods Podfile.lock
+ONESIGNAL_DISABLE_LOCATION=true pod install
+```
+
+Android Gradle, which re-reads the variable on each configuration:
+
+```bash
+ONESIGNAL_DISABLE_LOCATION=true npx cap sync android
+cd android
+ONESIGNAL_DISABLE_LOCATION=true ./gradlew assembleDebug
+```
+
+On CI, key any DerivedData, SwiftPM, CocoaPods, or Gradle caches on the value of `ONESIGNAL_DISABLE_LOCATION` so a restored cache does not resurrect the location module.
+
 ## Usage
 
 ```ts

package/android/build.gradle.kts

@@ -84,8 +84,16 @@ fun propertyOrCatalog(propertyName: String, catalogKey: String): String =
 fun intPropertyOrCatalog(propertyName: String, catalogKey: String): Int =
     project.findProperty(propertyName)?.toString()?.toInt() ?: catalogVersion(catalogKey).toInt()
 
+fun envFlag(envName: String): Boolean {
+    val value = System.getenv(envName)
+    val normalizedValue = value?.trim()
+    return normalizedValue.equals("true", ignoreCase = true) || normalizedValue == "1"
+}
+
 val junitVersion: String = propertyOrCatalog("junitVersion", "junit")
 val androidxAppCompatVersion: String = propertyOrCatalog("androidxAppCompatVersion", "androidxAppCompat")
+val oneSignalVersion: String = catalogVersion("onesignal")
+val oneSignalDisableLocation: Boolean = envFlag("ONESIGNAL_DISABLE_LOCATION")
 
 extra["junitVersion"] = junitVersion
 extra["androidxAppCompatVersion"] = androidxAppCompatVersion
@@ -126,7 +134,13 @@ repositories {
 dependencies {
     "implementation"(project(":capacitor-android"))
     "implementation"("androidx.appcompat:appcompat:$androidxAppCompatVersion")
-    "implementation"("com.onesignal:OneSignal:${catalogVersion("onesignal")}")
+    if (oneSignalDisableLocation) {
+        "implementation"("com.onesignal:core:$oneSignalVersion")
+        "implementation"("com.onesignal:notifications:$oneSignalVersion")
+        "implementation"("com.onesignal:in-app-messages:$oneSignalVersion")
+    } else {
+        "implementation"("com.onesignal:OneSignal:$oneSignalVersion")
+    }
     "testImplementation"("junit:junit:$junitVersion")
     "androidTestImplementation"("androidx.test.ext:junit:${catalogVersion("androidxTestJunit")}")
     "androidTestImplementation"("androidx.test.espresso:espresso-core:${catalogVersion("androidxEspresso")}")

package/android/src/main/kotlin/com/onesignal/capacitor/OneSignalCapacitorPlugin.kt

@@ -7,6 +7,7 @@ import com.getcapacitor.PluginMethod
 import com.getcapacitor.annotation.CapacitorPlugin
 import com.onesignal.OneSignal
 import com.onesignal.common.OneSignalWrapper
+import com.onesignal.debug.internal.logging.Logging
 import com.onesignal.inAppMessages.IInAppMessageClickEvent
 import com.onesignal.inAppMessages.IInAppMessageClickListener
 import com.onesignal.inAppMessages.IInAppMessageDidDismissEvent
@@ -24,6 +25,7 @@ import com.onesignal.user.state.IUserStateObserver
 import com.onesignal.user.state.UserChangedState
 import com.onesignal.user.subscriptions.IPushSubscriptionObserver
 import com.onesignal.user.subscriptions.PushSubscriptionChangedState
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
@@ -44,6 +46,8 @@ class OneSignalCapacitorPlugin : Plugin(),
         // provisional (3), and ephemeral (4) states do not apply here.
         private const val PERMISSION_DENIED = 1
         private const val PERMISSION_AUTHORIZED = 2
+        private const val LOCATION_CALL_FAILED =
+            "OneSignal.Location call failed. The location module may not be included in this build."
     }
 
     private val notificationWillDisplayCache = mutableMapOf<String, INotificationWillDisplayEvent>()
@@ -56,6 +60,10 @@ class OneSignalCapacitorPlugin : Plugin(),
     // call into the dead Capacitor bridge.
     private val pluginScope = MainScope()
 
+    private fun logLocationCallFailed(throwable: Throwable) {
+        Logging.error(LOCATION_CALL_FAILED, throwable)
+    }
+
     private val permissionObserver = object : IPermissionObserver {
         override fun onNotificationPermissionChange(permission: Boolean) {
             val ret = JSObject()
@@ -132,7 +140,7 @@ class OneSignalCapacitorPlugin : Plugin(),
         initialized = true
 
         OneSignalWrapper.sdkType = "capacitor"
-        OneSignalWrapper.sdkVersion = "010006"
+        OneSignalWrapper.sdkVersion = "010100"
         OneSignal.initWithContext(context, appId)
 
         OneSignal.Notifications.addPermissionObserver(permissionObserver)
@@ -640,7 +648,13 @@ class OneSignalCapacitorPlugin : Plugin(),
     @PluginMethod
     fun requestLocationPermission(call: PluginCall) {
         pluginScope.launch {
-            OneSignal.Location.requestPermission()
+            try {
+                OneSignal.Location.requestPermission()
+            } catch (e: CancellationException) {
+                throw e
+            } catch (t: Throwable) {
+                logLocationCallFailed(t)
+            }
             call.resolve()
         }
     }
@@ -648,14 +662,23 @@ class OneSignalCapacitorPlugin : Plugin(),
     @PluginMethod
     fun setLocationShared(call: PluginCall) {
         val shared = call.getBoolean("shared") ?: false
-        OneSignal.Location.isShared = shared
+        try {
+            OneSignal.Location.isShared = shared
+        } catch (t: Throwable) {
+            logLocationCallFailed(t)
+        }
         call.resolve()
     }
 
     @PluginMethod
     fun isLocationShared(call: PluginCall) {
         val ret = JSObject()
-        ret.put("shared", OneSignal.Location.isShared)
+        try {
+            ret.put("shared", OneSignal.Location.isShared)
+        } catch (t: Throwable) {
+            logLocationCallFailed(t)
+            ret.put("shared", false)
+        }
         call.resolve(ret)
     }
 

package/ios/Sources/OneSignalCapacitorPlugin/OneSignalCapacitorPlugin.swift

@@ -110,7 +110,7 @@ public class OneSignalCapacitorPlugin: CAPPlugin, CAPBridgedPlugin {
         initialized = true
 
         OneSignalWrapper.sdkType = "capacitor"
-        OneSignalWrapper.sdkVersion = "010006"
+        OneSignalWrapper.sdkVersion = "010100"
         // OSCapacitorLaunchOptions's +load captures the dictionary from
         // UIApplicationDidFinishLaunchingNotification at process start (before
         // main()), so cold-start notification taps that arrive via launchOptions

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onesignal/capacitor-plugin",
-  "version": "1.0.6",
+  "version": "1.1.0",
   "description": "OneSignal is a high volume Push Notification service for mobile apps. This is the pure Capacitor plugin for OneSignal, providing push notifications, in-app messaging, and more.",
   "keywords": [
     "apns",