From b9b299186112c0134e33195a99e394d148e982f5 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Tue, 7 Feb 2023 12:33:50 +0200
Subject: [PATCH] Fix android CustomPushNotificationHelper bad merge

---
 .../com/mattermost/helpers/CustomPushNotificationHelper.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/android/app/src/main/java/com/mattermost/helpers/CustomPushNotificationHelper.java b/android/app/src/main/java/com/mattermost/helpers/CustomPushNotificationHelper.java
index 919b32694..8bf4393e5 100644
--- a/android/app/src/main/java/com/mattermost/helpers/CustomPushNotificationHelper.java
+++ b/android/app/src/main/java/com/mattermost/helpers/CustomPushNotificationHelper.java
@@ -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)