Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add notification titles and group them properly on iOS 10+ #2347

Merged
merged 5 commits into from
Apr 3, 2019
Merged

Add notification titles and group them properly on iOS 10+ #2347

merged 5 commits into from
Apr 3, 2019

Conversation

fridtjof
Copy link
Contributor

As with #2207, I can't test this myself.

This is based on riot_2337 instead of develop, because required code was only merged into that branch (see #2207)

This closes #2208 and #2337

Signed-off-by: Fridtjof Mund 2780577+fridtjof@users.noreply.github.com

@SBiOSoftWhare
Copy link
Contributor

Thank you @fridtjof for your work. Thanks to you we will introduce notification title in Riot iOS.

Unfortunately since there are conflicts with riot_2337 branch I couldn't merge your work for the moment.
Could you resolve those conflicts by updating CHANGES.rst and adding your method notificationContentForEvent:pushRule:inAccount:onComplete: again in AppDelegate.m please? I will integrate this method again in handleLocalNotificationsForAccount: after merging your PR.
Otherwise don't worry I could manually integrate your work in riot_2337 branch.
In all cases you will be mentioned for your work in changes 🙂

# Conflicts:
#	CHANGES.rst
#	Riot/AppDelegate.m
@SBiOSoftWhare SBiOSoftWhare merged commit 55e6cb7 into element-hq:riot_2337 Apr 3, 2019
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants