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

Fix crash when using action buttons in Android #743

Merged
merged 2 commits into from
Sep 21, 2023
Merged

Fix crash when using action buttons in Android #743

merged 2 commits into from
Sep 21, 2023

Conversation

emawby
Copy link
Contributor

@emawby emawby commented Sep 15, 2023 •
edited
Loading

Description

One Line Summary

Fix crash in Android when receiving a notification with action buttons.

Details

We were converting the ActionButtons to a map so we could not bridge to dart from Android native
Fixes OneSignal/OneSignal-Android-SDK#1815

Motivation

fix crash

Scope

android push notifications

Testing

Manual testing

tested with Android push and iOS push

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 emawby force-pushed the fix/crash_when_using_action_buttons branch from 247a611 to 4c61e83 Compare September 15, 2023 19:43
This was referenced Sep 15, 2023
Closed
Closed
@emawby
Fix crash when using notification buttons
cb1a2b8 
The object names match iOS
@emawby emawby force-pushed the fix/crash_when_using_action_buttons branch from 16ed4ce to cb1a2b8 Compare September 15, 2023 21:44
jkasten2
jkasten2 requested changes Sep 19, 2023
View reviewed changes
android/src/main/java/com/onesignal/flutter/OneSignalSerializer.java Outdated
List<HashMap<String, Object>> convertedList = new ArrayList<HashMap<String, Object>>();
for (IActionButton actionButton : actionButtons) {
HashMap<String, Object> hash = new HashMap<>();
hash.put("i", actionButton.getId());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We shouldn't use creating the minited keys here, since these are the names the app developer will use.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed!

android/src/main/java/com/onesignal/flutter/OneSignalSerializer.java Outdated
HashMap<String, Object> hash = new HashMap<>();
hash.put("i", actionButton.getId());
hash.put("n", actionButton.getText());
hash.put("icon_type", actionButton.getIcon());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be icon instead of icon_type.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@emawby emawby requested a review from jkasten2 September 20, 2023 23:32
@emawby emawby merged commit 62a5670 into user_model/main Sep 21, 2023
@emawby emawby deleted the fix/crash_when_using_action_buttons branch September 21, 2023 18:45
@nan-li nan-li mentioned this pull request Sep 28, 2023
Merged
nan-li pushed a commit that referenced this pull request Jan 31, 2024
@emawby @nan-li
Merge pull request #743 from OneSignal/fix/crash_when_using_action_bu…
ecd7a75 
…ttons

Fix crash when using action buttons in Android
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.
2 participants
@emawby @jkasten2