Notifications (android via local) work

flutter/android/app/build.gradle

@@ -37,6 +37,7 @@ android {
     ndkVersion flutter.ndkVersion
 
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
@@ -55,6 +56,7 @@ android {
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
+        multiDexEnabled true
     }
 
     signingConfigs {
@@ -77,4 +79,9 @@ flutter {
     source '../..'
 }
 
-dependencies {}
+dependencies {
+    implementation 'androidx.window:window:1.0.0'
+    implementation 'androidx.window:window-java:1.0.0'
+
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'
+}

flutter/android/app/proguard-rules.pro

@@ -0,0 +1,27 @@
+## Gson rules
+# Gson uses generic type information stored in a class file when working with fields. Proguard
+# removes such information by default, so configure it to keep all of it.
+-keepattributes Signature
+
+# For using GSON @Expose annotation
+-keepattributes *Annotation*
+
+# Gson specific classes
+-dontwarn sun.misc.**
+#-keep class com.google.gson.stream.** { *; }
+
+# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
+# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
+-keep class * extends com.google.gson.TypeAdapter
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer
+
+# Prevent R8 from leaving Data object members always null
+-keepclassmembers,allowobfuscation class * {
+  @com.google.gson.annotations.SerializedName <fields>;
+}
+
+# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher.
+-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
+-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken

flutter/android/app/src/main/AndroidManifest.xml

@@ -31,6 +31,9 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+
+        <receiver android:exported="false" android:name="com.dexterous.flutterlocalnotifications.ActionBroadcastReceiver" />
+
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data

flutter/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+</vector>

flutter/android/app/src/main/res/raw/keep.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:keep="@drawable/*" />

flutter/android/build.gradle

@@ -6,6 +6,7 @@ buildscript {
     }
 
     dependencies {
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

flutter/ios/Runner/AppDelegate.swift

@@ -1,13 +1,27 @@
 import UIKit
 import Flutter
+import flutter_local_notifications
 
 @UIApplicationMain
 @objc class AppDelegate: FlutterAppDelegate {
+
   override func application(
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
+    
+    // This is required to make any communication available in the action isolate.
+    FlutterLocalNotificationsPlugin.setPluginRegistrantCallback { (registry) in
+      GeneratedPluginRegistrant.register(with: registry)
+    }
+    
+    if #available(iOS 10.0, *) {
+      UNUserNotificationCenter.current().delegate = self as? UNUserNotificationCenterDelegate
+    }
+    
     GeneratedPluginRegistrant.register(with: self)
+    
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
+
 }

flutter/lib/api/api_client.dart

@@ -11,7 +11,7 @@ import 'package:simplecloudnotifier/state/application_log.dart';
 import 'package:simplecloudnotifier/state/globals.dart';
 import 'package:simplecloudnotifier/state/request_log.dart';
 import 'package:simplecloudnotifier/models/channel.dart';
-import 'package:simplecloudnotifier/models/message.dart';
+import 'package:simplecloudnotifier/models/scn_message.dart';
 import 'package:simplecloudnotifier/state/token_source.dart';
 import 'package:simplecloudnotifier/utils/toaster.dart';
 
@@ -211,7 +211,7 @@ class APIClient {
     );
   }
 
-  static Future<(String, List<Message>)> getMessageList(TokenSource auth, String pageToken, {int? pageSize, List<String>? channelIDs}) async {
+  static Future<(String, List<SCNMessage>)> getMessageList(TokenSource auth, String pageToken, {int? pageSize, List<String>? channelIDs}) async {
     return await _request(
       name: 'getMessageList',
       method: 'GET',
@@ -221,18 +221,18 @@ class APIClient {
         if (pageSize != null) 'page_size': pageSize.toString(),
         if (channelIDs != null) 'channel_id': channelIDs.join(","),
       },
-      fn: (json) => Message.fromPaginatedJsonArray(json, 'messages', 'next_page_token'),
+      fn: (json) => SCNMessage.fromPaginatedJsonArray(json, 'messages', 'next_page_token'),
       authToken: auth.getToken(),
     );
   }
 
-  static Future<Message> getMessage(TokenSource auth, String msgid) async {
+  static Future<SCNMessage> getMessage(TokenSource auth, String msgid) async {
     return await _request(
       name: 'getMessage',
       method: 'GET',
       relURL: 'messages/$msgid',
       query: {},
-      fn: Message.fromJson,
+      fn: SCNMessage.fromJson,
       authToken: auth.getToken(),
     );
   }

flutter/lib/components/layout/app_bar.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
 import 'package:simplecloudnotifier/components/layout/app_bar_progress_indicator.dart';
 import 'package:simplecloudnotifier/pages/debug/debug_main.dart';
+import 'package:simplecloudnotifier/settings/app_settings.dart';
 import 'package:simplecloudnotifier/state/app_theme.dart';
 import 'package:simplecloudnotifier/utils/navi.dart';
 
@@ -12,7 +12,6 @@ class SCNAppBar extends StatelessWidget implements PreferredSizeWidget {
     Key? key,
     required this.title,
     required this.showThemeSwitch,
-    required this.showDebug,
     required this.showSearch,
     required this.showShare,
     this.onShare = null,
@@ -20,16 +19,17 @@ class SCNAppBar extends StatelessWidget implements PreferredSizeWidget {
 
   final String? title;
   final bool showThemeSwitch;
-  final bool showDebug;
   final bool showSearch;
   final bool showShare;
   final void Function()? onShare;
 
   @override
   Widget build(BuildContext context) {
+    final cfg = Provider.of<AppSettings>(context);
+
     var actions = <Widget>[];
 
-    if (showDebug) {
+    if (cfg.showDebugButton) {
       actions.add(IconButton(
         icon: const Icon(FontAwesomeIcons.solidSpiderBlackWidow),
         tooltip: 'Debug',

flutter/lib/components/layout/scaffold.dart

@@ -7,7 +7,6 @@ class SCNScaffold extends StatelessWidget {
     required this.child,
     this.title,
     this.showThemeSwitch = true,
-    this.showDebug = true,
     this.showSearch = true,
     this.showShare = false,
     this.onShare = null,
@@ -16,7 +15,6 @@ class SCNScaffold extends StatelessWidget {
   final Widget child;
   final String? title;
   final bool showThemeSwitch;
-  final bool showDebug;
   final bool showSearch;
   final bool showShare;
   final void Function()? onShare;
@@ -27,7 +25,6 @@ class SCNScaffold extends StatelessWidget {
       appBar: SCNAppBar(
         title: title,
         showThemeSwitch: showThemeSwitch,
-        showDebug: showDebug,
         showSearch: showSearch,
         showShare: showShare,
         onShare: onShare ?? () {},

flutter/lib/main.dart

@@ -2,13 +2,15 @@ import 'dart:io';
 
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:provider/provider.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:simplecloudnotifier/api/api_client.dart';
 import 'package:simplecloudnotifier/models/channel.dart';
 import 'package:simplecloudnotifier/models/client.dart';
-import 'package:simplecloudnotifier/models/message.dart';
+import 'package:simplecloudnotifier/models/scn_message.dart';
 import 'package:simplecloudnotifier/nav_layout.dart';
+import 'package:simplecloudnotifier/settings/app_settings.dart';
 import 'package:simplecloudnotifier/state/app_bar_state.dart';
 import 'package:simplecloudnotifier/state/app_theme.dart';
 import 'package:simplecloudnotifier/state/application_log.dart';
@@ -18,6 +20,7 @@ import 'package:simplecloudnotifier/state/request_log.dart';
 import 'package:simplecloudnotifier/state/app_auth.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:simplecloudnotifier/utils/navi.dart';
+import 'package:simplecloudnotifier/utils/notifier.dart';
 import 'package:toastification/toastification.dart';
 import 'firebase_options.dart';
 
@@ -39,20 +42,10 @@ void main() async {
   Hive.registerAdapter(SCNRequestAdapter());
   Hive.registerAdapter(SCNLogAdapter());
   Hive.registerAdapter(SCNLogLevelAdapter());
-  Hive.registerAdapter(MessageAdapter());
+  Hive.registerAdapter(SCNMessageAdapter());
   Hive.registerAdapter(ChannelAdapter());
   Hive.registerAdapter(FBMessageAdapter());
 
-  print('[INIT] Load Hive<scn-requests>...');
-
-  try {
-    await Hive.openBox<SCNRequest>('scn-requests');
-  } catch (exc, trace) {
-    Hive.deleteBoxFromDisk('scn-requests');
-    await Hive.openBox<SCNRequest>('scn-requests');
-    ApplicationLog.error('Failed to open Hive-Box: scn-requests: ' + exc.toString(), trace: trace);
-  }
-
   print('[INIT] Load Hive<scn-logs>...');
 
   try {
@@ -63,13 +56,23 @@ void main() async {
     ApplicationLog.error('Failed to open Hive-Box: scn-logs: ' + exc.toString(), trace: trace);
   }
 
+  print('[INIT] Load Hive<scn-requests>...');
+
+  try {
+    await Hive.openBox<SCNRequest>('scn-requests');
+  } catch (exc, trace) {
+    Hive.deleteBoxFromDisk('scn-requests');
+    await Hive.openBox<SCNRequest>('scn-requests');
+    ApplicationLog.error('Failed to open Hive-Box: scn-requests: ' + exc.toString(), trace: trace);
+  }
+
   print('[INIT] Load Hive<scn-message-cache>...');
 
   try {
-    await Hive.openBox<Message>('scn-message-cache');
+    await Hive.openBox<SCNMessage>('scn-message-cache');
   } catch (exc, trace) {
     Hive.deleteBoxFromDisk('scn-message-cache');
-    await Hive.openBox<Message>('scn-message-cache');
+    await Hive.openBox<SCNMessage>('scn-message-cache');
     ApplicationLog.error('Failed to open Hive-Box: scn-message-cache' + exc.toString(), trace: trace);
   }
 
@@ -147,6 +150,38 @@ void main() async {
     print('[INIT] Skip Firebase init (Platform == Linux)...');
   }
 
+  print('[INIT] Load Notifications...');
+
+  final flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
+  final flutterLocalNotificationsPluginImpl = flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation<AndroidFlutterLocalNotificationsPlugin>();
+  if (flutterLocalNotificationsPluginImpl == null) {
+    ApplicationLog.error('Failed to get AndroidFlutterLocalNotificationsPlugin', trace: StackTrace.current);
+  } else {
+    flutterLocalNotificationsPluginImpl.requestNotificationsPermission();
+
+    final initializationSettingsAndroid = AndroidInitializationSettings('ic_notification_white');
+    final initializationSettingsDarwin = DarwinInitializationSettings(
+      requestAlertPermission: true,
+      requestBadgePermission: true,
+      requestSoundPermission: true,
+      onDidReceiveLocalNotification: _receiveLocalDarwinNotification,
+      notificationCategories: getDarwinNotificationCategories(),
+    );
+    final initializationSettingsLinux = LinuxInitializationSettings(defaultActionName: 'Open notification');
+    final initializationSettings = InitializationSettings(
+      android: initializationSettingsAndroid,
+      iOS: initializationSettingsDarwin,
+      linux: initializationSettingsLinux,
+    );
+    flutterLocalNotificationsPlugin.initialize(initializationSettings, onDidReceiveNotificationResponse: _receiveLocalNotification);
+
+    final appLaunchNotification = await flutterLocalNotificationsPlugin.getNotificationAppLaunchDetails();
+    if (appLaunchNotification != null) {
+      //TODO show message (also this only works on android+localnotifications, also handle ios)
+      ApplicationLog.info('App launched by notification: ${appLaunchNotification.notificationResponse?.id}');
+    }
+  }
+
   ApplicationLog.debug('[INIT] Application started');
 
   runApp(
@@ -155,6 +190,7 @@ void main() async {
         ChangeNotifierProvider(create: (context) => AppAuth(), lazy: false),
         ChangeNotifierProvider(create: (context) => AppTheme(), lazy: false),
         ChangeNotifierProvider(create: (context) => AppBarState(), lazy: false),
+        ChangeNotifierProvider(create: (context) => AppSettings(), lazy: false),
       ],
       child: SCNApp(),
     ),
@@ -188,6 +224,11 @@ class SCNApp extends StatelessWidget {
   }
 }
 
+@pragma('vm:entry-point')
+void notificationTapBackground(NotificationResponse notificationResponse) {
+  ApplicationLog.info('Received local notification<vm:entry-point>: ${notificationResponse.id}');
+}
+
 void setFirebaseToken(String fcmToken) async {
   final acc = AppAuth();
 
@@ -233,9 +274,96 @@ void _onForegroundMessage(RemoteMessage message) {
 }
 
 Future<void> _receiveMessage(RemoteMessage message, bool foreground) async {
-  // ensure init
+  try {
-  Hive.openBox<SCNLog>('scn-logs');
+    // ensure globals init
+    if (!Globals().isInitialized) {
+      print('[LATE-INIT] Init Globals() - to ensure working _receiveMessage($foreground)...');
+      await Globals().init();
+    }
+
+    // ensure hive init
+    if (!Hive.isBoxOpen('scn-logs')) {
+      print('[LATE-INIT] Init Hive - to ensure working _receiveMessage($foreground)...');
+
+      await Hive.initFlutter();
+      Hive.registerAdapter(SCNRequestAdapter());
+      Hive.registerAdapter(SCNLogAdapter());
+      Hive.registerAdapter(SCNLogLevelAdapter());
+      Hive.registerAdapter(SCNMessageAdapter());
+      Hive.registerAdapter(ChannelAdapter());
+      Hive.registerAdapter(FBMessageAdapter());
+    }
+
+    print('[LATE-INIT] Ensure hive boxes are open for _receiveMessage($foreground)...');
+
+    await Hive.openBox<SCNLog>('scn-logs');
+    await Hive.openBox<FBMessage>('scn-fb-messages');
+    await Hive.openBox<SCNMessage>('scn-message-cache');
+  } catch (exc, trace) {
+    ApplicationLog.error('Failed to init hive:' + exc.toString(), trace: trace);
+    Notifier.showLocalNotification("@ERROR", "@ERROR", 'Error Channel', "Error", "Failed to receive SCN message (init failed)", null);
+    return;
+  }
 
   ApplicationLog.info('Received FB message (${foreground ? 'foreground' : 'background'}): ${message.messageId ?? 'NULL'}');
+
+  SCNMessage? receivedMessage;
+
+  try {
+    final scn_msg_id = message.data['scn_msg_id'] as String;
+    final usr_msg_id = message.data['usr_msg_id'] as String;
+    final timestamp = DateTime.fromMillisecondsSinceEpoch(int.parse(message.data['timestamp'] as String) * 1000);
+    final priority = int.parse(message.data['priority'] as String);
+    final title = message.data['title'] as String;
+    final channel = message.data['channel'] as String;
+    final channel_id = message.data['channel_id'] as String;
+    final body = message.data['body'] as String;
+
+    Notifier.showLocalNotification(channel_id, channel, 'Channel: ${channel}', title, body, timestamp);
+
+    receivedMessage = SCNMessage(
+      messageID: scn_msg_id,
+      userMessageID: usr_msg_id,
+      timestamp: timestamp.toIso8601String(),
+      priority: priority,
+      trimmed: true,
+      title: title,
+      channelID: channel_id,
+      channelInternalName: channel,
+      content: body,
+      senderIP: '',
+      senderName: '',
+      senderUserID: '',
+      usedKeyID: '',
+    );
+  } catch (exc, trace) {
+    ApplicationLog.error('Failed to decode received FB message' + exc.toString(), trace: trace);
+    Notifier.showLocalNotification("@ERROR", "@ERROR", 'Error Channel', "Error", "Failed to receive SCN message (decode failed)", null);
+    return;
+  }
+
+  try {
     FBMessageLog.insert(message);
+  } catch (exc, trace) {
+    ApplicationLog.error('Failed to persist received FB message' + exc.toString(), trace: trace);
+    Notifier.showLocalNotification("@ERROR", "@ERROR", 'Error Channel', "Error", "Failed to receive SCN message (persist failed)", null);
+    return;
+  }
+
+  //TODO add to scn-message-cache
+  //TODO refresh message_list view (if shown/initialized)
+}
+
+void _receiveLocalDarwinNotification(int id, String? title, String? body, String? payload) {
+  ApplicationLog.info('Received local notification<darwin>: $id -> [$title]');
+}
+
+void _receiveLocalNotification(NotificationResponse details) {
+  ApplicationLog.info('Received local notification: ${details.id}');
+}
+
+List<DarwinNotificationCategory> getDarwinNotificationCategories() {
+  return <DarwinNotificationCategory>[
+    //TODO ?!?
+  ];
 }

flutter/lib/models/scn_message.dart

@@ -1,10 +1,10 @@
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:simplecloudnotifier/state/interfaces.dart';
 
-part 'message.g.dart';
+part 'scn_message.g.dart';
 
 @HiveType(typeId: 105)
-class Message extends HiveObject implements FieldDebuggable {
+class SCNMessage extends HiveObject implements FieldDebuggable {
   @HiveField(0)
   final String messageID;
 
@@ -33,7 +33,7 @@ class Message extends HiveObject implements FieldDebuggable {
   @HiveField(21)
   final bool trimmed;
 
-  Message({
+  SCNMessage({
     required this.messageID,
     required this.senderUserID,
     required this.channelInternalName,
@@ -49,8 +49,8 @@ class Message extends HiveObject implements FieldDebuggable {
     required this.trimmed,
   });
 
-  factory Message.fromJson(Map<String, dynamic> json) {
+  factory SCNMessage.fromJson(Map<String, dynamic> json) {
-    return Message(
+    return SCNMessage(
       messageID: json['message_id'] as String,
       senderUserID: json['sender_user_id'] as String,
       channelInternalName: json['channel_internal_name'] as String,
@@ -67,10 +67,10 @@ class Message extends HiveObject implements FieldDebuggable {
     );
   }
 
-  static (String, List<Message>) fromPaginatedJsonArray(Map<String, dynamic> data, String keyMessages, String keyToken) {
+  static (String, List<SCNMessage>) fromPaginatedJsonArray(Map<String, dynamic> data, String keyMessages, String keyToken) {
     final npt = data[keyToken] as String;
 
-    final messages = (data[keyMessages] as List<dynamic>).map<Message>((e) => Message.fromJson(e as Map<String, dynamic>)).toList();
+    final messages = (data[keyMessages] as List<dynamic>).map<SCNMessage>((e) => SCNMessage.fromJson(e as Map<String, dynamic>)).toList();
 
     return (npt, messages);
   }

flutter/lib/models/scn_message.g.dart

@@ -1,22 +1,22 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'message.dart';
+part of 'scn_message.dart';
 
 // **************************************************************************
 // TypeAdapterGenerator
 // **************************************************************************
 
-class MessageAdapter extends TypeAdapter<Message> {
+class SCNMessageAdapter extends TypeAdapter<SCNMessage> {
   @override
   final int typeId = 105;
 
   @override
-  Message read(BinaryReader reader) {
+  SCNMessage read(BinaryReader reader) {
     final numOfFields = reader.readByte();
     final fields = <int, dynamic>{
       for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
     };
-    return Message(
+    return SCNMessage(
       messageID: fields[0] as String,
       senderUserID: fields[10] as String,
       channelInternalName: fields[11] as String,
@@ -34,7 +34,7 @@ class MessageAdapter extends TypeAdapter<Message> {
   }
 
   @override
-  void write(BinaryWriter writer, Message obj) {
+  void write(BinaryWriter writer, SCNMessage obj) {
     writer
       ..writeByte(13)
       ..writeByte(0)
@@ -71,7 +71,7 @@ class MessageAdapter extends TypeAdapter<Message> {
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
-      other is MessageAdapter &&
+      other is SCNMessageAdapter &&
           runtimeType == other.runtimeType &&
           typeId == other.typeId;
 }

flutter/lib/nav_layout.dart

@@ -59,7 +59,6 @@ class _SCNNavLayoutState extends State<SCNNavLayout> {
     return Scaffold(
       appBar: SCNAppBar(
         title: null,
-        showDebug: true,
         showSearch: _selectedIndex == 0 || _selectedIndex == 1,
         showShare: false,
         showThemeSwitch: true,

flutter/lib/pages/channel_list/channel_list_item.dart

@@ -3,7 +3,7 @@ import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:simplecloudnotifier/api/api_client.dart';
 import 'package:simplecloudnotifier/models/channel.dart';
-import 'package:simplecloudnotifier/models/message.dart';
+import 'package:simplecloudnotifier/models/scn_message.dart';
 import 'package:simplecloudnotifier/state/app_auth.dart';
 
 class ChannelListItem extends StatefulWidget {
@@ -23,7 +23,7 @@ class ChannelListItem extends StatefulWidget {
 }
 
 class _ChannelListItemState extends State<ChannelListItem> {
-  Message? lastMessage;
+  SCNMessage? lastMessage;
 
   @override
   void initState() {

flutter/lib/pages/debug/debug_actions.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:simplecloudnotifier/utils/notifier.dart';
 import 'package:simplecloudnotifier/utils/toaster.dart';
 import 'package:simplecloudnotifier/utils/ui.dart';
 
@@ -52,6 +53,12 @@ class _DebugActionsPageState extends State<DebugActionsPage> {
                 onPressed: _sendTokenToServer,
                 text: 'Send FCM Token to Server',
               ),
+              SizedBox(height: 20),
+              UI.button(
+                big: false,
+                onPressed: () => Notifier.showLocalNotification('TEST_CHANNEL', "Test Channel", "Channel for testing", "Hello World", "Local Notification test", null),
+                text: 'Show local notification',
+              ),
             ],
           ),
         ),

flutter/lib/pages/debug/debug_main.dart

@@ -30,7 +30,6 @@ class _DebugMainPageState extends State<DebugMainPage> {
     return SCNScaffold(
       title: 'Debug',
       showSearch: false,
-      showDebug: false,
       child: Column(
         children: [
           Padding(

flutter/lib/pages/debug/debug_persistence.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:simplecloudnotifier/models/channel.dart';
-import 'package:simplecloudnotifier/models/message.dart';
+import 'package:simplecloudnotifier/models/scn_message.dart';
 import 'package:simplecloudnotifier/pages/debug/debug_persistence_hive.dart';
 import 'package:simplecloudnotifier/pages/debug/debug_persistence_sharedprefs.dart';
 import 'package:simplecloudnotifier/state/application_log.dart';
@@ -36,7 +36,7 @@ class _DebugPersistencePageState extends State<DebugPersistencePage> {
           _buildSharedPrefCard(context),
           _buildHiveCard(context, () => Hive.box<SCNRequest>('scn-requests'), 'scn-requests'),
           _buildHiveCard(context, () => Hive.box<SCNLog>('scn-logs'), 'scn-logs'),
-          _buildHiveCard(context, () => Hive.box<Message>('scn-message-cache'), 'scn-message-cache'),
+          _buildHiveCard(context, () => Hive.box<SCNMessage>('scn-message-cache'), 'scn-message-cache'),
           _buildHiveCard(context, () => Hive.box<Channel>('scn-channel-cache'), 'scn-channel-cache'),
           _buildHiveCard(context, () => Hive.box<FBMessage>('scn-fb-messages'), 'scn-fb-messages'),
         ],
@@ -71,7 +71,7 @@ class _DebugPersistencePageState extends State<DebugPersistencePage> {
         padding: const EdgeInsets.all(8.0),
         child: GestureDetector(
           onTap: () {
-            Navi.push(context, () => DebugHiveBoxPage(boxName: boxname, box: Hive.box<FBMessage>(boxname)));
+            Navi.push(context, () => DebugHiveBoxPage(boxName: boxname, box: boxFunc()));
           },
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,

flutter/lib/pages/debug/debug_persistence_hive.dart

@@ -16,7 +16,6 @@ class DebugHiveBoxPage extends StatelessWidget {
     return SCNScaffold(
       title: 'Hive: ' + boxName,
       showSearch: false,
-      showDebug: false,
       child: ListView.separated(
         itemCount: box.length,
         itemBuilder: (context, listIndex) {
@@ -24,8 +23,9 @@ class DebugHiveBoxPage extends StatelessWidget {
             onTap: () {
               Navi.push(context, () => DebugHiveEntryPage(value: box.getAt(listIndex)!));
             },
-            child: ListTile(
+            child: Container(
-              title: Text(box.getAt(listIndex).toString(), style: TextStyle(fontWeight: FontWeight.bold)),
+              padding: EdgeInsets.fromLTRB(8, 4, 8, 4),
+              child: Text(box.getAt(listIndex).toString(), style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12)),
             ),
           );
         },

flutter/lib/pages/debug/debug_persistence_hiveentry.dart

@@ -13,11 +13,13 @@ class DebugHiveEntryPage extends StatelessWidget {
     return SCNScaffold(
       title: 'HiveEntry',
       showSearch: false,
-      showDebug: false,
       child: ListView.separated(
         itemCount: fields.length,
         itemBuilder: (context, listIndex) {
           return ListTile(
+            dense: true,
+            contentPadding: EdgeInsets.fromLTRB(8, 0, 8, 0),
+            visualDensity: VisualDensity(horizontal: 0, vertical: -4),
             title: Text(fields[listIndex].$1, style: TextStyle(fontWeight: FontWeight.bold)),
             subtitle: Text(fields[listIndex].$2, style: TextStyle(fontFamily: "monospace")),
           );

flutter/lib/pages/debug/debug_persistence_sharedprefs.dart

@@ -13,7 +13,6 @@ class DebugSharedPrefPage extends StatelessWidget {
     return SCNScaffold(
       title: 'SharedPreferences',
       showSearch: false,
-      showDebug: false,
       child: ListView.separated(
         itemCount: sharedPref.getKeys().length,
         itemBuilder: (context, listIndex) {

flutter/lib/pages/debug/debug_request_view.dart

@@ -16,7 +16,6 @@ class DebugRequestViewPage extends StatelessWidget {
     return SCNScaffold(
       title: 'Request',
       showSearch: false,
-      showDebug: false,
       child: SingleChildScrollView(
         child: Padding(
           padding: const EdgeInsets.all(8.0),

flutter/lib/pages/message_list/message_list.dart

@@ -4,8 +4,9 @@ import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'package:provider/provider.dart';
 import 'package:simplecloudnotifier/api/api_client.dart';
 import 'package:simplecloudnotifier/models/channel.dart';
-import 'package:simplecloudnotifier/models/message.dart';
+import 'package:simplecloudnotifier/models/scn_message.dart';
 import 'package:simplecloudnotifier/pages/message_view/message_view.dart';
+import 'package:simplecloudnotifier/settings/app_settings.dart';
 import 'package:simplecloudnotifier/state/app_bar_state.dart';
 import 'package:simplecloudnotifier/state/application_log.dart';
 import 'package:simplecloudnotifier/state/app_auth.dart';
@@ -25,11 +26,9 @@ class MessageListPage extends StatefulWidget {
 }
 
 class _MessageListPageState extends State<MessageListPage> with RouteAware {
-  static const _pageSize = 128;
-
   late final AppLifecycleListener _lifecyleListener;
 
-  PagingController<String, Message> _pagingController = PagingController.fromValue(PagingState(nextPageKey: null, itemList: [], error: null), firstPageKey: '@start');
+  PagingController<String, SCNMessage> _pagingController = PagingController.fromValue(PagingState(nextPageKey: null, itemList: [], error: null), firstPageKey: '@start');
 
   Map<String, Channel>? _channels = null;
 
@@ -65,7 +64,7 @@ class _MessageListPageState extends State<MessageListPage> with RouteAware {
     ApplicationLog.debug('MessageListPage::_realInitState');
 
     final chnCache = Hive.box<Channel>('scn-channel-cache');
-    final msgCache = Hive.box<Message>('scn-message-cache');
+    final msgCache = Hive.box<SCNMessage>('scn-message-cache');
 
     if (chnCache.isNotEmpty && msgCache.isNotEmpty) {
       // ==== Use cache values - and refresh in background
@@ -119,6 +118,7 @@ class _MessageListPageState extends State<MessageListPage> with RouteAware {
 
   Future<void> _fetchPage(String thisPageToken) async {
     final acc = Provider.of<AppAuth>(context, listen: false);
+    final cfg = Provider.of<AppSettings>(context, listen: false);
 
     ApplicationLog.debug('Start MessageList::_pagingController::_fetchPage [ ${thisPageToken} ]');
 
@@ -135,7 +135,7 @@ class _MessageListPageState extends State<MessageListPage> with RouteAware {
         _setChannelCache(channels); // no await
       }
 
-      final (npt, newItems) = await APIClient.getMessageList(acc, thisPageToken, pageSize: _pageSize);
+      final (npt, newItems) = await APIClient.getMessageList(acc, thisPageToken, pageSize: cfg.messagePageSize);
 
       _addToMessageCache(newItems); // no await
 
@@ -154,6 +154,7 @@ class _MessageListPageState extends State<MessageListPage> with RouteAware {
 
   Future<void> _backgroundRefresh(bool fullReplaceState) async {
     final acc = Provider.of<AppAuth>(context, listen: false);
+    final cfg = Provider.of<AppSettings>(context, listen: false);
 
     ApplicationLog.debug('Start background refresh of message list (fullReplaceState: $fullReplaceState)');
 
@@ -170,7 +171,7 @@ class _MessageListPageState extends State<MessageListPage> with RouteAware {
         _setChannelCache(channels); // no await
       }
 
-      final (npt, newItems) = await APIClient.getMessageList(acc, '@start', pageSize: _pageSize);
+      final (npt, newItems) = await APIClient.getMessageList(acc, '@start', pageSize: cfg.messagePageSize);
 
       _addToMessageCache(newItems); // no await
 
@@ -225,9 +226,9 @@ class _MessageListPageState extends State<MessageListPage> with RouteAware {
         onRefresh: () => Future.sync(
           () => _pagingController.refresh(),
         ),
-        child: PagedListView<String, Message>(
+        child: PagedListView<String, SCNMessage>(
           pagingController: _pagingController,
-          builderDelegate: PagedChildBuilderDelegate<Message>(
+          builderDelegate: PagedChildBuilderDelegate<SCNMessage>(
             itemBuilder: (context, item, index) => MessageListItem(
               message: item,
               allChannels: _channels ?? {},
@@ -249,20 +250,22 @@ class _MessageListPageState extends State<MessageListPage> with RouteAware {
     for (var chn in channels) await cache.put(chn.channel.channelID, chn.channel);
   }
 
-  Future<void> _addToMessageCache(List<Message> newItems) async {
+  Future<void> _addToMessageCache(List<SCNMessage> newItems) async {
-    final cache = Hive.box<Message>('scn-message-cache');
+    final cfg = AppSettings();
+
+    final cache = Hive.box<SCNMessage>('scn-message-cache');
 
     for (var msg in newItems) await cache.put(msg.messageID, msg);
 
     // delete all but the newest 128 messages
 
-    if (cache.length < _pageSize) return;
+    if (cache.length < cfg.messagePageSize) return;
 
     final allValues = cache.values.toList();
 
     allValues.sort((a, b) => -1 * a.timestamp.compareTo(b.timestamp));
 
-    for (var val in allValues.sublist(_pageSize)) {
+    for (var val in allValues.sublist(cfg.messagePageSize)) {
       await cache.delete(val.messageID);
     }
   }

flutter/lib/pages/message_list/message_list_item.dart

@@ -3,7 +3,7 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:simplecloudnotifier/models/channel.dart';
-import 'package:simplecloudnotifier/models/message.dart';
+import 'package:simplecloudnotifier/models/scn_message.dart';
 import 'package:intl/intl.dart';
 import 'package:simplecloudnotifier/utils/ui.dart';
 
@@ -18,7 +18,7 @@ class MessageListItem extends StatelessWidget {
     super.key,
   });
 
-  final Message message;
+  final SCNMessage message;
   final Map<String, Channel> allChannels;
   final Null Function() onPressed;
 
@@ -176,11 +176,11 @@ class MessageListItem extends StatelessWidget {
     return v;
   }
 
-  String resolveChannelName(Message message) {
+  String resolveChannelName(SCNMessage message) {
     return allChannels[message.channelID]?.displayName ?? message.channelInternalName;
   }
 
-  bool showChannel(Message message) {
+  bool showChannel(SCNMessage message) {
     return message.channelInternalName != 'main';
   }
 }

flutter/lib/pages/message_view/message_view.dart

@@ -8,7 +8,7 @@ import 'package:simplecloudnotifier/api/api_client.dart';
 import 'package:simplecloudnotifier/components/layout/scaffold.dart';
 import 'package:simplecloudnotifier/models/channel.dart';
 import 'package:simplecloudnotifier/models/keytoken.dart';
-import 'package:simplecloudnotifier/models/message.dart';
+import 'package:simplecloudnotifier/models/scn_message.dart';
 import 'package:simplecloudnotifier/models/user.dart';
 import 'package:simplecloudnotifier/state/app_auth.dart';
 import 'package:simplecloudnotifier/state/app_bar_state.dart';
@@ -18,15 +18,15 @@ import 'package:simplecloudnotifier/utils/ui.dart';
 class MessageViewPage extends StatefulWidget {
   const MessageViewPage({super.key, required this.message});
 
-  final Message message; // Potentially trimmed
+  final SCNMessage message; // Potentially trimmed
 
   @override
   State<MessageViewPage> createState() => _MessageViewPageState();
 }
 
 class _MessageViewPageState extends State<MessageViewPage> {
-  late Future<(Message, ChannelPreview, KeyTokenPreview, UserPreview)>? mainFuture;
+  late Future<(SCNMessage, ChannelPreview, KeyTokenPreview, UserPreview)>? mainFuture;
-  (Message, ChannelPreview, KeyTokenPreview, UserPreview)? mainFutureSnapshot = null;
+  (SCNMessage, ChannelPreview, KeyTokenPreview, UserPreview)? mainFutureSnapshot = null;
   static final _dateFormat = DateFormat('yyyy-MM-dd kk:mm');
 
   bool _monospaceMode = false;
@@ -37,7 +37,7 @@ class _MessageViewPageState extends State<MessageViewPage> {
     super.initState();
   }
 
-  Future<(Message, ChannelPreview, KeyTokenPreview, UserPreview)> fetchData() async {
+  Future<(SCNMessage, ChannelPreview, KeyTokenPreview, UserPreview)> fetchData() async {
     try {
       await Future.delayed(const Duration(seconds: 0), () {}); // this is annoyingly important - otherwise we call setLoadingIndeterminate directly in initStat() and get an exception....
 
@@ -79,7 +79,7 @@ class _MessageViewPageState extends State<MessageViewPage> {
       showSearch: false,
       showShare: true,
       onShare: _share,
-      child: FutureBuilder<(Message, ChannelPreview, KeyTokenPreview, UserPreview)>(
+      child: FutureBuilder<(SCNMessage, ChannelPreview, KeyTokenPreview, UserPreview)>(
         future: mainFuture,
         builder: (context, snapshot) {
           if (snapshot.hasData) {
@@ -118,7 +118,7 @@ class _MessageViewPageState extends State<MessageViewPage> {
     }
   }
 
-  Widget _buildMessageView(BuildContext context, Message message, ChannelPreview? channel, KeyTokenPreview? token, UserPreview? user) {
+  Widget _buildMessageView(BuildContext context, SCNMessage message, ChannelPreview? channel, KeyTokenPreview? token, UserPreview? user) {
     final userAccUserID = context.select<AppAuth, String?>((v) => v.userID);
 
     return SingleChildScrollView(
@@ -144,11 +144,11 @@ class _MessageViewPageState extends State<MessageViewPage> {
     );
   }
 
-  String _resolveChannelName(ChannelPreview? channel, Message message) {
+  String _resolveChannelName(ChannelPreview? channel, SCNMessage message) {
     return channel?.displayName ?? message.channelInternalName;
   }
 
-  List<Widget> _buildMessageHeader(BuildContext context, Message message, ChannelPreview? channel) {
+  List<Widget> _buildMessageHeader(BuildContext context, SCNMessage message, ChannelPreview? channel) {
     return [
       Row(
         children: [
@@ -167,7 +167,7 @@ class _MessageViewPageState extends State<MessageViewPage> {
     ];
   }
 
-  List<Widget> _buildMessageContent(BuildContext context, Message message) {
+  List<Widget> _buildMessageContent(BuildContext context, SCNMessage message) {
     return [
       Row(
         children: [
@@ -249,7 +249,7 @@ class _MessageViewPageState extends State<MessageViewPage> {
     }
   }
 
-  String _preformatTitle(Message message) {
+  String _preformatTitle(SCNMessage message) {
     return message.title.replaceAll('\n', '').replaceAll('\r', '').replaceAll('\t', ' ');
   }
 }

flutter/lib/settings/app_settings.dart

@@ -0,0 +1,33 @@
+import 'package:flutter/material.dart';
+
+class AppSettings extends ChangeNotifier {
+  bool groupNotifications = true;
+  int messagePageSize = 128;
+  bool showDebugButton = true;
+
+  static AppSettings? _singleton = AppSettings._internal();
+
+  factory AppSettings() {
+    return _singleton ?? (_singleton = AppSettings._internal());
+  }
+
+  AppSettings._internal() {
+    load();
+  }
+
+  void clear() {
+    //TODO
+
+    notifyListeners();
+  }
+
+  void load() {
+    //TODO
+
+    notifyListeners();
+  }
+
+  Future<void> save() async {
+    //TODO
+  }
+}

flutter/lib/state/application_log.dart

@@ -10,6 +10,7 @@ class ApplicationLog {
   static void debug(String message, {String? additional, StackTrace? trace}) {
     (additional != null && additional != '') ? print('[DEBUG] ${message}: ${additional}') : print('[DEBUG] ${message}');
 
+    if (!Hive.isBoxOpen('scn-logs')) return;
     Hive.box<SCNLog>('scn-logs').add(SCNLog(
       id: Xid().toString(),
       timestamp: DateTime.now(),
@@ -23,6 +24,7 @@ class ApplicationLog {
   static void info(String message, {String? additional, StackTrace? trace}) {
     (additional != null && additional != '') ? print('[INFO] ${message}: ${additional}') : print('[INFO] ${message}');
 
+    if (!Hive.isBoxOpen('scn-logs')) return;
     Hive.box<SCNLog>('scn-logs').add(SCNLog(
       id: Xid().toString(),
       timestamp: DateTime.now(),
@@ -36,6 +38,7 @@ class ApplicationLog {
   static void warn(String message, {String? additional, StackTrace? trace}) {
     (additional != null && additional != '') ? print('[WARN] ${message}: ${additional}') : print('[WARN] ${message}');
 
+    if (!Hive.isBoxOpen('scn-logs')) return;
     Hive.box<SCNLog>('scn-logs').add(SCNLog(
       id: Xid().toString(),
       timestamp: DateTime.now(),
@@ -49,6 +52,7 @@ class ApplicationLog {
   static void error(String message, {String? additional, StackTrace? trace}) {
     (additional != null && additional != '') ? print('[ERROR] ${message}: ${additional}') : print('[ERROR] ${message}');
 
+    if (!Hive.isBoxOpen('scn-logs')) return;
     Hive.box<SCNLog>('scn-logs').add(SCNLog(
       id: Xid().toString(),
       timestamp: DateTime.now(),
@@ -62,6 +66,7 @@ class ApplicationLog {
   static void fatal(String message, {String? additional, StackTrace? trace}) {
     (additional != null && additional != '') ? print('[FATAL] ${message}: ${additional}') : print('[FATAL] ${message}');
 
+    if (!Hive.isBoxOpen('scn-logs')) return;
     Hive.box<SCNLog>('scn-logs').add(SCNLog(
       id: Xid().toString(),
       timestamp: DateTime.now(),

flutter/lib/state/fb_message.dart

@@ -32,8 +32,6 @@ class FBMessage extends HiveObject implements FieldDebuggable {
   final String? messageType;
   @HiveField(8)
   final bool mutableContent;
-  @HiveField(9)
-  final RemoteNotification? notification;
   @HiveField(10)
   final DateTime? sentTime;
   @HiveField(11)
@@ -54,7 +52,7 @@ class FBMessage extends HiveObject implements FieldDebuggable {
   @HiveField(25)
   final String? notificationAndroidLink;
   @HiveField(26)
-  final AndroidNotificationPriority? notificationAndroidPriority;
+  final String? notificationAndroidPriority;
   @HiveField(27)
   final String? notificationAndroidSmallIcon;
   @HiveField(28)
@@ -62,14 +60,14 @@ class FBMessage extends HiveObject implements FieldDebuggable {
   @HiveField(29)
   final String? notificationAndroidTicker;
   @HiveField(30)
-  final AndroidNotificationVisibility? notificationAndroidVisibility;
+  final String? notificationAndroidVisibility;
   @HiveField(31)
   final String? notificationAndroidTag;
 
   @HiveField(40)
   final String? notificationAppleBadge;
   @HiveField(41)
-  final AppleNotificationSound? notificationAppleSound;
+  final String? notificationAppleSound;
   @HiveField(42)
   final String? notificationAppleImageUrl;
   @HiveField(43)
@@ -109,7 +107,6 @@ class FBMessage extends HiveObject implements FieldDebuggable {
     required this.messageId,
     required this.messageType,
     required this.mutableContent,
-    required this.notification,
     required this.sentTime,
     required this.threadId,
     required this.ttl,
@@ -152,7 +149,6 @@ class FBMessage extends HiveObject implements FieldDebuggable {
         this.messageId = rmsg.messageId,
         this.messageType = rmsg.messageType,
         this.mutableContent = rmsg.mutableContent,
-        this.notification = rmsg.notification,
         this.sentTime = rmsg.sentTime,
         this.threadId = rmsg.threadId,
         this.ttl = rmsg.ttl,
@@ -162,14 +158,14 @@ class FBMessage extends HiveObject implements FieldDebuggable {
         this.notificationAndroidCount = rmsg.notification?.android?.count,
         this.notificationAndroidImageUrl = rmsg.notification?.android?.imageUrl,
         this.notificationAndroidLink = rmsg.notification?.android?.link,
-        this.notificationAndroidPriority = rmsg.notification?.android?.priority,
+        this.notificationAndroidPriority = rmsg.notification?.android?.priority?.toString(),
         this.notificationAndroidSmallIcon = rmsg.notification?.android?.smallIcon,
         this.notificationAndroidSound = rmsg.notification?.android?.sound,
         this.notificationAndroidTicker = rmsg.notification?.android?.ticker,
-        this.notificationAndroidVisibility = rmsg.notification?.android?.visibility,
+        this.notificationAndroidVisibility = rmsg.notification?.android?.visibility?.toString(),
         this.notificationAndroidTag = rmsg.notification?.android?.tag,
         this.notificationAppleBadge = rmsg.notification?.apple?.badge,
-        this.notificationAppleSound = rmsg.notification?.apple?.sound,
+        this.notificationAppleSound = rmsg.notification?.apple?.sound?.toString(),
         this.notificationAppleImageUrl = rmsg.notification?.apple?.imageUrl,
         this.notificationAppleSubtitle = rmsg.notification?.apple?.subtitle,
         this.notificationAppleSubtitleLocArgs = rmsg.notification?.apple?.subtitleLocArgs,
@@ -195,12 +191,11 @@ class FBMessage extends HiveObject implements FieldDebuggable {
       ('category', this.category ?? ''),
       ('collapseKey', this.collapseKey ?? ''),
       ('contentAvailable', this.contentAvailable.toString()),
-      ('data', this.data.toString()),
+      ('data', this.data.entries.map((e) => '${e.key} := ${e.value}').join('\n')),
       ('from', this.from ?? ''),
       ('messageId', this.messageId ?? ''),
       ('messageType', this.messageType ?? ''),
       ('mutableContent', this.mutableContent.toString()),
-      ('notification', this.notification?.toString() ?? ''),
       ('sentTime', this.sentTime?.toString() ?? ''),
       ('threadId', this.threadId ?? ''),
       ('ttl', this.ttl?.toString() ?? ''),

flutter/lib/state/fb_message.g.dart

@@ -26,7 +26,6 @@ class FBMessageAdapter extends TypeAdapter<FBMessage> {
       messageId: fields[6] as String?,
       messageType: fields[7] as String?,
       mutableContent: fields[8] as bool,
-      notification: fields[9] as RemoteNotification?,
       sentTime: fields[10] as DateTime?,
       threadId: fields[11] as String?,
       ttl: fields[12] as int?,
@@ -36,15 +35,14 @@ class FBMessageAdapter extends TypeAdapter<FBMessage> {
       notificationAndroidCount: fields[23] as int?,
       notificationAndroidImageUrl: fields[24] as String?,
       notificationAndroidLink: fields[25] as String?,
-      notificationAndroidPriority: fields[26] as AndroidNotificationPriority?,
+      notificationAndroidPriority: fields[26] as String?,
       notificationAndroidSmallIcon: fields[27] as String?,
       notificationAndroidSound: fields[28] as String?,
       notificationAndroidTicker: fields[29] as String?,
-      notificationAndroidVisibility:
+      notificationAndroidVisibility: fields[30] as String?,
-          fields[30] as AndroidNotificationVisibility?,
       notificationAndroidTag: fields[31] as String?,
       notificationAppleBadge: fields[40] as String?,
-      notificationAppleSound: fields[41] as AppleNotificationSound?,
+      notificationAppleSound: fields[41] as String?,
       notificationAppleImageUrl: fields[42] as String?,
       notificationAppleSubtitle: fields[43] as String?,
       notificationAppleSubtitleLocArgs: (fields[44] as List?)?.cast<String>(),
@@ -64,7 +62,7 @@ class FBMessageAdapter extends TypeAdapter<FBMessage> {
   @override
   void write(BinaryWriter writer, FBMessage obj) {
     writer
-      ..writeByte(40)
+      ..writeByte(39)
       ..writeByte(0)
       ..write(obj.senderId)
       ..writeByte(1)
@@ -83,8 +81,6 @@ class FBMessageAdapter extends TypeAdapter<FBMessage> {
       ..write(obj.messageType)
       ..writeByte(8)
       ..write(obj.mutableContent)
-      ..writeByte(9)
-      ..write(obj.notification)
       ..writeByte(10)
       ..write(obj.sentTime)
       ..writeByte(11)

flutter/lib/state/globals.dart

@@ -1,3 +1,4 @@
+import 'dart:ffi';
 import 'dart:io';
 
 import 'package:device_info_plus/device_info_plus.dart';
@@ -13,6 +14,8 @@ class Globals {
 
   Globals._internal();
 
+  bool _initialized = false;
+
   String appName = '';
   String packageName = '';
   String version = '';
@@ -24,7 +27,11 @@ class Globals {
 
   late SharedPreferences sharedPrefs;
 
+  bool get isInitialized => _initialized;
+
   Future<void> init() async {
+    if (_initialized) return;
+
     PackageInfo packageInfo = await PackageInfo.fromPlatform();
 
     this.appName = packageInfo.appName;
@@ -54,6 +61,8 @@ class Globals {
     }
 
     this.sharedPrefs = await SharedPreferences.getInstance();
+
+    this._initialized = true;
   }
 
   String? getPrefFCMToken() {

flutter/lib/utils/notifier.dart

@@ -0,0 +1,70 @@
+import 'dart:io';
+
+import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+import 'package:simplecloudnotifier/settings/app_settings.dart';
+import 'package:simplecloudnotifier/state/application_log.dart';
+import 'package:simplecloudnotifier/state/globals.dart';
+
+class Notifier {
+  static void showLocalNotification(String channelID, String channelName, String channelDescr, String title, String body, DateTime? timestamp) async {
+    final nid = Globals().sharedPrefs.getInt('notifier.nextid') ?? 1000;
+    Globals().sharedPrefs.setInt('notifier.nextid', nid + 7);
+
+    final existingSummaryNID = Globals().sharedPrefs.getInt('notifier.summary.$channelID');
+
+    final flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
+
+    if (Platform.isAndroid && AppSettings().groupNotifications) {
+      final activeNotifications = (await flutterLocalNotificationsPlugin.getActiveNotifications()).where((p) => p.groupKey == channelID).toList();
+      final summaryNotification = activeNotifications.where((p) => p.id == existingSummaryNID).toList();
+
+      ApplicationLog.debug('found ${activeNotifications.length} active notifications in this group (${summaryNotification.length} summary notifications for channel ${channelID} with nid [${existingSummaryNID}])');
+
+      if (activeNotifications.isNotEmpty && !activeNotifications.any((p) => p.id == existingSummaryNID)) {
+        // ======== SHOW SUMMARY/GROUPING NOTIFICATION ========
+        final newSummaryNID = nid + 1;
+        ApplicationLog.debug('Create new summary notifications for channel ${channelID} with nid [${newSummaryNID}])');
+        Globals().sharedPrefs.setInt('notifier.summary.$channelID', newSummaryNID);
+        await flutterLocalNotificationsPlugin.show(
+          newSummaryNID,
+          channelName,
+          "(multiple notifications)",
+          NotificationDetails(
+            android: AndroidNotificationDetails(
+              channelID,
+              channelName,
+              importance: Importance.max,
+              priority: Priority.high,
+              groupKey: channelID,
+              setAsGroupSummary: true,
+              subText: (channelName == 'main') ? null : channelName,
+            ),
+          ),
+        );
+      }
+    }
+
+    final newMessageNID = nid + 2;
+
+    ApplicationLog.debug('Create new local notifications for message in channel ${channelID} with nid [${newMessageNID}])');
+
+    // ======== SHOW NOTIFICATION ========
+    await flutterLocalNotificationsPlugin.show(
+      newMessageNID,
+      title,
+      body,
+      NotificationDetails(
+        android: AndroidNotificationDetails(
+          channelID,
+          channelName,
+          channelDescription: channelDescr,
+          importance: Importance.max,
+          priority: Priority.high,
+          when: timestamp?.millisecondsSinceEpoch,
+          groupKey: channelID,
+          subText: (channelName == 'main') ? null : channelName,
+        ),
+      ),
+    );
+  }
+}

flutter/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -8,6 +8,7 @@ import Foundation
 import device_info_plus
 import firebase_core
 import firebase_messaging
+import flutter_local_notifications
 import package_info_plus
 import path_provider_foundation
 import share_plus
@@ -18,6 +19,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
   FLTFirebaseMessagingPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseMessagingPlugin"))
+  FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))

flutter/pubspec.lock

@@ -209,6 +209,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.6"
+  dbus:
+    dependency: transitive
+    description:
+      name: dbus
+      sha256: "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.10"
   device_info_plus:
     dependency: "direct main"
     description:
@@ -342,6 +350,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.0"
+  flutter_local_notifications:
+    dependency: "direct main"
+    description:
+      name: flutter_local_notifications
+      sha256: "40e6fbd2da7dcc7ed78432c5cdab1559674b4af035fddbfb2f9a8f9c2112fcef"
+      url: "https://pub.dev"
+    source: hosted
+    version: "17.1.2"
+  flutter_local_notifications_linux:
+    dependency: transitive
+    description:
+      name: flutter_local_notifications_linux
+      sha256: "33f741ef47b5f63cc7f78fe75eeeac7e19f171ff3c3df054d84c1e38bedb6a03"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.0+1"
+  flutter_local_notifications_platform_interface:
+    dependency: transitive
+    description:
+      name: flutter_local_notifications_platform_interface
+      sha256: "340abf67df238f7f0ef58f4a26d2a83e1ab74c77ab03cd2b2d5018ac64db30b7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.1.0"
   flutter_staggered_grid_view:
     dependency: transitive
     description:
@@ -916,6 +948,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.6.1"
+  timezone:
+    dependency: transitive
+    description:
+      name: timezone
+      sha256: a6ccda4a69a442098b602c44e61a1e2b4bf6f5516e875bbf0f427d5df14745d5
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.3"
   timing:
     dependency: transitive
     description:

flutter/pubspec.yaml

@@ -33,6 +33,7 @@ dependencies:
   toastification: ^2.0.0
   uuid: ^4.4.0
   share_plus: ^9.0.0
+  flutter_local_notifications: ^17.1.2
 
 
 dependency_overrides: