toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix android CustomPushNotificationHelper bad merge

Browse source
This commit is contained in:
Elias Nahum 2023-02-07 12:33:50 +02:00
parent 7927d9ce78
commit b9b2991861
No known key found for this signature in database
GPG key ID: A2EB45B81EA1AB32
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/app/src/main/java/com/mattermost/helpers/CustomPushNotificationHelper.java
View file

@ -60,6 +60,7 @@ public class CustomPushNotificationHelper {
String senderId = bundle.getString("sender_id");
String serverUrl = bundle.getString("server_url");
String type = bundle.getString("type");
String urlOverride = bundle.getString("override_icon_url");
if (senderId == null) {
senderId = "sender_id";
}
@ -260,6 +261,7 @@ public class CustomPushNotificationHelper {
final String senderId = "me";
final String serverUrl = bundle.getString("server_url");
final String type = bundle.getString("type");
String urlOverride = bundle.getString("override_icon_url");
Person.Builder sender = new Person.Builder()
.setKey(senderId)