From b5f80da28ddf1170eaa089252f0eb242701bc868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bispo?= <abispo@bitwarden.com>
Date: Fri, 30 Sep 2022 14:47:03 +0100
Subject: [PATCH] [SG-696] Android notification icon blank (#2105)

* [SG-696] Added new icon for android notifications. Changed notification intent flags to use helper.

* [SG-696] PR fix. Min version was already 21.
---
 src/Android/Android.csproj                            |  4 ++++
 src/Android/Resources/drawable/ic_notification.xml    |  4 ++++
 .../Services/AndroidPushNotificationService.cs        | 11 ++++++++---
 3 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 src/Android/Resources/drawable/ic_notification.xml

diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj
index af216e83f..78d51b5f7 100644
--- a/src/Android/Android.csproj
+++ b/src/Android/Android.csproj
@@ -217,6 +217,10 @@
     <AndroidResource Include="Resources\drawable-v26\splash_screen_round.xml" />
     <AndroidResource Include="Resources\drawable\logo_rounded.xml" />
     <AndroidResource Include="Resources\drawable-night-v26\splash_screen_round.xml" />
+    <AndroidResource Include="Resources\drawable\ic_notification.xml">
+      <SubType></SubType>
+      <Generator></Generator>
+    </AndroidResource>
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\splash_screen.xml" />
diff --git a/src/Android/Resources/drawable/ic_notification.xml b/src/Android/Resources/drawable/ic_notification.xml
new file mode 100644
index 000000000..ed92d0ce8
--- /dev/null
+++ b/src/Android/Resources/drawable/ic_notification.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="420"
+    android:viewportWidth="420" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M350.43,40.516C347.563,37.65 344.153,36.178 340.281,36.178L79.487,36.178C75.538,36.178 72.206,37.65 69.338,40.516C66.472,43.384 65,46.716 65,50.665L65,224.527C65,237.466 67.557,250.405 72.593,263.112C77.629,275.895 83.904,287.207 91.42,297.046C98.857,306.964 107.768,316.571 118.149,325.869C128.455,335.242 138.063,342.99 146.817,349.19C155.573,355.387 164.715,361.198 174.243,366.699C183.773,372.2 190.514,375.919 194.543,377.933C198.572,379.871 201.749,381.421 204.151,382.426C205.932,383.357 207.948,383.821 210.04,383.821C212.131,383.821 214.145,383.357 215.929,382.426C218.329,381.344 221.584,379.871 225.534,377.933C229.563,375.997 236.304,372.2 245.832,366.699C255.365,361.198 264.506,355.311 273.262,349.19C282.017,342.99 291.545,335.242 301.928,325.869C312.232,316.493 321.142,306.886 328.657,297.046C336.096,287.129 342.372,275.819 347.407,263.112C352.444,250.328 355,237.466 355,224.527L355,50.665C354.768,46.716 353.296,43.384 350.43,40.516ZM316.804,226.154C316.804,289.067 209.883,343.302 209.883,343.302L209.883,73.368L316.804,73.368C316.804,73.368 316.804,163.242 316.804,226.154Z"/>
+</vector>
diff --git a/src/Android/Services/AndroidPushNotificationService.cs b/src/Android/Services/AndroidPushNotificationService.cs
index b8088cb80..05602797c 100644
--- a/src/Android/Services/AndroidPushNotificationService.cs
+++ b/src/Android/Services/AndroidPushNotificationService.cs
@@ -3,10 +3,12 @@ using System;
 using System.Threading.Tasks;
 using Android.App;
 using Android.Content;
+using Android.OS;
 using AndroidX.Core.App;
 using Bit.App.Abstractions;
 using Bit.Core;
 using Bit.Core.Abstractions;
+using Bit.Droid.Utilities;
 using Xamarin.Forms;
 
 namespace Bit.Droid.Services
@@ -71,15 +73,18 @@ namespace Bit.Droid.Services
             {
                 throw new ArgumentNullException("notificationId cannot be null or empty.");
             }
-            
+
+
             var context = Android.App.Application.Context;
             var intent = new Intent(context, typeof(MainActivity));
-            var pendingIntent = PendingIntent.GetActivity(context, 20220801, intent, PendingIntentFlags.UpdateCurrent);
+            var pendingIntentFlags = AndroidHelpers.AddPendingIntentMutabilityFlag(PendingIntentFlags.UpdateCurrent, true);
+            var pendingIntent = PendingIntent.GetActivity(context, 20220801, intent, pendingIntentFlags);
             var builder = new NotificationCompat.Builder(context, Constants.AndroidNotificationChannelId)
                .SetContentIntent(pendingIntent)
                .SetContentTitle(title)
                .SetContentText(message)
-               .SetSmallIcon(Resource.Mipmap.ic_launcher)
+               .SetSmallIcon(Resource.Drawable.ic_notification)
+               .SetColor((int)Android.Graphics.Color.White)
                .SetAutoCancel(true);
 
             var notificationManager = NotificationManagerCompat.From(context);