forked from Ivasoft/mattermost-mobile
Fix android CustomPushNotificationHelper bad merge
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user