notif: Use null-safe generics in Pigeon

Now that we use the version of Pigeon package that supports
non-nullable types in collections, update our Pigeon files
to incorporate them.

Fixes: #942

Author: rajveermalviya

android/app/src/main/kotlin/com/zulip/flutter/Notifications.g.kt

@@ -262,15 +262,15 @@ data class MessagingStyleMessage (
 data class MessagingStyle (
   val user: Person,
   val conversationTitle: String? = null,
-  val messages: List<MessagingStyleMessage?>,
+  val messages: List<MessagingStyleMessage>,
   val isGroupConversation: Boolean
 )
  {
   companion object {
     fun fromList(pigeonVar_list: List<Any?>): MessagingStyle {
       val user = pigeonVar_list[0] as Person
       val conversationTitle = pigeonVar_list[1] as String?
-      val messages = pigeonVar_list[2] as List<MessagingStyleMessage?>
+      val messages = pigeonVar_list[2] as List<MessagingStyleMessage>
       val isGroupConversation = pigeonVar_list[3] as Boolean
       return MessagingStyle(user, conversationTitle, messages, isGroupConversation)
     }
@@ -294,13 +294,13 @@ data class MessagingStyle (
  */
 data class Notification (
   val group: String,
-  val extras: Map<String?, String?>
+  val extras: Map<String, String>
 )
  {
   companion object {
     fun fromList(pigeonVar_list: List<Any?>): Notification {
       val group = pigeonVar_list[0] as String
-      val extras = pigeonVar_list[1] as Map<String?, String?>
+      val extras = pigeonVar_list[1] as Map<String, String>
       return Notification(group, extras)
     }
   }
@@ -553,7 +553,7 @@ interface AndroidNotificationHostApi {
    *   https://developer.android.com/reference/kotlin/android/app/NotificationManager.html#notify
    *   https://developer.android.com/reference/androidx/core/app/NotificationCompat.Builder
    */
-  fun notify(tag: String?, id: Long, autoCancel: Boolean?, channelId: String, color: Long?, contentIntent: PendingIntent?, contentText: String?, contentTitle: String?, extras: Map<String?, String?>?, groupKey: String?, inboxStyle: InboxStyle?, isGroupSummary: Boolean?, messagingStyle: MessagingStyle?, number: Long?, smallIconResourceName: String?)
+  fun notify(tag: String?, id: Long, autoCancel: Boolean?, channelId: String, color: Long?, contentIntent: PendingIntent?, contentText: String?, contentTitle: String?, extras: Map<String, String>?, groupKey: String?, inboxStyle: InboxStyle?, isGroupSummary: Boolean?, messagingStyle: MessagingStyle?, number: Long?, smallIconResourceName: String?)
   /**
    * Wraps `androidx.core.app.NotificationManagerCompat.getActiveNotifications`,
    * combined with `androidx.core.app.NotificationCompat.MessagingStyle.extractMessagingStyleFromNotification`.
@@ -692,7 +692,7 @@ interface AndroidNotificationHostApi {
             val contentIntentArg = args[5] as PendingIntent?
             val contentTextArg = args[6] as String?
             val contentTitleArg = args[7] as String?
-            val extrasArg = args[8] as Map<String?, String?>?
+            val extrasArg = args[8] as Map<String, String>?
             val groupKeyArg = args[9] as String?
             val inboxStyleArg = args[10] as InboxStyle?
             val isGroupSummaryArg = args[11] as Boolean?

android/app/src/main/kotlin/com/zulip/flutter/ZulipPlugin.kt

@@ -183,7 +183,7 @@ private class AndroidNotificationHost(val context: Context)
         contentIntent: PendingIntent?,
         contentText: String?,
         contentTitle: String?,
-        extras: Map<String?, String?>?,
+        extras: Map<String, String>?,
         groupKey: String?,
         inboxStyle: InboxStyle?,
         isGroupSummary: Boolean?,
@@ -221,7 +221,7 @@ private class AndroidNotificationHost(val context: Context)
                 val style = NotificationCompat.MessagingStyle(toAndroidPerson(messagingStyle.user))
                     .setConversationTitle(messagingStyle.conversationTitle)
                     .setGroupConversation(messagingStyle.isGroupConversation)
-                messagingStyle.messages.forEach { it?.let {
+                messagingStyle.messages.forEach { it.let {
                     style.addMessage(NotificationCompat.MessagingStyle.Message(
                         it.text,
                         it.timestampMs,
@@ -268,8 +268,11 @@ private class AndroidNotificationHost(val context: Context)
                 Notification(
                     it.notification.group,
                     desiredExtras
-                        .associateWith { key -> it.notification.extras.getString(key) }
-                        .filter { entry -> entry.value != null }
+                        .mapNotNull { key ->
+                            it.notification.extras.getString(key)?.let { value ->
+                                key to value
+                            } }
+                        .toMap()
                 ),
             )
         }

lib/host/android_notifications.g.dart

@@ -256,7 +256,7 @@ class MessagingStyle {
 
   String? conversationTitle;
 
-  List<MessagingStyleMessage?> messages;
+  List<MessagingStyleMessage> messages;
 
   bool isGroupConversation;
 
@@ -274,7 +274,7 @@ class MessagingStyle {
     return MessagingStyle(
       user: result[0]! as Person,
       conversationTitle: result[1] as String?,
-      messages: (result[2] as List<Object?>?)!.cast<MessagingStyleMessage?>(),
+      messages: (result[2] as List<Object?>?)!.cast<MessagingStyleMessage>(),
       isGroupConversation: result[3]! as bool,
     );
   }
@@ -291,7 +291,7 @@ class Notification {
 
   String group;
 
-  Map<String?, String?> extras;
+  Map<String, String> extras;
 
   Object encode() {
     return <Object?>[
@@ -304,7 +304,7 @@ class Notification {
     result as List<Object?>;
     return Notification(
       group: result[0]! as String,
-      extras: (result[1] as Map<Object?, Object?>?)!.cast<String?, String?>(),
+      extras: (result[1] as Map<Object?, Object?>?)!.cast<String, String>(),
     );
   }
 }
@@ -645,7 +645,7 @@ class AndroidNotificationHostApi {
   /// See:
   ///   https://developer.android.com/reference/kotlin/android/app/NotificationManager.html#notify
   ///   https://developer.android.com/reference/androidx/core/app/NotificationCompat.Builder
-  Future<void> notify({String? tag, required int id, bool? autoCancel, required String channelId, int? color, PendingIntent? contentIntent, String? contentText, String? contentTitle, Map<String?, String?>? extras, String? groupKey, InboxStyle? inboxStyle, bool? isGroupSummary, MessagingStyle? messagingStyle, int? number, String? smallIconResourceName, }) async {
+  Future<void> notify({String? tag, required int id, bool? autoCancel, required String channelId, int? color, PendingIntent? contentIntent, String? contentText, String? contentTitle, Map<String, String>? extras, String? groupKey, InboxStyle? inboxStyle, bool? isGroupSummary, MessagingStyle? messagingStyle, int? number, String? smallIconResourceName, }) async {
     final String pigeonVar_channelName = 'dev.flutter.pigeon.zulip.AndroidNotificationHostApi.notify$pigeonVar_messageChannelSuffix';
     final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
       pigeonVar_channelName,

pigeon/notifications.dart

@@ -129,9 +129,7 @@ class MessagingStyle {
 
   final Person user;
   final String? conversationTitle;
-  // TODO(#942): Make list item non-nullable, once pigeon supports non-nullable type arguments.
-  //   https://github.com/flutter/flutter/issues/97848
-  final List<MessagingStyleMessage?> messages;
+  final List<MessagingStyleMessage> messages;
   final bool isGroupConversation;
 }
 
@@ -142,7 +140,7 @@ class Notification {
   Notification({required this.group, required this.extras});
 
   final String group;
-  final Map<String?, String?> extras; // TODO(#942)
+  final Map<String, String> extras;
   // Various other properties too; add them if needed.
 }
 
@@ -267,7 +265,7 @@ abstract class AndroidNotificationHostApi {
     PendingIntent? contentIntent,
     String? contentText,
     String? contentTitle,
-    Map<String?, String?>? extras, // TODO(#942)
+    Map<String, String>? extras,
     String? groupKey,
     InboxStyle? inboxStyle,
     bool? isGroupSummary,

test/model/binding.dart

@@ -646,7 +646,7 @@ class FakeAndroidNotificationHostApi implements AndroidNotificationHostApi {
     PendingIntent? contentIntent,
     String? contentText,
     String? contentTitle,
-    Map<String?, String?>? extras,
+    Map<String, String>? extras,
     String? groupKey,
     InboxStyle? inboxStyle,
     bool? isGroupSummary,
@@ -686,7 +686,7 @@ class FakeAndroidNotificationHostApi implements AndroidNotificationHostApi {
             isGroupConversation: messagingStyle.isGroupConversation,
             messages: messagingStyle.messages.map((message) =>
               MessagingStyleMessage(
-                text: message!.text,
+                text: message.text,
                 timestampMs: message.timestampMs,
                 person: Person(
                   key: message.person.key,
@@ -701,14 +701,14 @@ class FakeAndroidNotificationHostApi implements AndroidNotificationHostApi {
     _activeNotificationsMessagingStyle[tag];
 
   @override
-  Future<List<StatusBarNotification>> getActiveNotifications({required List<String?> desiredExtras}) async {
+  Future<List<StatusBarNotification>> getActiveNotifications({required List<String> desiredExtras}) async {
     return _activeNotifications.values.map((statusNotif) {
       final notificationExtras = statusNotif.notification.extras;
-      statusNotif.notification.extras = Map.fromEntries(
-        desiredExtras
-          .map((key) => MapEntry(key, notificationExtras[key]))
-          .where((entry) => entry.value != null)
-      );
+      statusNotif.notification.extras = {
+        for (final key in desiredExtras)
+          if (notificationExtras[key] != null)
+            key: notificationExtras[key]!,
+      };
       return statusNotif;
     }).toList(growable: false);
   }