Skip to content
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

🚫 Test merging two copies of branches #1330

Merged
merged 688 commits into from
Oct 30, 2023
Merged

Conversation

nan-li
Copy link
Contributor

@nan-li nan-li commented Oct 30, 2023

Test a rebase from copies of branches


This change is Reviewable

nan-li and others added 30 commits October 30, 2023 11:09
* instead of 5.0.0-alpha1
…s_user_data

[user model] replace user data with the fetch user response
…se_guide

[user model] Add `5.0.0-alpha-01` Migration Guide
* calculateIsOptedIn and calculateIsEnabled were not actually using the passed in arguments
* The anonymous user has been identified, but we still need to Fetch User as we cleared local data
* This will hydrate the onesignal_id again as well as other user properties
…gration_guide

migration guide alpha-01: update SDK install instructions
[user model] Fix firing the push subscription observer
emawby and others added 26 commits October 30, 2023 11:13
* Rename `OSBackgroundTaskManagerDelegate` -> `OSBackgroundTaskHandler` because it is not truly a delegate, but is a concrete implementation that is injected
…ility

[User model] Web view inspectability
[5.0.0] Push subscription related fixes (3)
* Fix a bug in setting an appId that is retrieved from cache. We were overwriting it with nil or "" after reading from cache.
* Additionally, remove `appId` property from the OneSignal class because we can manage the appId via the `OneSignalConfigManager`. Better not to have two sources of truth for appId.
* Remove `kOSSettingsKeyInOmitNoAppIdLogging` as it does not appear to be used anymore
* Nit: clarifying logs
…rappers

Fix bug when setting app_id from cache
@nan-li nan-li marked this pull request as ready for review October 30, 2023 18:35
@nan-li nan-li changed the title Test merging two copies of branches 🚫 Test merging two copies of branches Oct 30, 2023
@nan-li nan-li merged commit a9d9eb0 into main_copy Oct 30, 2023
1 of 2 checks passed
@nan-li nan-li deleted the major_release_5.0.0_copy branch October 30, 2023 18:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants