Skip to content

[FIX] Hide reply notification action when there are missing data #1771

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

Merged
diegolmello merged 4 commits into from
Feb 28, 2020
Merged

[FIX] Hide reply notification action when there are missing data #1771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
084a474
[FIX] Not allow to reply messages without necessary info
djorkaeffalexandre Feb 21, 2020
7631324
[FIX] Improve the condition place
djorkaeffalexandre Feb 21, 2020
79b3db2
[FIX] Remove unnecessary change
djorkaeffalexandre Feb 21, 2020
f1d04dc
Merge branch 'develop' into fix.notification-reply
diegolmello Feb 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion android/app/src/main/java/chat/rocket/reactnative/CustomPushNotification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,9 @@ private void notificationStyle(Notification.Builder notification, int notId, Bun
}

private void notificationReply(Notification.Builder notification, int notificationId, Bundle bundle) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
String notId = bundle.getString("notId", "1");
String ejson = bundle.getString("ejson", "{}");
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N || notId.equals("1") || ejson.equals("{}")) {
return;
}
String label = "Reply";
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/java/chat/rocket/reactnative/Ejson.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public String userId() {

public String serverURL() {
String url = this.host;
if (url.endsWith("/")) {
if (url != null && url.endsWith("/")) {
url = url.substring(0, url.length() - 1);
}
return url;
Expand Down