Add option to default to HMS over FCM #2163
Merged
Conversation
This file contains 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 is migrating over the PR from the player model pr #1984
jkasten2
reviewed
Aug 1, 2024
| @@ -37,7 +39,17 @@ internal class DeviceService(private val _applicationService: IApplicationServic | |||
| override val deviceType: IDeviceService.DeviceType | |||
| get() { | |||
| if (supportsADM()) return IDeviceService.DeviceType.Fire | |||
| if (supportsGooglePush()) return IDeviceService.DeviceType.Android | |||
|
|
|||
| val supportsHMS: Boolean = supportsHMS | |||
There was a problem hiding this comment.
nit, we don't need the type, remove : Boolean from here.
| val supportsFCM = supportsGooglePush() | ||
|
|
||
| if (supportsFCM && supportsHMS) { | ||
| val context: Context = _applicationService.appContext |
There was a problem hiding this comment.
nit, we don't need the type, remove : Context from here.
This creates a new DeviceServiceTests file and moves supportsHMS and supportsGooglePush to the IDeviceService interface
emawby
force-pushed
the
add_default_to_huawei
branch
from
68f2c44
to
12b5c44
Compare
jkasten2
reviewed
Aug 2, 2024
...nalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/device/DeviceServiceTests.kt
Outdated
Show resolved
Hide resolved
jkasten2
approved these changes
Aug 2, 2024
Merged
This was referenced Aug 15, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
One Line Summary
Read a manifest metadata boolean to allow apps to prefer HMS over FCM for devices that can receive both.
Details
Apps can add the following to their
AndroidManifest.xml<meta-data android:name="com.onesignal.preferHMS" android:value="true"/>This setting will allow devices with both HMS and FCM capabilities to use HMS rather than the default of FCM.
I have left in the testing commits for review, but will rebase prior to merge. The only changed file is
DeviceService.ktMotivation
Allows apps to message users who move in and out of zones reachable by FCM, but can always receive HMS.
Scope
subscription type
Testing
Unit testing
n/a
Manual testing
Tested on Huawei device. I have left in 3 testing commits if reviewers would like to test.
Affected code checklist
Checklist
Overview
Testing
Final pass
This change is