From 715b2c6876c9191cb5f60468bdbf4cc63f53b442 Mon Sep 17 00:00:00 2001
From: Dan Ballard <dan@mindstab.net>
Date: Wed, 2 Feb 2022 12:18:08 -0800
Subject: [PATCH 1/6] windows notifications: switch from desktoats to win_toats

---
 lib/notification_manager.dart                 | 61 +++++++++----------
 pubspec.lock                                  | 14 ++---
 pubspec.yaml                                  |  2 +-
 .../flutter/generated_plugin_registrant.cc    |  9 ++-
 windows/flutter/generated_plugins.cmake       |  3 +-
 5 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/lib/notification_manager.dart b/lib/notification_manager.dart
index 91f1cb52..68f56f3e 100644
--- a/lib/notification_manager.dart
+++ b/lib/notification_manager.dart
@@ -1,7 +1,8 @@
+import 'dart:async';
 import 'dart:io';
 
 import 'package:cwtch/main.dart';
-import 'package:desktoasts/desktoasts.dart';
+import 'package:win_toast/win_toast.dart';
 import 'package:desktop_notifications/desktop_notifications.dart';
 import 'package:path/path.dart' as path;
 
@@ -30,51 +31,43 @@ class LinuxNotificationsManager implements NotificationsManager {
 
   Future<void> notify(String message) async {
     var iconPath = Uri.file(path.join(path.current, "cwtch.png"));
-    client.notify(message, appName: "cwtch", appIcon: iconPath.toString(), replacesId: this.previous_id).then((Notification value) => previous_id = value.id);
+    client
+        .notify(message,
+            appName: "cwtch",
+            appIcon: iconPath.toString(),
+            replacesId: this.previous_id)
+        .then((Notification value) => previous_id = value.id);
   }
 }
 
 // Windows Notification Manager uses https://pub.dev/packages/desktoasts to implement
 // windows notifications
 class WindowsNotificationManager implements NotificationsManager {
-  late ToastService service;
   bool active = false;
+  bool initialized = false;
 
   WindowsNotificationManager() {
-    service = new ToastService(
-      appName: 'cwtch',
-      companyName: 'Open Privacy Research Society',
-      productName: 'Cwtch',
-    );
-
-    service.stream.listen((event) {
-      // the user closed the notification of the OS timed it out
-      if (event is ToastDismissed) {
-        active = false;
-      }
-      // clicked
-      if (event is ToastActivated) {
-        active = false;
-      }
-      // if a supplied action was clicked
-      if (event is ToastInteracted) {
-        active = false;
-      }
+    scheduleMicrotask(() async {
+      initialized = await WinToast.instance().initialize(
+          appName: 'cwtch',
+          productName: 'Cwtch',
+          companyName: 'Open Privacy Research Society');
     });
   }
 
   Future<void> notify(String message) async {
-    if (!globalAppState.focus) {
+    if (initialized && !globalAppState.focus) {
       if (!active) {
-        // One string of bold text on the first line (title),
-        // one string (subtitle) of regular text wrapped across the second and third lines.
-        Toast toast = new Toast(
-          type: ToastType.text02,
-          title: 'Cwtch',
-          subtitle: message,
-        );
-        service.show(toast);
+        WinToast.instance().clear();
+        final toast = await WinToast.instance()
+            .showToast(type: ToastType.text01, title: message);
         active = true;
+        toast?.eventStream.listen((event) {
+          if (event is ActivatedEvent) {
+            WinToast.instance().bringWindowToFront();
+          }
+          active = false;
+        });
       }
     }
   }
@@ -89,13 +82,15 @@ NotificationsManager newDesktopNotificationsManager() {
       client.getCapabilities();
       return LinuxNotificationsManager(client);
     } catch (e) {
-      EnvironmentConfig.debugLog("Attempted to access DBUS for notifications but failed. Switching off notifications.");
+      EnvironmentConfig.debugLog(
+          "Attempted to access DBUS for notifications but failed. Switching off notifications.");
     }
   } else if (Platform.isWindows) {
     try {
       return WindowsNotificationManager();
     } catch (e) {
-      EnvironmentConfig.debugLog("Failed to create Windows desktoasts notification manager");
+      EnvironmentConfig.debugLog(
+          "Failed to create Windows desktoasts notification manager");
     }
   }
   return NullNotificationsManager();
diff --git a/pubspec.lock b/pubspec.lock
index 1e1a4bec..0fa7e9d9 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -78,13 +78,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.5.2"
-  desktoasts:
-    dependency: "direct main"
-    description:
-      name: desktoasts
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.0.2"
   desktop_notifications:
     dependency: "direct main"
     description:
@@ -474,6 +467,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.2.4"
+  win_toast:
+    dependency: "direct main"
+    description:
+      name: win_toast
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.2"
   window_manager:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index c4dc007b..e13164d9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -44,7 +44,7 @@ dependencies:
   file_picker: ^4.3.2
   file_picker_desktop: ^1.1.0
   url_launcher: ^6.0.12
-  desktoasts: ^0.0.2
+  win_toast: ^0.0.2
   window_manager: ^0.1.4
 
 dev_dependencies:
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
index 6859cc41..0177b517 100644
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -6,12 +6,15 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <desktoasts/desktoasts_plugin.h>
 #include <url_launcher_windows/url_launcher_windows.h>
+#include <win_toast/win_toast_plugin.h>
+#include <window_manager/window_manager_plugin.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
-  DesktoastsPluginRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("DesktoastsPlugin"));
   UrlLauncherWindowsRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("UrlLauncherWindows"));
+  WinToastPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("WinToastPlugin"));
+  WindowManagerPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("WindowManagerPlugin"));
 }
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
index cb499b22..21bba102 100644
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -3,8 +3,9 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  desktoasts
   url_launcher_windows
+  win_toast
+  window_manager
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)

From a82ade8663a71a1c258145633a6369dcd4afaebe Mon Sep 17 00:00:00 2001
From: Dan Ballard <dan@mindstab.net>
Date: Tue, 25 Jan 2022 17:37:51 -0500
Subject: [PATCH 2/6] profile level unread notifications and in profile other
 profile unread notifications

---
 android/app/build.gradle     |  4 ++--
 lib/cwtch/cwtchNotifier.dart | 15 ++++++++++-----
 lib/models/appstate.dart     | 17 +++++++++++++++++
 lib/models/profile.dart      | 18 ++++++++++++++++++
 lib/models/profilelist.dart  |  4 ++++
 lib/themes/cwtch.dart        |  6 +++---
 lib/views/contactsview.dart  | 24 ++++++++++++++++++++++++
 lib/widgets/profilerow.dart  |  3 ++-
 8 files changed, 80 insertions(+), 11 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 4899ea9e..abbe8f45 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -65,8 +65,8 @@ android {
         release {
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
-            // signingConfig signingConfigs.debug
-            signingConfig signingConfigs.release
+            signingConfig signingConfigs.debug
+            // signingConfig signingConfigs.release
         }
     }
 
diff --git a/lib/cwtch/cwtchNotifier.dart b/lib/cwtch/cwtchNotifier.dart
index 0367c7ee..5584ae35 100644
--- a/lib/cwtch/cwtchNotifier.dart
+++ b/lib/cwtch/cwtchNotifier.dart
@@ -8,6 +8,7 @@ import 'package:cwtch/models/profileservers.dart';
 import 'package:cwtch/models/remoteserver.dart';
 import 'package:cwtch/models/servers.dart';
 import 'package:cwtch/notification_manager.dart';
+import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 
 import 'package:cwtch/torstatus.dart';
@@ -145,9 +146,10 @@ class CwtchNotifier {
         var senderImage = data['Picture'];
         var isAuto = data['Auto'] == "true";
         String? contenthash = data['ContentHash'];
-        var selectedConversation = appState.selectedProfile == data["ProfileOnion"] && appState.selectedConversation == identifier;
+        var selectedProfile = appState.selectedProfile == data["ProfileOnion"];
+        var selectedConversation = selectedProfile && appState.selectedConversation == identifier;
 
-        profileCN.getProfile(data["ProfileOnion"])?.contactList.newMessage(
+        profileCN.getProfile(data["ProfileOnion"])?.newMessage(
               identifier,
               messageID,
               timestamp,
@@ -156,9 +158,10 @@ class CwtchNotifier {
               isAuto,
               data["Data"],
               contenthash,
+              selectedProfile,
               selectedConversation,
             );
-
+        appState.notifyProfileUnread();
         break;
       case "PeerAcknowledgement":
         // We don't use these anymore, IndexedAcknowledgement is more suited to the UI front end...
@@ -198,7 +201,8 @@ class CwtchNotifier {
           var currentTotal = contact!.totalMessages;
           var isAuto = data['Auto'] == "true";
           String? contenthash = data['ContentHash'];
-          var selectedConversation = appState.selectedProfile == data["ProfileOnion"] && appState.selectedConversation == identifier;
+          var selectedProfile = appState.selectedProfile == data["ProfileOnion"];
+          var selectedConversation = selectedProfile && appState.selectedConversation == identifier;
 
           // Only bother to do anything if we know about the group and the provided index is greater than our current total...
           if (currentTotal != null && idx >= currentTotal) {
@@ -212,9 +216,10 @@ class CwtchNotifier {
             // For now we perform some minimal checks on the sent timestamp to use to provide a useful ordering for honest contacts
             // and ensure that malicious contacts in groups can only set this timestamp to a value within the range of `last seen message time`
             // and `local now`.
-            profileCN.getProfile(data["ProfileOnion"])?.contactList.newMessage(identifier, idx, timestampSent, senderHandle, senderImage, isAuto, data["Data"], contenthash, selectedConversation);
+            profileCN.getProfile(data["ProfileOnion"])?.newMessage(identifier, idx, timestampSent, senderHandle, senderImage, isAuto, data["Data"], contenthash, selectedProfile, selectedConversation);
 
             notificationManager.notify("New Message From Group!");
+            appState.notifyProfileUnread();
           }
           RemoteServerInfoState? server = profileCN.getProfile(data["ProfileOnion"])?.serverList.getServer(contact.server);
           server?.updateSyncProgressFor(timestampSent);
diff --git a/lib/models/appstate.dart b/lib/models/appstate.dart
index 5a2293c3..9d78dcbb 100644
--- a/lib/models/appstate.dart
+++ b/lib/models/appstate.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/widgets.dart';
 
 enum ModalState { none, storageMigration }
@@ -16,6 +18,13 @@ class AppState extends ChangeNotifier {
   bool _disableFilePicker = false;
   bool _focus = true;
 
+  StreamController<bool> _profilesUnreadNotifyControler = StreamController<bool>();
+  late Stream<bool> profilesUnreadNotify;
+
+  AppState() {
+    profilesUnreadNotify = _profilesUnreadNotifyControler.stream.asBroadcastStream();
+  }
+
   void SetCwtchInit() {
     cwtchInit = true;
     notifyListeners();
@@ -82,4 +91,12 @@ class AppState extends ChangeNotifier {
   }
 
   bool isLandscape(BuildContext c) => MediaQuery.of(c).size.width > MediaQuery.of(c).size.height;
+
+  void notifyProfileUnread() {
+    _profilesUnreadNotifyControler.add(true);
+  }
+
+  Stream<bool> getUnreadProfileNotifyStream() {
+    return profilesUnreadNotify;
+  }
 }
diff --git a/lib/models/profile.dart b/lib/models/profile.dart
index 268eeb78..2c193865 100644
--- a/lib/models/profile.dart
+++ b/lib/models/profile.dart
@@ -173,6 +173,24 @@ class ProfileInfoState extends ChangeNotifier {
     this._contacts.resort();
   }
 
+  void newMessage(int identifier, int messageID, DateTime timestamp, String senderHandle, String senderImage, bool isAuto, String data, String? contenthash, bool selectedProfile, bool selectedConversation) {
+    if (!selectedProfile) {
+      unreadMessages++;
+      notifyListeners();
+    }
+
+    contactList.newMessage(
+        identifier,
+        messageID,
+        timestamp,
+        senderHandle,
+        senderImage,
+        isAuto,
+        data,
+        contenthash,
+        selectedConversation);
+  }
+
   void downloadInit(String fileKey, int numChunks) {
     this._downloads[fileKey] = FileDownloadProgress(numChunks, DateTime.now());
     notifyListeners();
diff --git a/lib/models/profilelist.dart b/lib/models/profilelist.dart
index 1e0eb3e2..8cae18b5 100644
--- a/lib/models/profilelist.dart
+++ b/lib/models/profilelist.dart
@@ -27,4 +27,8 @@ class ProfileListState extends ChangeNotifier {
     _profiles.removeWhere((element) => element.onion == onion);
     notifyListeners();
   }
+
+  int generateUnreadCount(String selectedProfile) => _profiles.where( (p) => p.onion != selectedProfile ).fold(0, (i, p) => i + p.unreadMessages);
+
+
 }
diff --git a/lib/themes/cwtch.dart b/lib/themes/cwtch.dart
index e4a660c5..5d0eb3e1 100644
--- a/lib/themes/cwtch.dart
+++ b/lib/themes/cwtch.dart
@@ -68,8 +68,8 @@ class CwtchDark extends OpaqueThemeType {
   get portraitBlockedTextColor => lightGrey;
   get portraitContactBadgeColor => hotPink;
   get portraitContactBadgeTextColor => whiteishPurple;
-  get portraitProfileBadgeColor => mauvePurple;
-  get portraitProfileBadgeTextColor => darkGreyPurple;
+  get portraitProfileBadgeColor => hotPink;
+  get portraitProfileBadgeTextColor => whiteishPurple;
   get dropShadowColor => mauvePurple;
   get toolbarIconColor => settings; //whiteishPurple;
   get messageFromMeBackgroundColor => userBubble; //  mauvePurple;
@@ -112,7 +112,7 @@ class CwtchLight extends OpaqueThemeType {
   get portraitBlockedTextColor => softGrey;
   get portraitContactBadgeColor => accent;
   get portraitContactBadgeTextColor => whitePurple;
-  get portraitProfileBadgeColor => brightPurple;
+  get portraitProfileBadgeColor => accent;
   get portraitProfileBadgeTextColor => whitePurple;
   get dropShadowColor => purple;
   get toolbarIconColor => settings; //darkPurple;
diff --git a/lib/views/contactsview.dart b/lib/views/contactsview.dart
index 7f6b2236..c7ab0271 100644
--- a/lib/views/contactsview.dart
+++ b/lib/views/contactsview.dart
@@ -76,6 +76,30 @@ class _ContactsViewState extends State<ContactsView> {
         endDrawerEnableOpenDragGesture: false,
         drawerEnableOpenDragGesture: false,
         appBar: AppBar(
+          leading: Row(children: [
+            IconButton(
+              icon: Icon(Icons.arrow_back),
+              tooltip: MaterialLocalizations.of(context).backButtonTooltip,
+              onPressed: () {
+                Provider.of<AppState>(context, listen: false).selectedProfile = "";
+                Navigator.of(context).pop();
+              },
+            ),
+
+            StreamBuilder<bool>(
+                stream: Provider.of<AppState>(context).getUnreadProfileNotifyStream(),
+                builder: (BuildContext context, AsyncSnapshot<bool> unreadCountSnapshot) {
+                  int unreadCount = Provider.of<ProfileListState>(context).generateUnreadCount(Provider.of<AppState>(context).selectedProfile ?? "") ;
+
+                  return Visibility(
+                      visible: unreadCount > 0,
+                      child: CircleAvatar(
+                        radius: 10.0,
+                        backgroundColor: Provider.of<Settings>(context).theme.portraitProfileBadgeColor,
+                        child: Text(unreadCount > 99 ? "99+" : unreadCount.toString(), style: TextStyle(color: Provider.of<Settings>(context).theme.portraitProfileBadgeTextColor, fontSize: 8.0)),
+                      ));
+                }),
+          ]),
           title: RepaintBoundary(
               child: Row(children: [
             ProfileImage(
diff --git a/lib/widgets/profilerow.dart b/lib/widgets/profilerow.dart
index acbdce0a..2ddda6d9 100644
--- a/lib/widgets/profilerow.dart
+++ b/lib/widgets/profilerow.dart
@@ -33,7 +33,7 @@ class _ProfileRowState extends State<ProfileRow> {
               Padding(
                   padding: const EdgeInsets.all(6.0), //border size
                   child: ProfileImage(
-                      badgeCount: 0,
+                      badgeCount: profile.unreadMessages,
                       badgeColor: Provider.of<Settings>(context).theme.portraitProfileBadgeColor,
                       badgeTextColor: Provider.of<Settings>(context).theme.portraitProfileBadgeTextColor,
                       diameter: 64.0,
@@ -83,6 +83,7 @@ class _ProfileRowState extends State<ProfileRow> {
   }
 
   void _pushContactList(ProfileInfoState profile, bool isLandscape) {
+    Provider.of<ProfileInfoState>(context, listen: false).unreadMessages = 0;
     Navigator.of(context).push(
       MaterialPageRoute<void>(
         settings: RouteSettings(name: "conversations"),

From 1a9f0763d76b5e66008da144dfd392e2c81456ed Mon Sep 17 00:00:00 2001
From: Dan Ballard <dan@mindstab.net>
Date: Tue, 25 Jan 2022 17:47:13 -0500
Subject: [PATCH 3/6] update goldens with new profile unread widgetry

---
 android/app/build.gradle   |   4 ++--
 test/profileimage_init.png | Bin 6704 -> 6711 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index abbe8f45..4899ea9e 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -65,8 +65,8 @@ android {
         release {
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
-            // signingConfig signingConfigs.release
+            // signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
         }
     }
 
diff --git a/test/profileimage_init.png b/test/profileimage_init.png
index a7f5369fbb2798cff8f5c79a5be0d11bee29f9a3..7f1a1602dc8364e69369a757518b40eb7665b2cc 100644
GIT binary patch
literal 6711
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
CVOi<`

literal 6704
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


From 8a9ee402bff4f1dabd300b5f53b361e1baa71d4e Mon Sep 17 00:00:00 2001
From: Dan Ballard <dan@mindstab.net>
Date: Thu, 3 Feb 2022 08:43:02 -0500
Subject: [PATCH 4/6] recalculate unrad count incases some not read

---
 lib/models/profile.dart     | 5 +++++
 lib/views/contactsview.dart | 1 +
 lib/widgets/profilerow.dart | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/models/profile.dart b/lib/models/profile.dart
index 2c193865..ee10ec47 100644
--- a/lib/models/profile.dart
+++ b/lib/models/profile.dart
@@ -120,6 +120,10 @@ class ProfileInfoState extends ChangeNotifier {
     notifyListeners();
   }
 
+  void recountUnread() {
+    this._unreadMessages = _contacts.contacts.fold(0, (i, c) => i + c.unreadMessages);
+  }
+
   // Remove a contact from a list. Currently only used when rejecting a group invitation.
   // Eventually will also be used for other removals.
   void removeContact(String handle) {
@@ -168,6 +172,7 @@ class ProfileInfoState extends ChangeNotifier {
                 lastMessageTime: DateTime.fromMillisecondsSinceEpoch(1000 * int.parse(contact["lastMsgTime"])),
               ));
         }
+        unreadMessages += int.parse(contact["numUnread"]);
       });
     }
     this._contacts.resort();
diff --git a/lib/views/contactsview.dart b/lib/views/contactsview.dart
index c7ab0271..24168764 100644
--- a/lib/views/contactsview.dart
+++ b/lib/views/contactsview.dart
@@ -81,6 +81,7 @@ class _ContactsViewState extends State<ContactsView> {
               icon: Icon(Icons.arrow_back),
               tooltip: MaterialLocalizations.of(context).backButtonTooltip,
               onPressed: () {
+                Provider.of<ProfileInfoState>(context, listen: false).recountUnread();
                 Provider.of<AppState>(context, listen: false).selectedProfile = "";
                 Navigator.of(context).pop();
               },
diff --git a/lib/widgets/profilerow.dart b/lib/widgets/profilerow.dart
index 2ddda6d9..0554373d 100644
--- a/lib/widgets/profilerow.dart
+++ b/lib/widgets/profilerow.dart
@@ -1,6 +1,7 @@
 import 'package:cwtch/models/appstate.dart';
 import 'package:cwtch/models/contactlist.dart';
 import 'package:cwtch/models/profile.dart';
+import 'package:cwtch/models/profilelist.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:cwtch/views/addeditprofileview.dart';
@@ -83,7 +84,6 @@ class _ProfileRowState extends State<ProfileRow> {
   }
 
   void _pushContactList(ProfileInfoState profile, bool isLandscape) {
-    Provider.of<ProfileInfoState>(context, listen: false).unreadMessages = 0;
     Navigator.of(context).push(
       MaterialPageRoute<void>(
         settings: RouteSettings(name: "conversations"),

From be65417f27cd93e98e18df6886b2237f59c86c5e Mon Sep 17 00:00:00 2001
From: Dan Ballard <dan@mindstab.net>
Date: Thu, 3 Feb 2022 08:43:29 -0500
Subject: [PATCH 5/6] new plugin generated code

---
 linux/flutter/generated_plugin_registrant.cc | 4 ++++
 linux/flutter/generated_plugins.cmake        | 1 +
 2 files changed, 5 insertions(+)

diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc
index f6f23bfe..51e7cad4 100644
--- a/linux/flutter/generated_plugin_registrant.cc
+++ b/linux/flutter/generated_plugin_registrant.cc
@@ -7,9 +7,13 @@
 #include "generated_plugin_registrant.h"
 
 #include <url_launcher_linux/url_launcher_plugin.h>
+#include <window_manager/window_manager_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
   g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
   url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
+  g_autoptr(FlPluginRegistrar) window_manager_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "WindowManagerPlugin");
+  window_manager_plugin_register_with_registrar(window_manager_registrar);
 }
diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake
index 1fc8ed34..ec48ebfc 100644
--- a/linux/flutter/generated_plugins.cmake
+++ b/linux/flutter/generated_plugins.cmake
@@ -4,6 +4,7 @@
 
 list(APPEND FLUTTER_PLUGIN_LIST
   url_launcher_linux
+  window_manager
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)

From 19a202a04c576a19a96961c06c8dc280c9cf5cd8 Mon Sep 17 00:00:00 2001
From: Dan Ballard <dan@mindstab.net>
Date: Thu, 3 Feb 2022 13:58:51 -0800
Subject: [PATCH 6/6] formating, and moving active=true up to be better

---
 lib/notification_manager.dart | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/lib/notification_manager.dart b/lib/notification_manager.dart
index 68f56f3e..91d6ada8 100644
--- a/lib/notification_manager.dart
+++ b/lib/notification_manager.dart
@@ -31,12 +31,7 @@ class LinuxNotificationsManager implements NotificationsManager {
 
   Future<void> notify(String message) async {
     var iconPath = Uri.file(path.join(path.current, "cwtch.png"));
-    client
-        .notify(message,
-            appName: "cwtch",
-            appIcon: iconPath.toString(),
-            replacesId: this.previous_id)
-        .then((Notification value) => previous_id = value.id);
+    client.notify(message, appName: "cwtch", appIcon: iconPath.toString(), replacesId: this.previous_id).then((Notification value) => previous_id = value.id);
   }
 }
 
@@ -48,20 +43,16 @@ class WindowsNotificationManager implements NotificationsManager {
 
   WindowsNotificationManager() {
     scheduleMicrotask(() async {
-      initialized = await WinToast.instance().initialize(
-          appName: 'cwtch',
-          productName: 'Cwtch',
-          companyName: 'Open Privacy Research Society');
+      initialized = await WinToast.instance().initialize(appName: 'cwtch', productName: 'Cwtch', companyName: 'Open Privacy Research Society');
     });
   }
 
   Future<void> notify(String message) async {
     if (initialized && !globalAppState.focus) {
       if (!active) {
-        WinToast.instance().clear();
-        final toast = await WinToast.instance()
-            .showToast(type: ToastType.text01, title: message);
         active = true;
+        WinToast.instance().clear();
+        final toast = await WinToast.instance().showToast(type: ToastType.text01, title: message);
         toast?.eventStream.listen((event) {
           if (event is ActivatedEvent) {
             WinToast.instance().bringWindowToFront();
@@ -82,15 +73,13 @@ NotificationsManager newDesktopNotificationsManager() {
       client.getCapabilities();
       return LinuxNotificationsManager(client);
     } catch (e) {
-      EnvironmentConfig.debugLog(
-          "Attempted to access DBUS for notifications but failed. Switching off notifications.");
+      EnvironmentConfig.debugLog("Attempted to access DBUS for notifications but failed. Switching off notifications.");
     }
   } else if (Platform.isWindows) {
     try {
       return WindowsNotificationManager();
     } catch (e) {
-      EnvironmentConfig.debugLog(
-          "Failed to create Windows desktoasts notification manager");
+      EnvironmentConfig.debugLog("Failed to create Windows desktoasts notification manager");
     }
   }
   return NullNotificationsManager();