Fixes requested in the PR

Author: Franco Bugnano

examples/push_notifications/android/app/google-services.json

@@ -30,8 +30,7 @@ class MyApp extends StatelessWidget {
   // This widget is the root of your application.
   @override
   Widget build(BuildContext context) {
-    final session = Session(appId: 'Hku1c4Pt', enablePushNotifications: true);
-    //final session = Session(appId: 'tuM9UrY8', enablePushNotifications: true); // For local testing
+    final session = Session(appId: 'YOUR_APP_ID', enablePushNotifications: true);
 
     final me = session.getUser(
       id: '123456',

examples/push_notifications/lib/firebase_options.dart

@@ -14,7 +14,7 @@ import './chatoptions.dart';
 import './user.dart';
 import './message.dart';
 import './predicate.dart';
-import './notification.dart';
+import './webview_common.dart';
 
 typedef SendMessageHandler = void Function(SendMessageEvent event);
 typedef TranslationToggledHandler = void Function(TranslationToggledEvent event);
@@ -153,7 +153,7 @@ class ChatBoxState extends State<ChatBox> {
         }
       ''');
 
-      _createSession();
+      createSession(execute: execute, session: widget.session, variableName: getUserVariableName(widget.session.me));
       _createChatBox();
       // messageFilter and highlightedWords are set as options for the chatbox
       _createConversation();
@@ -202,43 +202,6 @@ class ChatBoxState extends State<ChatBox> {
     );
   }
 
-  void _createSession() {
-    // Initialize Session object
-    final options = <String, dynamic>{};
-
-    options['appId'] = widget.session.appId;
-
-    if (widget.session.signature != null) {
-      options["signature"] = widget.session.signature;
-    }
-
-    execute('const options = ${json.encode(options)};');
-
-    final variableName = getUserVariableName(widget.session.me);
-    execute('options["me"] = $variableName;');
-
-    execute('const session = new Talk.Session(options);');
-
-    // TODO: This part has to be moved in the Session once we have the data layer SDK ready
-    if (widget.session.enablePushNotifications) {
-      if (fcmToken != null) {
-        execute('session.setPushRegistration({provider: "fcm", pushRegistrationId: "$fcmToken"});');
-      }
-
-      if (apnsToken != null) {
-        execute('session.setPushRegistration({provider: "apns", pushRegistrationId: "$apnsToken"});');
-      }
-    } else {
-      if (fcmToken != null) {
-        execute('session.unsetPushRegistration({provider: "fcm", pushRegistrationId: "$fcmToken"});');
-      }
-
-      if (apnsToken != null) {
-        execute('session.unsetPushRegistration({provider: "apns", pushRegistrationId: "$apnsToken"});');
-      }
-    }
-  }
-
   void _createChatBox() {
     _oldOptions = ChatBoxOptions(
       dir: widget.dir,

examples/push_notifications/lib/main.dart

@@ -13,7 +13,7 @@ import './conversation.dart';
 import './user.dart';
 import './predicate.dart';
 import './chatbox.dart';
-import './notification.dart';
+import './webview_common.dart';
 
 typedef SelectConversationHandler = void Function(SelectConversationEvent event);
 
@@ -131,7 +131,7 @@ class ConversationListState extends State<ConversationList> {
       // is being constructed, and the callback may very possibly change the state
       Timer.run(() => widget.onLoadingStateChanged?.call(LoadingState.loading));
 
-      _createSession();
+      createSession(execute: execute, session: widget.session, variableName: getUserVariableName(widget.session.me));
       _createConversationList();
       // feedFilter is set as an option for the inbox
 
@@ -161,43 +161,6 @@ class ConversationListState extends State<ConversationList> {
     );
   }
 
-  void _createSession() {
-    // Initialize Session object
-    final options = <String, dynamic>{};
-
-    options['appId'] = widget.session.appId;
-
-    if (widget.session.signature != null) {
-      options["signature"] = widget.session.signature;
-    }
-
-    execute('const options = ${json.encode(options)};');
-
-    final variableName = getUserVariableName(widget.session.me);
-    execute('options["me"] = $variableName;');
-
-    execute('const session = new Talk.Session(options);');
-
-    // TODO: This part has to be moved in the Session once we have the data layer SDK ready
-    if (widget.session.enablePushNotifications) {
-      if (fcmToken != null) {
-        execute('session.setPushRegistration({provider: "fcm", pushRegistrationId: "$fcmToken"});');
-      }
-
-      if (apnsToken != null) {
-        execute('session.setPushRegistration({provider: "apns", pushRegistrationId: "$apnsToken"});');
-      }
-    } else {
-      if (fcmToken != null) {
-        execute('session.unsetPushRegistration({provider: "fcm", pushRegistrationId: "$fcmToken"});');
-      }
-
-      if (apnsToken != null) {
-        execute('session.unsetPushRegistration({provider: "apns", pushRegistrationId: "$apnsToken"});');
-      }
-    }
-  }
-
   void _createConversationList() {
     final options = ConversationListOptions(
       showFeedHeader: widget.showFeedHeader,

lib/src/chatbox.dart

@@ -106,29 +106,40 @@ final _activeNotifications = <String, List<String>>{};
 int _nextId = 0;
 final _showIdFromNotificationId = <String, int>{};
 final _receivePort = ReceivePort();
+final _imageCache = <String, Uint8List>{};
+
+Future<Uint8List> _imageDataFromUrl(String url) async {
+  // Use the cached image
+  if (_imageCache.containsKey(url)) {
+    print("📘 _imageDataFromUrl ($url): Using cached image");
+    return _imageCache[url]!;
+  }
+
+  final response = await http.get(Uri.parse(url));
+  print("📘 _imageDataFromUrl ($url): $response");
+
+  // Cache the response only if the HTTP request was successful
+  if (response.statusCode < 400) {
+    _imageCache[url] = response.bodyBytes;
+  }
+
+  return response.bodyBytes;
+}
 
 Future<ByteArrayAndroidBitmap?> _androidBitmapFromUrl(String? url) async {
   if (url == null) {
     return null;
   }
 
-  // TODO: maybe we can keep a cache in case _androidBitmapFromUrl gets called
-  // multiple times with the same URL
-  final response = await http.get(Uri.parse(url));
-  print("📘 _androidBitmapFromUrl ($url): $response");
-  return ByteArrayAndroidBitmap(response.bodyBytes);
+  return ByteArrayAndroidBitmap(await _imageDataFromUrl(url));
 }
 
 Future<ByteArrayAndroidIcon?> _androidIconFromUrl(String? url) async {
   if (url == null) {
     return null;
   }
 
-  // TODO: maybe we can keep a cache in case _androidIconFromUrl gets called
-  // multiple times with the same URL
-  final response = await http.get(Uri.parse(url));
-  print("📘 _androidIconFromUrl ($url): $response");
-  return ByteArrayAndroidIcon(response.bodyBytes);
+  return ByteArrayAndroidIcon(await _imageDataFromUrl(url));
 }
 
 Future<void> _onFCMBackgroundMessage(RemoteMessage firebaseMessage) async {

lib/src/conversationlist.dart

@@ -0,0 +1,45 @@
+import 'dart:convert';
+
+import './session.dart';
+import './notification.dart';
+
+typedef FnExecute = void Function(String statement);
+
+void createSession({
+  required FnExecute execute,
+  required Session session,
+  required String variableName,
+  }) {
+  // Initialize Session object
+  final options = <String, dynamic>{};
+
+  options['appId'] = session.appId;
+
+  if (session.signature != null) {
+    options["signature"] = session.signature;
+  }
+
+  execute('const options = ${json.encode(options)};');
+
+  execute('options["me"] = $variableName;');
+
+  execute('const session = new Talk.Session(options);');
+
+  if (session.enablePushNotifications) {
+    if (fcmToken != null) {
+      execute('session.setPushRegistration({provider: "fcm", pushRegistrationId: "$fcmToken"});');
+    }
+
+    if (apnsToken != null) {
+      execute('session.setPushRegistration({provider: "apns", pushRegistrationId: "$apnsToken"});');
+    }
+  } else {
+    if (fcmToken != null) {
+      execute('session.unsetPushRegistration({provider: "fcm", pushRegistrationId: "$fcmToken"});');
+    }
+
+    if (apnsToken != null) {
+      execute('session.unsetPushRegistration({provider: "apns", pushRegistrationId: "$apnsToken"});');
+    }
+  }
+}

lib/src/notification.dart

@@ -35,15 +35,11 @@ class Talk {
 }
 
 Future<void> registerPushNotificationHandlers({AndroidChannel? androidChannel, IOSPermissions? iosPermissions}) async {
-  if (Platform.isAndroid) {
-    if (androidChannel != null) {
-      await registerAndroidPushNotificationHandlers(androidChannel);
-    }
+  if ((Platform.isAndroid) && (androidChannel != null)) {
+    await registerAndroidPushNotificationHandlers(androidChannel);
   }
 
-  if (Platform.isIOS) {
-    if (iosPermissions != null) {
-      await registerIOSPushNotificationHandlers(iosPermissions);
-    }
+  if ((Platform.isIOS) && (iosPermissions != null)) {
+    await registerIOSPushNotificationHandlers(iosPermissions);
   }
 }