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.

Sign up for GitHub

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

Jump to bottom

Do not swizzle a subclass of an already swizzled class #1287

Merged
merged 1 commit into from
Aug 3, 2023
Merged

Do not swizzle a subclass of an already swizzled class #1287

merged 1 commit into from
Aug 3, 2023

Conversation

emawby
Copy link
Contributor

@emawby emawby commented Aug 3, 2023 •
edited by jwilm
Loading

Description

One Line Summary

Prevent swizzling a subclass of an already swizzled class.

Details

This is mostly a cherry-pick from #1284 into the user model branch.

A couple changes required are that we swizzle UIApplicationDelegate twice. Once for appWillTerminate in OneSignalFramework and once for the notification methods in OneSignalNotifications.

I have also moved over the unit tests despite not being able to run them.

Testing

Unit testing

moved over but not runnable

Affected code checklist

  • Notifications
    • Display
    • Open
    • Push Processing
    • Confirm Deliveries
  • Outcomes
  • Sessions
  • In-App Messaging
  • REST API requests
  • Public API changes

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 Reviewable

@emawby
Do not swizzle a subclass of an already swizzled class
d679f93 
Adding unit test for swizzling subclass

Adding subClass swizzling check to UNUserNotificationCenter

Don't swizzle subclass if we have already swizzled its super
@emawby emawby requested a review from jkasten2 August 3, 2023 18:17
@emawby emawby merged commit 9ef9c26 into major_release_5.0.0 Aug 3, 2023
1 check failed
@emawby emawby deleted the user_model/fix_swizzling_subclasses branch August 3, 2023 18:52
nan-li pushed a commit that referenced this pull request Oct 30, 2023
@emawby @nan-li
Merge pull request #1287 from OneSignal/user_model/fix_swizzling_subc…
4e24e72 
…lasses

Do not swizzle a subclass of an already swizzled class
nan-li pushed a commit that referenced this pull request Oct 30, 2023
@emawby @nan-li
Merge pull request #1287 from OneSignal/user_model/fix_swizzling_subc…
cfff80a 
…lasses

Do not swizzle a subclass of an already swizzled class
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jkasten2 jkasten2 jkasten2 approved these changes

@nan-li nan-li Awaiting requested review from nan-li

@shepherd-l shepherd-l Awaiting requested review from shepherd-l

@jennantilla jennantilla Awaiting requested review from jennantilla

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@emawby @jkasten2 @nan-li @shepherd-l @jennantilla