-
Notifications
You must be signed in to change notification settings - Fork 0
feat: [SDK-4768] support disabling location module #29
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 | ||
|
|
@@ -44,6 +45,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_MODULE_NOT_AVAILABLE = | ||
| "OneSignal location module is not available. Add the location dependency to use OneSignal.Location." | ||
| } | ||
|
|
||
| private val notificationWillDisplayCache = mutableMapOf<String, INotificationWillDisplayEvent>() | ||
|
|
@@ -56,6 +59,10 @@ class OneSignalCapacitorPlugin : Plugin(), | |
| // call into the dead Capacitor bridge. | ||
| private val pluginScope = MainScope() | ||
|
|
||
| private fun logLocationModuleNotAvailable(throwable: Throwable) { | ||
| Logging.error(LOCATION_MODULE_NOT_AVAILABLE, throwable) | ||
| } | ||
|
|
||
| private val permissionObserver = object : IPermissionObserver { | ||
| override fun onNotificationPermissionChange(permission: Boolean) { | ||
| val ret = JSObject() | ||
|
|
@@ -640,22 +647,35 @@ class OneSignalCapacitorPlugin : Plugin(), | |
| @PluginMethod | ||
| fun requestLocationPermission(call: PluginCall) { | ||
| pluginScope.launch { | ||
| OneSignal.Location.requestPermission() | ||
| try { | ||
| OneSignal.Location.requestPermission() | ||
| } catch (t: Throwable) { | ||
| logLocationModuleNotAvailable(t) | ||
| } | ||
|
Comment on lines
+650
to
+654
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If the scope is cancelled while
Fix: rethrow cancellation before the broad catch: |
||
| call.resolve() | ||
| } | ||
| } | ||
|
|
||
| @PluginMethod | ||
| fun setLocationShared(call: PluginCall) { | ||
| val shared = call.getBoolean("shared") ?: false | ||
| OneSignal.Location.isShared = shared | ||
| try { | ||
| OneSignal.Location.isShared = shared | ||
| } catch (t: Throwable) { | ||
| logLocationModuleNotAvailable(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) { | ||
| logLocationModuleNotAvailable(t) | ||
| ret.put("shared", false) | ||
| } | ||
| call.resolve(ret) | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Each try/catch in this file also throws when the SDK isn't initialized yet, which can be confusing to debug. Consider a message like "OneSignal.Location call failed — the location module may not be included in this build" or detecting the module-missing case specifically.