Merge user_model/main into main #975

jennantilla · 2024-02-12T20:01:52Z

Description

One Line Summary

This PR will merge user_model/main changes into main.

Details

See here for a comparison of this branch vs. user_model/main. After this PR, main and user_model/main should be equivalent.

Note: main and user model diverged on January 4, 2023.

I have compared all changes on main and cherry-picked the merge commits.

To make the main branch reflect v5.x.x., the "old" main branch is maintained in branch 3.x.x_patch_branch.

Testing

Manual testing

Built and ran new branch on Android 13 emulator and iOS 17.2 emulator. Tested various methods to ensure everything is working.

Checklist

Overview

I have filled out all REQUIRED sections above
PR does one thing
- If it is hard to explain how any codes changes are related to each other then it most likely needs to be more than one PR
Any Public API changes are explained in the PR details and conform to existing APIs

Testing

I have included test coverage for these changes, or explained why they are not needed
All automated tests pass, or I explained why that is not possible
I have personally tested this on my device, or explained why that is not possible

Final pass

Code is as readable as possible.
- Simplify with less code, followed by splitting up code into well named functions and variables, followed by adding comments to the code.
I have reviewed this PR myself, ensuring it meets each checklist item
- WIP (Work In Progress) is ok, but explain what is still in progress and what you would like feedback on. Start the PR title with "WIP" to indicate this.

This change is

Remove logging from OneSignalPlugin class, separate log and visual level into distinct methods, update iOS header and implementation files

Remove Outcomes methods and imports from OneSignalPlugin class, update method names, update iOS header and implementation files

Remove Location methods from OneSignalPlugin class, update method names, update iOS header and implementation files

Create Location namespace

Create Session namespace

Create Debug namespace

Remove In-App Messages methods from OneSignalPlugin class, update method names, update iOS header and implementation files

Create InAppMessages Namespace

Remove User methods from OneSignalPlugin class, create new methods for Alias, update method names, update iOS header and implementation files

Update imports and initialization code so that iOS 5.0.0-alpha-02 can be tested on branch

Remove Push Subscription methods from OneSignalPlugin class, create new methods for opt in & property getters, update method names, update iOS header and implementation files

Update imports and initialization code so that iOS 5.0.0-alpha1 can be tested on branch

Create Alias methods, update method names, remove deprecated methods

Add setAlertLevel and update method calls

Add Alias methods, rename existing methods, remove deprecated methods

Remove "Number" suffix of method name for conformity between SDKs.

Create User Namespace

New method names conform to v5.0.0-beta1 conventions

Update privacy methods and create login/logout methods

Update SDK to 5.0.0-beta1 and OneSignalWrapper import to allow setSdkType

Update method names for Session namespace

[User Model] Create pushSubscription Namespace

`addAlias` string method improvement & `removeAliases` updated to take in `Collection<String> labels`

This reverts commit 4eca9f7.

…ternalId

Update Migration Guide

* Extract functionality to translate `null` and empty string ("") into NULL objects, into helper methods as they are used in multiple places.

Instead of returning an object with a boolean value

- Create new async methods - Mark old getters as deprecated

- Ensure ids are nullable and remove undefined - Update push optedIn getter to return boolean in callback

…er logging - Will log null instead of 'nil'

* Instead of making dictionaries just to pass strings over the bridge, pass the strings directly, when appropriate. * Do this by creating helper methods in iOS and Android called `callbackSuccessString` and `successCallbackString`.

* To explain why they are still there

* Move Android requestPermission resolving into the bridge to improve readability of the method.

Add getters and observer for onesignal ID and external ID

Update Push Subscription/Permission Getters to Async

[README] Removed some 404 links

Update Zapier.yml

Adding a new github action that allows us to measure issue response time

Update set_response_time.yml

jennantilla added 30 commits January 18, 2023 15:11

Create Debug namespace

a069f3a

Remove logging from OneSignalPlugin class, separate log and visual level into distinct methods, update iOS header and implementation files

Create Session namespace

919c883

Remove Outcomes methods and imports from OneSignalPlugin class, update method names, update iOS header and implementation files

Create Location namespace

e2e532d

Remove Location methods from OneSignalPlugin class, update method names, update iOS header and implementation files

Merge pull request #848 from OneSignal/user_model/location

1455a31

Create Location namespace

Merge pull request #847 from OneSignal/user_model/session

c7abae2

Create Session namespace

Merge pull request #846 from OneSignal/user_model/debug

629c600

Create Debug namespace

Create InAppMessages Namespace

c5bdf06

Remove In-App Messages methods from OneSignalPlugin class, update method names, update iOS header and implementation files

Merge pull request #849 from OneSignal/user_model/in_app_messages

920545b

Create InAppMessages Namespace

Create User Namespace

e2d7ba8

Remove User methods from OneSignalPlugin class, create new methods for Alias, update method names, update iOS header and implementation files

Update OneSignal Initialization

182e234

Update imports and initialization code so that iOS 5.0.0-alpha-02 can be tested on branch

Create PushSubscription namespace

f686c61

Remove Push Subscription methods from OneSignalPlugin class, create new methods for opt in & property getters, update method names, update iOS header and implementation files

Update Android Initialization

5d87335

Update imports and initialization code so that iOS 5.0.0-alpha1 can be tested on branch

Update User Methods

487d9f7

Create Alias methods, update method names, remove deprecated methods

Update Debug methods

030ebc5

Add setAlertLevel and update method calls

Update User methods

429eb08

Add Alias methods, rename existing methods, remove deprecated methods

Add import for LogLevel

62f68a1

Update Outcome methods

cc28c4d

SMS method name change

09f75ce

Remove "Number" suffix of method name for conformity between SDKs.

Merge pull request #851 from OneSignal/user_model/user

78f3c03

Create User Namespace

Update addEmail and addSms methods

566639d

New method names conform to v5.0.0-beta1 conventions

Update OneSignal class

e091a72

Update privacy methods and create login/logout methods

Update iOS header and implementation for OneSignal class

39fa3d2

Update Android implementation for OneSignal class

73020e5

Update Android package and imports

b4b29c4

Update SDK to 5.0.0-beta1 and OneSignalWrapper import to allow setSdkType

Update OutcomeController

6f993ac

Update method names for Session namespace

Fix indentation in getId method

3ca917e

Merge pull request #852 from OneSignal/user_model/push_subscription

1dc7837

[User Model] Create pushSubscription Namespace

Update Alias methods

486276f

`addAlias` string method improvement & `removeAliases` updated to take in `Collection<String> labels`

Indentation, login/logout, alias fixes

4eca9f7

Revert "Indentation, login/logout, alias fixes"

7c4d28b

This reverts commit 4eca9f7.

jennantilla and others added 25 commits February 23, 2024 17:14

Add userObserverCallbackId

85f507d

Update user observer method description with instructions to check ex…

e84a924

…ternalId

Update Id getters to async

846efc5

Update Migration Guide

767cede

Update Migration Guide

Update observer to include null external id

12dd6c9

cleanup: extract common functionality into helper methods

2eed867

* Extract functionality to translate `null` and empty string ("") into NULL objects, into helper methods as they are used in multiple places.

Update permission getter to return boolean in callback

4a4360f

Instead of returning an object with a boolean value

Update PushSubscription and Notification permission getters

7e8f197

- Create new async methods - Mark old getters as deprecated

Update Migration Guide with async getters

189afcd

Clarify deprecation annotations

e0454c5

Update push subscription getters

7e99ac0

- Ensure ids are nullable and remove undefined - Update push optedIn getter to return boolean in callback

Revert changes made to internal observers

c40364b

Extract properties from OSPushSubscriptionChangedState to ensure prop…

4304794

…er logging - Will log null instead of 'nil'

Fix getOptedInAsync after it is now passed a bool

b5c82cc

ios: use getStringOrNSNull helper method

b5140dd

Android: add OneSignalUtils and extract getStringOrJSONObjectNull

df1fa9b

Bridge: Use helper method to pass strings

1a391e7

* Instead of making dictionaries just to pass strings over the bridge, pass the strings directly, when appropriate. * Do this by creating helper methods in iOS and Android called `callbackSuccessString` and `successCallbackString`.

nits: update documentation for internal methods

d5e07a3

* To explain why they are still there

Refactor requestPermission method

918454d

* Move Android requestPermission resolving into the bridge to improve readability of the method.

Merge pull request #959 from OneSignal/feat/add_get_ids

3124470

Add getters and observer for onesignal ID and external ID

Merge pull request #977 from OneSignal/fix/property_getters

85f3dbd

Update Push Subscription/Permission Getters to Async

Merge pull request #844 from marclucraft/main

74221bb

[README] Removed some 404 links

Merge pull request #872 from OneSignal/zapier-fix

70b0f4a

Update Zapier.yml

Merge pull request #879 from OneSignal/actions/set_response_time

ec23725

Adding a new github action that allows us to measure issue response time

Merge pull request #958 from OneSignal/emawby-patch-1

6e35c4d

Update set_response_time.yml

jennantilla force-pushed the user_model_rebase branch from 3f77c0b to 6e35c4d Compare March 4, 2024 22:38

Merge branch 'main' into user_model_rebase

fdcd44c

nan-li approved these changes Mar 5, 2024

View reviewed changes

jennantilla merged commit cb45da1 into main Mar 6, 2024
3 checks passed

jennantilla deleted the user_model_rebase branch March 6, 2024 00:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge user_model/main into main #975

Merge user_model/main into main #975

jennantilla commented Feb 12, 2024 •

edited

Loading

Merge user_model/main into main #975

Merge user_model/main into main #975

Conversation

jennantilla commented Feb 12, 2024 • edited Loading

Description

One Line Summary

Details

Testing

Manual testing

Checklist

Overview

Testing

Final pass

jennantilla commented Feb 12, 2024 •

edited

Loading