fix build

bugfixes
Channel QR Code scanner [WIP]
2024-10-23 15:22:08 +02:00 · 2024-10-20 03:34:34 +02:00 · 2024-10-19 22:39:05 +02:00 · 2024-10-19 20:00:44 +02:00 · 2024-10-19 17:52:27 +02:00 · 2024-10-19 17:16:34 +02:00
45 changed files with 1201 additions and 299 deletions
--- a/flutter/Makefile
+++ b/flutter/Makefile
@ -1,14 +1,32 @@


+# Setup
+#
+# flutter config --jdk-dir "/usr/lib/jvm/default-runtime/bin"
+# sudo archlinux-java set java-17-openjdk
+#
+
+
+
 run:
 	flutter pub run build_runner build
-	flutter run
+	_JAVA_OPTIONS="" flutter run
 	
 run-android:
 	ping -c1 10.10.10.177
 	adb connect 10.10.10.177:5555
 	flutter pub run build_runner build
-	flutter run -d 10.10.10.177:5555
+	_JAVA_OPTIONS="" flutter run -d 10.10.10.177:5555
+
+install-release:
+	# Install on Pixel 7a
+	flutter build apk --release
+	flutter run --release -d 35221JEHN07157
+
+build-release:
+	flutter build apk       --release
+	flutter build appbundle --release
+	flutter build linux     --release

 test:
 	dart analyze
@ -25,3 +43,7 @@ autoreload:
 	
 icons:
 	flutter pub run flutter_launcher_icons -f "flutter_launcher_icons.yaml"
+
+clean:
+	cd android && ./gradlew clean
+	flutter clean
--- a/flutter/TODO.md
+++ b/flutter/TODO.md
@ -25,6 +25,8 @@

 - [ ] Still @ERROR on scn-init, but no logs? - better persist error (write in SharedPrefs at error_$date=txt ?), also perhaps print first error line in scn-init notification?

+ - [ ] fix time format (in message-list, in card, top right) - midnight is shown as "24:05" instead of "00:05" - thats weird
+
 -----

 # TODO iOS specific
--- a/flutter/android/app/build.gradle
+++ b/flutter/android/app/build.gradle
@ -38,12 +38,12 @@ android {

    compileOptions {
        coreLibraryDesugaringEnabled true
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
    }

    kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
    }

    sourceSets {
--- a/flutter/android/gradle/wrapper/gradle-wrapper.properties
+++ b/flutter/android/gradle/wrapper/gradle-wrapper.properties
@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
--- a/flutter/ios/Runner/Info.plist
+++ b/flutter/ios/Runner/Info.plist
@ -45,5 +45,10 @@
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+	<key>NSCameraUsageDescription</key>
+	<string>This app needs camera access to scan QR codes</string>
+
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>This app needs photos access to get QR code from photo library</string>
 </dict>
 </plist>
--- a/flutter/lib/api/api_client.dart
+++ b/flutter/lib/api/api_client.dart
@ -5,6 +5,7 @@ import 'package:simplecloudnotifier/api/api_exception.dart';
 import 'package:simplecloudnotifier/models/api_error.dart';
 import 'package:simplecloudnotifier/models/client.dart';
 import 'package:simplecloudnotifier/models/keytoken.dart';
+import 'package:simplecloudnotifier/models/sender_name_statistics.dart';
 import 'package:simplecloudnotifier/models/subscription.dart';
 import 'package:simplecloudnotifier/models/user.dart';
 import 'package:simplecloudnotifier/state/app_auth.dart';
@ -101,21 +102,23 @@ class APIClient {
    }

    if (responseStatusCode != 200) {
-      try {
-        final apierr = APIError.fromJson(jsonDecode(responseBody) as Map<String, dynamic>);
+      APIError apierr;

-        RequestLog.addRequestAPIError(name, t0, method, uri, req.body, req.headers, responseStatusCode, responseBody, responseHeaders, apierr);
-        Toaster.error("Error", 'Request "${name}" failed');
-        throw APIException(responseStatusCode, apierr.error, apierr.errhighlight, apierr.message);
+      try {
+        apierr = APIError.fromJson(jsonDecode(responseBody) as Map<String, dynamic>);
      } catch (exc, trace) {
        ApplicationLog.warn('Failed to decode api response as error-object', additional: exc.toString() + "\nBody:\n" + responseBody, trace: trace);
-      }

        RequestLog.addRequestErrorStatuscode(name, t0, method, uri, req.body, req.headers, responseStatusCode, responseBody, responseHeaders);
        Toaster.error("Error", 'Request "${name}" failed');
        throw Exception('API request failed with status code ${responseStatusCode}');
      }

+      RequestLog.addRequestAPIError(name, t0, method, uri, req.body, req.headers, responseStatusCode, responseBody, responseHeaders, apierr);
+      Toaster.error("Error", apierr.message);
+      throw APIException(responseStatusCode, apierr.error, apierr.errhighlight, apierr.message);
+    }
+
    try {
      final data = jsonDecode(responseBody);

@ -281,6 +284,20 @@ class APIClient {
    );
  }

+  static Future<(String, List<SCNMessage>)> getChannelMessageList(TokenSource auth, String cid, String pageToken, {int? pageSize}) async {
+    return await _request(
+      name: 'getChannelMessageList',
+      method: 'GET',
+      relURL: 'users/${auth.getUserID()}/channels/${cid}/messages',
+      query: {
+        'next_page_token': [pageToken],
+        if (pageSize != null) 'page_size': [pageSize.toString()],
+      },
+      fn: (json) => SCNMessage.fromPaginatedJsonArray(json, 'messages', 'next_page_token'),
+      authToken: auth.getToken(),
+    );
+  }
+
  static Future<List<Subscription>> getSubscriptionList(TokenSource auth) async {
    return await _request(
      name: 'getSubscriptionList',
@ -369,7 +386,62 @@ class APIClient {
    );
  }

-  static Future<List<String>> getSenderNameList(AppAuth userAcc) {
-    return Future.value(['TODO']); //TODO
+  static Future<List<SenderNameStatistics>> getSenderNameList(TokenSource auth) async {
+    return await _request(
+      name: 'getSenderNameList',
+      method: 'GET',
+      relURL: 'users/${auth.getUserID()}/sender-names',
+      fn: (json) => SenderNameStatistics.fromJsonArray(json['sender_names'] as List<dynamic>),
+      authToken: auth.getToken(),
+    );
+  }
+
+  static Future<Subscription> subscribeToChannelbyID(TokenSource auth, String channelID) async {
+    return await _request(
+      name: 'subscribeToChannelbyID',
+      method: 'POST',
+      relURL: 'users/${auth.getUserID()}/subscriptions',
+      jsonBody: {
+        'channel_id': channelID,
+      },
+      fn: Subscription.fromJson,
+      authToken: auth.getToken(),
+    );
+  }
+
+  static Future<Subscription> deleteSubscription(TokenSource auth, String channelID, String subID) async {
+    return await _request(
+      name: 'deleteSubscription',
+      method: 'DELETE',
+      relURL: 'users/${auth.getUserID()}/subscriptions/${subID}',
+      fn: Subscription.fromJson,
+      authToken: auth.getToken(),
+    );
+  }
+
+  static Future<Subscription> confirmSubscription(TokenSource auth, String channelID, String subID) async {
+    return await _request(
+      name: 'confirmSubscription',
+      method: 'PATCH',
+      relURL: 'users/${auth.getUserID()}/subscriptions/${subID}',
+      jsonBody: {
+        'confirmed': true,
+      },
+      fn: Subscription.fromJson,
+      authToken: auth.getToken(),
+    );
+  }
+
+  static Future<Subscription> unconfirmSubscription(TokenSource auth, String channelID, String subID) async {
+    return await _request(
+      name: 'unconfirmSubscription',
+      method: 'PATCH',
+      relURL: 'users/${auth.getUserID()}/subscriptions/${subID}',
+      jsonBody: {
+        'confirmed': false,
+      },
+      fn: Subscription.fromJson,
+      authToken: auth.getToken(),
+    );
  }
 }
--- a/flutter/lib/api/api_exception.dart
+++ b/flutter/lib/api/api_exception.dart
@ -1,7 +1,7 @@
 class APIException implements Exception {
  final int httpStatus;
  final int error;
-  final String errHighlight;
+  final int errHighlight;
  final String message;

  APIException(this.httpStatus, this.error, this.errHighlight, this.message);
--- a/flutter/lib/components/modals/filter_modal_sendername.dart
+++ b/flutter/lib/components/modals/filter_modal_sendername.dart
@ -25,7 +25,7 @@ class _FilterModalSendernameState extends State<FilterModalSendername> {
      final userAcc = Provider.of<AppAuth>(context, listen: false);
      if (!userAcc.isAuth()) throw new Exception('not logged in');

-      final senders = await APIClient.getSenderNameList(userAcc);
+      final senders = (await APIClient.getSenderNameList(userAcc)).map((p) => p.name).toList();

      return senders;
    }());
--- a/flutter/lib/components/modals/filter_modal_time.dart
+++ b/flutter/lib/components/modals/filter_modal_time.dart
@ -1,10 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:simplecloudnotifier/api/api_client.dart';
-import 'package:simplecloudnotifier/pages/message_list/message_filter_chiplet.dart';
-import 'package:simplecloudnotifier/state/app_auth.dart';
-import 'package:simplecloudnotifier/state/app_events.dart';
-import 'package:simplecloudnotifier/types/immediate_future.dart';

 class FilterModalTime extends StatefulWidget {
  @override
--- a/flutter/lib/main.dart
+++ b/flutter/lib/main.dart
@ -59,6 +59,7 @@ void main() async {
    Hive.deleteBoxFromDisk('scn-logs');
    await Hive.openBox<SCNLog>('scn-logs');
    ApplicationLog.error('Failed to open Hive-Box: scn-logs: ' + exc.toString(), trace: trace);
+    ApplicationLog.writeRawFailure('Failed to open Hive-Box: scn-logs', {'error': exc.toString(), 'trace': trace});
  }

  print('[INIT] Load Hive<scn-requests>...');
@ -69,6 +70,7 @@ void main() async {
    Hive.deleteBoxFromDisk('scn-requests');
    await Hive.openBox<SCNRequest>('scn-requests');
    ApplicationLog.error('Failed to open Hive-Box: scn-requests: ' + exc.toString(), trace: trace);
+    ApplicationLog.writeRawFailure('Failed to open Hive-Box: scn-requests', {'error': exc.toString(), 'trace': trace});
  }

  print('[INIT] Load Hive<scn-message-cache>...');
@ -79,6 +81,7 @@ void main() async {
    Hive.deleteBoxFromDisk('scn-message-cache');
    await Hive.openBox<SCNMessage>('scn-message-cache');
    ApplicationLog.error('Failed to open Hive-Box: scn-message-cache' + exc.toString(), trace: trace);
+    ApplicationLog.writeRawFailure('Failed to open Hive-Box: scn-message-cache', {'error': exc.toString(), 'trace': trace});
  }

  print('[INIT] Load Hive<scn-channel-cache>...');
@ -89,6 +92,7 @@ void main() async {
    Hive.deleteBoxFromDisk('scn-channel-cache');
    await Hive.openBox<Channel>('scn-channel-cache');
    ApplicationLog.error('Failed to open Hive-Box: scn-channel-cache' + exc.toString(), trace: trace);
+    ApplicationLog.writeRawFailure('Failed to open Hive-Box: scn-channel-cache', {'error': exc.toString(), 'trace': trace});
  }

  print('[INIT] Load Hive<scn-fb-messages>...');
@ -99,6 +103,7 @@ void main() async {
    Hive.deleteBoxFromDisk('scn-fb-messages');
    await Hive.openBox<FBMessage>('scn-fb-messages');
    ApplicationLog.error('Failed to open Hive-Box: scn-fb-messages' + exc.toString(), trace: trace);
+    ApplicationLog.writeRawFailure('Failed to open Hive-Box: scn-fb-messages', {'error': exc.toString(), 'trace': trace});
  }

  print('[INIT] Load AppAuth...');
@ -112,11 +117,13 @@ void main() async {
        await appAuth.loadUser();
      } catch (exc, trace) {
        ApplicationLog.error('Failed to load user (background load on startup): ' + exc.toString(), trace: trace);
+        ApplicationLog.writeRawFailure('Failed to load user (background load on startup)', {'error': exc.toString(), 'trace': trace});
      }
      try {
        await appAuth.loadClient();
      } catch (exc, trace) {
        ApplicationLog.error('Failed to load user (background load on startup): ' + exc.toString(), trace: trace);
+        ApplicationLog.writeRawFailure('Failed to load user (background load on startup)', {'error': exc.toString(), 'trace': trace});
      }
    }();
  }
@ -219,7 +226,7 @@ class SCNApp extends StatelessWidget {
    return ToastificationWrapper(
      config: ToastificationConfig(
        itemWidth: 440,
-        marginBuilder: (alignment) => EdgeInsets.symmetric(vertical: 64),
+        marginBuilder: (context, alignment) => EdgeInsets.symmetric(vertical: 64),
        animationDuration: Duration(milliseconds: 200),
      ),
      child: Consumer<AppTheme>(
@ -321,6 +328,7 @@ Future<void> _receiveMessage(RemoteMessage message, bool foreground) async {
    await Hive.openBox<SCNMessage>('scn-message-cache');
    await Hive.openBox<SCNRequest>('scn-requests');
  } catch (exc, trace) {
+    ApplicationLog.writeRawFailure('Failed to init hive', {'exception': exc.toString(), 'trace': trace.toString(), 'data': message, 'foreground': foreground});
    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;
@ -341,6 +349,7 @@ Future<void> _receiveMessage(RemoteMessage message, bool foreground) async {

    Notifier.showLocalNotification(scn_msg_id, channel_id, channel, 'Channel: ${channel}', title, body, timestamp);
  } catch (exc, trace) {
+    ApplicationLog.writeRawFailure('Failed to decode received FB message', {'exception': exc.toString(), 'trace': trace.toString(), 'data': message, 'foreground': foreground});
    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;
@ -349,6 +358,7 @@ Future<void> _receiveMessage(RemoteMessage message, bool foreground) async {
  try {
    FBMessageLog.insert(message);
  } catch (exc, trace) {
+    ApplicationLog.writeRawFailure('Failed to persist received FB message', {'exception': exc.toString(), 'trace': trace.toString(), 'data': message, 'foreground': foreground});
    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;
@ -359,6 +369,7 @@ Future<void> _receiveMessage(RemoteMessage message, bool foreground) async {
    SCNDataCache().addToMessageCache([msg]);
    if (foreground) AppEvents().notifyMessageReceivedListeners(msg);
  } catch (exc, trace) {
+    ApplicationLog.writeRawFailure('Failed to query+persist message', {'exception': exc.toString(), 'trace': trace.toString(), 'data': message, 'foreground': foreground});
    ApplicationLog.error('Failed to query+persist message: ' + exc.toString(), trace: trace);
    return;
  }
@ -382,7 +393,7 @@ void _handleNotificationClickAction(String? payload, Duration delay) {
  if (parts.length == 4 && parts[0] == '@SCN_MESSAGE') {
    final messageID = parts[1];
    () async {
-      await Future.delayed(delay);
+      await Future.delayed(delay, () {});

      SchedulerBinding.instance.addPostFrameCallback((_) {
        ApplicationLog.info('Handle notification action @SCN_MESSAGE --> ${messageID}');
@ -392,7 +403,7 @@ void _handleNotificationClickAction(String? payload, Duration delay) {
  } else if (parts.length == 3 && parts[0] == '@SCN_MESSAGE_SUMMARY') {
    final channelID = parts[1];
    () async {
-      await Future.delayed(delay);
+      await Future.delayed(delay, () {});

      SchedulerBinding.instance.addPostFrameCallback((_) {
        ApplicationLog.info('Handle notification action @SCN_MESSAGE_SUMMARY --> ${channelID}');
--- a/flutter/lib/models/api_error.dart
+++ b/flutter/lib/models/api_error.dart
@ -1,7 +1,7 @@
 class APIError {
  final bool success;
  final int error;
-  final String errhighlight;
+  final int errhighlight;
  final String message;

  static final MISSING_UID = 1101;
@ -67,7 +67,7 @@ class APIError {
    return APIError(
      success: json['success'] as bool,
      error: (json['error'] as num).toInt(),
-      errhighlight: json['errhighlight'] as String,
+      errhighlight: (json['errhighlight'] as num).toInt(),
      message: json['message'] as String,
    );
  }
--- a/flutter/lib/models/scan_result.dart
+++ b/flutter/lib/models/scan_result.dart
@ -0,0 +1,75 @@
+import 'package:simplecloudnotifier/models/channel.dart';
+
+enum ScanResultMode { ChannelSubscribe, MessageSend, Channel }
+
+abstract class ScanResult {
+  ScanResultMode get mode;
+
+  static ScanResult? parse(String v) {
+    var lines = v.split('\n');
+
+    if (lines.length == 1 && lines[0].startsWith('https://simplecloudnotifier.de?')) {
+      final v = Uri.tryParse(lines[0]);
+
+      if (v != null && v.queryParameters.containsKey('preset_user_id') && v.queryParameters.containsKey('preset_user_key')) {
+        return ScanResultMessageSend(userID: v.queryParameters['preset_user_id']!, userKey: v.queryParameters['preset_user_key']);
+      }
+      if (v != null && v.queryParameters.containsKey('preset_user_id') && v.queryParameters.containsKey('preset_user_key')) {
+        return ScanResultMessageSend(userID: v.queryParameters['preset_user_id']!, userKey: null);
+      }
+    }
+
+    if (lines.length == 6 && lines[0] == '@scn.channel.subscribe' && lines[1] == 'v1') {
+      return ScanResultChannelSubscribe(channelDisplayName: lines[2], ownerUserID: lines[3], channelID: lines[4], subscribeKey: lines[5]);
+    }
+
+    if (lines.length == 5 && lines[0] == '@scn.channel' && lines[1] == 'v1') {
+      if (lines.length != 4) return null;
+
+      return ScanResultChannel(channelDisplayName: lines[2], ownerUserID: lines[3], channelID: lines[4]);
+    }
+
+    return null;
+  }
+
+  static String createChannelQR(Channel channel) {
+    return '@scn.channel' + '\n' + "v1" + '\n' + channel.displayName + '\n' + channel.ownerUserID + '\n' + channel.channelID;
+  }
+
+  static String createChannelSubscribeQR(Channel channel, String subscribeKey) {
+    return '@scn.channel.subscribe' + '\n' + "v1" + '\n' + channel.displayName + '\n' + channel.ownerUserID + '\n' + channel.channelID + '\n' + subscribeKey;
+  }
+}
+
+class ScanResultMessageSend extends ScanResult {
+  final String userID;
+  final String? userKey;
+
+  ScanResultMessageSend({required this.userID, required this.userKey});
+
+  @override
+  ScanResultMode get mode => ScanResultMode.MessageSend;
+}
+
+class ScanResultChannel extends ScanResult {
+  final String channelDisplayName;
+  final String ownerUserID;
+  final String channelID;
+
+  ScanResultChannel({required this.channelDisplayName, required this.ownerUserID, required this.channelID});
+
+  @override
+  ScanResultMode get mode => ScanResultMode.Channel;
+}
+
+class ScanResultChannelSubscribe extends ScanResult {
+  final String channelDisplayName;
+  final String ownerUserID;
+  final String channelID;
+  final String subscribeKey;
+
+  ScanResultChannelSubscribe({required this.channelDisplayName, required this.ownerUserID, required this.channelID, required this.subscribeKey});
+
+  @override
+  ScanResultMode get mode => ScanResultMode.ChannelSubscribe;
+}
--- a/flutter/lib/models/sender_name_statistics.dart
+++ b/flutter/lib/models/sender_name_statistics.dart
@ -0,0 +1,26 @@
+class SenderNameStatistics {
+  final String name;
+  final String lastTimestamp;
+  final String firstTimestamp;
+  final int count;
+
+  const SenderNameStatistics({
+    required this.name,
+    required this.lastTimestamp,
+    required this.firstTimestamp,
+    required this.count,
+  });
+
+  factory SenderNameStatistics.fromJson(Map<String, dynamic> json) {
+    return SenderNameStatistics(
+      name: json['name'] as String,
+      lastTimestamp: json['last_timestamp'] as String,
+      firstTimestamp: json['first_timestamp'] as String,
+      count: json['count'] as int,
+    );
+  }
+
+  static List<SenderNameStatistics> fromJsonArray(List<dynamic> jsonArr) {
+    return jsonArr.map<SenderNameStatistics>((e) => SenderNameStatistics.fromJson(e as Map<String, dynamic>)).toList();
+  }
+}
--- a/flutter/lib/pages/account/account.dart
+++ b/flutter/lib/pages/account/account.dart
@ -7,6 +7,7 @@ import 'package:provider/provider.dart';
 import 'package:simplecloudnotifier/api/api_client.dart';
 import 'package:simplecloudnotifier/models/user.dart';
 import 'package:simplecloudnotifier/pages/account/login.dart';
+import 'package:simplecloudnotifier/pages/channel_list/channel_list_extended.dart';
 import 'package:simplecloudnotifier/state/app_bar_state.dart';
 import 'package:simplecloudnotifier/state/application_log.dart';
 import 'package:simplecloudnotifier/state/globals.dart';
@ -32,6 +33,7 @@ class _AccountRootPageState extends State<AccountRootPage> {
  late ImmediateFuture<int>? futureKeyCount;
  late ImmediateFuture<int>? futureChannelAllCount;
  late ImmediateFuture<int>? futureChannelSubscribedCount;
+  late ImmediateFuture<int>? futureSenderNamesCount;
  late ImmediateFuture<User>? futureUser;

  late AppAuth userAcc;
@ -87,6 +89,7 @@ class _AccountRootPageState extends State<AccountRootPage> {
    futureKeyCount = null;
    futureChannelAllCount = null;
    futureChannelSubscribedCount = null;
+    futureSenderNamesCount = null;

    if (userAcc.isAuth()) {
      futureChannelAllCount = ImmediateFuture.ofFuture(() async {
@ -119,6 +122,12 @@ class _AccountRootPageState extends State<AccountRootPage> {
        return keys.length;
      }());

+      futureSenderNamesCount = ImmediateFuture.ofFuture(() async {
+        if (!userAcc.isAuth()) throw new Exception('not logged in');
+        final senders = (await APIClient.getSenderNameList(userAcc)).map((p) => p.name).toList();
+        return senders.length;
+      }());
+
      futureUser = ImmediateFuture.ofFuture(userAcc.loadUser(force: false));
    }
  }
@ -137,6 +146,7 @@ class _AccountRootPageState extends State<AccountRootPage> {
        final subs = await APIClient.getSubscriptionList(userAcc);
        final clients = await APIClient.getClientList(userAcc);
        final keys = await APIClient.getKeyTokenList(userAcc);
+        final senderNames = await APIClient.getSenderNameList(userAcc);
        final user = await userAcc.loadUser(force: true);

        setState(() {
@ -145,6 +155,7 @@ class _AccountRootPageState extends State<AccountRootPage> {
          futureSubscriptionCount = ImmediateFuture.ofValue(subs.length);
          futureClientCount = ImmediateFuture.ofValue(clients.length);
          futureKeyCount = ImmediateFuture.ofValue(keys.length);
+          futureSenderNamesCount = ImmediateFuture.ofValue(senderNames.length);
          futureUser = ImmediateFuture.ofValue(user);
        });
      } catch (exc, trace) {
@ -368,7 +379,10 @@ class _AccountRootPageState extends State<AccountRootPage> {
      _buildNumberCard(context, 'Subscriptions', futureSubscriptionCount, () {/*TODO*/}),
      _buildNumberCard(context, 'Clients', futureClientCount, () {/*TODO*/}),
      _buildNumberCard(context, 'Keys', futureKeyCount, () {/*TODO*/}),
-      _buildNumberCard(context, 'Channels', futureChannelSubscribedCount, () {/*TODO*/}),
+      _buildNumberCard(context, 'Channels', futureChannelSubscribedCount, () {
+        Navi.push(context, () => ChannelListExtendedPage());
+      }),
+      _buildNumberCard(context, 'Sender', futureSenderNamesCount, () {/*TODO*/}),
      UI.buttonCard(
        context: context,
        margin: EdgeInsets.fromLTRB(0, 4, 0, 4),
--- a/flutter/lib/pages/account/login.dart
+++ b/flutter/lib/pages/account/login.dart
@ -140,12 +140,14 @@ class _AccountLoginPageState extends State<AccountLoginPage> {
        return;
      }

+      if (stokv != "") {
        final toks = await APIClient.getKeyTokenByToken(uid, stokv);

        if (!toks.allChannels || toks.permissions != 'CS') {
          Toaster.error("Error", 'Send token does not have required permissions');
          return;
        }
+      }
      
      final user = await APIClient.getUser(DirectTokenSource(uid, atokv), uid);

--- a/flutter/lib/pages/channel_list/channel_list.dart
+++ b/flutter/lib/pages/channel_list/channel_list.dart
@ -4,7 +4,7 @@ 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/pages/channel_view/channel_view.dart';
+import 'package:simplecloudnotifier/pages/channel_list/channel_scanner.dart';
 import 'package:simplecloudnotifier/state/app_bar_state.dart';
 import 'package:simplecloudnotifier/state/application_log.dart';
 import 'package:simplecloudnotifier/state/app_auth.dart';
@ -154,8 +154,13 @@ class _ChannelRootPageState extends State<ChannelRootPage> with RouteAware {
            itemBuilder: (context, item, index) => ChannelListItem(
              channel: item.channel,
              subscription: item.subscription,
-              onPressed: () {
-                Navi.push(context, () => ChannelViewPage(channelID: item.channel.channelID, preloadedData: (item.channel, item.subscription), needsReload: _enqueueReload));
+              mode: ChannelListItemMode.Messages,
+              onChannelListReloadTrigger: _enqueueReload,
+              onSubscriptionChanged: (channelID, subscription) {
+                setState(() {
+                  final idx = _pagingController.itemList?.indexWhere((p) => p.channel.channelID == channelID);
+                  if (idx != null && idx >= 0) _pagingController.itemList![idx] = ChannelWithSubscription(channel: _pagingController.itemList![idx].channel, subscription: subscription);
+                });
              },
            ),
          ),
@ -164,7 +169,7 @@ class _ChannelRootPageState extends State<ChannelRootPage> with RouteAware {
      floatingActionButton: FloatingActionButton(
        heroTag: 'fab_channel_list_qr',
        onPressed: () {
-          //TODO scan qr code to subscribe channel
+          Navi.push(context, () => ChannelScannerPage());
        },
        child: const Icon(FontAwesomeIcons.qrcode),
      ),
--- a/flutter/lib/pages/channel_list/channel_list_extended.dart
+++ b/flutter/lib/pages/channel_list/channel_list_extended.dart
@ -0,0 +1,151 @@
+import 'package:flutter/material.dart';
+import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
+import 'package:provider/provider.dart';
+import 'package:simplecloudnotifier/api/api_client.dart';
+import 'package:simplecloudnotifier/components/layout/scaffold.dart';
+import 'package:simplecloudnotifier/models/channel.dart';
+import 'package:simplecloudnotifier/state/app_bar_state.dart';
+import 'package:simplecloudnotifier/state/application_log.dart';
+import 'package:simplecloudnotifier/state/app_auth.dart';
+import 'package:simplecloudnotifier/pages/channel_list/channel_list_item.dart';
+import 'package:simplecloudnotifier/utils/navi.dart';
+
+class ChannelListExtendedPage extends StatefulWidget {
+  const ChannelListExtendedPage({super.key});
+
+  @override
+  State<ChannelListExtendedPage> createState() => _ChannelListExtendedPageState();
+}
+
+class _ChannelListExtendedPageState extends State<ChannelListExtendedPage> with RouteAware {
+  final PagingController<int, ChannelWithSubscription> _pagingController = PagingController.fromValue(PagingState(nextPageKey: null, itemList: [], error: null), firstPageKey: 0);
+
+  bool _reloadEnqueued = false;
+
+  @override
+  void initState() {
+    super.initState();
+
+    _pagingController.addPageRequestListener(_fetchPage);
+
+    _pagingController.refresh();
+  }
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    Navi.modalRouteObserver.subscribe(this, ModalRoute.of(context)!);
+  }
+
+  @override
+  void dispose() {
+    ApplicationLog.debug('ChannelRootPage::dispose');
+    _pagingController.dispose();
+    Navi.modalRouteObserver.unsubscribe(this);
+    super.dispose();
+  }
+
+  @override
+  void didPopNext() {
+    if (_reloadEnqueued) {
+      ApplicationLog.debug('[ChannelList::RouteObserver] --> didPopNext (will background-refresh) (_reloadEnqueued == true)');
+      () async {
+        _reloadEnqueued = false;
+        await Future.delayed(const Duration(milliseconds: 500), () {}); // prevents flutter bug where the whole process crashes ?!?
+        await _backgroundRefresh();
+      }();
+    }
+  }
+
+  Future<void> _fetchPage(int pageKey) async {
+    final acc = Provider.of<AppAuth>(context, listen: false);
+
+    ApplicationLog.debug('Start ChannelList::_pagingController::_fetchPage [ ${pageKey} ]');
+
+    if (!acc.isAuth()) {
+      _pagingController.error = 'Not logged in';
+      return;
+    }
+
+    try {
+      final items = (await APIClient.getChannelList(acc, ChannelSelector.all)).toList();
+
+      items.sort((a, b) => -1 * (a.channel.timestampLastSent ?? '').compareTo(b.channel.timestampLastSent ?? ''));
+
+      _pagingController.value = PagingState(nextPageKey: null, itemList: items, error: null);
+    } catch (exc, trace) {
+      _pagingController.error = exc.toString();
+      ApplicationLog.error('Failed to list channels: ' + exc.toString(), trace: trace);
+    }
+  }
+
+  Future<void> _backgroundRefresh() async {
+    final acc = Provider.of<AppAuth>(context, listen: false);
+
+    ApplicationLog.debug('Start background refresh of channel list');
+
+    if (!acc.isAuth()) {
+      _pagingController.error = 'Not logged in';
+      return;
+    }
+
+    try {
+      await Future.delayed(const Duration(seconds: 0), () {}); // this is annoyingly important - otherwise we call setLoadingIndeterminate directly in initStat() and get an exception....
+
+      AppBarState().setLoadingIndeterminate(true);
+
+      final items = (await APIClient.getChannelList(acc, ChannelSelector.all)).toList();
+
+      items.sort((a, b) => -1 * (a.channel.timestampLastSent ?? '').compareTo(b.channel.timestampLastSent ?? ''));
+
+      setState(() {
+        _pagingController.value = PagingState(nextPageKey: null, itemList: items, error: null);
+      });
+    } catch (exc, trace) {
+      setState(() {
+        _pagingController.error = exc.toString();
+      });
+      ApplicationLog.error('Failed to list channels: ' + exc.toString(), trace: trace);
+    } finally {
+      AppBarState().setLoadingIndeterminate(false);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return SCNScaffold(
+      title: "Channels",
+      showSearch: false,
+      showShare: false,
+      child: Padding(
+        padding: EdgeInsets.fromLTRB(8, 4, 8, 4),
+        child: RefreshIndicator(
+          onRefresh: () => Future.sync(
+            () => _pagingController.refresh(),
+          ),
+          child: PagedListView<int, ChannelWithSubscription>(
+            pagingController: _pagingController,
+            builderDelegate: PagedChildBuilderDelegate<ChannelWithSubscription>(
+              itemBuilder: (context, item, index) => ChannelListItem(
+                channel: item.channel,
+                subscription: item.subscription,
+                mode: ChannelListItemMode.Extended,
+                onChannelListReloadTrigger: _enqueueReload,
+                onSubscriptionChanged: (channelID, subscription) {
+                  setState(() {
+                    final idx = _pagingController.itemList?.indexWhere((p) => p.channel.channelID == channelID);
+                    if (idx != null && idx >= 0) _pagingController.itemList![idx] = ChannelWithSubscription(channel: _pagingController.itemList![idx].channel, subscription: subscription);
+                  });
+                },
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  void _enqueueReload() {
+    _reloadEnqueued = true;
+  }
+}
--- a/flutter/lib/pages/channel_list/channel_list_item.dart
+++ b/flutter/lib/pages/channel_list/channel_list_item.dart
@ -1,6 +1,4 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
@ -9,24 +7,35 @@ import 'package:simplecloudnotifier/models/channel.dart';
 import 'package:simplecloudnotifier/models/scn_message.dart';
 import 'package:simplecloudnotifier/models/subscription.dart';
 import 'package:simplecloudnotifier/pages/channel_message_view/channel_message_view.dart';
+import 'package:simplecloudnotifier/pages/channel_view/channel_view.dart';
 import 'package:simplecloudnotifier/state/app_auth.dart';
+import 'package:simplecloudnotifier/state/application_log.dart';
 import 'package:simplecloudnotifier/state/scn_data_cache.dart';
 import 'package:simplecloudnotifier/utils/navi.dart';
 import 'package:simplecloudnotifier/utils/toaster.dart';

+enum ChannelListItemMode {
+  Messages,
+  Extended,
+}
+
 class ChannelListItem extends StatefulWidget {
  static final _dateFormat = DateFormat('yyyy-MM-dd kk:mm');

  const ChannelListItem({
    required this.channel,
-    required this.onPressed,
+    required this.onChannelListReloadTrigger,
+    required this.onSubscriptionChanged,
    required this.subscription,
+    required this.mode,
    super.key,
  });

  final Channel channel;
  final Subscription? subscription;
-  final Null Function() onPressed;
+  final void Function() onChannelListReloadTrigger;
+  final ChannelListItemMode mode;
+  final void Function(String, Subscription?) onSubscriptionChanged;

  @override
  State<ChannelListItem> createState() => _ChannelListItemState();
@ -41,11 +50,11 @@ class _ChannelListItemState extends State<ChannelListItem> {

    final acc = Provider.of<AppAuth>(context, listen: false);

-    if (acc.isAuth()) {
+    if (acc.isAuth() && widget.mode == ChannelListItemMode.Messages) {
      lastMessage = SCNDataCache().getMessagesSorted().where((p) => p.channelID == widget.channel.channelID).firstOrNull;

      () async {
-        final (_, channelMessages) = await APIClient.getMessageList(acc, '@start', pageSize: 1, filter: MessageFilter(channelIDs: [widget.channel.channelID]));
+        final (_, channelMessages) = await APIClient.getChannelMessageList(acc, widget.channel.channelID, '@start', pageSize: 1);
        setState(() {
          lastMessage = channelMessages.firstOrNull;
        });
@ -55,13 +64,18 @@ class _ChannelListItemState extends State<ChannelListItem> {

  @override
  Widget build(BuildContext context) {
-    //TODO subscription status
    return Card.filled(
      margin: EdgeInsets.fromLTRB(0, 4, 0, 4),
      shape: BeveledRectangleBorder(borderRadius: BorderRadius.circular(0)),
      color: Theme.of(context).cardTheme.color,
      child: InkWell(
-        onTap: widget.onPressed,
+        onTap: () {
+          if (widget.mode == ChannelListItemMode.Messages) {
+            Navi.push(context, () => ChannelMessageViewPage(channel: widget.channel));
+          } else {
+            Navi.push(context, () => ChannelViewPage(channelID: widget.channel.channelID, preloadedData: (widget.channel, widget.subscription), needsReload: widget.onChannelListReloadTrigger));
+          }
+        },
        child: Padding(
          padding: const EdgeInsets.all(8),
          child: Row(
@ -90,13 +104,8 @@ class _ChannelListItemState extends State<ChannelListItem> {
                    Row(
                      crossAxisAlignment: CrossAxisAlignment.end,
                      children: [
-                        Expanded(
-                          child: Text(
-                            _preformatTitle(lastMessage),
-                            style: TextStyle(color: Theme.of(context).textTheme.bodyLarge?.color?.withAlpha(160)),
-                          ),
-                        ),
-                        Text(widget.channel.messagesSent.toString(), style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold)),
+                        Expanded(child: (widget.mode == ChannelListItemMode.Messages) ? Text(_preformatTitle(lastMessage), style: TextStyle(color: Theme.of(context).textTheme.bodyLarge?.color?.withAlpha(160))) : _buildSubscriptionStateText(context)),
+                        (widget.mode == ChannelListItemMode.Messages) ? Text(widget.channel.messagesSent.toString(), style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold)) : Text("", style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold)),
                      ],
                    ),
                  ],
@ -105,11 +114,15 @@ class _ChannelListItemState extends State<ChannelListItem> {
              SizedBox(width: 4),
              GestureDetector(
                onTap: () {
-                  Navi.push(context, () => ChannelMessageViewPage(channel: this.widget.channel));
+                  if (widget.mode == ChannelListItemMode.Messages) {
+                    Navi.push(context, () => ChannelViewPage(channelID: widget.channel.channelID, preloadedData: (widget.channel, widget.subscription), needsReload: widget.onChannelListReloadTrigger));
+                  } else {
+                    Navi.push(context, () => ChannelMessageViewPage(channel: widget.channel));
+                  }
                },
                child: Padding(
                  padding: const EdgeInsets.all(8),
-                  child: Icon(FontAwesomeIcons.solidEnvelopes, color: Theme.of(context).colorScheme.onPrimaryContainer.withAlpha(128), size: 24),
+                  child: (widget.mode == ChannelListItemMode.Messages) ? Icon(FontAwesomeIcons.solidSquareInfo, color: Theme.of(context).colorScheme.onPrimaryContainer.withAlpha(128), size: 24) : Icon(FontAwesomeIcons.solidEnvelopes, color: Theme.of(context).colorScheme.onPrimaryContainer.withAlpha(128), size: 24),
                ),
              ),
            ],
@ -126,13 +139,73 @@ class _ChannelListItemState extends State<ChannelListItem> {

  Widget _buildIcon(BuildContext context) {
    if (widget.subscription == null) {
-      return Icon(FontAwesomeIcons.solidSquareDashed, color: Theme.of(context).colorScheme.outline, size: 32); // not-subscribed
+      Widget result = Icon(FontAwesomeIcons.solidSquareDashed, color: Theme.of(context).colorScheme.outline, size: 32); // not-subscribed
+      result = GestureDetector(onTap: () => _subscribe(), child: result);
+      return result;
    } else if (widget.subscription!.confirmed && widget.channel.ownerUserID == widget.subscription!.subscriberUserID) {
-      return Icon(FontAwesomeIcons.solidSquareRss, color: Theme.of(context).colorScheme.onPrimaryContainer, size: 32); // subscribed (own channel)
+      Widget result = Icon(FontAwesomeIcons.solidSquareRss, color: Theme.of(context).colorScheme.onPrimaryContainer, size: 32); // subscribed (own channel)
+      result = GestureDetector(onTap: () => _unsubscribe(widget.subscription!), child: result);
+      return result;
    } else if (widget.subscription!.confirmed) {
-      return Icon(FontAwesomeIcons.solidSquareShareNodes, color: Theme.of(context).colorScheme.onPrimaryContainer, size: 32); // subscribed (foreign channel)
+      Widget result = Icon(FontAwesomeIcons.solidSquareShareNodes, color: Theme.of(context).colorScheme.onPrimaryContainer, size: 32); // subscribed (foreign channel)
+      result = GestureDetector(onTap: () => _unsubscribe(widget.subscription!), child: result);
+      return result;
    } else {
-      return Icon(FontAwesomeIcons.solidSquareEnvelope, color: Theme.of(context).colorScheme.tertiary, size: 32); // requested
+      Widget result = Icon(FontAwesomeIcons.solidSquareEnvelope, color: Theme.of(context).colorScheme.tertiary, size: 32); // requested
+      result = GestureDetector(onTap: () => _unsubscribe(widget.subscription!), child: result);
+      return result;
+    }
+  }
+
+  Widget _buildSubscriptionStateText(BuildContext context) {
+    if (widget.subscription == null) {
+      return Text("", style: TextStyle(color: Theme.of(context).textTheme.bodyLarge?.color?.withAlpha(160)));
+    } else if (widget.subscription!.confirmed && widget.channel.ownerUserID == widget.subscription!.subscriberUserID) {
+      return Text("subscribed", style: TextStyle(color: Theme.of(context).textTheme.bodyLarge?.color?.withAlpha(160)));
+    } else if (widget.subscription!.confirmed) {
+      return Text("subscripted (foreign channe)", style: TextStyle(color: Theme.of(context).textTheme.bodyLarge?.color?.withAlpha(160)));
+    } else {
+      return Text("subscription requested", style: TextStyle(color: Theme.of(context).textTheme.bodyLarge?.color?.withAlpha(160)));
+    }
+  }
+
+  void _subscribe() async {
+    final acc = AppAuth();
+
+    if (acc.isAuth() && widget.channel.ownerUserID == acc.getUserID()) {
+      try {
+        var sub = await APIClient.subscribeToChannelbyID(acc, widget.channel.channelID);
+        widget.onChannelListReloadTrigger.call();
+
+        widget.onSubscriptionChanged(widget.channel.channelID, sub);
+
+        if (sub.confirmed) {
+          Toaster.success("Success", 'Subscribed to channel');
+        } else {
+          Toaster.success("Success", 'Requested widget.subscription to channel');
+        }
+      } catch (exc, trace) {
+        Toaster.error("Error", 'Failed to subscribe to channel');
+        ApplicationLog.error('Failed to subscribe to channel: ' + exc.toString(), trace: trace);
+      }
+    }
+  }
+
+  void _unsubscribe(Subscription sub) async {
+    final acc = AppAuth();
+
+    if (acc.isAuth() && widget.channel.ownerUserID == acc.getUserID() && widget.subscription != null) {
+      try {
+        await APIClient.deleteSubscription(acc, widget.channel.channelID, widget.subscription!.subscriptionID);
+        widget.onChannelListReloadTrigger.call();
+
+        widget.onSubscriptionChanged.call(widget.channel.channelID, null);
+
+        Toaster.success("Success", 'Unsubscribed from channel');
+      } catch (exc, trace) {
+        Toaster.error("Error", 'Failed to unsubscribe from channel');
+        ApplicationLog.error('Failed to unsubscribe from channel: ' + exc.toString(), trace: trace);
+      }
    }
  }
 }
--- a/flutter/lib/pages/channel_list/channel_scanner.dart
+++ b/flutter/lib/pages/channel_list/channel_scanner.dart
@ -0,0 +1,117 @@
+import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:mobile_scanner/mobile_scanner.dart';
+import 'package:simplecloudnotifier/components/layout/scaffold.dart';
+import 'package:simplecloudnotifier/models/scan_result.dart';
+import 'package:simplecloudnotifier/utils/ui.dart';
+
+class ChannelScannerPage extends StatefulWidget {
+  const ChannelScannerPage({super.key});
+
+  @override
+  State<ChannelScannerPage> createState() => _ChannelScannerPageState();
+}
+
+class _ChannelScannerPageState extends State<ChannelScannerPage> {
+  final MobileScannerController _controller = MobileScannerController(
+    formats: const [BarcodeFormat.qrCode],
+  );
+
+  ScanResult? scanResult = null;
+
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return SCNScaffold(
+      title: "Scanner",
+      showSearch: false,
+      showShare: false,
+      child: SingleChildScrollView(
+        child: Padding(
+          padding: const EdgeInsets.fromLTRB(24, 16, 24, 16),
+          child: Column(
+            children: [
+              SizedBox(height: 16),
+              Center(
+                child: Container(
+                  decoration: BoxDecoration(
+                    borderRadius: BorderRadius.circular(UI.DefaultBorderRadius),
+                  ),
+                  clipBehavior: Clip.hardEdge,
+                  child: SizedBox(
+                    height: 300,
+                    width: 300,
+                    child: MobileScanner(
+                      fit: BoxFit.cover,
+                      controller: _controller,
+                      onDetect: _handleBarcode,
+                    ),
+                  ),
+                ),
+              ),
+              SizedBox(height: 16),
+              _buildScanResult(context),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  void _handleBarcode(BarcodeCapture barcodes) {
+    setState(() {
+      if (barcodes.barcodes.isEmpty) {
+        scanResult = null;
+      } else {
+        print('parsed: ${barcodes.barcodes[0].rawValue}');
+        scanResult = ScanResult.parse(barcodes.barcodes[0].rawValue ?? '');
+      }
+    });
+  }
+
+  Widget _buildScanResult(BuildContext context) {
+    if (scanResult == null) {
+      return UI.box(
+        padding: EdgeInsets.fromLTRB(16, 2, 4, 2), //TODO
+        context: context,
+        child: Center(
+          child: Icon(FontAwesomeIcons.solidEmptySet, size: 64, color: Theme.of(context).colorScheme.onPrimaryContainer.withAlpha(128)),
+        ),
+      );
+    }
+
+    if (scanResult! is ScanResultMessageSend) {
+      return UI.box(
+        padding: EdgeInsets.fromLTRB(16, 2, 4, 2),
+        context: context,
+        child: Text("TODO -- ScanResultMessageSend"), //TODO
+      );
+    }
+
+    if (scanResult! is ScanResultChannel) {
+      return UI.box(
+        padding: EdgeInsets.fromLTRB(16, 2, 4, 2),
+        context: context,
+        child: Text("TODO -- ScanResultChannel"), //TODO
+      );
+    }
+
+    if (scanResult! is ScanResultChannelSubscribe) {
+      return UI.box(
+        padding: EdgeInsets.fromLTRB(16, 2, 4, 2),
+        context: context,
+        child: Text("TODO -- ScanResultChannelSubscribe"), //TODO
+      );
+    }
+
+    return UI.box(
+      padding: EdgeInsets.fromLTRB(16, 2, 4, 2),
+      context: context,
+      child: Text("TODO -- ERROR"), //TODO
+    );
+  }
+}
--- a/flutter/lib/pages/channel_message_view/channel_message_view.dart
+++ b/flutter/lib/pages/channel_message_view/channel_message_view.dart
@ -55,7 +55,7 @@ class _ChannelMessageViewPageState extends State<ChannelMessageViewPage> {
    }

    try {
-      final (npt, newItems) = await APIClient.getMessageList(acc, thisPageToken, pageSize: cfg.messagePageSize, filter: MessageFilter(channelIDs: [this.widget.channel.channelID]));
+      final (npt, newItems) = await APIClient.getChannelMessageList(acc, this.widget.channel.channelID, thisPageToken, pageSize: cfg.messagePageSize);

      SCNDataCache().addToMessageCache(newItems); // no await

--- a/flutter/lib/pages/channel_view/channel_view.dart
+++ b/flutter/lib/pages/channel_view/channel_view.dart
@ -5,6 +5,7 @@ import 'package:share_plus/share_plus.dart';
 import 'package:simplecloudnotifier/api/api_client.dart';
 import 'package:simplecloudnotifier/components/layout/scaffold.dart';
 import 'package:simplecloudnotifier/models/channel.dart';
+import 'package:simplecloudnotifier/models/scan_result.dart';
 import 'package:simplecloudnotifier/models/subscription.dart';
 import 'package:simplecloudnotifier/models/user.dart';
 import 'package:simplecloudnotifier/pages/channel_message_view/channel_message_view.dart';
@ -63,16 +64,15 @@ class _ChannelViewPageState extends State<ChannelViewPage> {

  @override
  void initState() {
-    _initStateAsync();
+    _initStateAsync(true);

    super.initState();
  }

-  @override
-  void _initStateAsync() async {
+  Future<void> _initStateAsync(bool usePreload) async {
    final userAcc = Provider.of<AppAuth>(context, listen: false);

-    if (widget.preloadedData != null) {
+    if (widget.preloadedData != null && usePreload) {
      channelPreview = widget.preloadedData!.$1.toPreview();
      channel = widget.preloadedData!.$1;
      subscription = widget.preloadedData!.$2;
@ -232,7 +232,7 @@ class _ChannelViewPageState extends State<ChannelViewPage> {
            UI.metaCard(
              context: context,
              icon: FontAwesomeIcons.solidDiagramSubtask,
-              title: 'Subscription (own)',
+              title: 'Subscription (foreign)',
              values: [_formatSubscriptionStatus(subscription)],
              iconActions: isSubscribed ? [(FontAwesomeIcons.solidSquareXmark, _unsubscribe)] : [(FontAwesomeIcons.solidSquareRss, _subscribe)],
            ),
@ -296,8 +296,8 @@ class _ChannelViewPageState extends State<ChannelViewPage> {
    return FutureBuilder(
      future: _futureSubscribeKey.future,
      builder: (context, snapshot) {
-        if (snapshot.hasData && snapshot.data != null) {
-          var text = 'TODO' + '\n' + channel!.channelID + '\n' + snapshot.data!; //TODO deeplink-y (also perhaps just bas64 everything together?)
+        if (snapshot.hasData) {
+          final text = (snapshot.data == null) ? ScanResult.createChannelQR(channel!) : ScanResult.createChannelSubscribeQR(channel!, snapshot.data!);
          return GestureDetector(
            onTap: () {
              Share.share(text, subject: _displayNameOverride ?? channel!.displayName);
@ -306,7 +306,7 @@ class _ChannelViewPageState extends State<ChannelViewPage> {
              child: QrImageView(
                data: text,
                version: QrVersions.auto,
-                size: 300.0,
+                size: 265.0,
                eyeStyle: QrEyeStyle(
                  eyeShape: QrEyeShape.square,
                  color: Theme.of(context).textTheme.bodyLarge?.color,
@ -318,12 +318,6 @@ class _ChannelViewPageState extends State<ChannelViewPage> {
              ),
            ),
          );
-        } else if (snapshot.hasData && snapshot.data == null) {
-          return const SizedBox(
-            width: 300.0,
-            height: 300.0,
-            child: Center(child: Icon(FontAwesomeIcons.solidSnake, size: 64)),
-          );
        } else {
          return const SizedBox(
            width: 300.0,
@ -447,14 +441,6 @@ class _ChannelViewPageState extends State<ChannelViewPage> {
    }
  }

-  void _subscribe() {
-    //TODO
-  }
-
-  void _unsubscribe() {
-    //TODO
-  }
-
  void _showEditDisplayName() {
    setState(() {
      _ctrlDisplayName.text = _displayNameOverride ?? channelPreview?.displayName ?? '';
@ -519,16 +505,90 @@ class _ChannelViewPageState extends State<ChannelViewPage> {
    }
  }

-  void _cancelForeignSubscription(Subscription sub) {
-    //TODO
+  void _subscribe() async {
+    final acc = AppAuth();
+
+    try {
+      var sub = await APIClient.subscribeToChannelbyID(acc, widget.channelID);
+      widget.needsReload?.call();
+
+      await _initStateAsync(false);
+
+      if (sub.confirmed) {
+        Toaster.success("Success", 'Subscribed to channel');
+      } else {
+        Toaster.success("Success", 'Requested subscription to channel');
+      }
+    } catch (exc, trace) {
+      Toaster.error("Error", 'Failed to subscribe to channel');
+      ApplicationLog.error('Failed to subscribe to channel: ' + exc.toString(), trace: trace);
+    }
  }

-  void _confirmForeignSubscription(Subscription sub) {
-    //TODO
+  void _unsubscribe() async {
+    final acc = AppAuth();
+
+    if (subscription == null) return;
+
+    try {
+      await APIClient.deleteSubscription(acc, widget.channelID, subscription!.subscriptionID);
+      widget.needsReload?.call();
+
+      await _initStateAsync(false);
+
+      Toaster.success("Success", 'Unsubscribed from channel');
+    } catch (exc, trace) {
+      Toaster.error("Error", 'Failed to unsubscribe from channel');
+      ApplicationLog.error('Failed to unsubscribe from channel: ' + exc.toString(), trace: trace);
+    }
  }

-  void _denyForeignSubscription(Subscription sub) {
-    //TODO
+  void _cancelForeignSubscription(Subscription sub) async {
+    final acc = AppAuth();
+
+    try {
+      await APIClient.unconfirmSubscription(acc, widget.channelID, sub.subscriptionID);
+      widget.needsReload?.call();
+
+      await _initStateAsync(false);
+
+      Toaster.success("Success", 'Subscription succesfully revoked');
+    } catch (exc, trace) {
+      Toaster.error("Error", 'Failed to revoke subscription');
+      ApplicationLog.error('Failed to revoke subscription: ' + exc.toString(), trace: trace);
+    }
+  }
+
+  void _confirmForeignSubscription(Subscription sub) async {
+    final acc = AppAuth();
+
+    try {
+      await APIClient.confirmSubscription(acc, widget.channelID, sub.subscriptionID);
+      widget.needsReload?.call();
+
+      await _initStateAsync(false);
+
+      Toaster.success("Success", 'Subscription succesfully confirmed');
+    } catch (exc, trace) {
+      Toaster.error("Error", 'Failed to confirm subscription');
+      ApplicationLog.error('Failed to confirm subscription: ' + exc.toString(), trace: trace);
+    }
+  }
+
+  void _denyForeignSubscription(Subscription sub) async {
+    final acc = AppAuth();
+
+    try {
+      await APIClient.deleteSubscription(acc, widget.channelID, sub.subscriptionID);
+      widget.needsReload?.call();
+
+      await _initStateAsync(false);
+
+      Toaster.success("Success", 'Subscription request succesfully denied');
+    } catch (exc, trace) {
+      Toaster.error("Error", 'Failed to deny subscription');
+      ApplicationLog.error('Failed to deny subscription: ' + exc.toString(), trace: trace);
+    }
  }

  String _formatSubscriptionStatus(Subscription? subscription) {
--- a/flutter/lib/pages/debug/debug_actions.dart
+++ b/flutter/lib/pages/debug/debug_actions.dart
@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:simplecloudnotifier/state/application_log.dart';
 import 'package:simplecloudnotifier/utils/notifier.dart';
 import 'package:simplecloudnotifier/utils/toaster.dart';
 import 'package:simplecloudnotifier/utils/ui.dart';
--- a/flutter/lib/pages/debug/debug_colors.dart
+++ b/flutter/lib/pages/debug/debug_colors.dart
@ -55,11 +55,11 @@ class _DebugColorsPageState extends State<DebugColorsPage> {
      buildCol("colorScheme.surface", Theme.of(context).colorScheme.surface),
      buildCol("colorScheme.onSurface", Theme.of(context).colorScheme.onSurface),
      buildCol("colorScheme.surfaceTint", Theme.of(context).colorScheme.surfaceTint),
-      buildCol("colorScheme.surfaceVariant", Theme.of(context).colorScheme.surfaceVariant),
+      buildCol("colorScheme.surfaceVariant", Theme.of(context).colorScheme.surfaceContainerHighest),
      buildCol("colorScheme.inverseSurface", Theme.of(context).colorScheme.inverseSurface),
      buildCol("colorScheme.onInverseSurface", Theme.of(context).colorScheme.onInverseSurface),
-      buildCol("colorScheme.background", Theme.of(context).colorScheme.background),
-      buildCol("colorScheme.onBackground", Theme.of(context).colorScheme.onBackground),
+      buildCol("colorScheme.background", Theme.of(context).colorScheme.surface),
+      buildCol("colorScheme.onBackground", Theme.of(context).colorScheme.onSurface),
      buildCol("colorScheme.error", Theme.of(context).colorScheme.error),
      buildCol("colorScheme.onError", Theme.of(context).colorScheme.onError),
      buildCol("colorScheme.errorContainer", Theme.of(context).colorScheme.errorContainer),
@ -98,7 +98,7 @@ class _DebugColorsPageState extends State<DebugColorsPage> {
      buildCol("badgeTheme.backgroundColor", Theme.of(context).badgeTheme.backgroundColor),
      buildCol("bannerTheme.backgroundColor", Theme.of(context).bannerTheme.backgroundColor),
      buildCol("bottomAppBarTheme.color", Theme.of(context).bottomAppBarTheme.color),
-      buildCol("buttonTheme.colorScheme.background", Theme.of(context).buttonTheme.colorScheme?.background),
+      buildCol("buttonTheme.colorScheme.background", Theme.of(context).buttonTheme.colorScheme?.surface),
      buildCol("buttonTheme.colorScheme.primary", Theme.of(context).buttonTheme.colorScheme?.primary),
      buildCol("buttonTheme.colorScheme.secondary", Theme.of(context).buttonTheme.colorScheme?.secondary),
      buildCol("cardTheme.color", Theme.of(context).cardTheme.color),
--- a/flutter/lib/pages/debug/debug_main.dart
+++ b/flutter/lib/pages/debug/debug_main.dart
@ -60,7 +60,7 @@ class _DebugMainPageState extends State<DebugMainPage> {
        ButtonSegment<DebugMainPageSubPage>(value: DebugMainPageSubPage.logs, icon: Icon(FontAwesomeIcons.solidFileLines, size: 14)),
      ],
      style: ButtonStyle(
-        padding: MaterialStateProperty.all<EdgeInsets>(EdgeInsets.fromLTRB(0, 0, 0, 0)),
+        padding: WidgetStateProperty.all<EdgeInsets>(EdgeInsets.fromLTRB(0, 0, 0, 0)),
        visualDensity: VisualDensity(horizontal: -3, vertical: -3),
      ),
      selected: <DebugMainPageSubPage>{_subPage},
--- a/flutter/lib/pages/debug/debug_persistence.dart
+++ b/flutter/lib/pages/debug/debug_persistence.dart
@ -1,15 +1,20 @@
+import 'dart:io';
+
 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/scn_message.dart';
+import 'package:simplecloudnotifier/pages/debug/debug_persistence_failurelogs.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';
 import 'package:simplecloudnotifier/state/fb_message.dart';
+import 'package:simplecloudnotifier/state/globals.dart';
 import 'package:simplecloudnotifier/state/interfaces.dart';
 import 'package:simplecloudnotifier/state/request_log.dart';
 import 'package:simplecloudnotifier/utils/navi.dart';
+import 'package:path/path.dart' as path;

 class DebugPersistencePage extends StatefulWidget {
  @override
@ -39,6 +44,7 @@ class _DebugPersistencePageState extends State<DebugPersistencePage> {
          _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'),
+          _buildFailureLogCard(context, Globals().rawFailureLogsDir),
        ],
      ),
    );
@ -85,4 +91,25 @@ class _DebugPersistencePageState extends State<DebugPersistencePage> {
      ),
    );
  }
+
+  Widget _buildFailureLogCard(BuildContext context, Directory dir) {
+    return Card.outlined(
+      child: Padding(
+        padding: const EdgeInsets.all(8.0),
+        child: GestureDetector(
+          onTap: () {
+            Navi.push(context, () => DebugFailureLogsPage(dir: dir.path));
+          },
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              SizedBox(width: 30, child: Text('')),
+              Expanded(child: Text('Failure [/${path.basename(dir.path)}/]', style: TextStyle(fontWeight: FontWeight.bold), textAlign: TextAlign.center)),
+              SizedBox(width: 40, child: Text("${dir.listSync().length}", textAlign: TextAlign.end)),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
 }
--- a/flutter/lib/pages/debug/debug_persistence_failurelogfile.dart
+++ b/flutter/lib/pages/debug/debug_persistence_failurelogfile.dart
@ -0,0 +1,63 @@
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:simplecloudnotifier/components/layout/scaffold.dart';
+import 'package:simplecloudnotifier/types/immediate_future.dart';
+
+class DebugFailureLogFilePage extends StatefulWidget {
+  final String path;
+
+  DebugFailureLogFilePage({required this.path}) {}
+
+  @override
+  State<DebugFailureLogFilePage> createState() => _DebugFailureLogFilePageState();
+}
+
+class _DebugFailureLogFilePageState extends State<DebugFailureLogFilePage> {
+  ImmediateFuture<String>? _futureContent;
+
+  @override
+  void initState() {
+    super.initState();
+
+    _futureContent = ImmediateFuture.ofFuture(new File(this.widget.path).readAsString());
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return SCNScaffold(
+      title: 'FailureLog',
+      showSearch: false,
+      child: () {
+        if (_futureContent == null) {
+          return Center(child: CircularProgressIndicator());
+        }
+
+        return FutureBuilder(
+          future: _futureContent!.future,
+          builder: ((context, snapshot) {
+            if (_futureContent?.value != null) {
+              return _buildContent(context, _futureContent!.value!);
+            } else if (snapshot.connectionState == ConnectionState.done && snapshot.hasError) {
+              return Text('Error: ${snapshot.error}'); //TODO better error display
+            } else if (snapshot.connectionState == ConnectionState.done) {
+              return _buildContent(context, snapshot.data!);
+            } else {
+              return Center(child: CircularProgressIndicator());
+            }
+          }),
+        );
+      }(),
+    );
+  }
+
+  Widget _buildContent(BuildContext context, String value) {
+    return SingleChildScrollView(
+      scrollDirection: Axis.horizontal,
+      child: Padding(
+        padding: const EdgeInsets.all(8.0),
+        child: Text(value, style: TextStyle(fontFamily: "monospace")),
+      ),
+    );
+  }
+}
--- a/flutter/lib/pages/debug/debug_persistence_failurelogs.dart
+++ b/flutter/lib/pages/debug/debug_persistence_failurelogs.dart
@ -0,0 +1,86 @@
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:simplecloudnotifier/components/layout/scaffold.dart';
+import 'package:simplecloudnotifier/pages/debug/debug_persistence_failurelogfile.dart';
+import 'package:simplecloudnotifier/state/application_log.dart';
+import 'package:simplecloudnotifier/state/globals.dart';
+import 'package:simplecloudnotifier/utils/navi.dart';
+import 'package:path/path.dart' as path;
+import 'package:simplecloudnotifier/utils/toaster.dart';
+
+class DebugFailureLogsPage extends StatefulWidget {
+  final String dir;
+
+  DebugFailureLogsPage({required this.dir});
+
+  @override
+  State<DebugFailureLogsPage> createState() => _DebugFailureLogsPageState();
+}
+
+class _DebugFailureLogsPageState extends State<DebugFailureLogsPage> {
+  List<String> files = [];
+
+  _DebugFailureLogsPageState() {
+    files = _listFilesInRawLogFolder();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return SCNScaffold(
+      title: 'F-Logs',
+      showSearch: false,
+      child: ListView.separated(
+        itemCount: files.length,
+        itemBuilder: (context, listIndex) {
+          return GestureDetector(
+            onTap: () {
+              Navi.push(context, () => DebugFailureLogFilePage(path: files[listIndex]));
+            },
+            child: Container(
+              padding: EdgeInsets.fromLTRB(8, 0, 8, 0),
+              child: Row(
+                children: [
+                  Expanded(child: Text(path.basename(files[listIndex]), style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12))),
+                  IconButton(
+                    icon: const Icon(FontAwesomeIcons.trash),
+                    tooltip: 'Delete',
+                    iconSize: 16,
+                    color: Colors.red,
+                    onPressed: () => _deleteFile(context, files[listIndex]),
+                  )
+                ],
+              ),
+            ),
+          );
+        },
+        separatorBuilder: (context, index) => Divider(),
+      ),
+    );
+  }
+
+  List<String> _listFilesInRawLogFolder() {
+    final fse = Globals().rawFailureLogsDir.listSync();
+
+    ApplicationLog.debug("Found ${fse.length} files in raw log folder '${Globals().rawFailureLogsDir.path}'");
+
+    var paths = fse.where((element) => element is File).map((e) => e.path).toList();
+
+    paths.sort((a, b) => -1 * a.compareTo(b));
+
+    return paths;
+  }
+
+  void _deleteFile(BuildContext context, String fil) {
+    final file = File(fil);
+
+    file.deleteSync();
+
+    setState(() {
+      files = _listFilesInRawLogFolder();
+    });
+
+    Toaster.info("Okay", "File deleted");
+  }
+}
--- a/flutter/lib/pages/message_list/message_list.dart
+++ b/flutter/lib/pages/message_list/message_list.dart
@ -72,6 +72,9 @@ class _MessageListPageState extends State<MessageListPage> with RouteAware {

      _channels = SCNDataCache().getChannelMap();

+      //TODO this is not 100% correct - the message-cache contains (which is right!) all messages, even from unsubscribed channels
+      //TODO what we should do is save another list in SCNDataCache, with the result of the last getMessageList call (page-1) and use that
+      //TODO this way we only get 1 page of data from cache, but its a weird behaviour anway that we loose data once _backgroundRefresh is finished
      _pagingController.value = PagingState(nextPageKey: null, itemList: SCNDataCache().getMessagesSorted(), error: null);

      _backgroundRefresh(true);
--- a/flutter/lib/state/application_log.dart
+++ b/flutter/lib/state/application_log.dart
@ -1,6 +1,11 @@
+import 'dart:convert';
+import 'dart:io';
+
 import 'package:hive_flutter/hive_flutter.dart';
+import 'package:simplecloudnotifier/state/globals.dart';
 import 'package:simplecloudnotifier/state/interfaces.dart';
 import 'package:xid/xid.dart';
+import 'package:path/path.dart' as path;

 part 'application_log.g.dart';

@ -76,6 +81,61 @@ class ApplicationLog {
      trace: trace?.toString() ?? '',
    ));
  }
+
+  static void writeRawFailure(String message, Map<String, dynamic> extraData) async {
+    try {
+      await Globals().init();
+
+      final fn = path.join(Globals().rawFailureLogsDir.path, 'failure-${DateTime.now().toIso8601String()}.log');
+
+      var txt = "[TEXT]\n${message}\n\n";
+      for (var k in extraData.keys) {
+        txt += "[${k}]\n${_debugToStr(extraData[k])}\n\n";
+      }
+
+      await File(fn).writeAsString(txt);
+
+      ApplicationLog.debug("Wrote raw failure log to '${fn}'  ('${message}')");
+    } catch (e) {
+      print("Failed to <writeRawFailure>: ${e}");
+    }
+  }
+
+  static String _debugToStr(dynamic v) {
+    if (v is String) {
+      return v;
+    }
+    if (v is StackTrace) {
+      return v.toString();
+    }
+
+    try {
+      final enc = new JsonEncoder.withIndent("  ");
+      return enc.convert(v);
+    } catch (e) {
+      // ignore
+    }
+
+    try {
+      return jsonEncode(v);
+    } catch (e) {
+      // ignore
+    }
+
+    try {
+      return v.toString();
+    } catch (e) {
+      // ignore
+    }
+
+    try {
+      return "${v}";
+    } catch (e) {
+      // ignore
+    }
+
+    return "<[!]FAILED_TO_PRINT_OBJECT>";
+  }
 }

@HiveType(typeId: 103)
--- a/flutter/lib/state/globals.dart
+++ b/flutter/lib/state/globals.dart
@ -2,7 +2,9 @@ import 'dart:io';

 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:package_info_plus/package_info_plus.dart';
+import 'package:path_provider/path_provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:path/path.dart' as path;

 class Globals {
  static final Globals _singleton = Globals._internal();
@ -26,6 +28,9 @@ class Globals {

  late SharedPreferences sharedPrefs;

+  late Directory appDocumentsDir;
+  late Directory rawFailureLogsDir;
+
  bool get isInitialized => _initialized;

  Future<void> init() async {
@ -61,6 +66,11 @@ class Globals {

    this.sharedPrefs = await SharedPreferences.getInstance();

+    this.appDocumentsDir = await getApplicationDocumentsDirectory();
+
+    this.rawFailureLogsDir = Directory(path.join(Globals().appDocumentsDir.path, "rawlogs"));
+    await this.rawFailureLogsDir.create(recursive: true);
+
    this._initialized = true;
  }

--- a/flutter/lib/utils/ui.dart
+++ b/flutter/lib/utils/ui.dart
@ -72,7 +72,7 @@ class UI {
        splashColor: Theme.of(context).splashColor,
        onTap: onTap,
        child: Padding(
-          padding: const EdgeInsets.all(16),
+          padding: EdgeInsets.symmetric(horizontal: 16, vertical: 12),
          child: child,
        ),
      ),
--- a/flutter/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/flutter/macos/Flutter/GeneratedPluginRegistrant.swift
@ -9,6 +9,7 @@ import device_info_plus
 import firebase_core
 import firebase_messaging
 import flutter_local_notifications
+import mobile_scanner
 import package_info_plus
 import path_provider_foundation
 import share_plus
@ -20,6 +21,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
  FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
  FLTFirebaseMessagingPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseMessagingPlugin"))
  FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
+  MobileScannerPlugin.register(with: registry.registrar(forPlugin: "MobileScannerPlugin"))
  FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
  SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
--- a/flutter/pubspec.lock
+++ b/flutter/pubspec.lock
@ -5,10 +5,10 @@ packages:
    dependency: transitive
    description:
      name: _fe_analyzer_shared
-      sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7"
+      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
      url: "https://pub.dev"
    source: hosted
-    version: "67.0.0"
+    version: "72.0.0"
  _flutterfire_internals:
    dependency: transitive
    description:
@ -17,14 +17,19 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.3.35"
+  _macros:
+    dependency: transitive
+    description: dart
+    source: sdk
+    version: "0.3.2"
  analyzer:
    dependency: transitive
    description:
      name: analyzer
-      sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d"
+      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
      url: "https://pub.dev"
    source: hosted
-    version: "6.4.1"
+    version: "6.7.0"
  archive:
    dependency: transitive
    description:
@ -37,10 +42,10 @@ packages:
    dependency: transitive
    description:
      name: args
-      sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a"
+      sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
      url: "https://pub.dev"
    source: hosted
-    version: "2.5.0"
+    version: "2.6.0"
  async:
    dependency: transitive
    description:
@ -77,10 +82,10 @@ packages:
    dependency: transitive
    description:
      name: build_daemon
-      sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1"
+      sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.1"
+    version: "4.0.2"
  build_resolvers:
    dependency: transitive
    description:
@ -93,18 +98,18 @@ packages:
    dependency: "direct dev"
    description:
      name: build_runner
-      sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22"
+      sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.9"
+    version: "2.4.13"
  build_runner_core:
    dependency: transitive
    description:
      name: build_runner_core
-      sha256: "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799"
+      sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0
      url: "https://pub.dev"
    source: hosted
-    version: "7.3.0"
+    version: "7.3.2"
  built_collection:
    dependency: transitive
    description:
@ -173,26 +178,26 @@ packages:
    dependency: transitive
    description:
      name: convert
-      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
+      sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.1"
+    version: "3.1.2"
  cross_file:
    dependency: transitive
    description:
      name: cross_file
-      sha256: "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32"
+      sha256: "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670"
      url: "https://pub.dev"
    source: hosted
-    version: "0.3.4+1"
+    version: "0.3.4+2"
  crypto:
    dependency: transitive
    description:
      name: crypto
-      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
+      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.3"
+    version: "3.0.6"
  cupertino_icons:
    dependency: "direct main"
    description:
@ -205,10 +210,10 @@ packages:
    dependency: transitive
    description:
      name: dart_style
-      sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9"
+      sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.6"
+    version: "2.3.7"
  dbus:
    dependency: transitive
    description:
@ -221,18 +226,18 @@ packages:
    dependency: "direct main"
    description:
      name: device_info_plus
-      sha256: eead12d1a1ed83d8283ab4c2f3fca23ac4082f29f25f29dff0f758f57d06ec91
+      sha256: a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074
      url: "https://pub.dev"
    source: hosted
-    version: "10.1.0"
+    version: "10.1.2"
  device_info_plus_platform_interface:
    dependency: transitive
    description:
      name: device_info_plus_platform_interface
-      sha256: d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64
+      sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba"
      url: "https://pub.dev"
    source: hosted
-    version: "7.0.0"
+    version: "7.0.1"
  equatable:
    dependency: transitive
    description:
@ -253,18 +258,18 @@ packages:
    dependency: transitive
    description:
      name: ffi
-      sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21"
+      sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
  file:
    dependency: transitive
    description:
      name: file
-      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
+      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
      url: "https://pub.dev"
    source: hosted
-    version: "7.0.0"
+    version: "7.0.1"
  firebase_core:
    dependency: "direct main"
    description:
@ -277,18 +282,18 @@ packages:
    dependency: transitive
    description:
      name: firebase_core_platform_interface
-      sha256: "1003a5a03a61fc9a22ef49f37cbcb9e46c86313a7b2e7029b9390cf8c6fc32cb"
+      sha256: e30da58198a6d4b49d5bce4e852f985c32cb10db329ebef9473db2b9f09ce810
      url: "https://pub.dev"
    source: hosted
-    version: "5.1.0"
+    version: "5.3.0"
  firebase_core_web:
    dependency: transitive
    description:
      name: firebase_core_web
-      sha256: "6643fe3dbd021e6ccfb751f7882b39df355708afbdeb4130fc50f9305a9d1a3d"
+      sha256: "362e52457ed2b7b180964769c1e04d1e0ea0259fdf7025fdfedd019d4ae2bd88"
      url: "https://pub.dev"
    source: hosted
-    version: "2.17.2"
+    version: "2.17.5"
  firebase_messaging:
    dependency: "direct main"
    description:
@ -317,10 +322,10 @@ packages:
    dependency: transitive
    description:
      name: fixnum
-      sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
+      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
  flutter:
    dependency: "direct main"
    description: flutter
@ -354,26 +359,26 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_local_notifications
-      sha256: "40e6fbd2da7dcc7ed78432c5cdab1559674b4af035fddbfb2f9a8f9c2112fcef"
+      sha256: "49eeef364fddb71515bc78d5a8c51435a68bccd6e4d68e25a942c5e47761ae71"
      url: "https://pub.dev"
    source: hosted
-    version: "17.1.2"
+    version: "17.2.3"
  flutter_local_notifications_linux:
    dependency: transitive
    description:
      name: flutter_local_notifications_linux
-      sha256: "33f741ef47b5f63cc7f78fe75eeeac7e19f171ff3c3df054d84c1e38bedb6a03"
+      sha256: c49bd06165cad9beeb79090b18cd1eb0296f4bf4b23b84426e37dd7c027fc3af
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.0+1"
+    version: "4.0.1"
  flutter_local_notifications_platform_interface:
    dependency: transitive
    description:
      name: flutter_local_notifications_platform_interface
-      sha256: "340abf67df238f7f0ef58f4a26d2a83e1ab74c77ab03cd2b2d5018ac64db30b7"
+      sha256: "85f8d07fe708c1bdcf45037f2c0109753b26ae077e9d9e899d55971711a4ea66"
      url: "https://pub.dev"
    source: hosted
-    version: "7.1.0"
+    version: "7.2.0"
  flutter_staggered_grid_view:
    dependency: transitive
    description:
@ -419,10 +424,10 @@ packages:
    dependency: transitive
    description:
      name: graphs
-      sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19
+      sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
  hive:
    dependency: transitive
    description:
@ -451,10 +456,10 @@ packages:
    dependency: "direct main"
    description:
      name: http
-      sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
+      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
      url: "https://pub.dev"
    source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
  http_multi_server:
    dependency: transitive
    description:
@ -483,10 +488,10 @@ packages:
    dependency: transitive
    description:
      name: image
-      sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8"
+      sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d
      url: "https://pub.dev"
    source: hosted
-    version: "4.2.0"
+    version: "4.3.0"
  infinite_scroll_pagination:
    dependency: "direct main"
    description:
@ -531,26 +536,26 @@ packages:
    dependency: transitive
    description:
      name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
      url: "https://pub.dev"
    source: hosted
-    version: "10.0.0"
+    version: "10.0.5"
  leak_tracker_flutter_testing:
    dependency: transitive
    description:
      name: leak_tracker_flutter_testing
-      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.1"
+    version: "3.0.5"
  leak_tracker_testing:
    dependency: transitive
    description:
      name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.1"
+    version: "3.0.1"
  lints:
    dependency: transitive
    description:
@ -563,10 +568,18 @@ packages:
    dependency: transitive
    description:
      name: logging
-      sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
+      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
      url: "https://pub.dev"
    source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
+  macros:
+    dependency: transitive
+    description:
+      name: macros
+      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.2-main.4"
  matcher:
    dependency: transitive
    description:
@ -579,26 +592,34 @@ packages:
    dependency: transitive
    description:
      name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
      url: "https://pub.dev"
    source: hosted
-    version: "0.8.0"
+    version: "0.11.1"
  meta:
    dependency: transitive
    description:
      name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
      url: "https://pub.dev"
    source: hosted
-    version: "1.11.0"
+    version: "1.15.0"
  mime:
    dependency: transitive
    description:
      name: mime
-      sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2"
+      sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a"
      url: "https://pub.dev"
    source: hosted
-    version: "1.0.5"
+    version: "1.0.6"
+  mobile_scanner:
+    dependency: "direct main"
+    description:
+      name: mobile_scanner
+      sha256: e93461298494a3e5475dd2b41068012823b8fe2caf8d47ba545faca2aa3767d6
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.0.1"
  nested:
    dependency: transitive
    description:
@ -619,20 +640,20 @@ packages:
    dependency: "direct main"
    description:
      name: package_info_plus
-      sha256: b93d8b4d624b4ea19b0a5a208b2d6eff06004bc3ce74c06040b120eeadd00ce0
+      sha256: df3eb3e0aed5c1107bb0fdb80a8e82e778114958b1c5ac5644fb1ac9cae8a998
      url: "https://pub.dev"
    source: hosted
-    version: "8.0.0"
+    version: "8.1.0"
  package_info_plus_platform_interface:
    dependency: transitive
    description:
      name: package_info_plus_platform_interface
-      sha256: f49918f3433a3146047372f9d4f1f847511f2acd5cd030e1f44fe5a50036b70e
+      sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.0"
+    version: "3.0.1"
  path:
-    dependency: transitive
+    dependency: "direct main"
    description:
      name: path
      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
@ -643,18 +664,18 @@ packages:
    dependency: "direct main"
    description:
      name: path_provider
-      sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161
+      sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
  path_provider_android:
    dependency: transitive
    description:
      name: path_provider_android
-      sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d
+      sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.4"
+    version: "2.2.12"
  path_provider_foundation:
    dependency: transitive
    description:
@ -683,10 +704,10 @@ packages:
    dependency: transitive
    description:
      name: path_provider_windows
-      sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
+      sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.1"
+    version: "2.3.0"
  pausable_timer:
    dependency: transitive
    description:
@ -707,10 +728,10 @@ packages:
    dependency: transitive
    description:
      name: platform
-      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
+      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.5"
+    version: "3.1.6"
  plugin_platform_interface:
    dependency: transitive
    description:
@ -755,10 +776,10 @@ packages:
    dependency: transitive
    description:
      name: qr
-      sha256: "64957a3930367bf97cc211a5af99551d630f2f4625e38af10edd6b19131b64b3"
+      sha256: "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
  qr_flutter:
    dependency: "direct main"
    description:
@ -787,58 +808,58 @@ packages:
    dependency: "direct main"
    description:
      name: shared_preferences
-      sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180
+      sha256: "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051"
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.3"
+    version: "2.3.2"
  shared_preferences_android:
    dependency: transitive
    description:
      name: shared_preferences_android
-      sha256: "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2"
+      sha256: "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab"
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.2"
+    version: "2.3.3"
  shared_preferences_foundation:
    dependency: transitive
    description:
      name: shared_preferences_foundation
-      sha256: "0a8a893bf4fd1152f93fec03a415d11c27c74454d96e2318a7ac38dd18683ab7"
+      sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d"
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.0"
+    version: "2.5.3"
  shared_preferences_linux:
    dependency: transitive
    description:
      name: shared_preferences_linux
-      sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa"
+      sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.2"
+    version: "2.4.1"
  shared_preferences_platform_interface:
    dependency: transitive
    description:
      name: shared_preferences_platform_interface
-      sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b"
+      sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.2"
+    version: "2.4.1"
  shared_preferences_web:
    dependency: transitive
    description:
      name: shared_preferences_web
-      sha256: "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a"
+      sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.0"
+    version: "2.4.2"
  shared_preferences_windows:
    dependency: transitive
    description:
      name: shared_preferences_windows
-      sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59"
+      sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.2"
+    version: "2.4.1"
  shelf:
    dependency: transitive
    description:
@ -851,10 +872,10 @@ packages:
    dependency: transitive
    description:
      name: shelf_web_socket
-      sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1"
+      sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
      url: "https://pub.dev"
    source: hosted
-    version: "1.0.4"
+    version: "2.0.0"
  sky_engine:
    dependency: transitive
    description: flutter
@ -944,18 +965,18 @@ packages:
    dependency: transitive
    description:
      name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
      url: "https://pub.dev"
    source: hosted
-    version: "0.6.1"
+    version: "0.7.2"
  timezone:
    dependency: transitive
    description:
      name: timezone
-      sha256: a6ccda4a69a442098b602c44e61a1e2b4bf6f5516e875bbf0f427d5df14745d5
+      sha256: "2236ec079a174ce07434e89fcd3fcda430025eb7692244139a9cf54fdcf1fc7d"
      url: "https://pub.dev"
    source: hosted
-    version: "0.9.3"
+    version: "0.9.4"
  timing:
    dependency: transitive
    description:
@ -968,58 +989,58 @@ packages:
    dependency: "direct main"
    description:
      name: toastification
-      sha256: "5e751acc2fb5b8d008138dac255d62290fde4e5a24824f29809ac098c3dfe395"
+      sha256: "4d97fbfa463dfe83691044cba9f37cb185a79bb9205cfecb655fa1f6be126a13"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.0"
+    version: "2.3.0"
  typed_data:
    dependency: transitive
    description:
      name: typed_data
-      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.2"
+    version: "1.4.0"
  url_launcher:
    dependency: "direct main"
    description:
      name: url_launcher
-      sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3"
+      sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603"
      url: "https://pub.dev"
    source: hosted
-    version: "6.3.0"
+    version: "6.3.1"
  url_launcher_android:
    dependency: transitive
    description:
      name: url_launcher_android
-      sha256: "17cd5e205ea615e2c6ea7a77323a11712dffa0720a8a90540db57a01347f9ad9"
+      sha256: "8fc3bae0b68c02c47c5c86fa8bfa74471d42687b0eded01b78de87872db745e2"
      url: "https://pub.dev"
    source: hosted
-    version: "6.3.2"
+    version: "6.3.12"
  url_launcher_ios:
    dependency: transitive
    description:
      name: url_launcher_ios
-      sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89"
+      sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e
      url: "https://pub.dev"
    source: hosted
-    version: "6.3.0"
+    version: "6.3.1"
  url_launcher_linux:
    dependency: transitive
    description:
      name: url_launcher_linux
-      sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811
+      sha256: e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.1"
+    version: "3.2.0"
  url_launcher_macos:
    dependency: transitive
    description:
      name: url_launcher_macos
-      sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de"
+      sha256: "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672"
      url: "https://pub.dev"
    source: hosted
-    version: "3.2.0"
+    version: "3.2.1"
  url_launcher_platform_interface:
    dependency: transitive
    description:
@ -1032,26 +1053,26 @@ packages:
    dependency: transitive
    description:
      name: url_launcher_web
-      sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a"
+      sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.1"
+    version: "2.3.3"
  url_launcher_windows:
    dependency: transitive
    description:
      name: url_launcher_windows
-      sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7
+      sha256: "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.1"
+    version: "3.1.3"
  uuid:
    dependency: "direct main"
    description:
      name: uuid
-      sha256: "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8"
+      sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff
      url: "https://pub.dev"
    source: hosted
-    version: "4.4.0"
+    version: "4.5.1"
  vector_math:
    dependency: transitive
    description:
@ -1064,10 +1085,10 @@ packages:
    dependency: transitive
    description:
      name: vm_service
-      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
      url: "https://pub.dev"
    source: hosted
-    version: "13.0.0"
+    version: "14.2.5"
  watcher:
    dependency: transitive
    description:
@ -1084,38 +1105,46 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.5.1"
+  web_socket:
+    dependency: transitive
+    description:
+      name: web_socket
+      sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.6"
  web_socket_channel:
    dependency: transitive
    description:
      name: web_socket_channel
-      sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42"
+      sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f"
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.5"
+    version: "3.0.1"
  win32:
    dependency: transitive
    description:
      name: win32
-      sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
+      sha256: "2294c64768987ea280b43a3d8357d42d5679f3e2b5b69b602be45b2abbd165b0"
      url: "https://pub.dev"
    source: hosted
-    version: "5.5.0"
+    version: "5.6.1"
  win32_registry:
    dependency: transitive
    description:
      name: win32_registry
-      sha256: "10589e0d7f4e053f2c61023a31c9ce01146656a70b7b7f0828c0b46d7da2a9bb"
+      sha256: "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852"
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.3"
+    version: "1.1.5"
  xdg_directories:
    dependency: transitive
    description:
      name: xdg_directories
-      sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
+      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
      url: "https://pub.dev"
    source: hosted
-    version: "1.0.4"
+    version: "1.1.0"
  xid:
    dependency: "direct main"
    description:
@ -1141,5 +1170,5 @@ packages:
    source: hosted
    version: "3.1.2"
 sdks:
-  dart: ">=3.3.0 <4.0.0"
-  flutter: ">=3.19.0"
+  dart: ">=3.5.0 <4.0.0"
+  flutter: ">=3.24.0"
--- a/flutter/pubspec.yaml
+++ b/flutter/pubspec.yaml
@ -33,9 +33,11 @@ dependencies:
  toastification: ^2.0.0
  uuid: ^4.4.0
  share_plus: ^9.0.0
-  flutter_local_notifications: ^17.1.2
+  flutter_local_notifications: ^17.2.3


+  path: any
+  mobile_scanner: ^6.0.1
 dependency_overrides:
  font_awesome_flutter:
    path: deps/font_awesome_flutter
--- a/scnserver/api/handler/apiChannel.go
+++ b/scnserver/api/handler/apiChannel.go
@ -411,7 +411,6 @@ func (h APIHandler) ListChannelMessages(pctx ginext.PreContext) ginext.HTTPRespo
 	type query struct {
 		PageSize      *int    `json:"page_size"       form:"page_size"`
 		NextPageToken *string `json:"next_page_token" form:"next_page_token"`
-		Filter        *string `json:"filter"          form:"filter"`
 		Trimmed       *bool   `json:"trimmed"         form:"trimmed"`
 	}
 	type response struct {
--- a/scnserver/cmd/dbhash/main.go
+++ b/scnserver/cmd/dbhash/main.go
@ -15,39 +15,46 @@ import (
 func main() {
 	exerr.Init(exerr.ErrorPackageConfigInit{})

-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), 1011*time.Second)
 	defer cancel()

 	if !langext.InArray("sqlite3", sql.Drivers()) {
 		sqlite.RegisterAsSQLITE3()
 	}

-	fmt.Println()
-
-	for i := 2; i <= schema.PrimarySchemaVersion; i++ {
-		h0, err := sq.HashGoSqliteSchema(ctx, schema.PrimarySchema[i].SQL)
+	for key, schemaObj := range langext.AsSortedBy(langext.MapToArr(schema.PrimarySchema), func(v langext.MapEntry[int, schema.Def]) int { return v.Key }) {
+		var h0 string
+		if key == 1 {
+			h0 = "N/A"
+		} else {
+			var err error
+			h0, err = sq.HashGoSqliteSchema(ctx, schemaObj.Value.SQL)
 			if err != nil {
 				h0 = "ERR"
 			}
-		fmt.Printf("PrimarySchema%d   := %s\n", i, h0)
+		}
+		fmt.Printf("PrimarySchema    [%d] := %s%s\n", schemaObj.Key, h0, langext.Conditional(schemaObj.Key == schema.PrimarySchemaVersion, "     (active)", ""))
 	}

-	for i := 1; i <= schema.RequestsSchemaVersion; i++ {
-		h0, err := sq.HashGoSqliteSchema(ctx, schema.RequestsSchema[i].SQL)
+	fmt.Printf("\n")
+
+	for _, schemaObj := range langext.AsSortedBy(langext.MapToArr(schema.RequestsSchema), func(v langext.MapEntry[int, schema.Def]) int { return v.Key }) {
+		h0, err := sq.HashGoSqliteSchema(ctx, schemaObj.Value.SQL)
 		if err != nil {
 			h0 = "ERR"
 		}
-		fmt.Printf("RequestsSchema%d  := %s\n", i, h0)
+		fmt.Printf("RequestsSchema   [%d] := %s%s\n", schemaObj.Key, h0, langext.Conditional(schemaObj.Key == schema.RequestsSchemaVersion, "     (active)", ""))
 	}

-	for i := 1; i <= schema.LogsSchemaVersion; i++ {
-		h0, err := sq.HashGoSqliteSchema(ctx, schema.LogsSchema[i].SQL)
+	fmt.Printf("\n")
+
+	for _, schemaObj := range langext.AsSortedBy(langext.MapToArr(schema.LogsSchema), func(v langext.MapEntry[int, schema.Def]) int { return v.Key }) {
+		h0, err := sq.HashGoSqliteSchema(ctx, schemaObj.Value.SQL)
 		if err != nil {
 			h0 = "ERR"
 		}
-		fmt.Printf("LogsSchema%d      := %s\n", i, h0)
+		fmt.Printf("LogsSchema       [%d] := %s%s\n", schemaObj.Key, h0, langext.Conditional(schemaObj.Key == schema.LogsSchemaVersion, "     (active)", ""))
 	}

-	fmt.Println()
-
+	fmt.Printf("\n")
 }
--- a/scnserver/db/impl/logs/database.go
+++ b/scnserver/db/impl/logs/database.go
@ -151,6 +151,8 @@ func (db *Database) Migrate(outerctx context.Context) error {
 			}

 			currschema = currschema + 1
+
+			ppReInit = true
 		}
 	}

--- a/scnserver/db/impl/primary/database.go
+++ b/scnserver/db/impl/primary/database.go
@ -151,6 +151,8 @@ func (db *Database) Migrate(outerctx context.Context) error {
 			}

 			currschema = currschema + 1
+
+			ppReInit = true
 		}
 	}

--- a/scnserver/db/impl/requests/database.go
+++ b/scnserver/db/impl/requests/database.go
@ -151,6 +151,8 @@ func (db *Database) Migrate(outerctx context.Context) error {
 			}

 			currschema = currschema + 1
+
+			ppReInit = true
 		}
 	}

--- a/scnserver/db/schema/assets.go
+++ b/scnserver/db/schema/assets.go
@ -1,6 +1,9 @@
 package schema

-import _ "embed"
+import (
+	"embed"
+	_ "embed"
+)

 type Def struct {
 	SQL       string
@ -8,75 +11,50 @@ type Def struct {
 	MigScript string
 }

-//go:embed primary_1.ddl
-var primarySchema1 string
-
-//go:embed primary_2.ddl
-var primarySchema2 string
-
-//go:embed primary_3.ddl
-var primarySchema3 string
-
-//go:embed primary_4.ddl
-var primarySchema4 string
-
-//go:embed primary_5.ddl
-var primarySchema5 string
-
-//go:embed primary_6.ddl
-var primarySchema6 string
-
-//go:embed primary_7.ddl
-var primarySchema7 string
-
-//go:embed primary_8.ddl
-var primarySchema8 string
-
-//go:embed primary_migration_3_4.ddl
-var primaryMigration_3_4 string
-
-//go:embed primary_migration_4_5.ddl
-var primaryMigration_4_5 string
-
-//go:embed primary_migration_5_6.ddl
-var primaryMigration_5_6 string
-
-//go:embed primary_migration_6_7.ddl
-var primaryMigration_6_7 string
-
-//go:embed primary_migration_7_8.ddl
-var primaryMigration_7_8 string
-
-//go:embed requests_1.ddl
-var requestsSchema1 string
-
-//go:embed logs_1.ddl
-var logsSchema1 string
+//go:embed *.ddl
+//go:embed *.sql
+var assets embed.FS

 var PrimarySchema = map[int]Def{
 	0: {"", "", ""},
-	1: {primarySchema1, "f2b2847f32681a7178e405553beea4a324034915a0c5a5dc70b3c6abbcc852f2", ""},
-	2: {primarySchema2, "07ed1449114416ed043084a30e0722a5f97bf172161338d2f7106a8dfd387d0a", ""},
-	3: {primarySchema3, "65c2125ad0e12d02490cf2275f0067ef3c62a8522edf9a35ee8aa3f3c09b12e8", ""},
-	4: {primarySchema4, "cb022156ab0e7aea39dd0c985428c43cae7d60e41ca8e9e5a84c774b3019d2ca", primaryMigration_3_4},
-	5: {primarySchema5, "9d6217ba4a3503cfe090f72569367f95a413bb14e9effe49ffeabbf255bce8dd", primaryMigration_4_5},
-	6: {primarySchema6, "8e83d20bcd008082713f248ae8cd558335a37a37ce90bd8c86e782da640ee160", primaryMigration_5_6},
-	7: {primarySchema7, "90d8dbc460afe025f9b74cda5c16bb8e58b178df275223bd2531907a8d8c36c3", primaryMigration_6_7},
-	8: {primarySchema8, "746f6005c7a573b8816e5993ecd1d949fe2552b0134ba63bab8b4d5b2b5058ad", primaryMigration_7_8},
+	1: {readDDL("primary_1.ddl"), "f2b2847f32681a7178e405553beea4a324034915a0c5a5dc70b3c6abbcc852f2", ""},
+	2: {readDDL("primary_2.ddl"), "07ed1449114416ed043084a30e0722a5f97bf172161338d2f7106a8dfd387d0a", ""},
+	3: {readDDL("primary_3.ddl"), "65c2125ad0e12d02490cf2275f0067ef3c62a8522edf9a35ee8aa3f3c09b12e8", ""},
+	4: {readDDL("primary_4.ddl"), "cb022156ab0e7aea39dd0c985428c43cae7d60e41ca8e9e5a84c774b3019d2ca", readMig("primary_migration_3_4.sql")},
+	5: {readDDL("primary_5.ddl"), "9d6217ba4a3503cfe090f72569367f95a413bb14e9effe49ffeabbf255bce8dd", readMig("primary_migration_4_5.sql")},
+	6: {readDDL("primary_6.ddl"), "8e83d20bcd008082713f248ae8cd558335a37a37ce90bd8c86e782da640ee160", readMig("primary_migration_5_6.sql")},
+	7: {readDDL("primary_7.ddl"), "90d8dbc460afe025f9b74cda5c16bb8e58b178df275223bd2531907a8d8c36c3", readMig("primary_migration_6_7.sql")},
+	8: {readDDL("primary_8.ddl"), "746f6005c7a573b8816e5993ecd1d949fe2552b0134ba63bab8b4d5b2b5058ad", readMig("primary_migration_7_8.sql")},
 }

 var PrimarySchemaVersion = len(PrimarySchema) - 1

 var RequestsSchema = map[int]Def{
 	0: {"", "", ""},
-	1: {requestsSchema1, "ebb0a5748b605e8215437413b738279670190ca8159b6227cfc2aa13418b41e9", ""},
+	1: {readDDL("requests_1.ddl"), "ebb0a5748b605e8215437413b738279670190ca8159b6227cfc2aa13418b41e9", ""},
 }

 var RequestsSchemaVersion = len(RequestsSchema) - 1

 var LogsSchema = map[int]Def{
 	0: {"", "", ""},
-	1: {logsSchema1, "65fba477c04095effc3a8e1bb79fe7547b8e52e983f776f156266eddc4f201d7", ""},
+	1: {readDDL("logs_1.ddl"), "65fba477c04095effc3a8e1bb79fe7547b8e52e983f776f156266eddc4f201d7", ""},
 }

 var LogsSchemaVersion = len(LogsSchema) - 1
+
+func readDDL(name string) string {
+	data, err := assets.ReadFile(name)
+	if err != nil {
+		panic(err)
+	}
+	return string(data)
+}
+
+func readMig(name string) string {
+	data, err := assets.ReadFile(name)
+	if err != nil {
+		panic(err)
+	}
+	return string(data)
+}
--- a/scnserver/db/schema/primary_migration_3_4.sql
+++ b/scnserver/db/schema/primary_migration_3_4.sql
--- a/scnserver/db/schema/primary_migration_4_5.sql
+++ b/scnserver/db/schema/primary_migration_4_5.sql
--- a/scnserver/db/schema/primary_migration_5_6.sql
+++ b/scnserver/db/schema/primary_migration_5_6.sql
--- a/scnserver/db/schema/primary_migration_6_7.sql
+++ b/scnserver/db/schema/primary_migration_6_7.sql
--- a/scnserver/db/schema/primary_migration_7_8.sql
+++ b/scnserver/db/schema/primary_migration_7_8.sql
Author	SHA1	Message	Date
Mike Schwörer	8ebd95a4b8	fix build	2024-10-23 15:22:08 +02:00
Mike Schwörer	80d4e18a23	bugfixes	2024-10-20 03:34:34 +02:00
Mike Schwörer	cc672d2f20	Channel QR Code scanner [WIP]	2024-10-19 22:39:05 +02:00
Mike Schwörer	1cf14e65a9	Subscribe/unsubscribe from channels	2024-10-19 20:00:44 +02:00
Mike Schwörer	9b2e429d3d	Fix warnings and upgrade	2024-10-19 17:52:27 +02:00
Mike Schwörer	2f73a21a41	Added raw-failure logs to flutter app (to debug init errors)	2024-10-19 17:16:34 +02:00
Mike Schwörer	05eb37bc80	Fix flutter project with new android-studio version: - upgrade gradle from 7.5 to 7.6.1 - change java target from 1.8 to 17 - set flutter jdk-dir to system-jdk (instead of now-incompatible android-studio bundled jdk) (android studio bundles jdk 21, jdk 21 needs gradle 8.4, flutetr does not work with gradle > 7.6.1 ) => see https://docs.gradle.org/current/userguide/compatibility.html#java => https://www.liquidbcn.com/en/insights/solving-issues-android-studio-ladybug-java-21-flutter	2024-10-15 19:41:15 +02:00
Mike Schwörer	779c86d8ac	Fix error after migration (preprocessor no reinitialized)	2024-09-28 00:13:22 +02:00
Mike Schwörer	d9a14c9973	Better migration handling	2024-09-20 23:50:34 +02:00