.gitea/workflows/build_and_deploy.yml

@@ -3,12 +3,6 @@
 # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
 # https://docs.github.com/en/actions/learn-github-actions/contexts#github-context
 
-# Configurable with a few commit messages:
-#   - [skip-tests]       Skip the test stage
-#   - [skip-deployment]  Skip the deployment stage
-#   - [skip-ci]          Skip all stages (the whole ci/cd)
-#
-
 name: Build Docker and Deploy
 run-name: Build & Deploy ${{ gitea.ref }} on ${{ gitea.actor }}
 
@@ -19,12 +13,9 @@ on:
 
 
 jobs:
-  build_server:
+  build_job:
     name: Build Docker Container
     runs-on: bfb-cicd-latest
-    if: >-
-      !contains(github.event.head_commit.message, '[skip-ci]') && 
-      !contains(github.event.head_commit.message, '[skip-deployment]')
     steps:
       - run: echo -n "${{ secrets.DOCKER_REG_PASS }}" | docker login registry.blackforestbytes.com -u docker --password-stdin
       - name: Check out code
@@ -33,59 +24,10 @@ jobs:
       - run: cd "${{ gitea.workspace }}/scnserver" && make docker
       - run: cd "${{ gitea.workspace }}/scnserver" && make push-docker
     
-  test_server:
+  deploy_job:
-    name: Run Unit-Tests
-    runs-on: bfb-cicd-latest
-    if: >-
-      !contains(github.event.head_commit.message, '[skip-ci]') && 
-      !contains(github.event.head_commit.message, '[skip-tests]')
-    steps:
-
-      - name: Check out code
-        uses: actions/checkout@v3
-
-      - name: Get Commiter Info
-        id: commiter_info
-        run: |
-          echo "NAME=$( git log -n 1 --pretty=format:%an )" >> $GITHUB_OUTPUT
-          echo "MAIL=$( git log -n 1 --pretty=format:%ae )" >> $GITHUB_OUTPUT
-
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: '${{ gitea.workspace }}/scnserver/go.mod'
-          cache: false
-
-      - name: Print Go Version
-        run: go version
-
-      - name: Run tests
-        run: cd "${{ gitea.workspace }}/scnserver" && make dgi && make swagger && SCN_TEST_LOGLEVEL=WARN make test
-
-      - name: Send failure mail
-        if: failure()
-        uses: dawidd6/action-send-mail@v3
-        with:
-          server_address: smtp.fastmail.com
-          server_port: 465
-          secure: true
-          username: ${{secrets.MAIL_USERNAME}}
-          password: ${{secrets.MAIL_PASSWORD}}
-          subject: Pipeline on '${{ gitea.repository }}' failed
-          to: ${{ steps.commiter_info.outputs.MAIL }}
-          from: Gitea Actions <gitea_actions@blackforestbytes.de>
-          body: "Go to https://gogs.blackforestbytes.com/${{ gitea.repository }}/actions"
-
-  deploy_server:
     name: Deploy to Server
-    needs: [build_server, test_server]
+    needs: [build_job]
     runs-on: ubuntu-latest
-    if: >-
-      !cancelled() &&
-      !contains(github.event.head_commit.message, '[skip-ci]') && 
-      !contains(github.event.head_commit.message, '[skip-deployment]') && 
-      needs.build_server.result == 'success' && 
-      (needs.test_server.result == 'skipped' || needs.test_server.result == 'success')
     steps:
       - name: Execute deploy on remote (via ssh)
         uses: appleboy/ssh-action@v1.0.0

.gitignore

@@ -1 +0,0 @@
-.aider*

android/.idea/AndroidProjectSystem.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AndroidProjectSystem">
-    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
-  </component>
-</project>

android/.idea/other.xml

@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="direct_access_persist.xml">
+    <option name="deviceSelectionList">
+      <list>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="27" />
+          <option name="brand" value="DOCOMO" />
+          <option name="codename" value="F01L" />
+          <option name="id" value="F01L" />
+          <option name="manufacturer" value="FUJITSU" />
+          <option name="name" value="F-01L" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1280" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="28" />
+          <option name="brand" value="DOCOMO" />
+          <option name="codename" value="SH-01L" />
+          <option name="id" value="SH-01L" />
+          <option name="manufacturer" value="SHARP" />
+          <option name="name" value="AQUOS sense2 SH-01L" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2160" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="31" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a51" />
+          <option name="id" value="a51" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy A51" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="akita" />
+          <option name="id" value="akita" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="b0q" />
+          <option name="id" value="b0q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S22 Ultra" />
+          <option name="screenDensity" value="600" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3088" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="32" />
+          <option name="brand" value="google" />
+          <option name="codename" value="bluejay" />
+          <option name="id" value="bluejay" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 6a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="29" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="crownqlteue" />
+          <option name="id" value="crownqlteue" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Note9" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2220" />
+          <option name="screenY" value="1080" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="dm3q" />
+          <option name="id" value="dm3q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S23 Ultra" />
+          <option name="screenDensity" value="600" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3088" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix" />
+          <option name="id" value="felix" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix_camera" />
+          <option name="id" value="felix_camera" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold (Camera-enabled)" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gts8uwifi" />
+          <option name="id" value="gts8uwifi" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Tab S8 Ultra" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="1848" />
+          <option name="screenY" value="2960" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="husky" />
+          <option name="id" value="husky" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8 Pro" />
+          <option name="screenDensity" value="390" />
+          <option name="screenX" value="1008" />
+          <option name="screenY" value="2244" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="java" />
+          <option name="id" value="java" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="G20" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1600" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="lynx" />
+          <option name="id" value="lynx" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 7a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="31" />
+          <option name="brand" value="google" />
+          <option name="codename" value="oriole" />
+          <option name="id" value="oriole" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 6" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="panther" />
+          <option name="id" value="panther" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 7" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="31" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="q2q" />
+          <option name="id" value="q2q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Z Fold3" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1768" />
+          <option name="screenY" value="2208" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="q5q" />
+          <option name="id" value="q5q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Z Fold5" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1812" />
+          <option name="screenY" value="2176" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="google" />
+          <option name="codename" value="r11" />
+          <option name="id" value="r11" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Watch" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="384" />
+          <option name="screenY" value="384" />
+          <option name="type" value="WEAR_OS" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="google" />
+          <option name="codename" value="redfin" />
+          <option name="id" value="redfin" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 5" />
+          <option name="screenDensity" value="440" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="shiba" />
+          <option name="id" value="shiba" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tangorpro" />
+          <option name="id" value="tangorpro" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Tablet" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="1600" />
+          <option name="screenY" value="2560" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="29" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="x1q" />
+          <option name="id" value="x1q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S20" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3200" />
+        </PersistentDeviceSelectionData>
+      </list>
+    </option>
+  </component>
+</project>

android/.idea/runConfigurations.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
-        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
-        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
-        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
-        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
-        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
-        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
-        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>

android/app/build.gradle

@@ -30,7 +30,6 @@ android {
         targetCompatibility 1.8
         sourceCompatibility 1.8
     }
-    namespace 'com.blackforestbytes.simplecloudnotifier'
 }
 
 dependencies {

android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.blackforestbytes.simplecloudnotifier">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

android/build.gradle

@@ -7,8 +7,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.9.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
-        classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'com.google.gms:google-services:4.3.4'
     }
 }
 

android/gradle.properties

@@ -14,6 +14,3 @@ org.gradle.jvmargs=-Xmx1536m
 
 android.useAndroidX=true
 android.enableJetifier=true
-android.defaults.buildfeatures.buildconfig=true
-android.nonTransitiveRClass=false
-android.nonFinalResIds=false

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

flutter/.gitignore

@@ -5,8 +5,6 @@
 firepit-log.txt
 flutter_jank_*
 
-_releases/*
-
 
 #######################################################################################################################
 
@@ -56,5 +54,3 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
-
-/lib/git_stamp/

flutter/Makefile

@@ -1,54 +1,8 @@
 
 
-HASH=$(shell git rev-parse HEAD)
+run:
-VERS=$(shell cat pubspec.yaml | grep -oP '(?<=version: ).*' | sed 's/[\s]*//' | tr -d '\n') # lazy evaluated!
-
-java:
-	sudo archlinux-java set java-17-openjdk
-	java -version
-
-# runs app locally (linux)
-run-linux: java gen
-	dart run build_runner build
-	_JAVA_OPTIONS="" flutter run -d linux
-
-# runs app locally (web | not really supported)
-run-web: java gen
-	dart run build_runner build
-	_JAVA_OPTIONS="" flutter run -d chrome
-
-# runs on android device (must have network adb enabled teh correct IP)
-run-android: java gen
-	ping -c1 10.10.10.177
-	adb connect 10.10.10.177:5555
 	flutter pub run build_runner build
-	_JAVA_OPTIONS="" flutter run -d 10.10.10.177:5555
+	flutter run
-
-install-release: java gen
-	# Install on Pixel 7a
-	flutter build apk --release
-	flutter run --release -d 35221JEHN07157
-
-release: java gen
-	flutter build apk       --release
-	cp build/app/outputs/flutter-apk/app-release.apk "_releases/v$(VERS).apk"
-	@echo ""
-	@echo "--> copied APK to _releases  ( Version: $(VERS) )"
-	@echo ""
-	flutter build appbundle --release
-	cp build/app/outputs/bundle/release/app-release.aab "_releases/v$(VERS).aab"
-	cd "build/app/intermediates/merged_native_libs/release/out/lib" && zip -r "../../../../../../../_releases/v$(VERS).symbols.zip" .
-	@echo ""
-	@echo "--> copied AAB to _releases  ( Version: $(VERS) )"
-	@echo ""
-	flutter build linux     --release
-	tar -czf "_releases/v$(VERS).tar.gz" -C build/linux/x64/release/bundle .
-	@echo ""
-	@echo "--> copied linux-binary to _releases  ( Version: $(VERS) )"
-	@echo ""
-	@echo "#=> file://$(shell pwd)/_releases"
-	@echo ""
-	@echo "Done."
 	
 test:
 	dart analyze
@@ -56,31 +10,12 @@ test:
 fix:
 	dart fix --apply
 
-gen: java
+gen:
-	./_utils/inc_buildnum.sh
+	flutter pub run build_runner build
-	dart run build_runner build
-	dart run git_stamp git_stamp --build-type lite --limit 2
 	
-# run `make run` in another terminal (or another variant of flutter run)
 autoreload:
-	@
+	@# run `make run` in another terminal (or another variant of flutter run)
 	@_utils/autoreload.sh
 	
 icons:
 	flutter pub run flutter_launcher_icons -f "flutter_launcher_icons.yaml"
-
-clean:
-	cd android && ./gradlew clean
-	flutter clean
-
-# upgrade all packages (add --major-versions even updates across new major versions)
-# https://docs.flutter.dev/release/upgrade
-# upgrading flutter can be done via `flutter upgrade`: https://docs.flutter.dev/release/upgrade
-# android/gradle updates should be done via androidStudio: https://docs.flutter.dev/release/breaking-changes/android-java-gradle-migration-guide
-upgrade: 
-	flutter upgrade
-	flutter pub upgrade
-	flutter doctor
-
-aider:
-	aider --model gemini-2.5-pro --no-auto-commits --no-dirty-commits --test-cmd "flutter build linux" --auto-test --subtree-only

flutter/TODO.md

@@ -1,38 +1,29 @@
 
 # TODO
 
- - [x] Message List
+ - [ ] Message List
-        * [x] CRUD
+        * [ ] CRUD
- - [x] Message Big-View
+ - [ ] Message Big-View
- - [x] Search/Filter Messages
+ - [ ] Search/Filter Messages
- - [x] Channel List
+ - [ ] Channel List
-        * [x] Show subs
+        * [ ] Show subs
-        * [x] CRUD
+        * [ ] CRUD
-        * [x] what about unsubbed foreign channels? - thex should still be visible (or should they, do i still get the messages?)
+        * [ ] what about unsubbed foreign channels? - thex should still be visible (or should they, do i still get the messages?)
- - [x] Sub List
+ - [ ] Sub List
-        * [x] Sub/Unsub/Accept/Deny
+        * [ ] Sub/Unsub/Accept/Deny
- - [x] Debug List (Show logs, requests)
+ - [ ] Debug List (Show logs, requests)
- - [x] Key List
+ - [ ] Key List
-        * [x] CRUD
+        * [ ] CRUD
- - [x] Auto R-only key for admin, use for QR+link+send
+ - [ ] Auto R-only key for admin, use for QR+link+send
  - [ ] settings
- - [?] notifications
+ - [ ] notifications
- - [?] push navigation stack
+ - [ ] push navigation stack
- - [/] read + migrate old SharedPrefs (or not? - who uses SCN even??)
+ - [ ] read + migrate old SharedPrefs (or not? - who uses SCN even??)
- - [x] Account-Page
+ - [ ] Account-Page
- - [x] Logout
+ - [ ] Logout
- - [x] Send-page
+ - [ ] Send-page
 
- - [x] 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?
+ - [ ] 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?
-
- - [x] fix time format (in message-list, in card, top right) - midnight is shown as "24:05" instead of "00:05" - thats weird
-
- - [x] Add scrollbar
-       -> https://api.flutter.dev/flutter/material/Scrollbar-class.html
-
- - [x] you cant unsubscribe from foreign channel without completely loosing subscription.
-       perhaps subscriptions should have two cofirmed bool (both must be true to receive messages): confirmed-owner && confirmed-subscriber
-       Then the subscriber can unconfirm his half - without loosing the owner confirmation
 
  -----
 
@@ -60,4 +51,4 @@
  - [ ] Disable compat | remove code 
         - [x] compat message title
         - [ ] ...
- - [x] RWLock directly in go - prevent/reduce db-locked exception
+ - [ ] RWLock directly in go - prevent/reduce db-locked exception

flutter/_utils/autoreload.sh

@@ -3,8 +3,8 @@
     # shellcheck disable=SC2002  # disable useless-cat warning
 
     set -o nounset   # disallow usage of unset vars  ( set -u )
-    #set -o errexit   # Exit immediately if a pipeline returns non-zero.  ( set -e )
+    set -o errexit   # Exit immediately if a pipeline returns non-zero.  ( set -e )
-    #set -o errtrace  # Allow the above trap be inherited by all functions in the script.  ( set -E )
+    set -o errtrace  # Allow the above trap be inherited by all functions in the script.  ( set -E )
     set -o pipefail  # Return value of a pipeline is the value of the last (rightmost) command to exit with a non-zero status
     IFS=$'\n\t'      # Set $IFS to only newline and tab.
 
@@ -24,34 +24,23 @@
 
 
 
-pids="$( pgrep -f 'flutter_tools\.[s]napshot run' || echo '' )"
+pid="$( pgrep -f 'flutter_tools\.[s]napshot run' || echo '' | tail -n 1 )"
 
-if [ -z "$pids" ]; then
+if [ -z "$pid" ]; then
     red "No [flutter run] process found - exiting"
     exit 1
 fi
 
-trap 'echo "reseived SIGNAL<EXIT> - exiting";    jobs -p | xargs kill ; exit 0' EXIT
+trap 'echo "reseived SIGNAL<EXIT> - exiting"; exit 0' EXIT
-trap 'echo "reseived SIGNAL<SIGINT> - exiting";  jobs -p | xargs kill ; exit 0' SIGINT
+trap 'echo "reseived SIGNAL<SIGINT> - exiting"; exit 0' SIGINT
-trap 'echo "reseived SIGNAL<SIGTERM> - exiting"; jobs -p | xargs kill ; exit 0' SIGTERM
+trap 'echo "reseived SIGNAL<SIGTERM> - exiting"; exit 0' SIGTERM
-trap 'echo "reseived SIGNAL<SIGQUIT> - exiting"; jobs -p | xargs kill ; exit 0' SIGQUIT
+trap 'echo "reseived SIGNAL<SIGQUIT> - exiting"; exit 0' SIGQUIT
 
 echo ""
-while IFS= read -r pid; do
+blue "Listening for changes in lib/ directory - sending signals to ${pid}..."
-    blue "Listening for changes in lib/ directory - sending signals to ${pid}..."
-done <<< "$pids"
-
 echo ""
 
-while IFS= read -r pid; do
+while true; do
-    {
+    find lib/ -name '*.dart' | entr -d -p sh -c "echo 'File(s) changed - Sending SIGUSR to $pid' ; kill -USR1 $pid";
-        while true; do
+	yellow 'File list changed - restart';
-            find lib/ -name '*.dart' | entr -d -p sh -c "echo 'File(s) changed - Sending SIGUSR to $pid' ; kill -USR1 $pid";
+done
-            yellow 'File list changed - restart';
-        done
-    } &
-done <<< "$pids"
-
-wait # wait for all background jobs to finish
-
-echo "DONE."

flutter/_utils/inc_buildnum.sh

@@ -1,41 +0,0 @@
-#!/bin/bash
-
-    # shellcheck disable=SC2002  # disable useless-cat warning
-
-    set -o nounset   # disallow usage of unset vars  ( set -u )
-    set -o errexit   # Exit immediately if a pipeline returns non-zero.  ( set -e )
-    set -o errtrace  # Allow the above trap be inherited by all functions in the script.  ( set -E )
-    set -o pipefail  # Return value of a pipeline is the value of the last (rightmost) command to exit with a non-zero status
-    IFS=$'\n\t'      # Set $IFS to only newline and tab.
-
-    # shellcheck disable=SC2034
-    cr=$'\n'
-
-    function black() { if [ -t 1 ] && [ -n "$(tput colors)" ] && [ "$(tput colors)" -ge 8 ]; then echo -e "\\x1B[30m$1\\x1B[0m"; else echo "$1"; fi  }
-    function red()   { if [ -t 1 ] && [ -n "$(tput colors)" ] && [ "$(tput colors)" -ge 8 ]; then echo -e "\\x1B[31m$1\\x1B[0m"; else echo "$1"; fi; }
-    function green() { if [ -t 1 ] && [ -n "$(tput colors)" ] && [ "$(tput colors)" -ge 8 ]; then echo -e "\\x1B[32m$1\\x1B[0m"; else echo "$1"; fi; }
-    function yellow(){ if [ -t 1 ] && [ -n "$(tput colors)" ] && [ "$(tput colors)" -ge 8 ]; then echo -e "\\x1B[33m$1\\x1B[0m"; else echo "$1"; fi; }
-    function blue()  { if [ -t 1 ] && [ -n "$(tput colors)" ] && [ "$(tput colors)" -ge 8 ]; then echo -e "\\x1B[34m$1\\x1B[0m"; else echo "$1"; fi; }
-    function purple(){ if [ -t 1 ] && [ -n "$(tput colors)" ] && [ "$(tput colors)" -ge 8 ]; then echo -e "\\x1B[35m$1\\x1B[0m"; else echo "$1"; fi; }
-    function cyan()  { if [ -t 1 ] && [ -n "$(tput colors)" ] && [ "$(tput colors)" -ge 8 ]; then echo -e "\\x1B[36m$1\\x1B[0m"; else echo "$1"; fi; }
-    function white() { if [ -t 1 ] && [ -n "$(tput colors)" ] && [ "$(tput colors)" -ge 8 ]; then echo -e "\\x1B[37m$1\\x1B[0m"; else echo "$1"; fi; }
-
-
-
-
-path_to_pubspec="$(dirname "$0")/../pubspec.yaml"
-current_version=$(awk '/^version:/ {print $2}' $path_to_pubspec)
-current_version_without_build=$(echo "$current_version" | sed 's/\+.*//')
-
-gitcount="$(git log | grep "^commit" | wc -l | xargs)"
-new_version="$current_version_without_build+$gitcount"
-
-echo "Setting pubspec.yaml version $current_version to $new_version"
-
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    # macOS sed (requires a space after -i)
-    sed -i '' -e "s/version: $current_version/version: $new_version/g" $path_to_pubspec
-else
-    # GNU sed (requires no space after -i)
-    sed -i'' -e "s/version: $current_version/version: $new_version/g" $path_to_pubspec
-fi

flutter/android/.gitignore

@@ -11,7 +11,3 @@ GeneratedPluginRegistrant.java
 key.properties
 **/*.keystore
 **/*.jks
-
-build/
-
-app/.cxx/

flutter/android/app/build.gradle

@@ -34,16 +34,15 @@ if (keystorePropertiesFile.exists()) {
 android {
     namespace "com.blackforestbytes.simplecloudnotifier"
     compileSdkVersion flutter.compileSdkVersion
-    ndkVersion        "27.0.12077973"                // should be `flutter.ndkVersion` - but some plugins need 27, even though flutter still has the default value of 26 (flutter 3.29 | 2025-04-12)
+    ndkVersion flutter.ndkVersion
 
     compileOptions {
-        coreLibraryDesugaringEnabled true
+        sourceCompatibility JavaVersion.VERSION_1_8
-        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '17'
+        jvmTarget = '1.8'
     }
 
     sourceSets {
@@ -56,7 +55,6 @@ android {
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        multiDexEnabled true
     }
 
     signingConfigs {
@@ -79,9 +77,4 @@ flutter {
     source '../..'
 }
 
-dependencies {
+dependencies {}
-    implementation 'androidx.window:window:1.0.0'
-    implementation 'androidx.window:window-java:1.0.0'
-
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'
-}

flutter/android/app/proguard-rules.pro

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

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

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

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

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

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

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

flutter/android/build.gradle

@@ -1,3 +1,15 @@
+buildscript {
+    ext.kotlin_version = '1.7.10'
+    repositories {
+        google()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
 allprojects {
     repositories {
         google()

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-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

flutter/android/settings.gradle

@@ -23,8 +23,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.9.1" apply false
+    id "com.android.application" version "7.3.0" apply false
-    id "org.jetbrains.kotlin.android" version "2.1.10" apply false
     // START: FlutterFire Configuration
     id "com.google.gms.google-services" version "4.3.15" apply false
     // END: FlutterFire Configuration

flutter/ios/Runner/AppDelegate.swift

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

flutter/ios/Runner/Info.plist

@@ -45,10 +45,5 @@
 	<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>

flutter/lib/api/api_client.dart

@@ -5,16 +5,13 @@ 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/send_message_response.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';
 import 'package:simplecloudnotifier/state/application_log.dart';
 import 'package:simplecloudnotifier/state/globals.dart';
 import 'package:simplecloudnotifier/state/request_log.dart';
 import 'package:simplecloudnotifier/models/channel.dart';
-import 'package:simplecloudnotifier/models/scn_message.dart';
+import 'package:simplecloudnotifier/models/message.dart';
 import 'package:simplecloudnotifier/state/token_source.dart';
 import 'package:simplecloudnotifier/utils/toaster.dart';
 
@@ -29,53 +26,26 @@ enum ChannelSelector {
   final String apiKey;
 }
 
-class MessageFilter {
-  List<String>? channelIDs;
-  List<String>? searchFilter;
-  List<String>? plainSearchFilter;
-  List<String>? senderNames;
-  List<String>? usedKeys;
-  List<int>? priority;
-  DateTime? timeBefore;
-  DateTime? timeAfter;
-  bool? hasSenderName;
-  List<String>? senderUserID;
-
-  MessageFilter({
-    this.channelIDs,
-    this.searchFilter,
-    this.plainSearchFilter,
-    this.senderNames,
-    this.usedKeys,
-    this.priority,
-    this.timeBefore,
-    this.timeAfter,
-    this.senderUserID,
-  });
-}
-
 class APIClient {
-  static const String _base = 'https://simplecloudnotifier.de';
+  static const String _base = 'https://simplecloudnotifier.de/api/v2';
-  static const String _prefix = '/api/v2';
 
   static Future<T> _request<T>({
     required String name,
     required String method,
     required String relURL,
-    Map<String, Iterable<String>>? query,
+    Map<String, String>? query,
     required T Function(Map<String, dynamic> json)? fn,
     dynamic jsonBody,
     String? authToken,
     Map<String, String>? header,
-    bool? nonAPI,
   }) async {
     final t0 = DateTime.now();
 
-    final uri = Uri.parse('$_base${(nonAPI ?? false) ? '' : _prefix}/$relURL').replace(queryParameters: query ?? {});
+    final uri = Uri.parse('$_base/$relURL').replace(queryParameters: query ?? {});
 
     final req = http.Request(method, uri);
 
-    print('[REQUEST|RUN] [${method}] ${name} | ${uri.toString()}');
+    print('[REQUEST|RUN] [${method}] ${name}');
 
     if (jsonBody != null) {
       req.body = jsonEncode(jsonBody);
@@ -109,21 +79,19 @@ class APIClient {
     }
 
     if (responseStatusCode != 200) {
-      APIError apierr;
-
       try {
-        apierr = APIError.fromJson(jsonDecode(responseBody) as Map<String, dynamic>);
+        final apierr = APIError.fromJson(jsonDecode(responseBody) as Map<String, dynamic>);
+
+        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);
       } 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);
+      RequestLog.addRequestErrorStatuscode(name, t0, method, uri, req.body, req.headers, responseStatusCode, responseBody, responseHeaders);
-      Toaster.error("Error", apierr.message);
+      Toaster.error("Error", 'Request "${name}" failed');
-      throw APIException(responseStatusCode, apierr.error, apierr.errhighlight, apierr.message);
+      throw Exception('API request failed with status code ${responseStatusCode}');
     }
 
     try {
@@ -169,33 +137,6 @@ class APIClient {
     );
   }
 
-  static Future<User> updateUser(TokenSource auth, String uid, {String? username, String? proToken}) async {
-    return await _request(
-      name: 'updateUser',
-      method: 'PATCH',
-      relURL: 'users/$uid',
-      jsonBody: {
-        if (username != null) 'username': username,
-        if (proToken != null) 'pro_token': proToken,
-      },
-      fn: User.fromJson,
-      authToken: auth.getToken(),
-    );
-  }
-
-  static Future<User> deleteUser(TokenSource auth, String uid) async {
-    return await _request(
-      name: 'deleteUser',
-      method: 'DELETE',
-      relURL: 'users/$uid',
-      fn: User.fromJson,
-      authToken: auth.getToken(),
-      query: {
-        'confirm': ['true']
-      },
-    );
-  }
-
   static Future<Client> addClient(TokenSource auth, String fcmToken, String agentModel, String agentVersion, String? name, String clientType) async {
     return await _request(
       name: 'addClient',
@@ -213,16 +154,16 @@ class APIClient {
     );
   }
 
-  static Future<Client> updateClient(TokenSource auth, String clientID, {String? fcmToken, String? agentModel, String? name, String? agentVersion}) async {
+  static Future<Client> updateClient(TokenSource auth, String clientID, String fcmToken, String agentModel, String? name, String agentVersion) async {
     return await _request(
       name: 'updateClient',
       method: 'PUT',
       relURL: 'users/${auth.getUserID()}/clients/$clientID',
       jsonBody: {
-        if (fcmToken != null) 'fcm_token': fcmToken,
+        'fcm_token': fcmToken,
-        if (agentModel != null) 'agent_model': agentModel,
+        'agent_model': agentModel,
-        if (agentVersion != null) 'agent_version': agentVersion,
+        'agent_version': agentVersion,
-        if (name != null) 'name': name,
+        'name': name,
       },
       fn: Client.fromJson,
       authToken: auth.getToken(),
@@ -244,9 +185,7 @@ class APIClient {
       name: 'getChannelList',
       method: 'GET',
       relURL: 'users/${auth.getUserID()}/channels',
-      query: {
+      query: {'selector': sel.apiKey},
-        'selector': [sel.apiKey]
-      },
       fn: (json) => ChannelWithSubscription.fromJsonArray(json['channels'] as List<dynamic>),
       authToken: auth.getToken(),
     );
@@ -272,75 +211,28 @@ class APIClient {
     );
   }
 
-  static Future<ChannelWithSubscription> updateChannel(AppAuth auth, String cid, {String? displayName, String? descriptionName}) async {
+  static Future<(String, List<Message>)> getMessageList(TokenSource auth, String pageToken, {int? pageSize, List<String>? channelIDs}) async {
-    return await _request(
-      name: 'updateChannel',
-      method: 'PATCH',
-      relURL: 'users/${auth.getUserID()}/channels/${cid}',
-      jsonBody: {
-        if (displayName != null) 'display_name': displayName,
-        if (descriptionName != null) 'description_name': descriptionName,
-      },
-      fn: ChannelWithSubscription.fromJson,
-      authToken: auth.getToken(),
-    );
-  }
-
-  static Future<(String, List<SCNMessage>)> getMessageList(TokenSource auth, String pageToken, {int? pageSize, MessageFilter? filter, bool? includeNonSuscribed}) async {
     return await _request(
       name: 'getMessageList',
       method: 'GET',
       relURL: 'messages',
       query: {
-        'next_page_token': [pageToken],
+        'next_page_token': pageToken,
-        if (pageSize != null) 'page_size': [pageSize.toString()],
+        if (pageSize != null) 'page_size': pageSize.toString(),
-        if (filter?.searchFilter != null) 'search': filter!.searchFilter!,
+        if (channelIDs != null) 'channel_id': channelIDs.join(","),
-        if (filter?.plainSearchFilter != null) 'string_search': filter!.plainSearchFilter!,
-        if (filter?.channelIDs != null) 'channel_id': filter!.channelIDs!,
-        if (filter?.senderNames != null) 'sender': filter!.senderNames!,
-        if (filter?.hasSenderName != null) 'has_sender': [filter!.hasSenderName!.toString()],
-        if (filter?.timeBefore != null) 'before': [filter!.timeBefore!.toUtc().toIso8601String()],
-        if (filter?.timeAfter != null) 'after': [filter!.timeAfter!.toUtc().toIso8601String()],
-        if (filter?.priority != null) 'priority': filter!.priority!.map((p) => p.toString()).toList(),
-        if (filter?.usedKeys != null) 'used_key': filter!.usedKeys!,
-        if (filter?.senderUserID != null) 'sender_user_id': filter!.senderUserID!,
-        if (includeNonSuscribed ?? false) 'subscription_status': ['all'],
       },
-      fn: (json) => SCNMessage.fromPaginatedJsonArray(json, 'messages', 'next_page_token'),
+      fn: (json) => Message.fromPaginatedJsonArray(json, 'messages', 'next_page_token'),
       authToken: auth.getToken(),
     );
   }
 
-  static Future<SCNMessage> getMessage(TokenSource auth, String msgid) async {
+  static Future<Message> getMessage(TokenSource auth, String msgid) async {
     return await _request(
       name: 'getMessage',
       method: 'GET',
       relURL: 'messages/$msgid',
-      fn: SCNMessage.fromJson,
+      query: {},
-      authToken: auth.getToken(),
+      fn: Message.fromJson,
-    );
-  }
-
-  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<Subscription> getSubscription(TokenSource auth, String subscriptionID) async {
-    return await _request(
-      name: 'getSubscription',
-      method: 'GET',
-      relURL: 'users/${auth.getUserID()}/subscriptions/${subscriptionID}',
-      fn: Subscription.fromJson,
       authToken: auth.getToken(),
     );
   }
@@ -350,21 +242,6 @@ class APIClient {
       name: 'getSubscriptionList',
       method: 'GET',
       relURL: 'users/${auth.getUserID()}/subscriptions',
-      query: {
-        'direction': ['both'],
-        'confirmation': ['all'],
-        'external': ['all'],
-      },
-      fn: (json) => Subscription.fromJsonArray(json['subscriptions'] as List<dynamic>),
-      authToken: auth.getToken(),
-    );
-  }
-
-  static Future<List<Subscription>> getChannelSubscriptions(TokenSource auth, String cid) async {
-    return await _request(
-      name: 'getChannelSubscriptions',
-      method: 'GET',
-      relURL: 'users/${auth.getUserID()}/channels/${cid}/subscriptions',
       fn: (json) => Subscription.fromJsonArray(json['subscriptions'] as List<dynamic>),
       authToken: auth.getToken(),
     );
@@ -418,9 +295,9 @@ class APIClient {
     );
   }
 
-  static Future<KeyTokenPreview> getKeyTokenPreviewByID(TokenSource auth, String kid) async {
+  static Future<KeyTokenPreview> getKeyTokenPreview(TokenSource auth, String kid) async {
     return await _request(
-      name: 'getKeyTokenPreviewByID',
+      name: 'getKeyTokenPreview',
       method: 'GET',
       relURL: 'preview/keys/$kid',
       fn: KeyTokenPreview.fromJson,
@@ -428,16 +305,6 @@ class APIClient {
     );
   }
 
-  static Future<KeyTokenPreview> getKeyTokenPreviewByToken(TokenSource auth, String tok) async {
-    return await _request(
-      name: 'getKeyTokenPreviewByToken',
-      method: 'GET',
-      relURL: 'preview/keys/$tok',
-      fn: KeyTokenPreview.fromJson,
-      authToken: auth.getToken(),
-    );
-  }
-
   static Future<KeyToken> getKeyTokenByToken(String userid, String token) async {
     return await _request(
       name: 'getCurrentKeyToken',
@@ -447,156 +314,4 @@ class APIClient {
       authToken: token,
     );
   }
-
-  static Future<void> deleteKeyToken(AppAuth acc, String keytokenID) {
-    return _request(
-      name: 'deleteKeyToken',
-      method: 'DELETE',
-      relURL: 'users/${acc.getUserID()}/keys/${keytokenID}',
-      fn: (_) => null,
-      authToken: acc.getToken(),
-    );
-  }
-
-  static Future<KeyToken> updateKeyToken(TokenSource auth, String kid, {String? name, bool? allChannels, List<String>? channels, String? permissions}) async {
-    return await _request(
-      name: 'updateKeyToken',
-      method: 'PATCH',
-      relURL: 'users/${auth.getUserID()}/keys/${kid}',
-      jsonBody: {
-        if (name != null) 'name': name,
-        if (allChannels != null) 'all_channels': allChannels,
-        if (channels != null) 'channels': channels,
-        if (permissions != null) 'permissions': permissions,
-      },
-      fn: KeyToken.fromJson,
-      authToken: auth.getToken(),
-    );
-  }
-
-  static Future<KeyTokenWithToken> createKeyToken(TokenSource auth, String name, String perm, bool allChannels, {List<String>? channels}) async {
-    return await _request(
-      name: 'createKeyToken',
-      method: 'POST',
-      relURL: 'users/${auth.getUserID()}/keys',
-      jsonBody: {
-        'name': name,
-        'permissions': perm,
-        'all_channels': allChannels,
-        if (channels != null) 'channels': channels,
-      },
-      fn: KeyTokenWithToken.fromJson,
-      authToken: auth.getToken(),
-    );
-  }
-
-  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, {String? subscribeKey}) async {
-    return await _request(
-      name: 'subscribeToChannelbyID',
-      method: 'POST',
-      relURL: 'users/${auth.getUserID()}/subscriptions',
-      query: {
-        if (subscribeKey != null) 'chan_subscribe_key': [subscribeKey],
-      },
-      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(),
-    );
-  }
-
-  static Future<Subscription> activateSubscription(TokenSource auth, String channelID, String subID) async {
-    return await _request(
-      name: 'activateSubscription',
-      method: 'PATCH',
-      relURL: 'users/${auth.getUserID()}/subscriptions/${subID}',
-      jsonBody: {
-        'active': true,
-      },
-      fn: Subscription.fromJson,
-      authToken: auth.getToken(),
-    );
-  }
-
-  static Future<Subscription> deactivateSubscription(TokenSource auth, String channelID, String subID) async {
-    return await _request(
-      name: 'deactivateSubscription',
-      method: 'PATCH',
-      relURL: 'users/${auth.getUserID()}/subscriptions/${subID}',
-      jsonBody: {
-        'active': false,
-      },
-      fn: Subscription.fromJson,
-      authToken: auth.getToken(),
-    );
-  }
-
-  static Future<SendMessageResponse> sendMessage(String userid, String keytoken, String text, {String? channel, String? content, String? messageID, int? priority, String? senderName, DateTime? timestamp}) async {
-    return await _request(
-      name: 'sendMessage',
-      method: 'POST',
-      relURL: '/send',
-      nonAPI: true,
-      jsonBody: {
-        'user_id': userid,
-        'key': keytoken,
-        'title': text,
-        if (channel != null) 'channel': channel,
-        if (content != null) 'content': content,
-        if (priority != null) 'priority': priority,
-        if (messageID != null) 'msg_id': messageID,
-        if (timestamp != null) 'timestamp': (timestamp.microsecondsSinceEpoch / 1000).toInt(),
-        if (senderName != null) 'sender_name': senderName,
-      },
-      fn: SendMessageResponse.fromJson,
-      authToken: null,
-    );
-  }
 }

flutter/lib/api/api_exception.dart

@@ -1,7 +1,7 @@
 class APIException implements Exception {
   final int httpStatus;
   final int error;
-  final int errHighlight;
+  final String errHighlight;
   final String message;
 
   APIException(this.httpStatus, this.error, this.errHighlight, this.message);

flutter/lib/components/badge_display/badge_display.dart

@@ -1,51 +0,0 @@
-import 'package:flutter/material.dart';
-
-enum BadgeMode { error, warn, info }
-
-class BadgeDisplay extends StatelessWidget {
-  final String text;
-  final BadgeMode mode;
-  final IconData? icon;
-
-  const BadgeDisplay({
-    Key? key,
-    required this.text,
-    required this.mode,
-    required this.icon,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    var col = Colors.grey;
-    var colFG = Colors.black;
-
-    if (mode == BadgeMode.error) col = Colors.red;
-    if (mode == BadgeMode.warn) col = Colors.orange;
-    if (mode == BadgeMode.info) col = Colors.blue;
-
-    if (mode == BadgeMode.error) colFG = Colors.red[900]!;
-    if (mode == BadgeMode.warn) colFG = Colors.black;
-    if (mode == BadgeMode.info) colFG = Colors.black;
-
-    return Container(
-      padding: const EdgeInsets.fromLTRB(8, 2, 8, 2),
-      decoration: BoxDecoration(
-        color: col[100],
-        border: Border.all(color: col[300]!),
-        borderRadius: BorderRadius.circular(4.0),
-      ),
-      child: Row(
-        children: [
-          if (icon != null) Icon(icon!, color: colFG, size: 16.0),
-          Expanded(
-            child: Text(
-              text,
-              textAlign: TextAlign.center,
-              style: TextStyle(color: colFG, fontSize: 14.0),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

flutter/lib/components/bottom_fab/fab_with_icons.dart

@@ -0,0 +1,81 @@
+import 'package:flutter/material.dart';
+
+// https://stackoverflow.com/questions/46480221/flutter-floating-action-button-with-speed-dail
+
+class FabWithIcons extends StatefulWidget {
+  FabWithIcons({super.key, required this.icons, required this.onIconTapped});
+  final List<IconData> icons;
+  final ValueChanged<int> onIconTapped;
+
+  @override
+  State createState() => FabWithIconsState();
+}
+
+class FabWithIconsState extends State<FabWithIcons> with TickerProviderStateMixin {
+  late AnimationController _controller;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 250),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.center,
+      mainAxisSize: MainAxisSize.min,
+      children: List.generate(widget.icons.length, (int index) {
+        return _buildChild(index);
+      }).toList()
+        ..add(
+          _buildFab(),
+        ),
+    );
+  }
+
+  Widget _buildChild(int index) {
+    Color backgroundColor = Theme.of(context).cardColor;
+    Color foregroundColor = Theme.of(context).secondaryHeaderColor;
+    return Container(
+      height: 70.0,
+      width: 56.0,
+      alignment: FractionalOffset.topCenter,
+      child: ScaleTransition(
+        scale: CurvedAnimation(
+          parent: _controller,
+          curve: Interval(0.0, 1.0 - index / widget.icons.length / 2.0, curve: Curves.easeOut),
+        ),
+        child: FloatingActionButton(
+          backgroundColor: backgroundColor,
+          mini: true,
+          child: Icon(widget.icons[index], color: foregroundColor),
+          onPressed: () => _onTapped(index),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildFab() {
+    return FloatingActionButton(
+      onPressed: () {
+        if (_controller.isDismissed) {
+          _controller.forward();
+        } else {
+          _controller.reverse();
+        }
+      },
+      tooltip: 'Increment',
+      elevation: 2.0,
+      child: const Icon(Icons.add),
+    );
+  }
+
+  void _onTapped(int index) {
+    _controller.reverse();
+    widget.onIconTapped(index);
+  }
+}

flutter/lib/components/error_display/error_display.dart

@@ -1,38 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-
-class ErrorDisplay extends StatelessWidget {
-  final String errorMessage;
-
-  const ErrorDisplay({Key? key, required this.errorMessage}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Center(
-      child: Padding(
-        padding: const EdgeInsets.all(32.0),
-        child: Container(
-          constraints: const BoxConstraints(maxWidth: 300),
-          padding: const EdgeInsets.all(16.0),
-          decoration: BoxDecoration(
-            color: Colors.red[100],
-            border: Border.all(color: Colors.red[300]!),
-            borderRadius: BorderRadius.circular(12.0),
-          ),
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              Icon(FontAwesomeIcons.triangleExclamation, color: Colors.red, size: 48.0),
-              const SizedBox(height: 16.0),
-              Text(
-                errorMessage,
-                textAlign: TextAlign.center,
-                style: TextStyle(color: Colors.red[900], fontSize: 16.0),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}

flutter/lib/components/hidable_fab/hidable_fab.dart

@@ -3,20 +3,17 @@ import 'package:flutter/material.dart';
 class HidableFAB extends StatelessWidget {
   final VoidCallback? onPressed;
   final IconData icon;
-  final Object heroTag;
 
   const HidableFAB({
     super.key,
     this.onPressed,
     required this.icon,
-    required this.heroTag,
   });
 
   Widget build(BuildContext context) {
     return Visibility(
       visible: MediaQuery.viewInsetsOf(context).bottom == 0.0, // hide when keyboard is shown
       child: FloatingActionButton(
-        heroTag: this.heroTag,
         onPressed: onPressed,
         shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(17))),
         elevation: 2.0,

flutter/lib/components/layout/app_bar.dart

@@ -1,21 +1,18 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
-import 'package:simplecloudnotifier/components/layout/app_bar_filter_dialog.dart';
 import 'package:simplecloudnotifier/components/layout/app_bar_progress_indicator.dart';
 import 'package:simplecloudnotifier/pages/debug/debug_main.dart';
-import 'package:simplecloudnotifier/pages/message_list/message_filter_chiplet.dart';
-import 'package:simplecloudnotifier/state/app_settings.dart';
-import 'package:simplecloudnotifier/state/app_bar_state.dart';
-import 'package:simplecloudnotifier/state/app_events.dart';
 import 'package:simplecloudnotifier/state/app_theme.dart';
 import 'package:simplecloudnotifier/utils/navi.dart';
 
-class SCNAppBar extends StatefulWidget implements PreferredSizeWidget {
+class SCNAppBar extends StatelessWidget implements PreferredSizeWidget {
-  SCNAppBar({
+  const SCNAppBar({
     Key? key,
     required this.title,
     required this.showThemeSwitch,
+    required this.showDebug,
     required this.showSearch,
     required this.showShare,
     this.onShare = null,
@@ -23,33 +20,16 @@ class SCNAppBar extends StatefulWidget implements PreferredSizeWidget {
 
   final String? title;
   final bool showThemeSwitch;
+  final bool showDebug;
   final bool showSearch;
   final bool showShare;
   final void Function()? onShare;
 
-  @override
-  Size get preferredSize => const Size.fromHeight(kToolbarHeight);
-
-  @override
-  State<SCNAppBar> createState() => _SCNAppBarState();
-}
-
-class _SCNAppBarState extends State<SCNAppBar> {
-  final TextEditingController _ctrlSearchField = TextEditingController();
-
-  @override
-  void dispose() {
-    _ctrlSearchField.dispose();
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
-    final cfg = Provider.of<AppSettings>(context);
-
     var actions = <Widget>[];
 
-    if (cfg.showDebugButton) {
+    if (showDebug) {
       actions.add(IconButton(
         icon: const Icon(FontAwesomeIcons.solidSpiderBlackWidow),
         tooltip: 'Debug',
@@ -59,127 +39,63 @@ class _SCNAppBarState extends State<SCNAppBar> {
       ));
     }
 
-    if (widget.showThemeSwitch) {
+    if (showThemeSwitch) {
       actions.add(Consumer<AppTheme>(
         builder: (context, appTheme, child) => IconButton(
           icon: Icon(appTheme.darkMode ? FontAwesomeIcons.solidSun : FontAwesomeIcons.solidMoon),
           tooltip: appTheme.darkMode ? 'Light mode' : 'Dark mode',
-          onPressed: AppTheme().switchDarkMode,
+          onPressed: appTheme.switchDarkMode,
         ),
       ));
     } else {
-      actions.add(_buildSpacer());
+      actions.add(Visibility(
+        visible: false,
+        maintainSize: true,
+        maintainAnimation: true,
+        maintainState: true,
+        child: IconButton(
+          icon: const Icon(FontAwesomeIcons.square),
+          onPressed: () {/*TODO*/},
+        ),
+      ));
     }
 
-    if (widget.showSearch) {
+    if (showSearch) {
-      actions.add(IconButton(
-        icon: const Icon(FontAwesomeIcons.solidFilter),
-        tooltip: 'Filter',
-        onPressed: () => _showFilterDialog(context),
-      ));
       actions.add(IconButton(
         icon: const Icon(FontAwesomeIcons.solidMagnifyingGlass),
         tooltip: 'Search',
-        onPressed: () => AppBarState().setShowSearchField(true),
+        onPressed: () {/*TODO*/},
       ));
-    } else if (widget.showShare) {
+    } else if (showShare) {
-      actions.add(_buildSpacer());
       actions.add(IconButton(
         icon: const Icon(FontAwesomeIcons.solidShareNodes),
         tooltip: 'Share',
-        onPressed: widget.onShare ?? () {},
+        onPressed: onShare ?? () {},
       ));
     } else {
-      actions.add(_buildSpacer());
+      actions.add(Visibility(
-      actions.add(_buildSpacer());
+        visible: false,
+        maintainSize: true,
+        maintainAnimation: true,
+        maintainState: true,
+        child: IconButton(
+          icon: const Icon(FontAwesomeIcons.square),
+          onPressed: () {/*TODO*/},
+        ),
+      ));
     }
 
-    return Consumer<AppBarState>(builder: (context, value, child) {
+    return AppBar(
-      if (value.showSearchField) {
+      title: Text(title ?? 'Simple Cloud Notifier 2.0'),
-        return AppBar(
+      actions: actions,
-          leading: IconButton(
+      backgroundColor: Theme.of(context).secondaryHeaderColor,
-            icon: const Icon(FontAwesomeIcons.solidArrowLeft),
+      bottom: PreferredSize(
-            onPressed: () {
+        preferredSize: Size(double.infinity, 1.0),
-              value.setShowSearchField(false);
+        child: AppBarProgressIndicator(),
-            },
-          ),
-          title: _buildSearchTextField(context),
-          actions: [
-            IconButton(
-              icon: const Icon(FontAwesomeIcons.solidMagnifyingGlass),
-              onPressed: () {
-                value.setShowSearchField(false);
-                final chiplet = MessageFilterChiplet(label: _ctrlSearchField.text, value: _ctrlSearchField.text, type: MessageFilterChipletType.search);
-                AppEvents().notifyFilterListeners([MessageFilterChipletType.search], [chiplet]);
-                _ctrlSearchField.clear();
-              },
-            ),
-          ],
-          backgroundColor: Theme.of(context).secondaryHeaderColor,
-          bottom: PreferredSize(
-            preferredSize: Size(double.infinity, 1.0),
-            child: AppBarProgressIndicator(show: value.loadingIndeterminate),
-          ),
-        );
-      } else {
-        return AppBar(
-          title: Text(widget.title ?? 'SCN'),
-          actions: actions,
-          backgroundColor: Theme.of(context).secondaryHeaderColor,
-          bottom: PreferredSize(
-            preferredSize: Size(double.infinity, 1.0),
-            child: AppBarProgressIndicator(show: value.loadingIndeterminate),
-          ),
-        );
-      }
-    });
-  }
-
-  Visibility _buildSpacer() {
-    return Visibility(
-      visible: false,
-      maintainSize: true,
-      maintainAnimation: true,
-      maintainState: true,
-      child: IconButton(
-        icon: const Icon(FontAwesomeIcons.square),
-        onPressed: () {/* NO-OP */},
       ),
     );
   }
 
-  Widget _buildSearchTextField(BuildContext context) {
+  @override
-    return TextField(
+  Size get preferredSize => const Size.fromHeight(kToolbarHeight);
-      controller: _ctrlSearchField,
-      autofocus: true,
-      style: TextStyle(fontSize: 20),
-      textInputAction: TextInputAction.search,
-      decoration: InputDecoration(
-        hintText: 'Search',
-      ),
-      onSubmitted: (value) {
-        AppBarState().setShowSearchField(false);
-        final chiplet = MessageFilterChiplet(label: _ctrlSearchField.text, value: _ctrlSearchField.text, type: MessageFilterChipletType.search);
-        AppEvents().notifyFilterListeners([MessageFilterChipletType.search], [chiplet]);
-        _ctrlSearchField.clear();
-      },
-    );
-  }
-
-  void _showFilterDialog(BuildContext context) {
-    showDialog<void>(
-      context: context,
-      barrierDismissible: true,
-      barrierColor: Colors.transparent,
-      builder: (BuildContext context) {
-        return Dialog(
-          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0)),
-          alignment: Alignment.topCenter,
-          insetPadding: EdgeInsets.fromLTRB(0, this.widget.preferredSize.height, 0, 0),
-          backgroundColor: Colors.transparent,
-          child: AppBarFilterDialog(),
-        );
-      },
-    );
-  }
 }

flutter/lib/components/layout/app_bar_filter_dialog.dart

@@ -1,141 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:simplecloudnotifier/components/modals/filter_modal_channel.dart';
-import 'package:simplecloudnotifier/components/modals/filter_modal_keytoken.dart';
-import 'package:simplecloudnotifier/components/modals/filter_modal_priority.dart';
-import 'package:simplecloudnotifier/components/modals/filter_modal_searchplain.dart';
-import 'package:simplecloudnotifier/components/modals/filter_modal_sendername.dart';
-import 'package:simplecloudnotifier/pages/message_list/message_filter_chiplet.dart';
-import 'package:simplecloudnotifier/state/app_bar_state.dart';
-import 'package:simplecloudnotifier/state/app_events.dart';
-import 'package:simplecloudnotifier/state/app_settings.dart';
-import 'package:simplecloudnotifier/utils/navi.dart';
-
-class AppBarFilterDialog extends StatefulWidget {
-  @override
-  _AppBarFilterDialogState createState() => _AppBarFilterDialogState();
-}
-
-class _AppBarFilterDialogState extends State<AppBarFilterDialog> {
-  double _height = 0;
-
-  static const int _itemCount = 7;
-
-  static const double _targetHeight = 4 + (48 * _itemCount) + (16 * (_itemCount - 1)) + 4;
-
-  @override
-  void initState() {
-    super.initState();
-    Future.delayed(Duration.zero, () {
-      setState(() {
-        _height = _targetHeight;
-      });
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    double vpWidth = MediaQuery.sizeOf(context).width;
-
-    return Container(
-      margin: const EdgeInsets.all(0),
-      width: vpWidth,
-      color: Colors.transparent,
-      child: Column(
-        children: [
-          Container(
-            color: Theme.of(context).secondaryHeaderColor,
-            child: AnimatedContainer(
-              duration: Duration(milliseconds: 350),
-              curve: Curves.easeInCubic,
-              height: _height,
-              child: ClipRect(
-                child: OverflowBox(
-                  alignment: Alignment.topCenter,
-                  maxWidth: vpWidth,
-                  minWidth: vpWidth,
-                  minHeight: 0,
-                  maxHeight: _targetHeight,
-                  child: Column(
-                    children: [
-                      SizedBox(height: 4),
-                      _buildFilterItem(context, FontAwesomeIcons.magnifyingGlass, 'Search', _showSearch),
-                      Divider(),
-                      _buildFilterItem(context, FontAwesomeIcons.snake, 'Channel', _showChannelModal),
-                      Divider(),
-                      _buildFilterItem(context, FontAwesomeIcons.signature, 'Sender', _showSenderModal),
-                      Divider(),
-                      _buildFilterItem(context, FontAwesomeIcons.timer, 'Time', _showTimeModal),
-                      Divider(),
-                      _buildFilterItem(context, FontAwesomeIcons.bolt, 'Priority', _showPriorityModal),
-                      Divider(),
-                      _buildFilterItem(context, FontAwesomeIcons.gearCode, 'Key', _showKeytokenModal),
-                      Divider(),
-                      _buildFilterItem(context, FontAwesomeIcons.magnifyingGlassPlus, 'Search (Plain)', _showPlainSearchModal),
-                      SizedBox(height: 4),
-                    ],
-                  ),
-                ),
-              ),
-            ),
-          ),
-          Expanded(child: GestureDetector(child: Container(width: vpWidth, color: Color(0x88000000)), onTap: () => Navi.popDialog(context))),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildFilterItem(BuildContext context, IconData icon, String label, void Function(BuildContext context) action) {
-    return ListTile(
-      visualDensity: VisualDensity.compact,
-      title: Text(label),
-      leading: Icon(icon),
-      onTap: () {
-        Navi.popDialog(context);
-        action(context);
-      },
-    );
-  }
-
-  void _showSearch(BuildContext context) {
-    AppBarState().setShowSearchField(true);
-  }
-
-  void _showPriorityModal(BuildContext context) {
-    showDialog<void>(context: context, builder: (BuildContext context) => FilterModalPriority());
-  }
-
-  void _showChannelModal(BuildContext context) {
-    showDialog<void>(context: context, builder: (BuildContext context) => FilterModalChannel());
-  }
-
-  void _showSenderModal(BuildContext context) {
-    showDialog<void>(context: context, builder: (BuildContext context) => FilterModalSendername());
-  }
-
-  void _showKeytokenModal(BuildContext context) {
-    showDialog<void>(context: context, builder: (BuildContext context) => FilterModalKeytoken());
-  }
-
-  void _showTimeModal(BuildContext context) {
-    final dateFormat = AppSettings().dateFormat.dateOnlyFormat();
-
-    final now = DateTime.now();
-    showDateRangePicker(context: context, firstDate: DateTime(2000), lastDate: DateTime(now.year, now.month, now.day + 7)).then((value) {
-      if (value != null) {
-        List<MessageFilterChiplet> chiplets = [];
-        chiplets.add(MessageFilterChiplet(
-          label: dateFormat.format(value.start) + ' - ' + dateFormat.format(value.end),
-          value: value,
-          type: MessageFilterChipletType.timeRange,
-        ));
-
-        AppEvents().notifyFilterListeners([MessageFilterChipletType.plainSearch], chiplets);
-      }
-    });
-  }
-
-  void _showPlainSearchModal(BuildContext context) {
-    showDialog<void>(context: context, builder: (BuildContext context) => FilterModalSearchPlain());
-  }
-}

flutter/lib/components/layout/app_bar_progress_indicator.dart

@@ -1,19 +1,21 @@
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:simplecloudnotifier/state/app_bar_state.dart';
 
 class AppBarProgressIndicator extends StatelessWidget implements PreferredSizeWidget {
-  AppBarProgressIndicator({required this.show});
-
-  final bool show;
-
   @override
   Size get preferredSize => Size(double.infinity, 1.0);
 
   @override
   Widget build(BuildContext context) {
-    if (show) {
+    return Consumer<AppBarState>(
-      return LinearProgressIndicator(value: null);
+      builder: (context, value, child) {
-    } else {
+        if (value.loadingIndeterminate) {
-      return SizedBox.square(dimension: 4); // 4 height is the same as the LinearProgressIndicator
+          return LinearProgressIndicator(value: null);
-    }
+        } else {
+          return SizedBox.square(dimension: 4); // 4 height is the same as the LinearProgressIndicator
+        }
+      },
+    );
   }
 }

flutter/lib/components/layout/scaffold.dart

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

flutter/lib/components/modals/filter_modal_channel.dart

@@ -1,109 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:simplecloudnotifier/api/api_client.dart';
-import 'package:simplecloudnotifier/components/error_display/error_display.dart';
-import 'package:simplecloudnotifier/models/channel.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';
-import 'package:simplecloudnotifier/utils/navi.dart';
-
-class FilterModalChannel extends StatefulWidget {
-  @override
-  _FilterModalChannelState createState() => _FilterModalChannelState();
-}
-
-class _FilterModalChannelState extends State<FilterModalChannel> {
-  Set<String> _selectedEntries = {};
-
-  ImmediateFuture<List<Channel>> _futureChannels = ImmediateFuture.ofPending();
-
-  @override
-  void initState() {
-    super.initState();
-
-    _futureChannels = ImmediateFuture.ofFuture(() async {
-      final userAcc = Provider.of<AppAuth>(context, listen: false);
-      if (!userAcc.isAuth()) throw new Exception('not logged in');
-
-      final channels = await APIClient.getChannelList(userAcc, ChannelSelector.all);
-
-      return channels.where((p) => p.subscription?.confirmed ?? false).map((e) => e.channel).toList(); // return only subscribed channels
-    }());
-  }
-
-  void toggleEntry(String channelID) {
-    setState(() {
-      if (_selectedEntries.contains(channelID)) {
-        _selectedEntries.remove(channelID);
-      } else {
-        _selectedEntries.add(channelID);
-      }
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: const Text('Channels'),
-      content: Container(
-        width: 9000,
-        height: 9000,
-        child: FutureBuilder(
-          future: _futureChannels.future,
-          builder: ((context, snapshot) {
-            if (_futureChannels.value != null) {
-              return _buildList(context, _futureChannels.value!);
-            } else if (snapshot.connectionState == ConnectionState.waiting) {
-              return Center(child: CircularProgressIndicator());
-            } else if (snapshot.connectionState == ConnectionState.done && snapshot.hasError) {
-              return ErrorDisplay(errorMessage: '${snapshot.error}');
-            } else if (snapshot.connectionState == ConnectionState.done && snapshot.hasData) {
-              return _buildList(context, snapshot.data!);
-            } else {
-              return ErrorDisplay(errorMessage: 'Invalid future state');
-            }
-          }),
-        ),
-      ),
-      actions: <Widget>[
-        TextButton(
-          style: TextButton.styleFrom(textStyle: Theme.of(context).textTheme.labelLarge),
-          child: const Text('Apply'),
-          onPressed: _onOkay,
-        ),
-      ],
-    );
-  }
-
-  void _onOkay() {
-    Navi.popDialog(context);
-
-    final chiplets = _selectedEntries
-        .map((e) => MessageFilterChiplet(
-              label: _futureChannels.get()?.map((e) => e as Channel?).firstWhere((p) => p?.channelID == e, orElse: () => null)?.displayName ?? '???',
-              value: e,
-              type: MessageFilterChipletType.channel,
-            ))
-        .toList();
-
-    AppEvents().notifyFilterListeners([MessageFilterChipletType.channel], chiplets);
-  }
-
-  Widget _buildList(BuildContext context, List<Channel> list) {
-    return ListView.builder(
-      shrinkWrap: true,
-      itemBuilder: (builder, index) {
-        final channel = list[index];
-        return ListTile(
-          title: Text(channel.displayName),
-          leading: Icon(_selectedEntries.contains(channel.channelID) ? Icons.check_box : Icons.check_box_outline_blank, color: Theme.of(context).primaryColor),
-          onTap: () => toggleEntry(channel.channelID),
-          visualDensity: VisualDensity(vertical: -4),
-        );
-      },
-      itemCount: list.length,
-    );
-  }
-}

flutter/lib/components/modals/filter_modal_keytoken.dart

@@ -1,111 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:simplecloudnotifier/api/api_client.dart';
-import 'package:simplecloudnotifier/components/error_display/error_display.dart';
-import 'package:simplecloudnotifier/models/keytoken.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';
-import 'package:simplecloudnotifier/utils/navi.dart';
-
-class FilterModalKeytoken extends StatefulWidget {
-  @override
-  _FilterModalKeytokenState createState() => _FilterModalKeytokenState();
-}
-
-class _FilterModalKeytokenState extends State<FilterModalKeytoken> {
-  Set<String> _selectedEntries = {};
-
-  ImmediateFuture<List<KeyToken>> _futureKeyTokens = ImmediateFuture.ofPending();
-
-  @override
-  void initState() {
-    super.initState();
-
-    _futureKeyTokens = ImmediateFuture.ofFuture(() async {
-      final userAcc = Provider.of<AppAuth>(context, listen: false);
-      if (!userAcc.isAuth()) throw new Exception('not logged in');
-
-      final toks = await APIClient.getKeyTokenList(userAcc);
-
-      return toks;
-    }());
-  }
-
-  void toggleEntry(String senderID) {
-    setState(() {
-      if (_selectedEntries.contains(senderID)) {
-        _selectedEntries.remove(senderID);
-      } else {
-        _selectedEntries.add(senderID);
-      }
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: const Text('Senders'),
-      content: Container(
-        width: 9000,
-        height: 9000,
-        child: FutureBuilder(
-          future: _futureKeyTokens.future,
-          builder: ((context, snapshot) {
-            if (_futureKeyTokens.value != null) {
-              return _buildList(context, _futureKeyTokens.value!);
-            } else if (snapshot.connectionState == ConnectionState.waiting) {
-              return Center(child: CircularProgressIndicator());
-            } else if (snapshot.connectionState == ConnectionState.done && snapshot.hasError) {
-              return ErrorDisplay(errorMessage: '${snapshot.error}');
-            } else if (snapshot.connectionState == ConnectionState.done && snapshot.hasData) {
-              return _buildList(context, snapshot.data!);
-            } else {
-              return ErrorDisplay(errorMessage: 'Invalid future state');
-            }
-          }),
-        ),
-      ),
-      actions: <Widget>[
-        TextButton(
-          style: TextButton.styleFrom(textStyle: Theme.of(context).textTheme.labelLarge),
-          child: const Text('Apply'),
-          onPressed: () {
-            onOkay();
-          },
-        ),
-      ],
-    );
-  }
-
-  void onOkay() {
-    Navi.popDialog(context);
-
-    final chiplets = _selectedEntries
-        .map((e) => MessageFilterChiplet(
-              label: _futureKeyTokens.get()?.map((e) => e as KeyToken?).firstWhere((p) => p?.keytokenID == e, orElse: () => null)?.name ?? '???',
-              value: e,
-              type: MessageFilterChipletType.sender,
-            ))
-        .toList();
-
-    AppEvents().notifyFilterListeners([MessageFilterChipletType.sender], chiplets);
-  }
-
-  Widget _buildList(BuildContext context, List<KeyToken> list) {
-    return ListView.builder(
-      shrinkWrap: true,
-      itemBuilder: (builder, index) {
-        final sender = list[index];
-        return ListTile(
-          title: Text(sender.name),
-          leading: Icon(_selectedEntries.contains(sender.keytokenID) ? Icons.check_box : Icons.check_box_outline_blank, color: Theme.of(context).primaryColor),
-          onTap: () => toggleEntry(sender.keytokenID),
-          visualDensity: VisualDensity(vertical: -4),
-        );
-      },
-      itemCount: list.length,
-    );
-  }
-}

flutter/lib/components/modals/filter_modal_priority.dart

@@ -1,68 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:simplecloudnotifier/pages/message_list/message_filter_chiplet.dart';
-import 'package:simplecloudnotifier/state/app_events.dart';
-import 'package:simplecloudnotifier/utils/navi.dart';
-
-class FilterModalPriority extends StatefulWidget {
-  @override
-  _FilterModalPriorityState createState() => _FilterModalPriorityState();
-}
-
-class _FilterModalPriorityState extends State<FilterModalPriority> {
-  Set<int> _selectedEntries = {};
-
-  Map<int, (String, String)> _texts = {
-    0: ('Low (0)', 'Low'),
-    1: ('Normal (1)', 'Normal'),
-    2: ('High (2)', 'High'),
-  };
-
-  void toggleEntry(int entry) {
-    setState(() {
-      if (_selectedEntries.contains(entry)) {
-        _selectedEntries.remove(entry);
-      } else {
-        _selectedEntries.add(entry);
-      }
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: const Text('Priority'),
-      content: Container(
-        width: 0,
-        height: 200,
-        child: ListView.builder(
-          shrinkWrap: true,
-          itemBuilder: (builder, index) {
-            return ListTile(
-              title: Text(_texts[index]?.$1 ?? '???'),
-              leading: Icon(_selectedEntries.contains(index) ? Icons.check_box : Icons.check_box_outline_blank, color: Theme.of(context).primaryColor),
-              onTap: () => toggleEntry(index),
-            );
-          },
-          itemCount: 3,
-        ),
-      ),
-      actions: <Widget>[
-        TextButton(
-          style: TextButton.styleFrom(textStyle: Theme.of(context).textTheme.labelLarge),
-          child: const Text('Apply'),
-          onPressed: () {
-            onOkay();
-          },
-        ),
-      ],
-    );
-  }
-
-  void onOkay() {
-    Navi.popDialog(context);
-
-    final chiplets = _selectedEntries.map((e) => MessageFilterChiplet(label: _texts[e]?.$2 ?? '???', value: e, type: MessageFilterChipletType.priority)).toList();
-
-    AppEvents().notifyFilterListeners([MessageFilterChipletType.priority], chiplets);
-  }
-}

flutter/lib/components/modals/filter_modal_searchplain.dart

@@ -1,61 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:simplecloudnotifier/pages/message_list/message_filter_chiplet.dart';
-import 'package:simplecloudnotifier/state/app_events.dart';
-import 'package:simplecloudnotifier/utils/navi.dart';
-
-class FilterModalSearchPlain extends StatefulWidget {
-  @override
-  _FilterModalSearchPlainState createState() => _FilterModalSearchPlainState();
-}
-
-class _FilterModalSearchPlainState extends State<FilterModalSearchPlain> {
-  final _controller = TextEditingController();
-
-  @override
-  void initState() {
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    _controller.dispose();
-
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: const Text('Search'),
-      content: Container(
-        child: TextField(
-          autofocus: true,
-          controller: _controller,
-          decoration: InputDecoration(hintText: "Search..."),
-        ),
-      ),
-      actions: <Widget>[
-        TextButton(
-          style: TextButton.styleFrom(textStyle: Theme.of(context).textTheme.labelLarge),
-          child: const Text('Apply'),
-          onPressed: _onOkay,
-        ),
-      ],
-    );
-  }
-
-  void _onOkay() {
-    Navi.popDialog(context);
-
-    List<MessageFilterChiplet> chiplets = [];
-    if (_controller.text.isNotEmpty) {
-      chiplets.add(MessageFilterChiplet(
-        label: _controller.text,
-        value: _controller.text,
-        type: MessageFilterChipletType.plainSearch,
-      ));
-    }
-
-    AppEvents().notifyFilterListeners([MessageFilterChipletType.plainSearch], chiplets);
-  }
-}

flutter/lib/components/modals/filter_modal_sendername.dart

@@ -1,107 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:simplecloudnotifier/api/api_client.dart';
-import 'package:simplecloudnotifier/components/error_display/error_display.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 FilterModalSendername extends StatefulWidget {
-  @override
-  _FilterModalSendernameState createState() => _FilterModalSendernameState();
-}
-
-class _FilterModalSendernameState extends State<FilterModalSendername> {
-  Set<String> _selectedEntries = {};
-
-  ImmediateFuture<List<String>> _futureSenders = ImmediateFuture.ofPending();
-
-  @override
-  void initState() {
-    super.initState();
-
-    _futureSenders = ImmediateFuture.ofFuture(() async {
-      final userAcc = Provider.of<AppAuth>(context, listen: false);
-      if (!userAcc.isAuth()) throw new Exception('not logged in');
-
-      final senders = (await APIClient.getSenderNameList(userAcc)).map((p) => p.name).toList();
-
-      return senders;
-    }());
-  }
-
-  void toggleEntry(String senderID) {
-    setState(() {
-      if (_selectedEntries.contains(senderID)) {
-        _selectedEntries.remove(senderID);
-      } else {
-        _selectedEntries.add(senderID);
-      }
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: const Text('Senders'),
-      content: Container(
-        width: 9000,
-        height: 9000,
-        child: FutureBuilder(
-          future: _futureSenders.future,
-          builder: ((context, snapshot) {
-            if (_futureSenders.value != null) {
-              return _buildList(context, _futureSenders.value!);
-            } else if (snapshot.connectionState == ConnectionState.waiting) {
-              return Center(child: CircularProgressIndicator());
-            } else if (snapshot.connectionState == ConnectionState.done && snapshot.hasError) {
-              return ErrorDisplay(errorMessage: '${snapshot.error}');
-            } else if (snapshot.connectionState == ConnectionState.done && snapshot.hasData) {
-              return _buildList(context, snapshot.data!);
-            } else {
-              return ErrorDisplay(errorMessage: 'Invalid future state');
-            }
-          }),
-        ),
-      ),
-      actions: <Widget>[
-        TextButton(
-          style: TextButton.styleFrom(textStyle: Theme.of(context).textTheme.labelLarge),
-          child: const Text('Apply'),
-          onPressed: _onOkay,
-        ),
-      ],
-    );
-  }
-
-  void _onOkay() {
-    Navigator.of(context).pop();
-
-    final chiplets = _selectedEntries
-        .map((e) => MessageFilterChiplet(
-              label: e,
-              value: e,
-              type: MessageFilterChipletType.sender,
-            ))
-        .toList();
-
-    AppEvents().notifyFilterListeners([MessageFilterChipletType.sender], chiplets);
-  }
-
-  Widget _buildList(BuildContext context, List<String> list) {
-    return ListView.builder(
-      shrinkWrap: true,
-      itemBuilder: (builder, index) {
-        final sender = list[index];
-        return ListTile(
-          title: Text(sender),
-          leading: Icon(_selectedEntries.contains(sender) ? Icons.check_box : Icons.check_box_outline_blank, color: Theme.of(context).primaryColor),
-          onTap: () => toggleEntry(sender),
-          visualDensity: VisualDensity(vertical: -4),
-        );
-      },
-      itemCount: list.length,
-    );
-  }
-}

flutter/lib/main.dart

@@ -1,19 +1,20 @@
-import 'dart:async';
 import 'dart:io';
 
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_local_notifications/flutter_local_notifications.dart';
-import 'package:in_app_purchase/in_app_purchase.dart';
 import 'package:provider/provider.dart';
-import 'package:simplecloudnotifier/main_messaging.dart';
+import 'package:hive_flutter/hive_flutter.dart';
-import 'package:simplecloudnotifier/main_utils.dart';
+import 'package:simplecloudnotifier/api/api_client.dart';
-import 'package:simplecloudnotifier/components/layout/nav_layout.dart';
+import 'package:simplecloudnotifier/models/channel.dart';
-import 'package:simplecloudnotifier/state/app_settings.dart';
+import 'package:simplecloudnotifier/models/client.dart';
+import 'package:simplecloudnotifier/models/message.dart';
+import 'package:simplecloudnotifier/nav_layout.dart';
 import 'package:simplecloudnotifier/state/app_bar_state.dart';
 import 'package:simplecloudnotifier/state/app_theme.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/request_log.dart';
 import 'package:simplecloudnotifier/state/app_auth.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:simplecloudnotifier/utils/navi.dart';
@@ -28,37 +29,89 @@ void main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
   print('[INIT] Init Globals...');
+
   await Globals().init();
 
   print('[INIT] Init Hive...');
-  await initHive();
 
-  print('[INIT] Register Hive-Adapters');
+  await Hive.initFlutter();
-  await registerHiveAdapter();
 
-  print('[INIT] Open Hive-Boxes');
+  Hive.registerAdapter(SCNRequestAdapter());
-  await openHiveBoxes(true);
+  Hive.registerAdapter(SCNLogAdapter());
+  Hive.registerAdapter(SCNLogLevelAdapter());
+  Hive.registerAdapter(MessageAdapter());
+  Hive.registerAdapter(ChannelAdapter());
+  Hive.registerAdapter(FBMessageAdapter());
+
+  print('[INIT] Load Hive<scn-requests>...');
+
+  try {
+    await Hive.openBox<SCNRequest>('scn-requests');
+  } catch (exc, trace) {
+    Hive.deleteBoxFromDisk('scn-requests');
+    await Hive.openBox<SCNRequest>('scn-requests');
+    ApplicationLog.error('Failed to open Hive-Box: scn-requests: ' + exc.toString(), trace: trace);
+  }
+
+  print('[INIT] Load Hive<scn-logs>...');
+
+  try {
+    await Hive.openBox<SCNLog>('scn-logs');
+  } catch (exc, trace) {
+    Hive.deleteBoxFromDisk('scn-logs');
+    await Hive.openBox<SCNLog>('scn-logs');
+    ApplicationLog.error('Failed to open Hive-Box: scn-logs: ' + exc.toString(), trace: trace);
+  }
+
+  print('[INIT] Load Hive<scn-message-cache>...');
+
+  try {
+    await Hive.openBox<Message>('scn-message-cache');
+  } catch (exc, trace) {
+    Hive.deleteBoxFromDisk('scn-message-cache');
+    await Hive.openBox<Message>('scn-message-cache');
+    ApplicationLog.error('Failed to open Hive-Box: scn-message-cache' + exc.toString(), trace: trace);
+  }
+
+  print('[INIT] Load Hive<scn-channel-cache>...');
+
+  try {
+    await Hive.openBox<Channel>('scn-channel-cache');
+  } catch (exc, trace) {
+    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);
+  }
+
+  print('[INIT] Load Hive<scn-fb-messages>...');
+
+  try {
+    await Hive.openBox<FBMessage>('scn-fb-messages');
+  } catch (exc, trace) {
+    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);
+  }
 
   print('[INIT] Load AppAuth...');
 
   final appAuth = AppAuth(); // ensure UserAccount is loaded
 
   if (appAuth.isAuth()) {
-    // load user+client in background
+    try {
-    () async {
+      print('[INIT] Load User...');
-      try {
+      await appAuth.loadUser();
-        await appAuth.loadUser();
+      //TODO fallback to cached user (perhaps event use cached client (if exists) directly and only update/load in background)
-      } catch (exc, trace) {
+    } catch (exc, trace) {
-        ApplicationLog.error('Failed to load user (background load on startup): ' + exc.toString(), trace: trace);
+      ApplicationLog.error('Failed to load user (on startup): ' + exc.toString(), trace: trace);
-        ApplicationLog.writeRawFailure('Failed to load user (background load on startup)', {'error': exc.toString(), 'trace': trace});
+    }
-      }
+    try {
-      try {
+      print('[INIT] Load Client...');
-        await appAuth.loadClient();
+      await appAuth.loadClient();
-      } catch (exc, trace) {
+      //TODO fallback to cached client (perhaps event use cached client (if exists) directly and only update/load in background)
-        ApplicationLog.error('Failed to load user (background load on startup): ' + exc.toString(), trace: trace);
+    } catch (exc, trace) {
-        ApplicationLog.writeRawFailure('Failed to load user (background load on startup)', {'error': exc.toString(), 'trace': trace});
+      ApplicationLog.error('Failed to load user (on startup): ' + exc.toString(), trace: trace);
-      }
+    }
-    }();
   }
 
   if (!Platform.isLinux) {
@@ -88,133 +141,44 @@ void main() async {
       ApplicationLog.error('Failed to get+set firebase token: ' + exc.toString(), trace: trace);
     }
 
-    FirebaseMessaging.onBackgroundMessage(onBackgroundMessage);
+    FirebaseMessaging.onBackgroundMessage(_onBackgroundMessage);
-    FirebaseMessaging.onMessage.listen(onForegroundMessage);
+    FirebaseMessaging.onMessage.listen(_onForegroundMessage);
   } else {
     print('[INIT] Skip Firebase init (Platform == Linux)...');
   }
 
-  await appAuth.tryMigrateFromV1();
-
-  print('[INIT] Load Notifications...');
-
-  final flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
-  final flutterLocalNotificationsPluginImpl = flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation<AndroidFlutterLocalNotificationsPlugin>();
-  if (flutterLocalNotificationsPluginImpl == null) {
-    ApplicationLog.error('Failed to get AndroidFlutterLocalNotificationsPlugin', trace: StackTrace.current);
-  } else {
-    flutterLocalNotificationsPluginImpl.requestNotificationsPermission();
-
-    final initializationSettingsAndroid = AndroidInitializationSettings('ic_notification_white');
-    final initializationSettingsDarwin = DarwinInitializationSettings(
-      requestAlertPermission: true,
-      requestBadgePermission: true,
-      requestSoundPermission: true,
-      onDidReceiveLocalNotification: receiveLocalDarwinNotification,
-      notificationCategories: getDarwinNotificationCategories(),
-    );
-    final initializationSettingsLinux = LinuxInitializationSettings(defaultActionName: 'Open notification');
-    final initializationSettings = InitializationSettings(
-      android: initializationSettingsAndroid,
-      iOS: initializationSettingsDarwin,
-      linux: initializationSettingsLinux,
-    );
-    flutterLocalNotificationsPlugin.initialize(
-      initializationSettings,
-      onDidReceiveNotificationResponse: receiveLocalNotification,
-      onDidReceiveBackgroundNotificationResponse: notificationTapBackground,
-    );
-
-    final appLaunchNotification = await flutterLocalNotificationsPlugin.getNotificationAppLaunchDetails();
-    if (appLaunchNotification != null) {
-      // Use has launched SCN by clicking on a local notifiaction, if it was a summary or message notifiaction open the corresponding screen
-      // This is android only
-      //TODO same on iOS, somehow??
-      ApplicationLog.info('App launched by notification: ${appLaunchNotification.notificationResponse?.id}');
-
-      handleNotificationClickAction(appLaunchNotification.notificationResponse?.payload, Duration(milliseconds: 600));
-    }
-  }
-
   ApplicationLog.debug('[INIT] Application started');
 
-  Globals().appWidgetInitialized = true;
-
   runApp(
     MultiProvider(
       providers: [
         ChangeNotifierProvider(create: (context) => AppAuth(), lazy: false),
         ChangeNotifierProvider(create: (context) => AppTheme(), lazy: false),
         ChangeNotifierProvider(create: (context) => AppBarState(), lazy: false),
-        ChangeNotifierProvider(create: (context) => AppSettings(), lazy: false),
       ],
       child: SCNApp(),
     ),
   );
 }
 
-class SCNApp extends StatefulWidget {
+class SCNApp extends StatelessWidget {
   SCNApp({super.key});
 
-  static var materialKey = GlobalKey<NavigatorState>();
-
-  @override
-  State<SCNApp> createState() => _SCNAppState();
-}
-
-class _SCNAppState extends State<SCNApp> {
-  StreamSubscription<List<PurchaseDetails>>? _purchaseSubscription;
-
-  @override
-  void initState() {
-    if (Globals().clientType == 'IOS' || Globals().clientType == 'ANDROID') {
-      _purchaseSubscription = InAppPurchase.instance.purchaseStream.listen(
-        purchaseUpdated,
-        onDone: () => _purchaseSubscription?.cancel(),
-        onError: purchaseError,
-      );
-    }
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    _purchaseSubscription?.cancel();
-    _purchaseSubscription = null;
-    super.dispose();
-  }
-
-  void purchaseUpdated(List<PurchaseDetails> purchaseDetailsList) {
-    // see https://pub.dev/packages/in_app_purchase
-
-    for (var purchaseDetails in purchaseDetailsList) {
-      ApplicationLog.debug('Purchase ${purchaseDetails.productID} is ${purchaseDetails.status.toString()}'); //TODO
-    }
-  }
-
-  void purchaseError(dynamic error) {
-    // TODO handle error here.
-    ApplicationLog.error('Purchase error: ${error.toString()}', trace: StackTrace.current);
-  }
-
   @override
   Widget build(BuildContext context) {
     return ToastificationWrapper(
       config: ToastificationConfig(
         itemWidth: 440,
-        marginBuilder: (context, alignment) => EdgeInsets.symmetric(vertical: 64),
+        marginBuilder: (alignment) => EdgeInsets.symmetric(vertical: 64),
         animationDuration: Duration(milliseconds: 200),
       ),
       child: Consumer<AppTheme>(
         builder: (context, appTheme, child) => MaterialApp(
-          navigatorKey: SCNApp.materialKey,
           title: 'SimpleCloudNotifier',
           navigatorObservers: [Navi.routeObserver, Navi.modalRouteObserver],
           theme: ThemeData(
-            colorScheme: ColorScheme.fromSeed(
+            //TODO color settings
-              seedColor: appTheme.color.value,
+            colorScheme: ColorScheme.fromSeed(seedColor: Colors.blue, brightness: appTheme.darkMode ? Brightness.dark : Brightness.light),
-              brightness: appTheme.darkMode ? Brightness.dark : Brightness.light,
-            ),
             useMaterial3: true,
           ),
           home: SCNNavLayout(),
@@ -223,3 +187,55 @@ class _SCNAppState extends State<SCNApp> {
     );
   }
 }
+
+void setFirebaseToken(String fcmToken) async {
+  final acc = AppAuth();
+
+  final oldToken = Globals().getPrefFCMToken();
+
+  await Globals().setPrefFCMToken(fcmToken);
+
+  ApplicationLog.info('New firebase token received', additional: 'Token: $fcmToken (old: $oldToken)');
+
+  if (!acc.isAuth()) return;
+
+  Client? client;
+  try {
+    client = await acc.loadClient(forceIfOlder: Duration(seconds: 60));
+  } catch (exc, trace) {
+    ApplicationLog.error('Failed to get client: ' + exc.toString(), trace: trace);
+    return;
+  }
+
+  if (oldToken != null && oldToken == fcmToken && client != null && client.fcmToken == fcmToken) {
+    ApplicationLog.info('Firebase token unchanged - do nothing', additional: 'Token: $fcmToken');
+    return;
+  }
+
+  if (client == null) {
+    // should not really happen - perhaps someone externally deleted the client?
+    final newClient = await APIClient.addClient(acc, fcmToken, Globals().deviceModel, Globals().version, Globals().hostname, Globals().clientType);
+    acc.setClientAndClientID(newClient);
+    await acc.save();
+  } else {
+    final newClient = await APIClient.updateClient(acc, client.clientID, fcmToken, Globals().deviceModel, Globals().hostname, Globals().version);
+    acc.setClientAndClientID(newClient);
+    await acc.save();
+  }
+}
+
+Future<void> _onBackgroundMessage(RemoteMessage message) async {
+  await _receiveMessage(message, false);
+}
+
+void _onForegroundMessage(RemoteMessage message) {
+  _receiveMessage(message, true);
+}
+
+Future<void> _receiveMessage(RemoteMessage message, bool foreground) async {
+  // ensure init
+  Hive.openBox<SCNLog>('scn-logs');
+
+  ApplicationLog.info('Received FB message (${foreground ? 'foreground' : 'background'}): ${message.messageId ?? 'NULL'}');
+  FBMessageLog.insert(message);
+}

flutter/lib/main_messaging.dart

@@ -1,152 +0,0 @@
-import 'package:firebase_messaging/firebase_messaging.dart';
-import 'package:flutter/scheduler.dart';
-import 'package:flutter_local_notifications/flutter_local_notifications.dart';
-import 'package:simplecloudnotifier/api/api_client.dart';
-import 'package:simplecloudnotifier/main.dart';
-import 'package:simplecloudnotifier/main_utils.dart';
-import 'package:simplecloudnotifier/pages/channel_view/channel_view.dart';
-import 'package:simplecloudnotifier/pages/message_view/message_view.dart';
-import 'package:simplecloudnotifier/state/app_events.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/app_auth.dart';
-import 'package:simplecloudnotifier/state/scn_data_cache.dart';
-import 'package:simplecloudnotifier/utils/navi.dart';
-import 'package:simplecloudnotifier/utils/notifier.dart';
-
-@pragma('vm:entry-point')
-void notificationTapBackground(NotificationResponse notificationResponse) {
-  // I think only iOS triggers this, TODO
-  ApplicationLog.info('Received local notification<vm:entry-point>: ${notificationResponse.id}');
-}
-
-@pragma('vm:entry-point')
-Future<void> onBackgroundMessage(RemoteMessage message) async {
-  // a firebase message was received while the app was in the background or terminated
-  await _receiveMessage(message, false);
-}
-
-@pragma('vm:entry-point')
-void onForegroundMessage(RemoteMessage message) {
-  // a firebase message was received while the app was in the foreground
-  _receiveMessage(message, true);
-}
-
-Future<void> _receiveMessage(RemoteMessage message, bool foreground) async {
-  try {
-    // ensure globals init
-    if (!Globals().isInitialized) {
-      print('[LATE-INIT] Init Globals() - to ensure working _receiveMessage($foreground)...');
-      await Globals().init();
-    }
-
-    // ensure hive init
-    if (!Globals().hiveInitialized) {
-      print('[LATE-INIT] Init Hive - to ensure working _receiveMessage($foreground)...');
-      await initHive();
-    }
-
-    // ensure hive init
-    if (!Globals().hiveAdaptersRegistered) {
-      print('[LATE-INIT] Init Hive-Adapter - to ensure working _receiveMessage($foreground)...');
-      await registerHiveAdapter();
-    }
-
-    // ensure hive init
-    if (!Globals().hiveBoxesOpened) {
-      print('[LATE-INIT] Ensure hive boxes are open for _receiveMessage($foreground)...');
-      await openHiveBoxes(false);
-    }
-  } 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, null);
-    return;
-  }
-
-  ApplicationLog.info('Received FB message (${foreground ? 'foreground' : 'background'}): ${message.messageId ?? 'NULL'}');
-
-  String scn_msg_id;
-
-  try {
-    scn_msg_id = message.data['scn_msg_id'] as String;
-
-    final timestamp = DateTime.fromMillisecondsSinceEpoch(int.parse(message.data['timestamp'] as String) * 1000);
-    final title = message.data['title'] as String;
-    final channel = message.data['channel'] as String;
-    final channel_id = message.data['channel_id'] as String;
-    final body = message.data['body'] as String;
-    final prio = int.parse(message.data['priority'] as String);
-
-    Notifier.showLocalNotification(scn_msg_id, channel_id, channel, 'Channel: ${channel}', title, body, timestamp, prio);
-  } 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, null);
-    return;
-  }
-
-  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, null);
-    return;
-  }
-
-  try {
-    final msg = await APIClient.getMessage(AppAuth(), scn_msg_id);
-    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;
-  }
-}
-
-void receiveLocalDarwinNotification(int id, String? title, String? body, String? payload) {
-  //TODO iOS?
-  ApplicationLog.info('Received local notification<darwin>: $id -> [$title]');
-}
-
-void receiveLocalNotification(NotificationResponse details) {
-  // User has tapped a flutter_local notification, while the app was running
-  ApplicationLog.info('Tapped local notification: [[${details.id} | ${details.actionId} | ${details.input} | ${details.notificationResponseType} | ${details.payload}]]');
-
-  handleNotificationClickAction(details.payload, Duration.zero);
-}
-
-void handleNotificationClickAction(String? payload, Duration delay) {
-  final parts = payload?.split('\n') ?? [];
-
-  if (parts.length == 4 && parts[0] == '@SCN_MESSAGE') {
-    final messageID = parts[1];
-    () async {
-      await Future.delayed(delay, () {});
-
-      SchedulerBinding.instance.addPostFrameCallback((_) {
-        ApplicationLog.info('Handle notification action @SCN_MESSAGE --> ${messageID}');
-        Navi.push(SCNApp.materialKey.currentContext!, () => MessageViewPage(messageID: messageID, preloadedData: null));
-      });
-    }();
-  } else if (parts.length == 3 && parts[0] == '@SCN_MESSAGE_SUMMARY') {
-    final channelID = parts[1];
-    () async {
-      await Future.delayed(delay, () {});
-
-      SchedulerBinding.instance.addPostFrameCallback((_) {
-        ApplicationLog.info('Handle notification action @SCN_MESSAGE_SUMMARY --> ${channelID}');
-        Navi.push(SCNApp.materialKey.currentContext!, () => ChannelViewPage(channelID: channelID, preloadedData: null, needsReload: null));
-      });
-    }();
-  }
-}
-
-List<DarwinNotificationCategory> getDarwinNotificationCategories() {
-  return <DarwinNotificationCategory>[
-    //TODO ?!?
-  ];
-}

flutter/lib/main_utils.dart

@@ -1,155 +0,0 @@
-
-import 'package:mutex/mutex.dart';
-import 'package:hive_flutter/hive_flutter.dart';
-import 'package:simplecloudnotifier/api/api_client.dart';
-import 'package:simplecloudnotifier/models/channel.dart';
-import 'package:simplecloudnotifier/models/client.dart';
-import 'package:simplecloudnotifier/models/keytoken.dart';
-import 'package:simplecloudnotifier/models/scn_message.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/request_log.dart';
-import 'package:simplecloudnotifier/state/app_auth.dart';
-
-final lockHive = Mutex();
-
-void setFirebaseToken(String fcmToken) async {
-  final acc = AppAuth();
-
-  final oldToken = Globals().getPrefFCMToken();
-
-  await Globals().setPrefFCMToken(fcmToken);
-
-  ApplicationLog.info('New firebase token received', additional: 'Token: $fcmToken (old: $oldToken)');
-
-  if (!acc.isAuth()) return;
-
-  Client? client;
-  try {
-    client = await acc.loadClient(forceIfOlder: Duration(seconds: 60));
-  } catch (exc, trace) {
-    ApplicationLog.error('Failed to get client: ' + exc.toString(), trace: trace);
-    return;
-  }
-
-  if (oldToken != null && oldToken == fcmToken && client != null && client.fcmToken == fcmToken) {
-    ApplicationLog.info('Firebase token unchanged - do nothing', additional: 'Token: $fcmToken');
-    return;
-  }
-
-  if (client == null) {
-    // should not really happen - perhaps someone externally deleted the client?
-    final newClient = await APIClient.addClient(acc, fcmToken, Globals().deviceModel, Globals().version, Globals().hostname, Globals().clientType);
-    acc.setClientAndClientID(newClient);
-    await acc.save();
-  } else {
-    final newClient = await APIClient.updateClient(acc, client.clientID, fcmToken: fcmToken, agentModel: Globals().deviceModel, name: Globals().hostname, agentVersion: Globals().version);
-    acc.setClientAndClientID(newClient);
-    await acc.save();
-  }
-}
-
-Future<void> initHive() async {
-  await lockHive.protect(() async {
-    if (Globals().hiveAdaptersRegistered) return;
-
-    await Hive.initFlutter();
-    Globals().hiveInitialized = true;
-  });
-}
-
-Future<void> openHiveBoxes(bool safe) async {
-  await lockHive.protect(() async {
-    if (Globals().hiveBoxesOpened) return;
-
-    if (!safe) {
-      await Hive.openBox<SCNLog>('scn-logs');
-      await Hive.openBox<SCNRequest>('scn-requests');
-      await Hive.openBox<SCNMessage>('scn-message-cache');
-      await Hive.openBox<Channel>('scn-channel-cache');
-      await Hive.openBox<FBMessage>('scn-fb-messages');
-      await Hive.openBox<KeyToken>('scn-keytoken-value-cache');
-      Globals().hiveBoxesOpened = true;
-      return;
-    }
-
-    try {
-      print('[INIT] Load Hive<scn-logs>...');
-      await Hive.openBox<SCNLog>('scn-logs');
-    } catch (exc, trace) {
-      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});
-    }
-
-    try {
-      print('[INIT] Load Hive<scn-requests>...');
-      await Hive.openBox<SCNRequest>('scn-requests');
-    } catch (exc, trace) {
-      Hive.deleteBoxFromDisk('scn-requests');
-      await Hive.openBox<SCNRequest>('scn-requests');
-      ApplicationLog.error('Failed to open Hive-Box: scn-requests: ' + exc.toString(), trace: trace);
-      ApplicationLog.writeRawFailure('Failed to open Hive-Box: scn-requests', {'error': exc.toString(), 'trace': trace});
-    }
-
-    try {
-      print('[INIT] Load Hive<scn-message-cache>...');
-      await Hive.openBox<SCNMessage>('scn-message-cache');
-    } catch (exc, trace) {
-      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});
-    }
-
-    try {
-      print('[INIT] Load Hive<scn-channel-cache>...');
-      await Hive.openBox<Channel>('scn-channel-cache');
-    } catch (exc, trace) {
-      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});
-    }
-
-    try {
-      print('[INIT] Load Hive<scn-fb-messages>...');
-      await Hive.openBox<FBMessage>('scn-fb-messages');
-    } catch (exc, trace) {
-      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});
-    }
-
-    try {
-      print('[INIT] Load Hive<scn-keytoken-value-cache>...');
-      await Hive.openBox<KeyToken>('scn-keytoken-value-cache');
-    } catch (exc, trace) {
-      Hive.deleteBoxFromDisk('scn-keytoken-value-cache');
-      await Hive.openBox<KeyToken>('scn-keytoken-value-cache');
-      ApplicationLog.error('Failed to open Hive-Box: scn-keytoken-value-cache' + exc.toString(), trace: trace);
-      ApplicationLog.writeRawFailure('Failed to open Hive-Box: scn-keytoken-value-cache', {'error': exc.toString(), 'trace': trace});
-    }
-
-    Globals().hiveBoxesOpened = true;
-  });
-}
-
-Future<void> registerHiveAdapter() async {
-  await lockHive.protect(() async {
-    if (Globals().hiveAdaptersRegistered) return;
-
-    Hive.registerAdapter(SCNRequestAdapter());
-    Hive.registerAdapter(SCNLogAdapter());
-    Hive.registerAdapter(SCNLogLevelAdapter());
-    Hive.registerAdapter(SCNMessageAdapter());
-    Hive.registerAdapter(ChannelAdapter());
-    Hive.registerAdapter(FBMessageAdapter());
-    Hive.registerAdapter(KeyTokenAdapter());
-
-    Globals().hiveAdaptersRegistered = true;
-  });
-}

flutter/lib/models/api_error.dart

@@ -1,7 +1,7 @@
 class APIError {
   final bool success;
   final int error;
-  final int errhighlight;
+  final String errhighlight;
   final String message;
 
   static final MISSING_UID = 1101;
@@ -66,8 +66,8 @@ class APIError {
   factory APIError.fromJson(Map<String, dynamic> json) {
     return APIError(
       success: json['success'] as bool,
-      error: (json['error'] as num).toInt(),
+      error: (json['error'] as double).toInt(),
-      errhighlight: (json['errhighlight'] as num).toInt(),
+      errhighlight: json['errhighlight'] as String,
       message: json['message'] as String,
     );
   }

flutter/lib/models/channel.dart

@@ -12,11 +12,11 @@ class Channel extends HiveObject implements FieldDebuggable {
   @HiveField(10)
   final String ownerUserID;
   @HiveField(11)
-  final String internalName; // = InternalName, used for sending, normalized, cannot be changed
+  final String internalName;
   @HiveField(12)
-  final String displayName; // = DisplayName, used for display purposes, can be changed, initially equals InternalName
+  final String displayName;
   @HiveField(13)
-  final String? descriptionName; // = DescriptionName, (optional), longer description text, initally nil
+  final String? descriptionName;
   @HiveField(14)
   final String? subscribeKey;
   @HiveField(15)
@@ -70,23 +70,11 @@ class Channel extends HiveObject implements FieldDebuggable {
       ('messagesSent', '${this.messagesSent}'),
     ];
   }
-
-  ChannelPreview toPreview(Subscription? sub) {
-    return ChannelPreview(
-      channelID: this.channelID,
-      ownerUserID: this.ownerUserID,
-      internalName: this.internalName,
-      displayName: this.displayName,
-      descriptionName: this.descriptionName,
-      messagesSent: this.messagesSent,
-      subscription: sub,
-    );
-  }
 }
 
 class ChannelWithSubscription {
   final Channel channel;
-  final Subscription? subscription;
+  final Subscription subscription;
 
   ChannelWithSubscription({
     required this.channel,
@@ -96,7 +84,7 @@ class ChannelWithSubscription {
   factory ChannelWithSubscription.fromJson(Map<String, dynamic> json) {
     return ChannelWithSubscription(
       channel: Channel.fromJson(json),
-      subscription: json['subscription'] == null ? null : Subscription.fromJson(json['subscription'] as Map<String, dynamic>),
+      subscription: Subscription.fromJson(json['subscription'] as Map<String, dynamic>),
     );
   }
 
@@ -111,8 +99,6 @@ class ChannelPreview {
   final String internalName;
   final String displayName;
   final String? descriptionName;
-  final int messagesSent;
-  final Subscription? subscription;
 
   const ChannelPreview({
     required this.channelID,
@@ -120,8 +106,6 @@ class ChannelPreview {
     required this.internalName,
     required this.displayName,
     required this.descriptionName,
-    required this.messagesSent,
-    required this.subscription,
   });
 
   factory ChannelPreview.fromJson(Map<String, dynamic> json) {
@@ -131,8 +115,6 @@ class ChannelPreview {
       internalName: json['internal_name'] as String,
       displayName: json['display_name'] as String,
       descriptionName: json['description_name'] as String?,
-      messagesSent: json['messages_sent'] as int,
-      subscription: json['subscription'] == null ? null : Subscription.fromJson(json['subscription'] as Map<String, dynamic>),
     );
   }
 }

flutter/lib/models/client.dart

@@ -32,19 +32,6 @@ class Client {
     );
   }
 
-  Map<String, dynamic> toJson() {
-    return {
-      'client_id': clientID,
-      'user_id': userID,
-      'type': type,
-      'fcm_token': fcmToken,
-      'timestamp_created': timestampCreated,
-      'agent_model': agentModel,
-      'agent_version': agentVersion,
-      'name': name,
-    };
-  }
-
   static List<Client> fromJsonArray(List<dynamic> jsonArr) {
     return jsonArr.map<Client>((e) => Client.fromJson(e as Map<String, dynamic>)).toList();
   }

flutter/lib/models/keytoken.dart

@@ -1,34 +1,19 @@
-import 'package:hive_flutter/hive_flutter.dart';
-
-part 'keytoken.g.dart';
-
-@HiveType(typeId: 107)
 class KeyToken {
-  @HiveField(0)
   final String keytokenID;
-
-  @HiveField(10)
   final String name;
-  @HiveField(11)
   final String timestampCreated;
-  @HiveField(13)
+  final String? timestampLastused;
-  final String? timestampLastUsed;
-  @HiveField(14)
   final String ownerUserID;
-  @HiveField(15)
   final bool allChannels;
-  @HiveField(16)
   final List<String> channels;
-  @HiveField(17)
   final String permissions;
-  @HiveField(18)
   final int messagesSent;
 
   const KeyToken({
     required this.keytokenID,
     required this.name,
     required this.timestampCreated,
-    required this.timestampLastUsed,
+    required this.timestampLastused,
     required this.ownerUserID,
     required this.allChannels,
     required this.channels,
@@ -41,7 +26,7 @@ class KeyToken {
       keytokenID: json['keytoken_id'] as String,
       name: json['name'] as String,
       timestampCreated: json['timestamp_created'] as String,
-      timestampLastUsed: json['timestamp_lastused'] as String?,
+      timestampLastused: json['timestamp_lastused'] as String?,
       ownerUserID: json['owner_user_id'] as String,
       allChannels: json['all_channels'] as bool,
       channels: (json['channels'] as List<dynamic>).map((e) => e as String).toList(),
@@ -53,34 +38,6 @@ class KeyToken {
   static List<KeyToken> fromJsonArray(List<dynamic> jsonArr) {
     return jsonArr.map<KeyToken>((e) => KeyToken.fromJson(e as Map<String, dynamic>)).toList();
   }
-
-  KeyTokenPreview toPreview() {
-    return KeyTokenPreview(
-      keytokenID: keytokenID,
-      name: name,
-      ownerUserID: ownerUserID,
-      allChannels: allChannels,
-      channels: channels,
-      permissions: permissions,
-    );
-  }
-}
-
-class KeyTokenWithToken {
-  final KeyToken keyToken;
-  final String token;
-
-  KeyTokenWithToken({
-    required this.keyToken,
-    required this.token,
-  });
-
-  factory KeyTokenWithToken.fromJson(Map<String, dynamic> json) {
-    return KeyTokenWithToken(
-      keyToken: KeyToken.fromJson(json),
-      token: json['token'] as String,
-    );
-  }
 }
 
 class KeyTokenPreview {

flutter/lib/models/keytoken.g.dart

@@ -1,65 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'keytoken.dart';
-
-// **************************************************************************
-// TypeAdapterGenerator
-// **************************************************************************
-
-class KeyTokenAdapter extends TypeAdapter<KeyToken> {
-  @override
-  final int typeId = 107;
-
-  @override
-  KeyToken read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return KeyToken(
-      keytokenID: fields[0] as String,
-      name: fields[10] as String,
-      timestampCreated: fields[11] as String,
-      timestampLastUsed: fields[13] as String?,
-      ownerUserID: fields[14] as String,
-      allChannels: fields[15] as bool,
-      channels: (fields[16] as List).cast<String>(),
-      permissions: fields[17] as String,
-      messagesSent: fields[18] as int,
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, KeyToken obj) {
-    writer
-      ..writeByte(9)
-      ..writeByte(0)
-      ..write(obj.keytokenID)
-      ..writeByte(10)
-      ..write(obj.name)
-      ..writeByte(11)
-      ..write(obj.timestampCreated)
-      ..writeByte(13)
-      ..write(obj.timestampLastUsed)
-      ..writeByte(14)
-      ..write(obj.ownerUserID)
-      ..writeByte(15)
-      ..write(obj.allChannels)
-      ..writeByte(16)
-      ..write(obj.channels)
-      ..writeByte(17)
-      ..write(obj.permissions)
-      ..writeByte(18)
-      ..write(obj.messagesSent);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is KeyTokenAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}

flutter/lib/models/message.dart

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

flutter/lib/models/message.g.dart

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

flutter/lib/models/scan_result.dart

@@ -1,85 +0,0 @@
-import 'package:simplecloudnotifier/models/channel.dart';
-
-enum ScanResultMode { ChannelSubscribe, MessageSend, Channel, Error }
-
-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'], url: 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: null, url: lines[0]);
-      }
-    }
-
-    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 != 5) return null;
-
-      return ScanResultChannel(channelDisplayName: lines[2], ownerUserID: lines[3], channelID: lines[4]);
-    }
-
-    return ScanResultError(message: 'Invalid QR code');
-  }
-
-  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;
-  final String url;
-
-  ScanResultMessageSend({required this.userID, required this.userKey, required this.url});
-
-  @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;
-}
-
-class ScanResultError extends ScanResult {
-  final String message;
-
-  ScanResultError({required this.message});
-
-  @override
-  ScanResultMode get mode => ScanResultMode.Error;
-}

flutter/lib/models/send_message_response.dart

@@ -1,55 +0,0 @@
-class SendMessageResponse {
-  final bool success;
-  final int errorID;
-  final int errorHighlight;
-  final String message;
-  final bool suppressSend;
-  final int messageCount;
-  final int quota;
-  final bool isPro;
-  final int quotaMax;
-  final String scnMessageID;
-
-  SendMessageResponse({
-    required this.success,
-    required this.errorID,
-    required this.errorHighlight,
-    required this.message,
-    required this.suppressSend,
-    required this.messageCount,
-    required this.quota,
-    required this.isPro,
-    required this.quotaMax,
-    required this.scnMessageID,
-  });
-
-  factory SendMessageResponse.fromJson(Map<String, dynamic> json) {
-    return SendMessageResponse(
-      success: json['success'] as bool,
-      errorID: json['error'] as int,
-      errorHighlight: json['errhighlight'] as int,
-      message: json['message'] as String,
-      suppressSend: json['suppress_send'] as bool,
-      messageCount: json['messagecount'] as int,
-      quota: json['quota'] as int,
-      isPro: json['is_pro'] as bool,
-      quotaMax: json['quota_max'] as int,
-      scnMessageID: json['scn_msg_id'] as String,
-    );
-  }
-
-  Map<String, dynamic> toJson() {
-    return {
-      'success': success,
-      'error': errorID,
-      'errhighlight': errorHighlight,
-      'message': message,
-      'suppress_send': suppressSend,
-      'messagecount': messageCount,
-      'quota': quota,
-      'is_pro': isPro,
-      'quota_max': quotaMax,
-      'scn_msg_id': scnMessageID,
-    };
-  }
-}

flutter/lib/models/sender_name_statistics.dart

@@ -1,26 +0,0 @@
-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();
-  }
-}

flutter/lib/models/subscription.dart

@@ -6,7 +6,6 @@ class Subscription {
   final String channelInternalName;
   final String timestampCreated;
   final bool confirmed;
-  final bool active;
 
   const Subscription({
     required this.subscriptionID,
@@ -16,7 +15,6 @@ class Subscription {
     required this.channelInternalName,
     required this.timestampCreated,
     required this.confirmed,
-    required this.active,
   });
 
   factory Subscription.fromJson(Map<String, dynamic> json) {
@@ -28,7 +26,6 @@ class Subscription {
       channelInternalName: json['channel_internal_name'] as String,
       timestampCreated: json['timestamp_created'] as String,
       confirmed: json['confirmed'] as bool,
-      active: json['active'] as bool,
     );
   }
 

flutter/lib/models/user.dart

@@ -63,33 +63,6 @@ class User {
       maxUserMessageIDLength: json['max_user_message_id_length'] as int,
     );
   }
-
-  Map<String, dynamic> toJson() {
-    return {
-      'user_id': userID,
-      'username': username,
-      'timestamp_created': timestampCreated,
-      'timestamp_lastread': timestampLastRead,
-      'timestamp_lastsent': timestampLastSent,
-      'messages_sent': messagesSent,
-      'quota_used': quotaUsed,
-      'quota_remaining': quotaRemaining,
-      'quota_max': quotaPerDay,
-      'is_pro': isPro,
-      'default_channel': defaultChannel,
-      'max_body_size': maxBodySize,
-      'max_title_length': maxTitleLength,
-      'default_priority': defaultPriority,
-      'max_channel_name_length': maxChannelNameLength,
-      'max_channel_description_length': maxChannelDescriptionLength,
-      'max_sender_name_length': maxSenderNameLength,
-      'max_user_message_id_length': maxUserMessageIDLength,
-    };
-  }
-
-  UserPreview toPreview() {
-    return UserPreview(userID: userID, username: username);
-  }
 }
 
 class UserWithClientsAndKeys {

flutter/lib/nav_layout.dart

@@ -8,7 +8,7 @@ import 'package:simplecloudnotifier/pages/send/send.dart';
 import 'package:simplecloudnotifier/components/bottom_fab/fab_bottom_app_bar.dart';
 import 'package:simplecloudnotifier/pages/account/account.dart';
 import 'package:simplecloudnotifier/pages/message_list/message_list.dart';
-import 'package:simplecloudnotifier/pages/settings/settings_view.dart';
+import 'package:simplecloudnotifier/pages/settings/root.dart';
 import 'package:simplecloudnotifier/state/app_auth.dart';
 import 'package:simplecloudnotifier/utils/toaster.dart';
 
@@ -59,7 +59,8 @@ class _SCNNavLayoutState extends State<SCNNavLayout> {
     return Scaffold(
       appBar: SCNAppBar(
         title: null,
-        showSearch: _selectedIndex == 0,
+        showDebug: true,
+        showSearch: _selectedIndex == 0 || _selectedIndex == 1,
         showShare: false,
         showThemeSwitch: true,
       ),
@@ -76,7 +77,6 @@ class _SCNNavLayoutState extends State<SCNNavLayout> {
       bottomNavigationBar: _buildNavBar(context),
       floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked,
       floatingActionButton: HidableFAB(
-        heroTag: 'fab_main',
         onPressed: _onFABTapped,
         icon: FontAwesomeIcons.solidPaperPlaneTop,
       ),

flutter/lib/pages/account/account.dart

@@ -1,27 +1,17 @@
-import 'dart:async';
 import 'dart:io';
 
-import 'package:action_slider/action_slider.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
 import 'package:simplecloudnotifier/api/api_client.dart';
-import 'package:simplecloudnotifier/components/error_display/error_display.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/pages/client_list/client_list.dart';
-import 'package:simplecloudnotifier/pages/filtered_message_view/filtered_message_view.dart';
-import 'package:simplecloudnotifier/pages/keytoken_list/keytoken_list.dart';
-import 'package:simplecloudnotifier/pages/sender_list/sender_list.dart';
-import 'package:simplecloudnotifier/pages/subscription_list/subscription_list.dart';
 import 'package:simplecloudnotifier/state/app_bar_state.dart';
 import 'package:simplecloudnotifier/state/application_log.dart';
 import 'package:simplecloudnotifier/state/globals.dart';
 import 'package:simplecloudnotifier/state/app_auth.dart';
 import 'package:simplecloudnotifier/types/immediate_future.dart';
-import 'package:simplecloudnotifier/utils/dialogs.dart';
 import 'package:simplecloudnotifier/utils/navi.dart';
 import 'package:simplecloudnotifier/utils/toaster.dart';
 import 'package:simplecloudnotifier/utils/ui.dart';
@@ -37,13 +27,12 @@ class AccountRootPage extends StatefulWidget {
 }
 
 class _AccountRootPageState extends State<AccountRootPage> {
-  ImmediateFuture<int> _futureSubscriptionCount = ImmediateFuture.ofPending();
+  late ImmediateFuture<int>? futureSubscriptionCount;
-  ImmediateFuture<int> _futureClientCount = ImmediateFuture.ofPending();
+  late ImmediateFuture<int>? futureClientCount;
-  ImmediateFuture<int> _futureKeyCount = ImmediateFuture.ofPending();
+  late ImmediateFuture<int>? futureKeyCount;
-  ImmediateFuture<int> _futureChannelAllCount = ImmediateFuture.ofPending();
+  late ImmediateFuture<int>? futureChannelAllCount;
-  ImmediateFuture<int> _futureChannelOwnedCount = ImmediateFuture.ofPending();
+  late ImmediateFuture<int>? futureChannelSubscribedCount;
-  ImmediateFuture<int> _futureSenderNamesCount = ImmediateFuture.ofPending();
+  late ImmediateFuture<User>? futureUser;
-  ImmediateFuture<User> _futureUser = ImmediateFuture.ofPending();
 
   late AppAuth userAcc;
 
@@ -93,51 +82,44 @@ class _AccountRootPageState extends State<AccountRootPage> {
   }
 
   void _createFutures() {
-    _futureSubscriptionCount = ImmediateFuture.ofPending();
+    futureSubscriptionCount = null;
-    _futureClientCount = ImmediateFuture.ofPending();
+    futureClientCount = null;
-    _futureKeyCount = ImmediateFuture.ofPending();
+    futureKeyCount = null;
-    _futureChannelAllCount = ImmediateFuture.ofPending();
+    futureChannelAllCount = null;
-    _futureChannelOwnedCount = ImmediateFuture.ofPending();
+    futureChannelSubscribedCount = null;
-    _futureSenderNamesCount = ImmediateFuture.ofPending();
 
     if (userAcc.isAuth()) {
-      _futureChannelAllCount = ImmediateFuture.ofFuture(() async {
+      futureChannelAllCount = ImmediateFuture.ofFuture(() async {
         if (!userAcc.isAuth()) throw new Exception('not logged in');
         final channels = await APIClient.getChannelList(userAcc, ChannelSelector.all);
         return channels.length;
       }());
 
-      _futureChannelOwnedCount = ImmediateFuture.ofFuture(() async {
+      futureChannelSubscribedCount = ImmediateFuture.ofFuture(() async {
         if (!userAcc.isAuth()) throw new Exception('not logged in');
-        final channels = await APIClient.getChannelList(userAcc, ChannelSelector.owned);
+        final channels = await APIClient.getChannelList(userAcc, ChannelSelector.subscribed);
         return channels.length;
       }());
 
-      _futureSubscriptionCount = ImmediateFuture.ofFuture(() async {
+      futureSubscriptionCount = ImmediateFuture.ofFuture(() async {
         if (!userAcc.isAuth()) throw new Exception('not logged in');
         final subs = await APIClient.getSubscriptionList(userAcc);
         return subs.length;
       }());
 
-      _futureClientCount = ImmediateFuture.ofFuture(() async {
+      futureClientCount = ImmediateFuture.ofFuture(() async {
         if (!userAcc.isAuth()) throw new Exception('not logged in');
         final clients = await APIClient.getClientList(userAcc);
         return clients.length;
       }());
 
-      _futureKeyCount = ImmediateFuture.ofFuture(() async {
+      futureKeyCount = ImmediateFuture.ofFuture(() async {
         if (!userAcc.isAuth()) throw new Exception('not logged in');
         final keys = await APIClient.getKeyTokenList(userAcc);
         return keys.length;
       }());
 
-      _futureSenderNamesCount = ImmediateFuture.ofFuture(() async {
+      futureUser = ImmediateFuture.ofFuture(userAcc.loadUser(force: false));
-        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));
     }
   }
 
@@ -151,19 +133,19 @@ class _AccountRootPageState extends State<AccountRootPage> {
         // refresh all data and then replace teh futures used in build()
 
         final channelsAll = await APIClient.getChannelList(userAcc, ChannelSelector.all);
+        final channelsSubscribed = await APIClient.getChannelList(userAcc, ChannelSelector.subscribed);
         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(() {
-          _futureChannelAllCount = ImmediateFuture.ofValue(channelsAll.length);
+          futureChannelAllCount = ImmediateFuture.ofValue(channelsAll.length);
-          _futureSubscriptionCount = ImmediateFuture.ofValue(subs.length);
+          futureChannelSubscribedCount = ImmediateFuture.ofValue(channelsSubscribed.length);
-          _futureClientCount = ImmediateFuture.ofValue(clients.length);
+          futureSubscriptionCount = ImmediateFuture.ofValue(subs.length);
-          _futureKeyCount = ImmediateFuture.ofValue(keys.length);
+          futureClientCount = ImmediateFuture.ofValue(clients.length);
-          _futureSenderNamesCount = ImmediateFuture.ofValue(senderNames.length);
+          futureKeyCount = ImmediateFuture.ofValue(keys.length);
-          _futureUser = ImmediateFuture.ofValue(user);
+          futureUser = ImmediateFuture.ofValue(user);
         });
       } catch (exc, trace) {
         ApplicationLog.error('Failed to refresh account data: ' + exc.toString(), trace: trace);
@@ -184,12 +166,12 @@ class _AccountRootPageState extends State<AccountRootPage> {
           return _buildNoAuth(context);
         } else {
           return FutureBuilder(
-            future: _futureUser.future,
+            future: futureUser!.future,
             builder: ((context, snapshot) {
-              if (_futureUser.value != null) {
+              if (futureUser?.value != null) {
-                return _buildShowAccount(context, acc, _futureUser.value!);
+                return _buildShowAccount(context, acc, futureUser!.value!);
               } else if (snapshot.connectionState == ConnectionState.done && snapshot.hasError) {
-                return ErrorDisplay(errorMessage: '${snapshot.error}');
+                return Text('Error: ${snapshot.error}'); //TODO better error display
               } else if (snapshot.connectionState == ConnectionState.done) {
                 return _buildShowAccount(context, acc, snapshot.data!);
               } else {
@@ -346,12 +328,10 @@ class _AccountRootPageState extends State<AccountRootPage> {
                 children: [
                   SizedBox(width: 80, child: Text("Channels", style: TextStyle(color: Theme.of(context).textTheme.bodyLarge?.color?.withAlpha(160)))),
                   FutureBuilder(
-                    future: _futureChannelOwnedCount.future,
+                    future: futureChannelAllCount!.future,
                     builder: (context, snapshot) {
-                      if (_futureChannelOwnedCount.value != null) {
+                      if (futureChannelAllCount?.value != null) {
-                        return Text('${_futureChannelOwnedCount.value}');
+                        return Text('${futureChannelAllCount!.value}');
-                      } else if (snapshot.connectionState == ConnectionState.done && snapshot.hasError) {
-                        return Text('ERROR: ${snapshot.error}', style: TextStyle(color: Colors.red));
                       } else if (snapshot.connectionState == ConnectionState.done) {
                         return Text('${snapshot.data}');
                       } else {
@@ -368,15 +348,13 @@ class _AccountRootPageState extends State<AccountRootPage> {
           mainAxisAlignment: MainAxisAlignment.start,
           children: [
             UI.buttonIconOnly(
-              onPressed: _changeUsername,
+              onPressed: () {/*TODO*/},
               icon: FontAwesomeIcons.pen,
             ),
             const SizedBox(height: 4),
             if (!user.isPro)
               UI.buttonIconOnly(
-                onPressed: () {
+                onPressed: () {/*TODO*/},
-                  Toaster.info("Not Implemented", "Account Upgrading will be implemented in a later version"); // TODO
-                },
                 icon: FontAwesomeIcons.cartCircleArrowUp,
               ),
           ],
@@ -387,11 +365,10 @@ class _AccountRootPageState extends State<AccountRootPage> {
 
   List<Widget> _buildCards(BuildContext context, User user) {
     return [
-      _buildNumberCard(context, 'Subscription', 's', _futureSubscriptionCount, () => Navi.push(context, () => SubscriptionListPage())),
+      _buildNumberCard(context, 'Subscriptions', futureSubscriptionCount, () {/*TODO*/}),
-      _buildNumberCard(context, 'Client', 's', _futureClientCount, () => Navi.push(context, () => ClientListPage())),
+      _buildNumberCard(context, 'Clients', futureClientCount, () {/*TODO*/}),
-      _buildNumberCard(context, 'Key', 's', _futureKeyCount, () => Navi.push(context, () => KeyTokenListPage())),
+      _buildNumberCard(context, 'Keys', futureKeyCount, () {/*TODO*/}),
-      _buildNumberCard(context, 'Channel', 's', _futureChannelAllCount, () => Navi.push(context, () => ChannelListExtendedPage())),
+      _buildNumberCard(context, 'Channels', futureChannelSubscribedCount, () {/*TODO*/}),
-      _buildNumberCard(context, 'Sender', '', _futureSenderNamesCount, () => Navi.push(context, () => SenderListPage())),
       UI.buttonCard(
         context: context,
         margin: EdgeInsets.fromLTRB(0, 4, 0, 4),
@@ -402,26 +379,22 @@ class _AccountRootPageState extends State<AccountRootPage> {
             Text('Messages', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 20)),
           ],
         ),
-        onTap: () {
+        onTap: () {/*TODO*/},
-          Navi.push(context, () => FilteredMessageViewPage(title: "All Messages", filter: MessageFilter(senderUserID: [user.userID])));
-        },
       ),
     ];
   }
 
-  Widget _buildNumberCard(BuildContext context, String txt, String pluralSuffix, ImmediateFuture<int> future, void Function() action) {
+  Widget _buildNumberCard(BuildContext context, String txt, ImmediateFuture<int>? future, void Function() action) {
     return UI.buttonCard(
       context: context,
       margin: EdgeInsets.fromLTRB(0, 4, 0, 4),
       child: Row(
         children: [
           FutureBuilder(
-            future: future.future,
+            future: future?.future,
             builder: (context, snapshot) {
-              if (future.value != null) {
+              if (future?.value != null) {
-                return Text('${future.value}', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 20));
+                return Text('${future?.value}', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 20));
-              } else if (snapshot.connectionState == ConnectionState.done && snapshot.hasError) {
-                return Text('ERROR: ${snapshot.error}', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 20, color: Colors.red));
               } else if (snapshot.connectionState == ConnectionState.done) {
                 return Text('${snapshot.data}', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 20));
               } else {
@@ -430,20 +403,7 @@ class _AccountRootPageState extends State<AccountRootPage> {
             },
           ),
           const SizedBox(width: 12),
-          FutureBuilder(
+          Text(txt, style: TextStyle(fontWeight: FontWeight.bold, fontSize: 20)),
-            future: future.future,
-            builder: (context, snapshot) {
-              if (future.value != null) {
-                return Text('${txt}${((future.value != 1) ? pluralSuffix : '')}', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 20));
-              } else if (snapshot.connectionState == ConnectionState.done && snapshot.hasError) {
-                return Text('ERROR: ${snapshot.error}', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 20, color: Colors.red));
-              } else if (snapshot.connectionState == ConnectionState.done) {
-                return Text('${txt}${((snapshot.data != 1) ? pluralSuffix : '')}', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 20));
-              } else {
-                return Text(txt, style: TextStyle(fontWeight: FontWeight.bold, fontSize: 20));
-              }
-            },
-          ),
         ],
       ),
       onTap: action,
@@ -526,195 +486,6 @@ class _AccountRootPageState extends State<AccountRootPage> {
   }
 
   void _deleteAccount() async {
-    final acc = AppAuth();
+    //TODO
-    if (!acc.isAuth()) return;
-
-    final r1 = await UIDialogs.showConfirmDialog(context, "Delete Account?", text: "Are you sure you want to delete your account?", okText: "Delete", cancelText: "Cancel");
-    if (!r1) return;
-
-    final r2 = await UIDialogs.showConfirmDialog(context, "Really sure?", text: "Are you really sure you want to delete your account?.\n\nThis includes all your messages and channels etc.\nThis action cannot be undone!", okText: "Delete", cancelText: "Cancel");
-    if (!r2) return;
-
-    final r3 = await UIDialogs.showTextInput(context, "Please input 'Delete' to delete your Account.", "");
-    if (r3 == null) return;
-    if (r3.trim().toLowerCase() != 'delete') return;
-
-    final r4 = await this._showDeleteDialog(context);
-    if (!r4) return;
-
-    final r5 = await this._showDeleteAccountWaitDialog(context);
-    if (!r5) return;
-
-    try {
-      await APIClient.deleteUser(acc, acc.userID!);
-
-      Toaster.info('Logout', 'Successfully logged out');
-
-      //TODO clear messages/channels/etc in open views
-      acc.clear();
-      await acc.save();
-    } catch (exc, trace) {
-      Toaster.error("Error", 'Failed to delete user');
-      ApplicationLog.error('Failed to delete user: ' + exc.toString(), trace: trace);
-    }
-  }
-
-  void _changeUsername() async {
-    final acc = AppAuth();
-    if (!acc.isAuth()) return;
-
-    var newusername = await UIDialogs.showTextInput(context, 'Change your public username', 'Enter new username');
-    if (newusername == null) return;
-
-    newusername = newusername.trim();
-    if (newusername == '') {
-      Toaster.error("Error", 'Username cannot be empty');
-      return;
-    }
-
-    try {
-      final user = await APIClient.updateUser(acc, acc.userID!, username: newusername);
-      setState(() {
-        _futureUser = ImmediateFuture.ofValue(user);
-      });
-      Toaster.success("Success", 'Username changed');
-
-      _backgroundRefresh();
-    } catch (exc, trace) {
-      Toaster.error("Error", 'Failed to update username');
-      ApplicationLog.error('Failed to update username: ' + exc.toString(), trace: trace);
-    }
-  }
-
-  Future<bool> _showDeleteDialog(BuildContext context) {
-    return showDialog<bool>(
-      context: context,
-      builder: (context) => AlertDialog(
-        title: Text("Delete Account?"),
-        content: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            SizedBox(
-              child: ActionSlider.standard(
-                sliderBehavior: SliderBehavior.stretch,
-                width: 300,
-                backgroundColor: Colors.white,
-                toggleColor: Colors.red,
-                action: (controller) => Navigator.of(context).pop(true),
-                child: const Text('Slide to delete'),
-              ),
-              width: 300,
-              height: 65,
-            ),
-          ],
-        ),
-        actions: [
-          TextButton(
-            onPressed: () => Navigator.of(context).pop(false),
-            child: Text('Cancel'),
-          ),
-        ],
-      ),
-    ).then((value) => value ?? false);
-  }
-
-  Future<bool> _showDeleteAccountWaitDialog(BuildContext context) {
-    final completer = Completer<bool>();
-
-    bool isTimerActive = true;
-
-    const int totalSeconds = 20;
-    int secondsRemaining = totalSeconds;
-    double percentageRemaining = 1.0;
-
-    late Timer timer;
-
-    showDialog<void>(
-      context: context,
-      barrierDismissible: false,
-      builder: (BuildContext dialogContext) {
-        void Function(void Function())? setStateInner = null;
-
-        final t0 = DateTime.now();
-
-        timer = Timer.periodic(const Duration(milliseconds: 50), (t) {
-          setStateInner?.call(() {
-            percentageRemaining = 1 - (DateTime.now().millisecondsSinceEpoch - t0.millisecondsSinceEpoch) / (totalSeconds * 1000.0);
-            secondsRemaining = (totalSeconds * percentageRemaining).ceil();
-
-            if (secondsRemaining <= 0) {
-              t.cancel();
-              isTimerActive = false;
-
-              // Close the dialog and return true for successful deletion
-              Navigator.of(dialogContext).pop();
-              if (!completer.isCompleted) {
-                completer.complete(true);
-              }
-            }
-          });
-        });
-
-        return StatefulBuilder(
-          builder: (context, setState) {
-            setStateInner = setState;
-            return AlertDialog(
-              title: const Text('Delete Account'),
-              content: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Text(
-                    'Your account will be deleted in $secondsRemaining seconds.',
-                    textAlign: TextAlign.center,
-                  ),
-                  const SizedBox(height: 20),
-                  SizedBox(
-                    height: 100,
-                    width: 100,
-                    child: CircularProgressIndicator(
-                      value: 1 - percentageRemaining,
-                      strokeWidth: 8.0,
-                      valueColor: const AlwaysStoppedAnimation<Color>(Colors.red),
-                      backgroundColor: Colors.grey[300],
-                    ),
-                  ),
-                ],
-              ),
-              actions: <Widget>[
-                TextButton(
-                  onPressed: () {
-                    // Cancel the timer
-                    if (timer.isActive) {
-                      timer.cancel();
-                    }
-                    isTimerActive = false;
-
-                    // Close the dialog and return false for cancellation
-                    Navigator.of(dialogContext).pop();
-                    if (!completer.isCompleted) {
-                      completer.complete(false);
-                    }
-                  },
-                  child: const Text('CANCEL'),
-                ),
-              ],
-            );
-          },
-        );
-      },
-    ).then((_) {
-      // Ensure timer is cancelled if dialog is dismissed
-      if (timer.isActive) {
-        timer.cancel();
-      }
-
-      // If the completer hasn't been completed yet (e.g., if the dialog is dismissed),
-      // complete it with false
-      if (!completer.isCompleted && isTimerActive) {
-        completer.complete(false);
-      }
-    });
-
-    return completer.future;
   }
 }

flutter/lib/pages/account/login.dart

@@ -122,9 +122,9 @@ class _AccountLoginPageState extends State<AccountLoginPage> {
     try {
       setState(() => loading = true);
 
-      var uid = _ctrlUserID.text;
+      final uid = _ctrlUserID.text;
-      var atokv = _ctrlTokenAdmin.text;
+      final atokv = _ctrlTokenAdmin.text;
-      var stokv = _ctrlTokenSend.text;
+      final stokv = _ctrlTokenSend.text;
 
       final fcmToken = await FirebaseMessaging.instance.getToken();
 
@@ -140,17 +140,11 @@ class _AccountLoginPageState extends State<AccountLoginPage> {
         return;
       }
 
-      if (stokv != "") {
+      final toks = await APIClient.getKeyTokenByToken(uid, stokv);
-        final toks = await APIClient.getKeyTokenByToken(uid, stokv);
 
-        if (!toks.allChannels || toks.permissions != 'CS') {
+      if (!toks.allChannels || toks.permissions != 'CS') {
-          Toaster.error("Error", 'Send token does not have required permissions');
+        Toaster.error("Error", 'Send token does not have required permissions');
-          return;
+        return;
-        }
-      } else {
-        final toks = await APIClient.createKeyToken(DirectTokenSource(uid, atokv), "SendKey (auto generated by SCN)", "CS", true);
-
-        stokv = toks.token;
       }
 
       final user = await APIClient.getUser(DirectTokenSource(uid, atokv), uid);

flutter/lib/pages/channel_list/channel_list.dart

@@ -1,15 +1,12 @@
 import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.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/models/channel.dart';
-import 'package:simplecloudnotifier/pages/channel_scanner/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';
 import 'package:simplecloudnotifier/pages/channel_list/channel_list_item.dart';
-import 'package:simplecloudnotifier/utils/navi.dart';
 
 class ChannelRootPage extends StatefulWidget {
   const ChannelRootPage({super.key, required this.isVisiblePage});
@@ -20,13 +17,11 @@ class ChannelRootPage extends StatefulWidget {
   State<ChannelRootPage> createState() => _ChannelRootPageState();
 }
 
-class _ChannelRootPageState extends State<ChannelRootPage> with RouteAware {
+class _ChannelRootPageState extends State<ChannelRootPage> {
-  final PagingController<int, ChannelWithSubscription> _pagingController = PagingController.fromValue(PagingState(nextPageKey: null, itemList: [], error: null), firstPageKey: 0);
+  final PagingController<int, Channel> _pagingController = PagingController.fromValue(PagingState(nextPageKey: null, itemList: [], error: null), firstPageKey: 0);
 
   bool _isInitialized = false;
 
-  bool _reloadEnqueued = false;
-
   @override
   void initState() {
     super.initState();
@@ -36,17 +31,10 @@ class _ChannelRootPageState extends State<ChannelRootPage> with RouteAware {
     if (widget.isVisiblePage && !_isInitialized) _realInitState();
   }
 
-  @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();
   }
 
@@ -63,24 +51,6 @@ class _ChannelRootPageState extends State<ChannelRootPage> with RouteAware {
     }
   }
 
-  @override
-  void didPush() {
-    // ...
-  }
-
-  @override
-  void didPopNext() {
-    if (_reloadEnqueued) {
-      ApplicationLog.debug('[ChannelList::RouteObserver] --> didPopNext (will background-refresh) (_reloadEnqueued == true)');
-      () async {
-        _reloadEnqueued = false;
-        AppBarState().setLoadingIndeterminate(true);
-        await Future.delayed(const Duration(milliseconds: 500), () {}); // prevents flutter bug where the whole process crashes ?!?
-        await _backgroundRefresh();
-      }();
-    }
-  }
-
   void _realInitState() {
     ApplicationLog.debug('ChannelRootPage::_realInitState');
     _pagingController.refresh();
@@ -98,9 +68,9 @@ class _ChannelRootPageState extends State<ChannelRootPage> with RouteAware {
     }
 
     try {
-      final items = (await APIClient.getChannelList(acc, ChannelSelector.all)).toList();
+      final items = (await APIClient.getChannelList(acc, ChannelSelector.all)).map((p) => p.channel).toList();
 
-      items.sort((a, b) => -1 * (a.channel.timestampLastSent ?? '').compareTo(b.channel.timestampLastSent ?? ''));
+      items.sort((a, b) => -1 * (a.timestampLastSent ?? '').compareTo(b.timestampLastSent ?? ''));
 
       _pagingController.value = PagingState(nextPageKey: null, itemList: items, error: null);
     } catch (exc, trace) {
@@ -124,17 +94,13 @@ class _ChannelRootPageState extends State<ChannelRootPage> with RouteAware {
 
       AppBarState().setLoadingIndeterminate(true);
 
-      final items = (await APIClient.getChannelList(acc, ChannelSelector.all)).toList();
+      final items = (await APIClient.getChannelList(acc, ChannelSelector.all)).map((p) => p.channel).toList();
 
-      items.sort((a, b) => -1 * (a.channel.timestampLastSent ?? '').compareTo(b.channel.timestampLastSent ?? ''));
+      items.sort((a, b) => -1 * (a.timestampLastSent ?? '').compareTo(b.timestampLastSent ?? ''));
 
-      setState(() {
+      _pagingController.value = PagingState(nextPageKey: null, itemList: items, error: null);
-        _pagingController.value = PagingState(nextPageKey: null, itemList: items, error: null);
-      });
     } catch (exc, trace) {
-      setState(() {
+      _pagingController.error = exc.toString();
-        _pagingController.error = exc.toString();
-      });
       ApplicationLog.error('Failed to list channels: ' + exc.toString(), trace: trace);
     } finally {
       AppBarState().setLoadingIndeterminate(false);
@@ -143,40 +109,19 @@ class _ChannelRootPageState extends State<ChannelRootPage> with RouteAware {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return RefreshIndicator(
-      body: RefreshIndicator(
+      onRefresh: () => Future.sync(
-        onRefresh: () => Future.sync(
+        () => _pagingController.refresh(),
-          () => _pagingController.refresh(),
+      ),
-        ),
+      child: PagedListView<int, Channel>(
-        child: PagedListView<int, ChannelWithSubscription>(
+        pagingController: _pagingController,
-          pagingController: _pagingController,
+        builderDelegate: PagedChildBuilderDelegate<Channel>(
-          builderDelegate: PagedChildBuilderDelegate<ChannelWithSubscription>(
+          itemBuilder: (context, item, index) => ChannelListItem(
-            itemBuilder: (context, item, index) => ChannelListItem(
+            channel: item,
-              channel: item.channel,
+            onPressed: () {/*TODO*/},
-              subscription: item.subscription,
-              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);
-                });
-              },
-            ),
           ),
         ),
       ),
-      floatingActionButton: FloatingActionButton(
-        heroTag: 'fab_channel_list_qr',
-        onPressed: () {
-          Navi.push(context, () => ChannelScannerPage());
-        },
-        child: const Icon(FontAwesomeIcons.qrcode),
-      ),
     );
   }
-
-  void _enqueueReload() {
-    _reloadEnqueued = true;
-  }
 }

flutter/lib/pages/channel_list/channel_list_extended.dart

@@ -1,160 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.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/pages/channel_scanner/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';
-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);
-                  });
-                },
-              ),
-            ),
-          ),
-        ),
-      ),
-      floatingActionButton: FloatingActionButton(
-        heroTag: 'fab_channel_list_extended-plus',
-        onPressed: () {
-          Navi.push(context, () => ChannelScannerPage());
-        },
-        child: const Icon(FontAwesomeIcons.plus),
-      ),
-    );
-  }
-
-  void _enqueueReload() {
-    _reloadEnqueued = true;
-  }
-}

flutter/lib/pages/channel_list/channel_list_item.dart

@@ -1,46 +1,29 @@
 import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:simplecloudnotifier/api/api_client.dart';
 import 'package:simplecloudnotifier/models/channel.dart';
-import 'package:simplecloudnotifier/models/scn_message.dart';
+import 'package:simplecloudnotifier/models/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/app_settings.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.onChannelListReloadTrigger,
+    required this.onPressed,
-    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();
 }
 
 class _ChannelListItemState extends State<ChannelListItem> {
-  SCNMessage? lastMessage;
+  Message? lastMessage;
 
   @override
   void initState() {
@@ -48,11 +31,9 @@ class _ChannelListItemState extends State<ChannelListItem> {
 
     final acc = Provider.of<AppAuth>(context, listen: false);
 
-    if (acc.isAuth() && widget.mode == ChannelListItemMode.Messages) {
+    if (acc.isAuth()) {
-      lastMessage = SCNDataCache().getMessagesSorted().where((p) => p.channelID == widget.channel.channelID).firstOrNull;
-
       () async {
-        final (_, channelMessages) = await APIClient.getChannelMessageList(acc, widget.channel.channelID, '@start', pageSize: 1);
+        final (_, channelMessages) = await APIClient.getMessageList(acc, '@start', pageSize: 1, channelIDs: [widget.channel.channelID]);
         setState(() {
           lastMessage = channelMessages.firstOrNull;
         });
@@ -62,68 +43,45 @@ class _ChannelListItemState extends State<ChannelListItem> {
 
   @override
   Widget build(BuildContext context) {
-    final dateFormat = context.select<AppSettings, AppSettingsDateFormat>((v) => v.dateFormat).dateOnlyFormat();
+    //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: () {
+        splashColor: Theme.of(context).splashColor,
-          if (widget.mode == ChannelListItemMode.Messages) {
+        onTap: widget.onPressed,
-            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(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.stretch,
             children: [
-              _buildIcon(context),
+              Row(
-              SizedBox(width: 8),
+                children: [
-              Expanded(
+                  Expanded(
-                child: Column(
+                    child: Text(
-                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                      widget.channel.displayName,
-                  children: [
+                      style: const TextStyle(fontWeight: FontWeight.bold),
-                    Row(
-                      children: [
-                        Expanded(
-                          child: Text(
-                            widget.channel.displayName,
-                            style: const TextStyle(fontWeight: FontWeight.bold),
-                          ),
-                        ),
-                        Text(
-                          (widget.channel.timestampLastSent == null) ? '' : dateFormat.format(DateTime.parse(widget.channel.timestampLastSent!).toLocal()),
-                          style: const TextStyle(fontSize: 14),
-                        ),
-                      ],
                     ),
-                    SizedBox(height: 4),
+                  ),
-                    Row(
+                  Text(
-                      crossAxisAlignment: CrossAxisAlignment.end,
+                    (widget.channel.timestampLastSent == null) ? '' : ChannelListItem._dateFormat.format(DateTime.parse(widget.channel.timestampLastSent!).toLocal()),
-                      children: [
+                    style: const TextStyle(fontSize: 14),
-                        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)),
+                ],
-                      ],
-                    ),
-                  ],
-                ),
               ),
-              SizedBox(width: 4),
+              SizedBox(height: 4),
-              GestureDetector(
+              Row(
-                onTap: () {
+                crossAxisAlignment: CrossAxisAlignment.end,
-                  if (widget.mode == ChannelListItemMode.Messages) {
+                children: [
-                    Navi.push(context, () => ChannelViewPage(channelID: widget.channel.channelID, preloadedData: (widget.channel, widget.subscription), needsReload: widget.onChannelListReloadTrigger));
+                  Expanded(
-                  } else {
+                    child: Text(
-                    Navi.push(context, () => ChannelMessageViewPage(channel: widget.channel));
+                      lastMessage?.title ?? '...',
-                  }
+                      style: TextStyle(color: Theme.of(context).textTheme.bodyLarge?.color?.withAlpha(160)),
-                },
+                    ),
-                child: Padding(
+                  ),
-                  padding: const EdgeInsets.all(8),
+                  Text(widget.channel.messagesSent.toString(), style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold)),
-                  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),
+                ],
-                ),
               ),
             ],
           ),
@@ -131,153 +89,4 @@ class _ChannelListItemState extends State<ChannelListItem> {
       ),
     );
   }
-
-  String _preformatTitle(SCNMessage? message) {
-    if (message == null) return '...';
-    return message.title.replaceAll('\n', '').replaceAll('\r', '').replaceAll('\t', ' ');
-  }
-
-  Widget _buildIcon(BuildContext context) {
-    final acc = AppAuth();
-
-    if (widget.subscription == null && widget.channel.ownerUserID == acc.userID) {
-      // not-subscribed (own channel)
-      Widget result = Icon(FontAwesomeIcons.solidSquareRss, color: Theme.of(context).colorScheme.outline.withAlpha(75), size: 32);
-      result = GestureDetector(onTap: () => _subscribe(), child: result);
-      return result;
-    } else if (widget.subscription == null) {
-      // not-subscribed (foreign channel)
-      Widget result = Icon(FontAwesomeIcons.solidSquareShareNodes, color: Theme.of(context).colorScheme.outline.withAlpha(75), size: 32);
-      return result;
-    } else if (widget.subscription!.confirmed && !widget.subscription!.active) {
-      if (widget.channel.ownerUserID == widget.subscription!.subscriberUserID) {
-        // inactive (own channel)
-        Widget result = Icon(FontAwesomeIcons.solidSquareRss, color: Theme.of(context).colorScheme.outline.withAlpha(75), size: 32);
-        result = GestureDetector(onTap: () => _activate(widget.subscription!), child: result);
-        return result;
-      } else {
-        // inactive (foreign channel)
-        Widget result = Icon(FontAwesomeIcons.solidSquareShareNodes, color: Theme.of(context).colorScheme.outline.withAlpha(75), size: 32);
-        result = GestureDetector(onTap: () => _activate(widget.subscription!), child: result);
-        return result;
-      }
-    } else if (widget.subscription!.confirmed && widget.subscription!.active) {
-      if (widget.channel.ownerUserID == widget.subscription!.subscriberUserID) {
-        // subscribed+active (own channel)
-        Widget result = Icon(FontAwesomeIcons.solidSquareRss, color: Theme.of(context).colorScheme.onPrimaryContainer, size: 32);
-        result = GestureDetector(onTap: () => _unsubscribe(widget.subscription!), child: result);
-        return result;
-      } else {
-        // subscribed+active (foreign channel)
-        Widget result = Icon(FontAwesomeIcons.solidSquareShareNodes, color: Theme.of(context).colorScheme.onPrimaryContainer, size: 32);
-        result = GestureDetector(onTap: () => _deactivate(widget.subscription!), child: result);
-        return result;
-      }
-    } else if (!widget.subscription!.confirmed) {
-      if (widget.channel.ownerUserID == widget.subscription!.subscriberUserID) {
-        // requested (own channel)
-        return SizedBox(width: 32, height: 32);
-      } else {
-        // requested (foreign channel)
-        Widget result = Icon(FontAwesomeIcons.solidSquareEnvelope, color: Theme.of(context).colorScheme.tertiary, size: 32);
-        result = GestureDetector(onTap: () => _unsubscribe(widget.subscription!), child: result);
-        return result;
-      }
-    }
-
-    // fallback
-    return SizedBox(width: 32, height: 32);
-  }
-
-  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.subscription!.active && 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 && !widget.subscription!.active && widget.channel.ownerUserID == widget.subscription!.subscriberUserID) {
-      return Text("inactive (own channel)", style: TextStyle(color: Theme.of(context).textTheme.bodyLarge?.color?.withAlpha(160)));
-    } else if (widget.subscription!.confirmed && widget.subscription!.active) {
-      return Text("subscribed & active (foreign channel)", style: TextStyle(color: Theme.of(context).textTheme.bodyLarge?.color?.withAlpha(160)));
-    } else if (widget.subscription!.confirmed && !widget.subscription!.active) {
-      return Text("subscribed (foreign channel) (inactive)", 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()) {
-      try {
-        await APIClient.deleteSubscription(acc, sub.channelID, sub.subscriptionID);
-        widget.onChannelListReloadTrigger.call();
-
-        widget.onSubscriptionChanged.call(sub.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);
-      }
-    }
-  }
-
-  void _deactivate(Subscription sub) async {
-    final acc = AppAuth();
-
-    if (acc.isAuth()) {
-      try {
-        var newSub = await APIClient.deactivateSubscription(acc, sub.channelID, sub.subscriptionID);
-        widget.onChannelListReloadTrigger.call();
-
-        widget.onSubscriptionChanged.call(sub.channelID, newSub);
-
-        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 _activate(Subscription sub) async {
-    final acc = AppAuth();
-
-    if (acc.isAuth()) {
-      try {
-        var newSub = await APIClient.activateSubscription(acc, sub.channelID, sub.subscriptionID);
-        widget.onChannelListReloadTrigger.call();
-
-        widget.onSubscriptionChanged.call(sub.channelID, newSub);
-
-        Toaster.success("Success", 'Subscribed to channel');
-      } catch (exc, trace) {
-        Toaster.error("Error", 'Failed to subscribe to channel');
-        ApplicationLog.error('Failed to subscribe to channel: ' + exc.toString(), trace: trace);
-      }
-    }
-  }
 }

flutter/lib/pages/channel_message_view/channel_message_view.dart

@@ -1,105 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:infinite_scroll_pagination/infinite_scroll_pagination.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/scn_message.dart';
-import 'package:simplecloudnotifier/pages/message_list/message_list_item.dart';
-import 'package:simplecloudnotifier/pages/message_view/message_view.dart';
-import 'package:simplecloudnotifier/state/app_settings.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:provider/provider.dart';
-
-class ChannelMessageViewPage extends StatefulWidget {
-  const ChannelMessageViewPage({
-    required this.channel,
-    super.key,
-  });
-
-  final Channel channel;
-
-  @override
-  State<ChannelMessageViewPage> createState() => _ChannelMessageViewPageState();
-}
-
-class _ChannelMessageViewPageState extends State<ChannelMessageViewPage> {
-  PagingController<String, SCNMessage> _pagingController = PagingController.fromValue(PagingState(nextPageKey: null, itemList: [], error: null), firstPageKey: '@start');
-
-  @override
-  void initState() {
-    super.initState();
-
-    _pagingController.addPageRequestListener(_fetchPage);
-
-    _pagingController.refresh();
-  }
-
-  @override
-  void dispose() {
-    _pagingController.dispose();
-    super.dispose();
-  }
-
-  Future<void> _fetchPage(String thisPageToken) async {
-    final acc = Provider.of<AppAuth>(context, listen: false);
-    final cfg = Provider.of<AppSettings>(context, listen: false);
-
-    ApplicationLog.debug('Start ChannelMessageViewPage::_pagingController::_fetchPage [ ${thisPageToken} ]');
-
-    if (!acc.isAuth()) {
-      _pagingController.error = 'Not logged in';
-      return;
-    }
-
-    try {
-      final (npt, newItems) = await APIClient.getChannelMessageList(acc, this.widget.channel.channelID, thisPageToken, pageSize: cfg.messagePageSize);
-
-      SCNDataCache().addToMessageCache(newItems); // no await
-
-      if (npt == '@end') {
-        _pagingController.appendLastPage(newItems);
-      } else {
-        _pagingController.appendPage(newItems, npt);
-      }
-    } catch (exc, trace) {
-      _pagingController.error = exc.toString();
-      ApplicationLog.error('Failed to list channel-messages: ' + exc.toString(), trace: trace);
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return SCNScaffold(
-      title: this.widget.channel.displayName,
-      showSearch: false,
-      showShare: false,
-      child: _buildMessageList(context),
-    );
-  }
-
-  Widget _buildMessageList(BuildContext context) {
-    return Padding(
-      padding: EdgeInsets.fromLTRB(8, 4, 8, 4),
-      child: RefreshIndicator(
-        onRefresh: () => Future.sync(
-          () => _pagingController.refresh(),
-        ),
-        child: PagedListView<String, SCNMessage>(
-          pagingController: _pagingController,
-          builderDelegate: PagedChildBuilderDelegate<SCNMessage>(
-            itemBuilder: (context, item, index) => MessageListItem(
-              message: item,
-              allChannels: {this.widget.channel.channelID: this.widget.channel},
-              onPressed: () {
-                Navi.push(context, () => MessageViewPage(messageID: item.messageID, preloadedData: (item,)));
-              },
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

flutter/lib/pages/channel_scanner/channel_scanner.dart

@@ -1,159 +0,0 @@
-import 'dart:convert';
-
-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/pages/channel_scanner/channel_scanner_result_channelsubscribe.dart';
-import 'package:simplecloudnotifier/pages/channel_scanner/channel_scanner_result_channelview.dart';
-import 'package:simplecloudnotifier/pages/channel_scanner/channel_scanner_result_messagesend.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),
-              if (scanResult == null) ...[
-                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),
-              ],
-              Center(
-                child: ConstrainedBox(
-                  constraints: BoxConstraints(maxWidth: 300, minWidth: 300, minHeight: 200),
-                  child: _buildScanResult(context),
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  void _handleBarcode(BarcodeCapture barcodes) {
-    setState(() {
-      if (barcodes.barcodes.isEmpty) {
-        scanResult = null;
-      } else {
-        scanResult = ScanResult.parse(barcodes.barcodes[0].rawValue ?? '');
-        print('parsed: ${jsonEncode(barcodes.barcodes[0].rawValue)} as ${scanResult.runtimeType.toString()}');
-      }
-    });
-  }
-
-  Widget _buildScanResult(BuildContext context) {
-    if (scanResult == null) {
-      return UI.box(
-        padding: EdgeInsets.fromLTRB(16, 32, 16, 8),
-        context: context,
-        child: Center(
-          child: Column(
-            spacing: 32,
-            children: [
-              Icon(FontAwesomeIcons.solidEmptySet, size: 64, color: Theme.of(context).colorScheme.onPrimaryContainer.withAlpha(48)),
-              Text("Please scan a Channel QR Code to subscribe to it", style: TextStyle(fontStyle: FontStyle.italic), textAlign: TextAlign.center),
-            ],
-          ),
-        ),
-      );
-    }
-
-    if (scanResult! is ScanResultMessageSend) {
-      return UI.box(
-        padding: EdgeInsets.fromLTRB(16, 8, 16, 8),
-        context: context,
-        child: ChannelScannerResultMessageSend(value: scanResult! as ScanResultMessageSend),
-      );
-    }
-
-    if (scanResult! is ScanResultChannel) {
-      return UI.box(
-        padding: EdgeInsets.fromLTRB(16, 8, 16, 8),
-        context: context,
-        child: ChannelScannerResultChannelView(value: scanResult! as ScanResultChannel),
-      );
-    }
-
-    if (scanResult! is ScanResultChannelSubscribe) {
-      return UI.box(
-        padding: EdgeInsets.fromLTRB(16, 8, 16, 8),
-        context: context,
-        child: ChannelScannerResultChannelSubscribe(value: scanResult! as ScanResultChannelSubscribe),
-      );
-    }
-
-    if (scanResult! is ScanResultError) {
-      return UI.box(
-        padding: EdgeInsets.fromLTRB(16, 32, 16, 8),
-        context: context,
-        child: Center(
-          child: Column(
-            spacing: 32,
-            children: [
-              Icon(FontAwesomeIcons.solidTriangleExclamation, size: 64, color: Colors.red[900]),
-              Text((scanResult! as ScanResultError).message, textAlign: TextAlign.center),
-            ],
-          ),
-        ),
-      );
-    }
-
-    return UI.box(
-      padding: EdgeInsets.fromLTRB(16, 32, 16, 8),
-      context: context,
-      child: Center(
-        child: Column(
-          spacing: 32,
-          children: [
-            Icon(FontAwesomeIcons.solidTriangleExclamation, size: 64, color: Colors.red[900]),
-            Text("Please scan a Channel QR Code to subscribe to it", style: TextStyle(fontStyle: FontStyle.italic), textAlign: TextAlign.center),
-          ],
-        ),
-      ),
-    );
-  }
-}

flutter/lib/pages/channel_scanner/channel_scanner_result_channelsubscribe.dart

@@ -1,203 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:provider/provider.dart';
-import 'package:simplecloudnotifier/api/api_client.dart';
-import 'package:simplecloudnotifier/components/error_display/error_display.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_view/channel_view.dart';
-import 'package:simplecloudnotifier/state/app_auth.dart';
-import 'package:simplecloudnotifier/state/application_log.dart';
-import 'package:simplecloudnotifier/utils/navi.dart';
-import 'package:simplecloudnotifier/utils/toaster.dart';
-import 'package:simplecloudnotifier/utils/ui.dart';
-
-class ChannelScannerResultChannelSubscribe extends StatefulWidget {
-  final ScanResultChannelSubscribe value;
-
-  const ChannelScannerResultChannelSubscribe({required this.value}) : super();
-
-  @override
-  State<ChannelScannerResultChannelSubscribe> createState() => _ChannelScannerResultChannelSubscribeState();
-}
-
-class _ChannelScannerResultChannelSubscribeState extends State<ChannelScannerResultChannelSubscribe> {
-  Future<(ChannelPreview, UserPreview)?> _fetchDataFuture;
-
-  _ChannelScannerResultChannelSubscribeState() : _fetchDataFuture = Future.value(null); // Initial dummy future
-
-  Subscription? overrideSubscription = null;
-
-  @override
-  void initState() {
-    super.initState();
-
-    final auth = Provider.of<AppAuth>(context, listen: false);
-    setState(() {
-      _fetchDataFuture = _fetchData(auth);
-    });
-  }
-
-  Future<(ChannelPreview, UserPreview)?> _fetchData(AppAuth auth) async {
-    ChannelPreview? channel = null;
-    try {
-      channel = await APIClient.getChannelPreview(auth, widget.value.channelID);
-    } catch (e, stackTrace) {
-      Toaster.error("Error", 'Failed to fetch channel preview: ${e.toString()}');
-      ApplicationLog.error('Failed to fetch channel (preview) for ${widget.value.channelID}', trace: stackTrace);
-      return null;
-    }
-
-    UserPreview? user = null;
-    try {
-      user = await APIClient.getUserPreview(auth, widget.value.ownerUserID);
-    } catch (e, stackTrace) {
-      Toaster.error("Error", 'Failed to fetch user preview: ${e.toString()}');
-      ApplicationLog.error('Failed to fetch user (preview) for ${widget.value.ownerUserID}', trace: stackTrace);
-      return null;
-    }
-
-    return (channel, user);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return FutureBuilder<(ChannelPreview, UserPreview)?>(
-      future: _fetchDataFuture,
-      builder: (context, snapshot) {
-        final auth = Provider.of<AppAuth>(context, listen: false);
-
-        if (snapshot.connectionState == ConnectionState.waiting) {
-          return const Center(child: CircularProgressIndicator());
-        }
-
-        if (snapshot.hasError) {
-          return ErrorDisplay(errorMessage: '${snapshot.error}');
-        }
-
-        if (snapshot.data == null) {
-          return Column(
-            spacing: 32,
-            children: [
-              Icon(FontAwesomeIcons.solidTriangleExclamation, size: 64, color: Colors.red[900]),
-              Text("Failed to parse QR", textAlign: TextAlign.center),
-            ],
-          );
-        }
-
-        final (channel, user) = snapshot.data!;
-
-        final sub = overrideSubscription ?? channel.subscription;
-
-        return Column(
-          crossAxisAlignment: CrossAxisAlignment.stretch,
-          children: [
-            Text("SCN Channel", style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 20), textAlign: TextAlign.center),
-            const SizedBox(height: 16),
-            Row(
-              children: [
-                ConstrainedBox(child: Text("Name: ", style: const TextStyle(fontWeight: FontWeight.bold)), constraints: const BoxConstraints(minWidth: 100)),
-                Expanded(child: SingleChildScrollView(child: Text(channel.displayName), scrollDirection: Axis.horizontal)),
-              ],
-            ),
-            Row(
-              children: [
-                ConstrainedBox(child: Text("InternalName: ", style: const TextStyle(fontWeight: FontWeight.bold)), constraints: const BoxConstraints(minWidth: 100)),
-                Expanded(child: SingleChildScrollView(child: Text(channel.internalName, style: const TextStyle(fontStyle: FontStyle.italic)), scrollDirection: Axis.horizontal)),
-              ],
-            ),
-            Row(
-              children: [
-                ConstrainedBox(child: Text("ChannelID: ", style: const TextStyle(fontWeight: FontWeight.bold)), constraints: const BoxConstraints(minWidth: 100)),
-                Expanded(child: SingleChildScrollView(child: Text(channel.channelID, style: const TextStyle(fontStyle: FontStyle.italic)), scrollDirection: Axis.horizontal)),
-              ],
-            ),
-            Row(
-              children: [
-                ConstrainedBox(child: Text("Messages: ", style: const TextStyle(fontWeight: FontWeight.bold)), constraints: const BoxConstraints(minWidth: 100)),
-                Expanded(child: SingleChildScrollView(child: Text(channel.messagesSent.toString()), scrollDirection: Axis.horizontal)),
-              ],
-            ),
-            if (channel.descriptionName != null && channel.descriptionName!.isNotEmpty)
-              Row(
-                children: [
-                  ConstrainedBox(child: Text("Description:", style: const TextStyle(fontWeight: FontWeight.bold)), constraints: const BoxConstraints(minWidth: 100)),
-                  Expanded(child: SingleChildScrollView(child: Text(channel.descriptionName!), scrollDirection: Axis.horizontal)),
-                ],
-              ),
-            const SizedBox(height: 16),
-            Row(
-              children: [
-                ConstrainedBox(child: Text("Owner:", style: const TextStyle(fontWeight: FontWeight.bold)), constraints: const BoxConstraints(minWidth: 100)),
-                Expanded(child: SingleChildScrollView(child: Text((user.username ?? user.userID) + ((auth.userID != null && auth.userID! == user.userID) ? "\n(you)" : "")), scrollDirection: Axis.horizontal)),
-              ],
-            ),
-            Row(
-              children: [
-                ConstrainedBox(child: Text("UserID:", style: const TextStyle(fontWeight: FontWeight.bold)), constraints: const BoxConstraints(minWidth: 100)),
-                Expanded(child: SingleChildScrollView(child: Text(user.userID, style: const TextStyle(fontStyle: FontStyle.italic)), scrollDirection: Axis.horizontal)),
-              ],
-            ),
-            const SizedBox(height: 16),
-            Row(
-              children: [
-                ConstrainedBox(child: Text("Status:", style: const TextStyle(fontWeight: FontWeight.bold)), constraints: const BoxConstraints(minWidth: 100)),
-                Expanded(child: SingleChildScrollView(child: Text(_formatSubscriptionStatus(sub)), scrollDirection: Axis.horizontal)),
-              ],
-            ),
-            const SizedBox(height: 48),
-            if (sub == null)
-              UI.button(
-                text: 'Request Subscription',
-                onPressed: _onSubscribe,
-                color: Theme.of(context).colorScheme.primary,
-                textColor: Theme.of(context).colorScheme.onPrimary,
-              ),
-            if (sub != null && sub.confirmed)
-              UI.button(
-                text: 'Go to channel',
-                onPressed: () {
-                  Navi.pushOnRoot(context, () => ChannelViewPage(channelID: widget.value.channelID, preloadedData: null, needsReload: null));
-                },
-                color: Theme.of(context).colorScheme.primary,
-                textColor: Theme.of(context).colorScheme.onPrimary,
-              ),
-          ],
-        );
-      },
-    );
-  }
-
-  void _onSubscribe() async {
-    final auth = Provider.of<AppAuth>(context, listen: false);
-    try {
-      var sub = await APIClient.subscribeToChannelbyID(auth, widget.value.channelID, subscribeKey: widget.value.subscribeKey);
-      if (sub.confirmed) {
-        Toaster.success("Success", "Subscription request sent and auto-confirmed");
-      } else {
-        Toaster.success("Success", "Subscription request sent - pending confirmation");
-      }
-      setState(() {
-        overrideSubscription = sub;
-      });
-    } catch (e) {
-      Toaster.error("Error", 'Failed to send subscription-request: ${e.toString()}');
-    }
-  }
-
-  String _formatSubscriptionStatus(Subscription? sub) {
-    if (sub == null) {
-      return "Not Subscribed";
-    } else if (sub.confirmed) {
-      if (sub.active) {
-        return "Already Subscribed";
-      } else {
-        return "Already Subscribed (inactive)";
-      }
-    } else {
-      return "Unconfirmed Subscription";
-    }
-  }
-}

flutter/lib/pages/channel_scanner/channel_scanner_result_channelview.dart

@@ -1,162 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:provider/provider.dart';
-import 'package:simplecloudnotifier/api/api_client.dart';
-import 'package:simplecloudnotifier/components/error_display/error_display.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/state/app_auth.dart';
-import 'package:simplecloudnotifier/state/application_log.dart';
-import 'package:simplecloudnotifier/utils/toaster.dart';
-
-class ChannelScannerResultChannelView extends StatefulWidget {
-  final ScanResultChannel value;
-
-  const ChannelScannerResultChannelView({required this.value}) : super();
-
-  @override
-  State<ChannelScannerResultChannelView> createState() => _ChannelScannerResultChannelViewState();
-}
-
-class _ChannelScannerResultChannelViewState extends State<ChannelScannerResultChannelView> {
-  Future<(ChannelPreview, UserPreview)?> _fetchDataFuture;
-
-  _ChannelScannerResultChannelViewState() : _fetchDataFuture = Future.value(null); // Initial dummy future
-
-  @override
-  void initState() {
-    super.initState();
-
-    final auth = Provider.of<AppAuth>(context, listen: false);
-    setState(() {
-      _fetchDataFuture = _fetchData(auth);
-    });
-  }
-
-  Future<(ChannelPreview, UserPreview)?> _fetchData(AppAuth auth) async {
-    ChannelPreview? channel = null;
-    try {
-      channel = await APIClient.getChannelPreview(auth, widget.value.channelID);
-    } catch (e, stackTrace) {
-      Toaster.error("Error", 'Failed to fetch channel preview: ${e.toString()}');
-      ApplicationLog.error('Failed to fetch channel (preview) for ${widget.value.channelID}', trace: stackTrace);
-      return null;
-    }
-
-    UserPreview? user = null;
-    try {
-      user = await APIClient.getUserPreview(auth, widget.value.ownerUserID);
-    } catch (e, stackTrace) {
-      Toaster.error("Error", 'Failed to fetch user preview: ${e.toString()}');
-      ApplicationLog.error('Failed to fetch user (preview) for ${widget.value.ownerUserID}', trace: stackTrace);
-      return null;
-    }
-
-    return (channel, user);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return FutureBuilder<(ChannelPreview, UserPreview)?>(
-      future: _fetchDataFuture,
-      builder: (context, snapshot) {
-        if (snapshot.connectionState == ConnectionState.waiting) {
-          return const Center(child: CircularProgressIndicator());
-        }
-
-        if (snapshot.hasError) {
-          return ErrorDisplay(errorMessage: '${snapshot.error}');
-        }
-
-        if (snapshot.data == null) {
-          return Column(
-            spacing: 32,
-            children: [
-              Icon(FontAwesomeIcons.solidTriangleExclamation, size: 64, color: Colors.red[900]),
-              Text("Failed to parse QR", textAlign: TextAlign.center),
-            ],
-          );
-        }
-
-        final (channel, user) = snapshot.data!;
-
-        return Column(
-          crossAxisAlignment: CrossAxisAlignment.stretch,
-          children: [
-            Text("SCN Channel", style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 20), textAlign: TextAlign.center),
-            const SizedBox(height: 16),
-            Row(
-              children: [
-                ConstrainedBox(child: Text("Name: ", style: const TextStyle(fontWeight: FontWeight.bold)), constraints: const BoxConstraints(minWidth: 100)),
-                Expanded(child: SingleChildScrollView(child: Text(channel.displayName), scrollDirection: Axis.horizontal)),
-              ],
-            ),
-            Row(
-              children: [
-                ConstrainedBox(child: Text("InternalName: ", style: const TextStyle(fontWeight: FontWeight.bold)), constraints: const BoxConstraints(minWidth: 100)),
-                Expanded(child: SingleChildScrollView(child: Text(channel.internalName, style: const TextStyle(fontStyle: FontStyle.italic)), scrollDirection: Axis.horizontal)),
-              ],
-            ),
-            Row(
-              children: [
-                ConstrainedBox(child: Text("ChannelID: ", style: const TextStyle(fontWeight: FontWeight.bold)), constraints: const BoxConstraints(minWidth: 100)),
-                Expanded(child: SingleChildScrollView(child: Text(channel.channelID, style: const TextStyle(fontStyle: FontStyle.italic)), scrollDirection: Axis.horizontal)),
-              ],
-            ),
-            Row(
-              children: [
-                ConstrainedBox(child: Text("Messages: ", style: const TextStyle(fontWeight: FontWeight.bold)), constraints: const BoxConstraints(minWidth: 100)),
-                Expanded(child: SingleChildScrollView(child: Text(channel.messagesSent.toString()), scrollDirection: Axis.horizontal)),
-              ],
-            ),
-            if (channel.descriptionName != null && channel.descriptionName!.isNotEmpty)
-              Row(
-                children: [
-                  ConstrainedBox(child: Text("Description:", style: const TextStyle(fontWeight: FontWeight.bold)), constraints: const BoxConstraints(minWidth: 100)),
-                  Expanded(child: SingleChildScrollView(child: Text(channel.descriptionName!), scrollDirection: Axis.horizontal)),
-                ],
-              ),
-            const SizedBox(height: 16),
-            Row(
-              children: [
-                ConstrainedBox(child: Text("Owner:", style: const TextStyle(fontWeight: FontWeight.bold)), constraints: const BoxConstraints(minWidth: 100)),
-                Expanded(child: SingleChildScrollView(child: Text(user.username ?? user.userID), scrollDirection: Axis.horizontal)),
-              ],
-            ),
-            Row(
-              children: [
-                ConstrainedBox(child: Text("UserID:", style: const TextStyle(fontWeight: FontWeight.bold)), constraints: const BoxConstraints(minWidth: 100)),
-                Expanded(child: SingleChildScrollView(child: Text(user.userID, style: const TextStyle(fontStyle: FontStyle.italic)), scrollDirection: Axis.horizontal)),
-              ],
-            ),
-            const SizedBox(height: 16),
-            Row(
-              children: [
-                ConstrainedBox(child: Text("Status:", style: const TextStyle(fontWeight: FontWeight.bold)), constraints: const BoxConstraints(minWidth: 100)),
-                Expanded(child: SingleChildScrollView(child: Text(_formatSubscriptionStatus(channel.subscription)), scrollDirection: Axis.horizontal)),
-              ],
-            ),
-            const SizedBox(height: 48),
-            Text('QR Code contains no subscription-key\nCannot subscribe to channel', textAlign: TextAlign.center, style: const TextStyle(fontStyle: FontStyle.italic)),
-          ],
-        );
-      },
-    );
-  }
-
-  String _formatSubscriptionStatus(Subscription? sub) {
-    if (sub == null) {
-      return "Not Subscribed";
-    } else if (sub.confirmed) {
-      if (sub.active) {
-        return "Already Subscribed";
-      } else {
-        return "Already Subscribed (inactive)";
-      }
-    } else {
-      return "Unconfirmed Subscription";
-    }
-  }
-}

flutter/lib/pages/channel_scanner/channel_scanner_result_messagesend.dart

@@ -1,243 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:provider/provider.dart';
-import 'package:simplecloudnotifier/api/api_client.dart';
-import 'package:simplecloudnotifier/components/error_display/error_display.dart';
-import 'package:simplecloudnotifier/models/keytoken.dart';
-import 'package:simplecloudnotifier/models/scan_result.dart';
-import 'package:simplecloudnotifier/models/user.dart';
-import 'package:simplecloudnotifier/state/app_auth.dart';
-import 'package:simplecloudnotifier/state/application_log.dart';
-import 'package:simplecloudnotifier/utils/toaster.dart';
-import 'package:simplecloudnotifier/utils/ui.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-class ChannelScannerResultMessageSend extends StatefulWidget {
-  final ScanResultMessageSend value;
-
-  const ChannelScannerResultMessageSend({required this.value}) : super();
-
-  @override
-  State<ChannelScannerResultMessageSend> createState() => _ChannelScannerResultMessageSendState();
-}
-
-class _ChannelScannerResultMessageSendState extends State<ChannelScannerResultMessageSend> {
-  Future<(UserPreview, KeyTokenPreview?)?> _fetchDataFuture;
-
-  _ChannelScannerResultMessageSendState() : _fetchDataFuture = Future.value(null); // Initial dummy future
-
-  late TextEditingController _ctrlMessage;
-
-  @override
-  void initState() {
-    super.initState();
-
-    _ctrlMessage = TextEditingController();
-
-    final auth = Provider.of<AppAuth>(context, listen: false);
-    setState(() {
-      _fetchDataFuture = _fetchData(auth);
-    });
-  }
-
-  @override
-  void dispose() {
-    _ctrlMessage.dispose();
-    super.dispose();
-  }
-
-  Future<(UserPreview, KeyTokenPreview?)?> _fetchData(AppAuth auth) async {
-    UserPreview? user = null;
-    try {
-      user = await APIClient.getUserPreview(auth, widget.value.userID);
-    } catch (e, stackTrace) {
-      Toaster.error("Error", 'Failed to fetch user preview: ${e.toString()}');
-      ApplicationLog.error('Failed to fetch user (preview) for ${widget.value.userID}', trace: stackTrace);
-      return null;
-    }
-
-    KeyTokenPreview? key = null;
-    if (widget.value.userKey != null) {
-      try {
-        key = await APIClient.getKeyTokenPreviewByToken(auth, widget.value.userKey!);
-      } catch (e, stackTrace) {
-        Toaster.error("Error", 'Failed to fetch keytoken preview: ${e.toString()}');
-        ApplicationLog.error('Failed to fetch keytoken (preview) for ${widget.value.userID}', trace: stackTrace);
-        return null;
-      }
-    }
-
-    return (user, key);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return FutureBuilder<(UserPreview, KeyTokenPreview?)?>(
-      future: _fetchDataFuture,
-      builder: (context, snapshot) {
-        if (snapshot.connectionState == ConnectionState.waiting) {
-          return const Center(child: CircularProgressIndicator());
-        }
-
-        if (snapshot.hasError) {
-          return ErrorDisplay(errorMessage: '${snapshot.error}');
-        }
-
-        if (snapshot.data == null) {
-          return Column(
-            spacing: 32,
-            children: [
-              Icon(FontAwesomeIcons.solidTriangleExclamation, size: 64, color: Colors.red[900]),
-              Text("Failed to parse QR", textAlign: TextAlign.center),
-            ],
-          );
-        }
-
-        final (user, key) = snapshot.data!;
-
-        return Column(
-          crossAxisAlignment: CrossAxisAlignment.stretch,
-          children: [
-            Text((widget.value.userKey == null) ? "SCN User" : "SCN User & Key", style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 20), textAlign: TextAlign.center),
-            const SizedBox(height: 16),
-            if (user.username != null)
-              Row(
-                children: [
-                  ConstrainedBox(child: Text("Name: ", style: const TextStyle(fontWeight: FontWeight.bold)), constraints: const BoxConstraints(minWidth: 100)),
-                  Expanded(child: SingleChildScrollView(child: Text(user.username!), scrollDirection: Axis.horizontal)),
-                ],
-              ),
-            Row(
-              children: [
-                ConstrainedBox(child: Text("UserID:", style: const TextStyle(fontWeight: FontWeight.bold)), constraints: const BoxConstraints(minWidth: 100)),
-                Expanded(child: SingleChildScrollView(child: Text(user.userID, style: const TextStyle(fontStyle: FontStyle.italic)), scrollDirection: Axis.horizontal)),
-              ],
-            ),
-            const SizedBox(height: 16),
-            if (key != null) ...[
-              Row(
-                children: [
-                  ConstrainedBox(child: Text("KeyID:", style: const TextStyle(fontWeight: FontWeight.bold)), constraints: const BoxConstraints(minWidth: 100)),
-                  Expanded(child: SingleChildScrollView(child: Text(key.keytokenID, style: const TextStyle(fontStyle: FontStyle.italic)), scrollDirection: Axis.horizontal)),
-                ],
-              ),
-              Row(
-                children: [
-                  ConstrainedBox(child: Text("KeyName:", style: const TextStyle(fontWeight: FontWeight.bold)), constraints: const BoxConstraints(minWidth: 100)),
-                  Expanded(child: SingleChildScrollView(child: Text(key.name), scrollDirection: Axis.horizontal)),
-                ],
-              ),
-              Row(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  ConstrainedBox(child: Text("Permissions:", style: const TextStyle(fontWeight: FontWeight.bold)), constraints: const BoxConstraints(minWidth: 100)),
-                  Expanded(
-                    child: SingleChildScrollView(
-                      child: Text(_formatPermissions(key.permissions) + "\n" + (key.allChannels ? "(all channels)" : '(${key.channels.length} channels)')),
-                      scrollDirection: Axis.horizontal,
-                    ),
-                  ),
-                ],
-              ),
-            ],
-            const SizedBox(height: 16),
-            if (widget.value.userKey == null)
-              Text(
-                'QR Code contains no key\nCannot send messages',
-                textAlign: TextAlign.center,
-                style: const TextStyle(fontStyle: FontStyle.italic),
-              ),
-            if (widget.value.userKey != null) ..._buildSend(context),
-          ],
-        );
-      },
-    );
-  }
-
-  List<Widget> _buildSend(BuildContext context) {
-    return [
-      FractionallySizedBox(
-        widthFactor: 1.0,
-        child: TextField(
-          controller: _ctrlMessage,
-          decoration: const InputDecoration(
-            border: OutlineInputBorder(),
-            labelText: 'Text',
-          ),
-        ),
-      ),
-      const SizedBox(height: 4),
-      Row(
-        children: [
-          Expanded(
-            child: UI.button(
-              text: 'Send Message',
-              onPressed: _onSend,
-              color: Theme.of(context).colorScheme.primary,
-              textColor: Theme.of(context).colorScheme.onPrimary,
-            ),
-          ),
-          const SizedBox(width: 8),
-          UI.buttonIconOnly(
-            icon: FontAwesomeIcons.earthAmericas,
-            onPressed: _onOpenWeb,
-            square: true,
-            color: Theme.of(context).colorScheme.secondary,
-            iconColor: Theme.of(context).colorScheme.onSecondary,
-          ),
-        ],
-      ),
-    ];
-  }
-
-  void _onSend() async {
-    if (_ctrlMessage.text.isEmpty) {
-      Toaster.error("Error", 'Please enter a message');
-      return;
-    }
-
-    if (widget.value.userKey == null) return;
-
-    try {
-      await APIClient.sendMessage(widget.value.userID, widget.value.userKey!, _ctrlMessage.text);
-      Toaster.success("Success", 'Message sent');
-      setState(() {
-        _ctrlMessage.clear();
-      });
-    } catch (e, stackTrace) {
-      Toaster.error("Error", 'Failed to send message: ${e.toString()}');
-      ApplicationLog.error('Failed to send message', trace: stackTrace);
-    }
-  }
-
-  void _onOpenWeb() async {
-    try {
-      final Uri uri = Uri.parse(widget.value.url);
-
-      ApplicationLog.debug('Opening URL: [ ${uri.toString()} ]');
-
-      if (await canLaunchUrl(uri)) {
-        await launchUrl(uri);
-      } else {
-        Toaster.error("Error", 'Cannot open URL on this system');
-      }
-    } catch (exc, trace) {
-      ApplicationLog.error('Failed to open URL: ' + exc.toString(), additional: 'URL: ${widget.value.url}', trace: trace);
-    }
-  }
-
-  String _formatPermissions(String v) {
-    var splt = v.split(';');
-
-    if (splt.length == 0) return "None";
-
-    List<String> result = [];
-
-    if (splt.contains("A")) result.add(" - Admin");
-    if (splt.contains("UR")) result.add(" - Read Account");
-    if (splt.contains("CR")) result.add(" - Read Messages");
-    if (splt.contains("CS")) result.add(" - Send Messages");
-
-    return result.join("\n");
-  }
-}

flutter/lib/pages/channel_view/channel_view.dart

@@ -1,786 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:qr_flutter/qr_flutter.dart';
-import 'package:share_plus/share_plus.dart';
-import 'package:simplecloudnotifier/api/api_client.dart';
-import 'package:simplecloudnotifier/components/error_display/error_display.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';
-import 'package:simplecloudnotifier/pages/filtered_message_view/filtered_message_view.dart';
-import 'package:simplecloudnotifier/pages/subscription_view/subscription_view.dart';
-import 'package:simplecloudnotifier/state/app_auth.dart';
-import 'package:simplecloudnotifier/state/app_bar_state.dart';
-import 'package:simplecloudnotifier/state/application_log.dart';
-import 'package:simplecloudnotifier/types/immediate_future.dart';
-import 'package:simplecloudnotifier/utils/dialogs.dart';
-import 'package:simplecloudnotifier/utils/navi.dart';
-import 'package:simplecloudnotifier/utils/toaster.dart';
-import 'package:simplecloudnotifier/utils/ui.dart';
-import 'package:provider/provider.dart';
-
-class ChannelViewPage extends StatefulWidget {
-  const ChannelViewPage({
-    required this.channelID,
-    required this.preloadedData,
-    required this.needsReload,
-    super.key,
-  });
-
-  final String channelID;
-  final (Channel, Subscription?)? preloadedData;
-
-  final void Function()? needsReload;
-
-  @override
-  State<ChannelViewPage> createState() => _ChannelViewPageState();
-}
-
-enum EditState { none, editing, saving }
-
-enum ChannelViewPageInitState { loading, okay, error }
-
-class _ChannelViewPageState extends State<ChannelViewPage> {
-  ImmediateFuture<String?> _futureSubscribeKey = ImmediateFuture.ofPending();
-  ImmediateFuture<List<(Subscription, UserPreview?)>> _futureSubscriptions = ImmediateFuture.ofPending();
-  ImmediateFuture<UserPreview> _futureOwner = ImmediateFuture.ofPending();
-
-  final TextEditingController _ctrlDisplayName = TextEditingController();
-  final TextEditingController _ctrlDescriptionName = TextEditingController();
-
-  int _loadingIndeterminateCounter = 0;
-
-  EditState _editDisplayName = EditState.none;
-  String? _displayNameOverride = null;
-
-  EditState _editDescriptionName = EditState.none;
-  String? _descriptionNameOverride = null;
-
-  ChannelPreview? channelPreview;
-  Channel? channel;
-  Subscription? subscription;
-
-  ChannelViewPageInitState loadingState = ChannelViewPageInitState.loading;
-  String errorMessage = '';
-
-  @override
-  void initState() {
-    _initStateAsync(true);
-
-    super.initState();
-  }
-
-  Future<void> _initStateAsync(bool usePreload) async {
-    final userAcc = Provider.of<AppAuth>(context, listen: false);
-
-    if (widget.preloadedData != null && usePreload) {
-      channel = widget.preloadedData!.$1;
-      subscription = widget.preloadedData!.$2;
-      channelPreview = widget.preloadedData!.$1.toPreview(widget.preloadedData!.$2);
-    } else {
-      try {
-        var p = await APIClient.getChannelPreview(userAcc, widget.channelID);
-        setState(() {
-          channelPreview = p;
-          subscription = p.subscription;
-        });
-
-        if (p.ownerUserID == userAcc.userID) {
-          var r = await APIClient.getChannel(userAcc, widget.channelID);
-          setState(() {
-            channel = r.channel;
-            subscription = r.subscription;
-          });
-        } else {
-          setState(() {
-            channel = null;
-          });
-        }
-      } catch (exc, trace) {
-        ApplicationLog.error('Failed to load data: ' + exc.toString(), trace: trace);
-        Toaster.error("Error", 'Failed to load data');
-        this.errorMessage = 'Failed to load data: ' + exc.toString();
-        this.loadingState = ChannelViewPageInitState.error;
-        return;
-      }
-    }
-
-    setState(() {
-      this.loadingState = ChannelViewPageInitState.okay;
-
-      assert(channelPreview != null);
-
-      if (this.channelPreview!.ownerUserID == userAcc.userID) {
-        if (this.channel != null && this.channel!.subscribeKey != null) {
-          _futureSubscribeKey = ImmediateFuture<String?>.ofValue(this.channel!.subscribeKey);
-        } else {
-          _futureSubscribeKey = ImmediateFuture<String?>.ofFuture(_getSubscribeKey(userAcc));
-        }
-        _futureSubscriptions = ImmediateFuture<List<(Subscription, UserPreview?)>>.ofFuture(_listSubscriptions(userAcc));
-      } else {
-        _futureSubscribeKey = ImmediateFuture<String?>.ofValue(null);
-        _futureSubscriptions = ImmediateFuture<List<(Subscription, UserPreview?)>>.ofValue([]);
-      }
-
-      if (this.channelPreview!.ownerUserID == userAcc.userID) {
-        var cacheUser = userAcc.getUserOrNull();
-        if (cacheUser != null) {
-          _futureOwner = ImmediateFuture<UserPreview>.ofValue(cacheUser.toPreview());
-        } else {
-          _futureOwner = ImmediateFuture<UserPreview>.ofFuture(_getOwner(userAcc));
-        }
-      } else {
-        _futureOwner = ImmediateFuture<UserPreview>.ofFuture(APIClient.getUserPreview(userAcc, this.channelPreview!.ownerUserID));
-      }
-    });
-  }
-
-  @override
-  void dispose() {
-    _ctrlDisplayName.dispose();
-    _ctrlDescriptionName.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final userAcc = Provider.of<AppAuth>(context, listen: false);
-
-    Widget child;
-
-    if (loadingState == ChannelViewPageInitState.loading) {
-      child = Center(child: CircularProgressIndicator());
-    } else if (loadingState == ChannelViewPageInitState.error) {
-      child = ErrorDisplay(errorMessage: errorMessage);
-    } else if (loadingState == ChannelViewPageInitState.okay && channelPreview!.ownerUserID == userAcc.userID) {
-      child = _buildOwnedChannelView(context, this.channel!);
-    } else {
-      child = _buildForeignChannelView(context, this.channelPreview!);
-    }
-
-    return SCNScaffold(
-      title: 'Channel',
-      showSearch: false,
-      showShare: false,
-      child: child,
-    );
-  }
-
-  Widget _buildOwnedChannelView(BuildContext context, Channel channel) {
-    final userAccUserID = context.select<AppAuth, String?>((v) => v.userID);
-    final isSubscribed = (subscription != null && subscription!.confirmed);
-
-    return SingleChildScrollView(
-      child: Padding(
-        padding: const EdgeInsets.fromLTRB(24, 16, 24, 16),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.stretch,
-          children: [
-            _buildQRCode(context),
-            SizedBox(height: 8),
-            UI.metaCard(
-              context: context,
-              icon: FontAwesomeIcons.solidIdCardClip,
-              title: 'ChannelID',
-              values: [channel.channelID],
-            ),
-            UI.metaCard(
-              context: context,
-              icon: FontAwesomeIcons.solidInputNumeric,
-              title: 'InternalName',
-              values: [channel.internalName],
-            ),
-            _buildDisplayNameCard(context, true),
-            _buildDescriptionNameCard(context, true),
-            UI.metaCard(
-              context: context,
-              icon: FontAwesomeIcons.solidDiagramSubtask,
-              title: 'Subscription (own)',
-              values: [_formatSubscriptionStatus(this.subscription)],
-              iconActions: isSubscribed ? [(FontAwesomeIcons.solidSquareXmark, null, _unsubscribe)] : [(FontAwesomeIcons.solidSquareRss, null, _subscribe)],
-              mainAction: () => Navi.push(context, () => SubscriptionViewPage(subscriptionID: subscription!.subscriptionID, preloadedData: (subscription, null, null, null), needsReload: widget.needsReload)),
-            ),
-            _buildForeignSubscriptions(context),
-            _buildOwnerCard(context, true),
-            UI.metaCard(
-              context: context,
-              icon: FontAwesomeIcons.solidEnvelope,
-              title: 'Messages',
-              values: [channel.messagesSent.toString()],
-              mainAction: () {
-                Navi.push(context, () => ChannelMessageViewPage(channel: channel));
-              },
-            ),
-            if (channel.ownerUserID == userAccUserID)
-              UI.button(
-                  text: "Delete Channel",
-                  onPressed: () {
-                    Toaster.info("Not Implemented", "... will be implemented in a later version"); // TODO
-                  },
-                  color: Colors.red[900]),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildForeignChannelView(BuildContext context, ChannelPreview channel) {
-    Widget subCard;
-
-    if (subscription != null && subscription!.confirmed && subscription!.active) {
-      subCard = UI.metaCard(
-        context: context,
-        icon: FontAwesomeIcons.solidDiagramSubtask,
-        title: 'Subscription (foreign)',
-        values: [_formatSubscriptionStatus(subscription)],
-        iconActions: [(FontAwesomeIcons.solidSquareXmark, null, _deactivate)],
-        mainAction: () => Navi.push(context, () => SubscriptionViewPage(subscriptionID: subscription!.subscriptionID, preloadedData: (subscription, null, null, null), needsReload: widget.needsReload)),
-      );
-    } else if (subscription != null && subscription!.confirmed && !subscription!.active) {
-      subCard = UI.metaCard(
-        context: context,
-        icon: FontAwesomeIcons.solidDiagramSubtask,
-        title: 'Subscription (foreign)',
-        values: [_formatSubscriptionStatus(subscription)],
-        iconActions: [(FontAwesomeIcons.solidSquareXmark, Colors.red[900], () => _unsubscribe(confirm: 'Really (permantenly) delete your subscription to this channel?')), (FontAwesomeIcons.solidSquareRss, null, _activate)],
-        mainAction: () => Navi.push(context, () => SubscriptionViewPage(subscriptionID: subscription!.subscriptionID, preloadedData: (subscription, null, null, null), needsReload: widget.needsReload)),
-      );
-    } else if (subscription != null && !subscription!.confirmed) {
-      subCard = UI.metaCard(
-        context: context,
-        icon: FontAwesomeIcons.solidDiagramSubtask,
-        title: 'Subscription (foreign)',
-        values: [_formatSubscriptionStatus(subscription)],
-        iconActions: [(FontAwesomeIcons.solidSquareXmark, Colors.red[900], () => _unsubscribe(confirm: 'Really withdraw your subscription-request to this channel?'))],
-        mainAction: () => Navi.push(context, () => SubscriptionViewPage(subscriptionID: subscription!.subscriptionID, preloadedData: (subscription, null, null, null), needsReload: widget.needsReload)),
-      );
-    } else if (subscription == null) {
-      subCard = UI.metaCard(
-        context: context,
-        icon: FontAwesomeIcons.solidDiagramSubtask,
-        title: 'Subscription (foreign)',
-        values: [_formatSubscriptionStatus(subscription)],
-        iconActions: [(FontAwesomeIcons.solidSquareRss, null, _subscribe)],
-        mainAction: () => Navi.push(context, () => SubscriptionViewPage(subscriptionID: subscription!.subscriptionID, preloadedData: (subscription, null, null, null), needsReload: widget.needsReload)),
-      );
-    } else {
-      subCard = UI.metaCard(
-        context: context,
-        icon: FontAwesomeIcons.solidDiagramSubtask,
-        title: 'Subscription (foreign)',
-        values: [_formatSubscriptionStatus(subscription)],
-        mainAction: () => Navi.push(context, () => SubscriptionViewPage(subscriptionID: subscription!.subscriptionID, preloadedData: (subscription, null, null, null), needsReload: widget.needsReload)),
-      );
-    }
-
-    return SingleChildScrollView(
-      child: Padding(
-        padding: const EdgeInsets.fromLTRB(24, 16, 24, 16),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.stretch,
-          children: [
-            SizedBox(height: 8),
-            UI.metaCard(
-              context: context,
-              icon: FontAwesomeIcons.solidIdCardClip,
-              title: 'ChannelID',
-              values: [channel.channelID],
-            ),
-            UI.metaCard(
-              context: context,
-              icon: FontAwesomeIcons.solidInputNumeric,
-              title: 'InternalName',
-              values: [channel.internalName],
-            ),
-            _buildDisplayNameCard(context, false),
-            _buildDescriptionNameCard(context, false),
-            subCard,
-            _buildForeignSubscriptions(context),
-            _buildOwnerCard(context, false),
-            UI.metaCard(
-              context: context,
-              icon: FontAwesomeIcons.solidEnvelope,
-              title: 'Messages',
-              values: [channel.messagesSent.toString()],
-              mainAction: (subscription != null && subscription!.confirmed) ? () => Navi.push(context, () => FilteredMessageViewPage(title: channel.displayName, filter: MessageFilter(channelIDs: [channel.channelID]))) : null,
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildForeignSubscriptions(BuildContext context) {
-    return FutureBuilder(
-      future: _futureSubscriptions.future,
-      builder: (context, snapshot) {
-        if (snapshot.hasData) {
-          return Column(
-            crossAxisAlignment: CrossAxisAlignment.stretch,
-            children: [
-              for (final (sub, user) in snapshot.data!.where((v) => v.$1.subscriptionID != subscription?.subscriptionID))
-                UI.metaCard(
-                  context: context,
-                  icon: FontAwesomeIcons.solidDiagramSuccessor,
-                  title: 'Subscription (' + (user?.username ?? user?.userID ?? 'other') + ')',
-                  values: [_formatSubscriptionStatus(sub)],
-                  iconActions: _getForeignIncomingSubActions(sub),
-                  mainAction: () => Navi.push(context, () => SubscriptionViewPage(subscriptionID: subscription!.subscriptionID, preloadedData: (subscription, null, null, null), needsReload: widget.needsReload)),
-                ),
-            ],
-          );
-        } else {
-          return SizedBox();
-        }
-      },
-    );
-  }
-
-  Widget _buildOwnerCard(BuildContext context, bool isOwned) {
-    return FutureBuilder(
-      future: _futureOwner.future,
-      builder: (context, snapshot) {
-        if (snapshot.hasData) {
-          return UI.metaCard(
-            context: context,
-            icon: FontAwesomeIcons.solidUser,
-            title: 'Owner',
-            values: [channelPreview!.ownerUserID + (isOwned ? ' (you)' : ''), if (snapshot.data?.username != null) snapshot.data!.username!],
-          );
-        } else {
-          return UI.metaCard(
-            context: context,
-            icon: FontAwesomeIcons.solidUser,
-            title: 'Owner',
-            values: [channelPreview!.ownerUserID + (isOwned ? ' (you)' : '')],
-          );
-        }
-      },
-    );
-  }
-
-  Widget _buildQRCode(BuildContext context) {
-    return FutureBuilder(
-      future: _futureSubscribeKey.future,
-      builder: (context, snapshot) {
-        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);
-            },
-            child: Center(
-              child: QrImageView(
-                data: text,
-                version: QrVersions.auto,
-                size: 265.0,
-                eyeStyle: QrEyeStyle(
-                  eyeShape: QrEyeShape.square,
-                  color: Theme.of(context).textTheme.bodyLarge?.color,
-                ),
-                dataModuleStyle: QrDataModuleStyle(
-                  dataModuleShape: QrDataModuleShape.square,
-                  color: Theme.of(context).textTheme.bodyLarge?.color,
-                ),
-              ),
-            ),
-          );
-        } else {
-          return const SizedBox(
-            width: 300.0,
-            height: 300.0,
-            child: Center(child: CircularProgressIndicator()),
-          );
-        }
-      },
-    );
-  }
-
-  Widget _buildDisplayNameCard(BuildContext context, bool isOwned) {
-    if (_editDisplayName == EditState.editing) {
-      return Padding(
-        padding: EdgeInsets.symmetric(vertical: 4, horizontal: 0),
-        child: UI.box(
-          context: context,
-          padding: EdgeInsets.fromLTRB(16, 2, 4, 2),
-          child: Row(
-            children: [
-              Container(child: Center(child: FaIcon(FontAwesomeIcons.solidInputText, size: 18)), height: 43),
-              SizedBox(width: 16),
-              Expanded(
-                child: TextField(
-                  autofocus: true,
-                  controller: _ctrlDisplayName,
-                  decoration: new InputDecoration.collapsed(hintText: 'DisplayName'),
-                ),
-              ),
-              SizedBox(width: 12),
-              SizedBox(width: 4),
-              IconButton(icon: FaIcon(FontAwesomeIcons.solidFloppyDisk), onPressed: _saveDisplayName),
-            ],
-          ),
-        ),
-      );
-    } else if (_editDisplayName == EditState.none) {
-      return UI.metaCard(
-        context: context,
-        icon: FontAwesomeIcons.solidInputText,
-        title: 'DisplayName',
-        values: [_displayNameOverride ?? channelPreview!.displayName],
-        iconActions: isOwned ? [(FontAwesomeIcons.penToSquare, null, _showEditDisplayName)] : [],
-      );
-    } else if (_editDisplayName == EditState.saving) {
-      return Padding(
-        padding: EdgeInsets.symmetric(vertical: 4, horizontal: 0),
-        child: UI.box(
-          context: context,
-          padding: EdgeInsets.fromLTRB(16, 2, 4, 2),
-          child: Row(
-            children: [
-              Container(child: Center(child: FaIcon(FontAwesomeIcons.solidInputText, size: 18)), height: 43),
-              SizedBox(width: 16),
-              Expanded(child: SizedBox()),
-              SizedBox(width: 12),
-              SizedBox(width: 4),
-              Padding(padding: const EdgeInsets.all(8.0), child: SizedBox(width: 18, height: 18, child: CircularProgressIndicator())),
-            ],
-          ),
-        ),
-      );
-    } else {
-      throw 'Invalid EditDisplayNameState: $_editDisplayName';
-    }
-  }
-
-  Widget _buildDescriptionNameCard(BuildContext context, bool isOwned) {
-    if (_editDescriptionName == EditState.editing) {
-      return Padding(
-        padding: EdgeInsets.symmetric(vertical: 4, horizontal: 0),
-        child: UI.box(
-          context: context,
-          padding: EdgeInsets.fromLTRB(16, 2, 4, 2),
-          child: Row(
-            children: [
-              Container(child: Center(child: FaIcon(FontAwesomeIcons.solidInputPipe, size: 18)), height: 43),
-              SizedBox(width: 16),
-              Expanded(
-                child: TextField(
-                  autofocus: true,
-                  controller: _ctrlDescriptionName,
-                  decoration: new InputDecoration.collapsed(hintText: 'Description'),
-                ),
-              ),
-              SizedBox(width: 12),
-              SizedBox(width: 4),
-              IconButton(icon: FaIcon(FontAwesomeIcons.solidFloppyDisk), onPressed: _saveDescriptionName),
-            ],
-          ),
-        ),
-      );
-    } else if (_editDescriptionName == EditState.none) {
-      return UI.metaCard(
-        context: context,
-        icon: FontAwesomeIcons.solidInputPipe,
-        title: 'Description',
-        values: [_descriptionNameOverride ?? channelPreview?.descriptionName ?? ''],
-        iconActions: isOwned ? [(FontAwesomeIcons.penToSquare, null, _showEditDescriptionName)] : [],
-      );
-    } else if (_editDescriptionName == EditState.saving) {
-      return Padding(
-        padding: EdgeInsets.symmetric(vertical: 4, horizontal: 0),
-        child: UI.box(
-          context: context,
-          padding: EdgeInsets.fromLTRB(16, 2, 4, 2),
-          child: Row(
-            children: [
-              Container(child: Center(child: FaIcon(FontAwesomeIcons.solidInputPipe, size: 18)), height: 43),
-              SizedBox(width: 16),
-              Expanded(child: SizedBox()),
-              SizedBox(width: 12),
-              SizedBox(width: 4),
-              Padding(padding: const EdgeInsets.all(8.0), child: SizedBox(width: 18, height: 18, child: CircularProgressIndicator())),
-            ],
-          ),
-        ),
-      );
-    } else {
-      throw 'Invalid EditDescriptionNameState: $_editDescriptionName';
-    }
-  }
-
-  void _showEditDisplayName() {
-    setState(() {
-      _ctrlDisplayName.text = _displayNameOverride ?? channelPreview?.displayName ?? '';
-      _editDisplayName = EditState.editing;
-      if (_editDescriptionName == EditState.editing) _editDescriptionName = EditState.none;
-    });
-  }
-
-  void _saveDisplayName() async {
-    final userAcc = Provider.of<AppAuth>(context, listen: false);
-
-    final newName = _ctrlDisplayName.text;
-
-    try {
-      setState(() {
-        _editDisplayName = EditState.saving;
-      });
-
-      final newChannel = await APIClient.updateChannel(userAcc, widget.channelID, displayName: newName);
-
-      setState(() {
-        _editDisplayName = EditState.none;
-        _displayNameOverride = newChannel.channel.displayName;
-      });
-
-      widget.needsReload?.call();
-    } catch (exc, trace) {
-      ApplicationLog.error('Failed to save DisplayName: ' + exc.toString(), trace: trace);
-      Toaster.error("Error", 'Failed to save DisplayName');
-    }
-  }
-
-  void _showEditDescriptionName() {
-    setState(() {
-      _ctrlDescriptionName.text = _descriptionNameOverride ?? channelPreview?.descriptionName ?? '';
-      _editDescriptionName = EditState.editing;
-      if (_editDisplayName == EditState.editing) _editDisplayName = EditState.none;
-    });
-  }
-
-  void _saveDescriptionName() async {
-    final userAcc = Provider.of<AppAuth>(context, listen: false);
-
-    final newName = _ctrlDescriptionName.text;
-
-    try {
-      setState(() {
-        _editDescriptionName = EditState.saving;
-      });
-
-      final newChannel = await APIClient.updateChannel(userAcc, widget.channelID, descriptionName: newName);
-
-      setState(() {
-        _editDescriptionName = EditState.none;
-        _descriptionNameOverride = newChannel.channel.descriptionName ?? '';
-      });
-
-      widget.needsReload?.call();
-    } catch (exc, trace) {
-      ApplicationLog.error('Failed to save DescriptionName: ' + exc.toString(), trace: trace);
-      Toaster.error("Error", 'Failed to save DescriptionName');
-    }
-  }
-
-  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 _unsubscribe({String? confirm = null}) async {
-    final acc = AppAuth();
-
-    if (subscription == null) return;
-
-    if (confirm != null) {
-      final r = await UIDialogs.showConfirmDialog(context, confirm, okText: 'Unsubscribe', cancelText: 'Cancel');
-      if (!r) 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 _deactivate() async {
-    final acc = AppAuth();
-
-    if (subscription == null) return;
-
-    try {
-      await APIClient.deactivateSubscription(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 _activate() async {
-    final acc = AppAuth();
-
-    if (subscription == null) return;
-
-    try {
-      await APIClient.activateSubscription(acc, widget.channelID, subscription!.subscriptionID);
-      widget.needsReload?.call();
-
-      await _initStateAsync(false);
-
-      Toaster.success("Success", 'Subscribed 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 _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) {
-    if (subscription == null) {
-      return 'Not Subscribed';
-    } else if (subscription.confirmed && subscription.active) {
-      return 'Subscribed & Active';
-    } else if (subscription.confirmed && !subscription.active) {
-      return 'Subscribed & Inactive';
-    } else if (!subscription.confirmed) {
-      return 'Requested';
-    } else {
-      return '?';
-    }
-  }
-
-  Future<String?> _getSubscribeKey(AppAuth auth) async {
-    try {
-      await Future.delayed(const Duration(seconds: 0), () {}); // this is annoyingly important - otherwise we call setLoadingIndeterminate directly in initStat() and get an exception....
-
-      _incLoadingIndeterminateCounter(1);
-
-      var channel = await APIClient.getChannel(auth, widget.channelID);
-
-      //await Future.delayed(const Duration(seconds: 10), () {});
-
-      return channel.channel.subscribeKey;
-    } finally {
-      _incLoadingIndeterminateCounter(-1);
-    }
-  }
-
-  Future<List<(Subscription, UserPreview?)>> _listSubscriptions(AppAuth auth) async {
-    try {
-      await Future.delayed(const Duration(seconds: 0), () {}); // this is annoyingly important - otherwise we call setLoadingIndeterminate directly in initStat() and get an exception....
-
-      _incLoadingIndeterminateCounter(1);
-
-      var subs = await APIClient.getChannelSubscriptions(auth, widget.channelID);
-
-      var userMap = {for (var v in (await Future.wait(subs.map((e) => e.subscriberUserID).toSet().map((e) => APIClient.getUserPreview(auth, e)).toList()))) v.userID: v};
-
-      //await Future.delayed(const Duration(seconds: 10), () {});
-
-      return subs.map((e) => (e, userMap[e.subscriberUserID] ?? null)).toList();
-    } finally {
-      _incLoadingIndeterminateCounter(-1);
-    }
-  }
-
-  Future<UserPreview> _getOwner(AppAuth auth) async {
-    try {
-      await Future.delayed(const Duration(seconds: 0), () {}); // this is annoyingly important - otherwise we call setLoadingIndeterminate directly in initStat() and get an exception....
-
-      _incLoadingIndeterminateCounter(1);
-
-      final owner = APIClient.getUserPreview(auth, channelPreview!.ownerUserID);
-
-      //await Future.delayed(const Duration(seconds: 10), () {});
-
-      return owner;
-    } finally {
-      _incLoadingIndeterminateCounter(-1);
-    }
-  }
-
-  List<(IconData, Color?, void Function())> _getForeignIncomingSubActions(Subscription sub) {
-    if (sub.confirmed) {
-      return [(FontAwesomeIcons.solidSquareXmark, Colors.red[900], () => _cancelForeignSubscription(sub))];
-    } else {
-      return [
-        (FontAwesomeIcons.solidSquareCheck, Colors.green[900], () => _confirmForeignSubscription(sub)),
-        (FontAwesomeIcons.solidSquareXmark, Colors.red[900], () => _denyForeignSubscription(sub)),
-      ];
-    }
-  }
-
-  void _incLoadingIndeterminateCounter(int delta) {
-    setState(() {
-      _loadingIndeterminateCounter += delta;
-      AppBarState().setLoadingIndeterminate(_loadingIndeterminateCounter > 0);
-    });
-  }
-}

flutter/lib/pages/client_list/client_list.dart

@@ -1,86 +0,0 @@
-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/client.dart';
-import 'package:simplecloudnotifier/state/application_log.dart';
-import 'package:simplecloudnotifier/state/app_auth.dart';
-import 'package:simplecloudnotifier/pages/client_list/client_list_item.dart';
-
-class ClientListPage extends StatefulWidget {
-  const ClientListPage({super.key});
-
-  @override
-  State<ClientListPage> createState() => _ClientListPageState();
-}
-
-class _ClientListPageState extends State<ClientListPage> {
-  final PagingController<int, Client> _pagingController = PagingController.fromValue(PagingState(nextPageKey: null, itemList: [], error: null), firstPageKey: 0);
-
-  @override
-  void initState() {
-    super.initState();
-
-    _pagingController.addPageRequestListener(_fetchPage);
-
-    _pagingController.refresh();
-  }
-
-  @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-  }
-
-  @override
-  void dispose() {
-    ApplicationLog.debug('ClientListPage::dispose');
-    _pagingController.dispose();
-    super.dispose();
-  }
-
-  Future<void> _fetchPage(int pageKey) async {
-    final acc = Provider.of<AppAuth>(context, listen: false);
-
-    ApplicationLog.debug('Start ClientListPage::_pagingController::_fetchPage [ ${pageKey} ]');
-
-    if (!acc.isAuth()) {
-      _pagingController.error = 'Not logged in';
-      return;
-    }
-
-    try {
-      final items = (await APIClient.getClientList(acc)).toList();
-
-      items.sort((a, b) => -1 * a.timestampCreated.compareTo(b.timestampCreated));
-
-      _pagingController.value = PagingState(nextPageKey: null, itemList: items, error: null);
-    } catch (exc, trace) {
-      _pagingController.error = exc.toString();
-      ApplicationLog.error('Failed to list clients: ' + exc.toString(), trace: trace);
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return SCNScaffold(
-      title: "Clients",
-      showSearch: false,
-      showShare: false,
-      child: Padding(
-        padding: EdgeInsets.fromLTRB(8, 4, 8, 4),
-        child: RefreshIndicator(
-          onRefresh: () => Future.sync(
-            () => _pagingController.refresh(),
-          ),
-          child: PagedListView<int, Client>(
-            pagingController: _pagingController,
-            builderDelegate: PagedChildBuilderDelegate<Client>(
-              itemBuilder: (context, item, index) => ClientListItem(item: item),
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

flutter/lib/pages/client_list/client_list_item.dart

@@ -1,79 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:provider/provider.dart';
-import 'package:simplecloudnotifier/models/client.dart';
-import 'package:simplecloudnotifier/state/app_settings.dart';
-
-enum ClientListItemMode {
-  Messages,
-  Extended,
-}
-
-class ClientListItem extends StatelessWidget {
-  const ClientListItem({
-    required this.item,
-    super.key,
-  });
-
-  final Client item;
-
-  @override
-  Widget build(BuildContext context) {
-    final dateFormat = context.select<AppSettings, AppSettingsDateFormat>((v) => v.dateFormat).dateOnlyFormat();
-
-    return Card.filled(
-      margin: EdgeInsets.fromLTRB(0, 4, 0, 4),
-      shape: BeveledRectangleBorder(borderRadius: BorderRadius.circular(0)),
-      color: Theme.of(context).cardTheme.color,
-      child: Padding(
-        padding: const EdgeInsets.all(8),
-        child: Row(
-          children: [
-            _buildIcon(context),
-            SizedBox(width: 16),
-            Expanded(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.stretch,
-                children: [
-                  Row(
-                    children: [
-                      Expanded(
-                        child: Text(
-                          item.name ?? item.clientID,
-                          style: const TextStyle(fontWeight: FontWeight.bold),
-                        ),
-                      ),
-                      Text(
-                        dateFormat.format(DateTime.parse(item.timestampCreated).toLocal()),
-                        style: TextStyle(color: Theme.of(context).textTheme.bodyLarge?.color?.withAlpha(160)),
-                      ),
-                    ],
-                  ),
-                  SizedBox(height: 4),
-                  Row(
-                    crossAxisAlignment: CrossAxisAlignment.end,
-                    children: [
-                      Expanded(
-                        child: Text(item.agentModel.toString() + " " + item.agentVersion.toString()),
-                      ),
-                    ],
-                  ),
-                ],
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildIcon(BuildContext context) {
-    if (item.type == "ANDROID") return Icon(FontAwesomeIcons.android, color: Theme.of(context).colorScheme.outline, size: 32);
-    if (item.type == "IOS") return Icon(FontAwesomeIcons.apple, color: Theme.of(context).colorScheme.outline, size: 32);
-    if (item.type == "LINUX") return Icon(FontAwesomeIcons.linux, color: Theme.of(context).colorScheme.outline, size: 32);
-    if (item.type == "MACOS") return Icon(FontAwesomeIcons.appleWhole, color: Theme.of(context).colorScheme.outline, size: 32);
-    if (item.type == "WINDOWS") return Icon(FontAwesomeIcons.windows, color: Theme.of(context).colorScheme.outline, size: 32);
-
-    return Icon(FontAwesomeIcons.solidSignature, color: Theme.of(context).colorScheme.outline, size: 32);
-  }
-}

flutter/lib/pages/debug/debug_actions.dart

@@ -1,11 +1,4 @@
-import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:simplecloudnotifier/api/api_client.dart';
-import 'package:simplecloudnotifier/state/app_settings.dart';
-import 'package:simplecloudnotifier/state/app_auth.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';
 
@@ -54,47 +47,11 @@ class _DebugActionsPageState extends State<DebugActionsPage> {
                 text: 'Show Simple Notification',
               ),
               SizedBox(height: 20),
-              UI.button(
-                big: false,
-                onPressed: _copyToken,
-                text: 'Query+Copy FCM Token',
-              ),
-              SizedBox(height: 4),
               UI.button(
                 big: false,
                 onPressed: _sendTokenToServer,
                 text: 'Send FCM Token to Server',
               ),
-              SizedBox(height: 20),
-              UI.button(
-                big: false,
-                onPressed: () => Notifier.showLocalNotification('', 'TEST_CHANNEL', "Test Channel", "Channel for testing", "Hello World", "Local Notification test", null, null),
-                text: 'Show local notification (generic)',
-              ),
-              UI.button(
-                big: false,
-                onPressed: () => Notifier.showLocalNotification('', 'TEST_CHANNEL', "Test Channel", "Channel for testing", "Hello World", "Local Notification test", null, 0),
-                text: 'Show local notification (Prio = 0)',
-              ),
-              UI.button(
-                big: false,
-                onPressed: () => Notifier.showLocalNotification('', 'TEST_CHANNEL', "Test Channel", "Channel for testing", "Hello World", "Local Notification test", null, 1),
-                text: 'Show local notification (Prio = 1)',
-              ),
-              UI.button(
-                big: false,
-                onPressed: () => Notifier.showLocalNotification('', 'TEST_CHANNEL', "Test Channel", "Channel for testing", "Hello World", "Local Notification test", null, 2),
-                text: 'Show local notification (Prio = 2)',
-              ),
-              SizedBox(height: 20),
-              UI.button(
-                big: false,
-                onPressed: () {
-                  AppSettings().update((p) => p.reset());
-                  Toaster.success("Success", "AppSettings reset to default");
-                },
-                text: 'Reset AppSettings to default',
-              ),
             ],
           ),
         ),
@@ -102,46 +59,7 @@ class _DebugActionsPageState extends State<DebugActionsPage> {
     );
   }
 
-  void _sendTokenToServer() async {
+  void _sendTokenToServer() {
-    try {
+    //TODO
-      final auth = AppAuth();
-
-      final clientID = auth.getClientID();
-      if (clientID == null) {
-        Toaster.error("Error", "No Client set");
-        return;
-      }
-
-      final fcmToken = await FirebaseMessaging.instance.getToken();
-      if (fcmToken == null) {
-        Toaster.error("Error", "No FCM token returned from Firebase");
-        return;
-      }
-
-      var newClient = await APIClient.updateClient(auth, clientID, fcmToken: fcmToken);
-      auth.setClientAndClientID(newClient);
-
-      Toaster.success("Success", "Token sent to server");
-    } catch (exc, trace) {
-      Toaster.error("Error", "An error occurred while sending the token: ${exc.toString()}");
-      ApplicationLog.error("An error occurred while sending the token: ${exc.toString()}", trace: trace);
-    }
-  }
-
-  void _copyToken() async {
-    try {
-      final fcmToken = await FirebaseMessaging.instance.getToken();
-      if (fcmToken == null) {
-        Toaster.error("Error", "No FCM token returned from Firebase");
-        return;
-      }
-
-      Clipboard.setData(new ClipboardData(text: fcmToken));
-      Toaster.info("Clipboard", 'Copied text to Clipboard');
-      print('================= [CLIPBOARD] =================\n${fcmToken}\n================= [/CLIPBOARD] =================');
-    } catch (exc, trace) {
-      Toaster.error("Error", "An error occurred while sending the token: ${exc.toString()}");
-      ApplicationLog.error("An error occurred while sending the token: ${exc.toString()}", trace: trace);
-    }
   }
 }

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.surfaceContainerHighest),
+      buildCol("colorScheme.surfaceVariant", Theme.of(context).colorScheme.surfaceVariant),
       buildCol("colorScheme.inverseSurface", Theme.of(context).colorScheme.inverseSurface),
       buildCol("colorScheme.onInverseSurface", Theme.of(context).colorScheme.onInverseSurface),
-      buildCol("colorScheme.background", Theme.of(context).colorScheme.surface),
+      buildCol("colorScheme.background", Theme.of(context).colorScheme.background),
-      buildCol("colorScheme.onBackground", Theme.of(context).colorScheme.onSurface),
+      buildCol("colorScheme.onBackground", Theme.of(context).colorScheme.onBackground),
       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?.surface),
+      buildCol("buttonTheme.colorScheme.background", Theme.of(context).buttonTheme.colorScheme?.background),
       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),

flutter/lib/pages/debug/debug_logs.dart

@@ -11,7 +11,7 @@ class DebugLogsPage extends StatefulWidget {
 class _DebugLogsPageState extends State<DebugLogsPage> {
   Box<SCNLog> logBox = Hive.box<SCNLog>('scn-logs');
 
-  static final _dateFormat = DateFormat('yyyy-MM-dd HH:mm');
+  static final _dateFormat = DateFormat('yyyy-MM-dd kk:mm');
 
   @override
   Widget build(BuildContext context) {

flutter/lib/pages/debug/debug_main.dart

@@ -23,13 +23,14 @@ class _DebugMainPageState extends State<DebugMainPage> {
     DebugMainPageSubPage.actions: DebugActionsPage(),
   };
 
-  DebugMainPageSubPage _subPage = DebugMainPageSubPage.logs;
+  DebugMainPageSubPage _subPage = DebugMainPageSubPage.colors;
 
   @override
   Widget build(BuildContext context) {
     return SCNScaffold(
       title: 'Debug',
       showSearch: false,
+      showDebug: false,
       child: Column(
         children: [
           Padding(
@@ -53,14 +54,14 @@ class _DebugMainPageState extends State<DebugMainPage> {
     return SegmentedButton<DebugMainPageSubPage>(
       showSelectedIcon: false,
       segments: const <ButtonSegment<DebugMainPageSubPage>>[
-        ButtonSegment<DebugMainPageSubPage>(value: DebugMainPageSubPage.logs, icon: Icon(FontAwesomeIcons.solidFileLines, size: 14)),
+        ButtonSegment<DebugMainPageSubPage>(value: DebugMainPageSubPage.colors, icon: Icon(FontAwesomeIcons.solidPaintRoller, size: 14)),
         ButtonSegment<DebugMainPageSubPage>(value: DebugMainPageSubPage.actions, icon: Icon(FontAwesomeIcons.solidHammer, size: 14)),
         ButtonSegment<DebugMainPageSubPage>(value: DebugMainPageSubPage.requests, icon: Icon(FontAwesomeIcons.solidNetworkWired, size: 14)),
         ButtonSegment<DebugMainPageSubPage>(value: DebugMainPageSubPage.persistence, icon: Icon(FontAwesomeIcons.solidDatabase, size: 14)),
-        ButtonSegment<DebugMainPageSubPage>(value: DebugMainPageSubPage.colors, icon: Icon(FontAwesomeIcons.solidPaintRoller, size: 14)),
+        ButtonSegment<DebugMainPageSubPage>(value: DebugMainPageSubPage.logs, icon: Icon(FontAwesomeIcons.solidFileLines, size: 14)),
       ],
       style: ButtonStyle(
-        padding: WidgetStateProperty.all<EdgeInsets>(EdgeInsets.fromLTRB(0, 0, 0, 0)),
+        padding: MaterialStateProperty.all<EdgeInsets>(EdgeInsets.fromLTRB(0, 0, 0, 0)),
         visualDensity: VisualDensity(horizontal: -3, vertical: -3),
       ),
       selected: <DebugMainPageSubPage>{_subPage},

flutter/lib/pages/debug/debug_persistence.dart

@@ -1,20 +1,15 @@
-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/models/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
@@ -41,10 +36,9 @@ class _DebugPersistencePageState extends State<DebugPersistencePage> {
           _buildSharedPrefCard(context),
           _buildHiveCard(context, () => Hive.box<SCNRequest>('scn-requests'), 'scn-requests'),
           _buildHiveCard(context, () => Hive.box<SCNLog>('scn-logs'), 'scn-logs'),
-          _buildHiveCard(context, () => Hive.box<SCNMessage>('scn-message-cache'), 'scn-message-cache'),
+          _buildHiveCard(context, () => Hive.box<Message>('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),
         ],
       ),
     );
@@ -77,7 +71,7 @@ class _DebugPersistencePageState extends State<DebugPersistencePage> {
         padding: const EdgeInsets.all(8.0),
         child: GestureDetector(
           onTap: () {
-            Navi.push(context, () => DebugHiveBoxPage(boxName: boxname, box: boxFunc()));
+            Navi.push(context, () => DebugHiveBoxPage(boxName: boxname, box: Hive.box<FBMessage>(boxname)));
           },
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -91,25 +85,4 @@ 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)),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
 }

flutter/lib/pages/debug/debug_persistence_failurelogfile.dart

@@ -1,64 +0,0 @@
-import 'dart:io';
-
-import 'package:flutter/material.dart';
-import 'package:simplecloudnotifier/components/error_display/error_display.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 ErrorDisplay(errorMessage: '${snapshot.error}');
-            } 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")),
-      ),
-    );
-  }
-}

flutter/lib/pages/debug/debug_persistence_failurelogs.dart

@@ -1,86 +0,0 @@
-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");
-  }
-}

flutter/lib/pages/debug/debug_persistence_hive.dart

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

flutter/lib/pages/debug/debug_persistence_hiveentry.dart

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

flutter/lib/pages/debug/debug_persistence_sharedprefs.dart

@@ -6,15 +6,14 @@ class DebugSharedPrefPage extends StatelessWidget {
   final SharedPreferences sharedPref;
   final List<String> keys;
 
-  DebugSharedPrefPage({required this.sharedPref}) : keys = sharedPref.getKeys().toList() {
+  DebugSharedPrefPage({required this.sharedPref}) : keys = sharedPref.getKeys().toList();
-    keys.sort((a, b) => a.compareTo(b));
-  }
 
   @override
   Widget build(BuildContext context) {
     return SCNScaffold(
       title: 'SharedPreferences',
       showSearch: false,
+      showDebug: false,
       child: ListView.separated(
         itemCount: sharedPref.getKeys().length,
         itemBuilder: (context, listIndex) {

flutter/lib/pages/debug/debug_request_view.dart

@@ -1,5 +1,3 @@
-import 'dart:convert';
-
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
@@ -8,24 +6,17 @@ import 'package:simplecloudnotifier/state/request_log.dart';
 import 'package:simplecloudnotifier/utils/toaster.dart';
 import 'package:simplecloudnotifier/utils/ui.dart';
 
-class DebugRequestViewPage extends StatefulWidget {
+class DebugRequestViewPage extends StatelessWidget {
   final SCNRequest request;
 
   DebugRequestViewPage({required this.request});
 
-  @override
-  State<DebugRequestViewPage> createState() => _DebugRequestViewPageState();
-}
-
-class _DebugRequestViewPageState extends State<DebugRequestViewPage> {
-  Set<String> _monospaceMode = new Set();
-  Set<String> _prettyJson = new Set();
-
   @override
   Widget build(BuildContext context) {
     return SCNScaffold(
       title: 'Request',
       showSearch: false,
+      showDebug: false,
       child: SingleChildScrollView(
         child: Padding(
           padding: const EdgeInsets.all(8.0),
@@ -33,23 +24,22 @@ class _DebugRequestViewPageState extends State<DebugRequestViewPage> {
             crossAxisAlignment: CrossAxisAlignment.stretch,
             mainAxisAlignment: MainAxisAlignment.start,
             children: [
-              ...buildRow(context, "name", "Name", widget.request.name),
+              ...buildRow(context, "Name", request.name),
-              ...buildRow(context, "timestampStart", "Timestamp (Start)", widget.request.timestampStart.toString()),
+              ...buildRow(context, "Timestamp (Start)", request.timestampStart.toString()),
-              ...buildRow(context, "timestampEnd", "Timestamp (End)", widget.request.timestampEnd.toString()),
+              ...buildRow(context, "Timestamp (End)", request.timestampEnd.toString()),
-              ...buildRow(context, "duration", "Duration", widget.request.timestampEnd.difference(widget.request.timestampStart).toString()),
+              ...buildRow(context, "Duration", request.timestampEnd.difference(request.timestampStart).toString()),
               Divider(),
-              ...buildRow(context, "method", "Method", widget.request.method),
+              ...buildRow(context, "Method", request.method),
-              ...buildRow(context, "url", "URL", widget.request.url, mono: true),
+              ...buildRow(context, "URL", request.url),
-              if (widget.request.requestHeaders.isNotEmpty) ...buildRow(context, "request_headers", "Request->Headers", widget.request.requestHeaders.entries.map((v) => '${v.key} = ${v.value}').join('\n'), mono: true),
+              if (request.requestHeaders.isNotEmpty) ...buildRow(context, "Request->Headers", request.requestHeaders.entries.map((v) => '${v.key} = ${v.value}').join('\n')),
-              if (widget.request.requestBody != '') ...buildRow(context, "request_body", "Request->Body", widget.request.requestBody, mono: true, json: true),
+              if (request.requestBody != '') ...buildRow(context, "Request->Body", request.requestBody),
-              UI.button(text: "Copy request as curl", onPressed: _copyCurl, tonal: true),
               Divider(),
-              if (widget.request.responseStatusCode != 0) ...buildRow(context, "response_statuscode", "Response->Statuscode", widget.request.responseStatusCode.toString()),
+              if (request.responseStatusCode != 0) ...buildRow(context, "Response->Statuscode", request.responseStatusCode.toString()),
-              if (widget.request.responseBody != '') ...buildRow(context, "response_body", "Reponse->Body", widget.request.responseBody, mono: true, json: true),
+              if (request.responseBody != '') ...buildRow(context, "Reponse->Body", request.responseBody),
-              if (widget.request.responseHeaders.isNotEmpty) ...buildRow(context, "response_headers", "Reponse->Headers", widget.request.responseHeaders.entries.map((v) => '${v.key} = ${v.value}').join('\n'), mono: true, json: false),
+              if (request.responseHeaders.isNotEmpty) ...buildRow(context, "Reponse->Headers", request.responseHeaders.entries.map((v) => '${v.key} = ${v.value}').join('\n')),
               Divider(),
-              if (widget.request.error != '') ...buildRow(context, "error", "Error", widget.request.error, mono: true),
+              if (request.error != '') ...buildRow(context, "Error", request.error),
-              if (widget.request.stackTrace != '') ...buildRow(context, "trace", "Stacktrace", widget.request.stackTrace, mono: true),
+              if (request.stackTrace != '') ...buildRow(context, "Stacktrace", request.stackTrace),
             ],
           ),
         ),
@@ -57,19 +47,7 @@ class _DebugRequestViewPageState extends State<DebugRequestViewPage> {
     );
   }
 
-  List<Widget> buildRow(BuildContext context, String key, String title, String value, {bool? json, bool? mono}) {
+  List<Widget> buildRow(BuildContext context, String title, String value) {
-    var isMono = _monospaceMode.contains(key);
-    var isJson = _prettyJson.contains(key);
-
-    if (isJson) {
-      try {
-        var jsonValue = jsonDecode(value);
-        value = JsonEncoder.withIndent('  ').convert(jsonValue);
-      } catch (e) {
-        value = ('Error parsing JSON: $e');
-      }
-    }
-
     return [
       Padding(
         padding: const EdgeInsets.symmetric(vertical: 0, horizontal: 8.0),
@@ -81,68 +59,26 @@ class _DebugRequestViewPageState extends State<DebugRequestViewPage> {
             UI.buttonIconOnly(
               iconSize: 14,
               onPressed: () {
-                Clipboard.setData(new ClipboardData(text: value));
+                Clipboard.setData(new ClipboardData(text: title));
                 Toaster.info("Clipboard", 'Copied text to Clipboard');
-                print('================= [CLIPBOARD] =================\n${value}\n================= [/CLIPBOARD] =================');
               },
               icon: FontAwesomeIcons.copy,
             ),
-            if (mono == true)
-              UI.buttonIconOnly(
-                icon: isMono ? FontAwesomeIcons.lineColumns : FontAwesomeIcons.alignLeft,
-                onPressed: () {
-                  setState(() {
-                    _monospaceMode.contains(key) ? _monospaceMode.remove(key) : _monospaceMode.add(key);
-                  });
-                },
-              ),
-            if (json == true)
-              UI.buttonIconOnly(
-                icon: isJson ? FontAwesomeIcons.bracketsRound : FontAwesomeIcons.bracketsCurly,
-                onPressed: () {
-                  setState(() {
-                    _prettyJson.contains(key) ? _prettyJson.remove(key) : _prettyJson.add(key);
-                  });
-                },
-              ),
           ],
         ),
       ),
       Card.filled(
         shape: BeveledRectangleBorder(borderRadius: BorderRadius.circular(0)),
-        color: widget.request.type == 'SUCCESS' ? null : Theme.of(context).colorScheme.errorContainer,
+        color: request.type == 'SUCCESS' ? null : Theme.of(context).colorScheme.errorContainer,
         child: Padding(
           padding: const EdgeInsets.symmetric(vertical: 2.0, horizontal: 6.0),
-          child: (isMono || isJson)
+          child: SelectableText(
-              ? SingleChildScrollView(
+            value,
-                  scrollDirection: Axis.horizontal,
+            minLines: 1,
-                  child: SelectableText(
+            maxLines: 10,
-                    value,
+          ),
-                    minLines: 1,
-                    maxLines: 10,
-                  ),
-                )
-              : SelectableText(
-                  value,
-                  minLines: 1,
-                  maxLines: 10,
-                ),
         ),
       ),
     ];
   }
-
-  void _copyCurl() {
-    final method = '-X ${widget.request.method}';
-    final header = widget.request.requestHeaders.entries.map((v) => '-H "${v.key}: ${v.value}"').join(' ');
-    final body = widget.request.requestBody.isNotEmpty ? '-d "${widget.request.requestBody}"' : '';
-
-    final curlParts = ['curl', method, header, '"${widget.request.url}"', body];
-
-    final txt = curlParts.where((part) => part.isNotEmpty).join(' ');
-
-    Clipboard.setData(new ClipboardData(text: txt));
-    Toaster.info("Clipboard", 'Copied text to Clipboard');
-    print('================= [CLIPBOARD] =================\n${txt}\n================= [/CLIPBOARD] =================');
-  }
 }

flutter/lib/pages/debug/debug_requests.dart

@@ -13,7 +13,7 @@ class DebugRequestsPage extends StatefulWidget {
 class _DebugRequestsPageState extends State<DebugRequestsPage> {
   Box<SCNRequest> requestsBox = Hive.box<SCNRequest>('scn-requests');
 
-  static final _dateFormat = DateFormat('yyyy-MM-dd HH:mm');
+  static final _dateFormat = DateFormat('yyyy-MM-dd kk:mm');
 
   @override
   Widget build(BuildContext context) {
@@ -47,6 +47,10 @@ class _DebugRequestsPageState extends State<DebugRequestsPage> {
             textColor: Theme.of(context).colorScheme.onErrorContainer,
             title: Row(
               children: [
+                SizedBox(
+                  width: 120,
+                  child: Text(_dateFormat.format(req.timestampStart), style: TextStyle(fontSize: 12)),
+                ),
                 Expanded(
                   child: Text(req.name, style: TextStyle(fontWeight: FontWeight.bold)),
                 ),
@@ -57,14 +61,7 @@ class _DebugRequestsPageState extends State<DebugRequestsPage> {
             subtitle: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                Row(
+                Text(req.type),
-                  children: [
-                    Text(_dateFormat.format(req.timestampStart), style: TextStyle(fontSize: 12)),
-                    Expanded(child: SizedBox()),
-                    Text(req.type),
-                  ],
-                ),
-                SizedBox(height: 16),
                 Text(
                   req.error,
                   maxLines: 1,
@@ -84,6 +81,10 @@ class _DebugRequestsPageState extends State<DebugRequestsPage> {
         child: ListTile(
           title: Row(
             children: [
+              SizedBox(
+                width: 120,
+                child: Text(_dateFormat.format(req.timestampStart), style: TextStyle(fontSize: 12)),
+              ),
               Expanded(
                 child: Text(req.name, style: TextStyle(fontWeight: FontWeight.bold)),
               ),
@@ -91,13 +92,7 @@ class _DebugRequestsPageState extends State<DebugRequestsPage> {
               Text('${req.timestampEnd.difference(req.timestampStart).inMilliseconds}ms', style: TextStyle(fontSize: 12)),
             ],
           ),
-          subtitle: Row(
+          subtitle: Text(req.type),
-            children: [
-              Text(_dateFormat.format(req.timestampStart), style: TextStyle(fontSize: 12)),
-              Expanded(child: SizedBox()),
-              Text(req.type),
-            ],
-          ),
         ),
       ),
     );

flutter/lib/pages/filtered_message_view/filtered_message_view.dart

@@ -1,120 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:infinite_scroll_pagination/infinite_scroll_pagination.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/scn_message.dart';
-import 'package:simplecloudnotifier/pages/message_list/message_list_item.dart';
-import 'package:simplecloudnotifier/pages/message_view/message_view.dart';
-import 'package:simplecloudnotifier/state/app_settings.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:provider/provider.dart';
-
-class FilteredMessageViewPage extends StatefulWidget {
-  const FilteredMessageViewPage({
-    required this.title,
-    required this.filter,
-    super.key,
-  });
-
-  final String title;
-  final MessageFilter filter;
-
-  @override
-  State<FilteredMessageViewPage> createState() => _FilteredMessageViewPageState();
-}
-
-class _FilteredMessageViewPageState extends State<FilteredMessageViewPage> {
-  PagingController<String, SCNMessage> _pagingController = PagingController.fromValue(PagingState(nextPageKey: null, itemList: [], error: null), firstPageKey: '@start');
-
-  Map<String, Channel>? _channels = null;
-  bool _channelsFetched = false;
-
-  @override
-  void initState() {
-    super.initState();
-
-    _channels = SCNDataCache().getChannelMap();
-
-    _pagingController.addPageRequestListener(_fetchPage);
-
-    _pagingController.refresh();
-  }
-
-  @override
-  void dispose() {
-    _pagingController.dispose();
-    super.dispose();
-  }
-
-  Future<void> _fetchPage(String thisPageToken) async {
-    final acc = Provider.of<AppAuth>(context, listen: false);
-    final cfg = Provider.of<AppSettings>(context, listen: false);
-
-    ApplicationLog.debug('Start FilteredMessageViewPage::_pagingController::_fetchPage [ ${thisPageToken} ]');
-
-    if (!acc.isAuth()) {
-      _pagingController.error = 'Not logged in';
-      return;
-    }
-
-    try {
-      if (_channels == null || !_channelsFetched) {
-        final channels = await APIClient.getChannelList(acc, ChannelSelector.allAny);
-        setState(() {
-          _channels = <String, Channel>{for (var v in channels) v.channel.channelID: v.channel};
-          _channelsFetched = true;
-        });
-      }
-
-      final (npt, newItems) = await APIClient.getMessageList(acc, thisPageToken, pageSize: cfg.messagePageSize, filter: this.widget.filter, includeNonSuscribed: true);
-
-      SCNDataCache().addToMessageCache(newItems); // no await
-
-      if (npt == '@end') {
-        _pagingController.appendLastPage(newItems);
-      } else {
-        _pagingController.appendPage(newItems, npt);
-      }
-    } catch (exc, trace) {
-      _pagingController.error = exc.toString();
-      ApplicationLog.error('Failed to list channel-messages: ' + exc.toString(), trace: trace);
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return SCNScaffold(
-      title: this.widget.title,
-      showSearch: false,
-      showShare: false,
-      child: _buildMessageList(context),
-    );
-  }
-
-  Widget _buildMessageList(BuildContext context) {
-    return Padding(
-      padding: EdgeInsets.fromLTRB(8, 4, 8, 4),
-      child: RefreshIndicator(
-        onRefresh: () => Future.sync(
-          () => _pagingController.refresh(),
-        ),
-        child: PagedListView<String, SCNMessage>(
-          pagingController: _pagingController,
-          builderDelegate: PagedChildBuilderDelegate<SCNMessage>(
-            itemBuilder: (context, item, index) => MessageListItem(
-              message: item,
-              allChannels: _channels ?? {},
-              onPressed: () {
-                Navi.push(context, () => MessageViewPage(messageID: item.messageID, preloadedData: (item,)));
-              },
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

flutter/lib/pages/keytoken_list/keytoken_create_modal.dart

@@ -1,216 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:simplecloudnotifier/api/api_client.dart';
-import 'package:simplecloudnotifier/components/error_display/error_display.dart';
-import 'package:simplecloudnotifier/models/channel.dart';
-import 'package:simplecloudnotifier/models/keytoken.dart';
-import 'package:simplecloudnotifier/state/app_auth.dart';
-import 'package:simplecloudnotifier/state/application_log.dart';
-import 'package:simplecloudnotifier/types/immediate_future.dart';
-import 'package:simplecloudnotifier/utils/toaster.dart';
-
-class KeyTokenCreateDialog extends StatefulWidget {
-  final void Function(KeyToken, String) onCreated;
-
-  const KeyTokenCreateDialog({
-    required this.onCreated,
-    Key? key,
-  }) : super(key: key);
-
-  @override
-  _KeyTokenCreateDialogState createState() => _KeyTokenCreateDialogState();
-}
-
-class _KeyTokenCreateDialogState extends State<KeyTokenCreateDialog> {
-  TextEditingController _ctrlName = TextEditingController();
-  Set<String> selectedPermissions = {'CS'};
-
-  ImmediateFuture<List<Channel>> _futureOwnedChannels = ImmediateFuture.ofPending();
-
-  bool allChannels = true;
-  Set<String> selectedChannels = new Set<String>();
-
-  @override
-  void initState() {
-    super.initState();
-
-    final userAcc = Provider.of<AppAuth>(context, listen: false);
-
-    setState(() {
-      _futureOwnedChannels = ImmediateFuture.ofFuture(APIClient.getChannelList(userAcc, ChannelSelector.owned).then((p) => p.map((c) => c.channel).toList()));
-    });
-  }
-
-  @override
-  void dispose() {
-    _ctrlName.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: const Text('Create new key'),
-      content: Container(
-        width: 0,
-        height: 400,
-        child: SingleChildScrollView(
-          child: Column(
-            children: [
-              _buildNameCtrl(context),
-              SizedBox(height: 32),
-              _buildPermissionCtrl(context),
-              SizedBox(height: 32),
-              _buildChannelCtrl(context),
-            ],
-          ),
-        ),
-      ),
-      actions: <Widget>[
-        TextButton(
-          onPressed: () => Navigator.of(context).pop(),
-          child: Text('Cancel'),
-        ),
-        TextButton(
-          style: TextButton.styleFrom(textStyle: Theme.of(context).textTheme.labelLarge),
-          child: const Text('Create'),
-          onPressed: _create,
-        ),
-      ],
-    );
-  }
-
-  Widget _buildNameCtrl(BuildContext context) {
-    return TextField(
-      controller: _ctrlName,
-      decoration: const InputDecoration(
-        labelText: 'Key name',
-        hintText: 'Enter a name for the new key',
-      ),
-    );
-  }
-
-  Widget _buildPermissionCtrl(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.stretch,
-      children: [
-        Text('Permissions:', style: Theme.of(context).textTheme.labelLarge, textAlign: TextAlign.start),
-        ListView.builder(
-          shrinkWrap: true,
-          primary: false,
-          itemBuilder: (builder, index) {
-            final txt = (['Admin', 'Read messages', 'Send messages', 'Read userdata'])[index];
-            final prm = (['A', 'CR', 'CS', 'UR'])[index];
-
-            return ListTile(
-              contentPadding: EdgeInsets.fromLTRB(8, 0, 8, 0),
-              visualDensity: VisualDensity(horizontal: 0, vertical: -4),
-              title: Text(txt),
-              leading: Icon(
-                selectedPermissions.contains(prm) ? Icons.check_box : Icons.check_box_outline_blank,
-                color: Theme.of(context).primaryColor,
-              ),
-              onTap: () {
-                setState(() {
-                  if (selectedPermissions.contains(prm)) {
-                    selectedPermissions.remove(prm);
-                  } else {
-                    selectedPermissions.add(prm);
-                  }
-                });
-              },
-            );
-          },
-          itemCount: 4,
-        )
-      ],
-    );
-  }
-
-  Widget _buildChannelCtrl(BuildContext context) {
-    return FutureBuilder<List<Channel>>(
-      future: _futureOwnedChannels.future,
-      builder: (context, snapshot) {
-        if (snapshot.connectionState == ConnectionState.waiting) {
-          return Center(child: CircularProgressIndicator());
-        } else if (snapshot.hasError) {
-          return ErrorDisplay(errorMessage: '${snapshot.error}');
-        }
-
-        final ownChannels = snapshot.data!;
-
-        return Column(
-          crossAxisAlignment: CrossAxisAlignment.stretch,
-          children: [
-            Text('Channels:', style: Theme.of(context).textTheme.labelLarge, textAlign: TextAlign.start),
-            ListTile(
-              contentPadding: EdgeInsets.fromLTRB(8, 0, 8, 0),
-              visualDensity: VisualDensity(horizontal: 0, vertical: -4),
-              title: Text('All Channels'),
-              leading: Icon(
-                allChannels ? Icons.check_box : Icons.check_box_outline_blank,
-                color: Theme.of(context).primaryColor,
-              ),
-              onTap: () {
-                setState(() {
-                  allChannels = !allChannels;
-                });
-              },
-            ),
-            SizedBox(height: 16),
-            if (!allChannels)
-              ListView.builder(
-                shrinkWrap: true,
-                primary: false,
-                itemBuilder: (builder, index) {
-                  return ListTile(
-                    contentPadding: EdgeInsets.fromLTRB(8, 0, 8, 0),
-                    visualDensity: VisualDensity(horizontal: 0, vertical: -4),
-                    title: Text(ownChannels[index].displayName),
-                    leading: Icon(
-                      selectedChannels.contains(ownChannels[index].channelID) ? Icons.check_box : Icons.check_box_outline_blank,
-                      color: Theme.of(context).primaryColor,
-                    ),
-                    onTap: () {
-                      setState(() {
-                        if (selectedChannels.contains(ownChannels[index].channelID)) {
-                          selectedChannels.remove(ownChannels[index].channelID);
-                        } else {
-                          selectedChannels.add(ownChannels[index].channelID);
-                        }
-                      });
-                    },
-                  );
-                },
-                itemCount: ownChannels.length,
-              ),
-          ],
-        );
-      },
-    );
-  }
-
-  void _create() async {
-    final userAcc = Provider.of<AppAuth>(context, listen: false);
-
-    if (!userAcc.isAuth()) return;
-
-    if (_ctrlName.text.isEmpty) {
-      Toaster.error('Missing data', 'Please enter a name for the key');
-      return;
-    }
-
-    try {
-      final perm = selectedPermissions.join(';');
-      final channels = allChannels ? <String>[] : selectedChannels.toList();
-
-      var kt = await APIClient.createKeyToken(userAcc, _ctrlName.text, perm, allChannels, channels: channels);
-      Toaster.success('Success', 'Key created successfully');
-      Navigator.of(context).pop();
-      widget.onCreated(kt.keyToken, kt.token);
-    } catch (exc, trace) {
-      ApplicationLog.error('Failed to create keytoken: ' + exc.toString(), trace: trace);
-      Toaster.error("Error", 'Failed to create key: ${exc.toString()}');
-    }
-  }
-}

flutter/lib/pages/keytoken_list/keytoken_created_modal.dart

@@ -1,97 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:simplecloudnotifier/components/badge_display/badge_display.dart';
-import 'package:simplecloudnotifier/models/keytoken.dart';
-import 'package:simplecloudnotifier/utils/toaster.dart';
-import 'package:simplecloudnotifier/utils/ui.dart';
-
-class KeyTokenCreatedModal extends StatelessWidget {
-  final KeyToken keytoken;
-  final String tokenValue;
-
-  const KeyTokenCreatedModal({
-    Key? key,
-    required this.keytoken,
-    required this.tokenValue,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: const Text('A new key was created'),
-      content: Container(
-        width: 0,
-        height: 350,
-        child: SingleChildScrollView(
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.stretch,
-            children: [
-              UI.metaCard(
-                context: context,
-                icon: FontAwesomeIcons.solidIdCardClip,
-                title: 'KeyTokenID',
-                values: [keytoken.keytokenID],
-              ),
-              UI.metaCard(
-                context: context,
-                icon: FontAwesomeIcons.solidInputText,
-                title: 'Name',
-                values: [keytoken.name],
-              ),
-              UI.metaCard(
-                context: context,
-                icon: FontAwesomeIcons.solidShieldKeyhole,
-                title: 'Permissions',
-                values: _formatPermissions(keytoken.permissions),
-              ),
-              const SizedBox(height: 16),
-              const BadgeDisplay(
-                text: "Please copy and save the token now, it cannot be retrieved later.",
-                icon: null,
-                mode: BadgeMode.warn,
-              ),
-              const SizedBox(height: 4),
-              UI.metaCard(
-                context: context,
-                icon: FontAwesomeIcons.solidKey,
-                title: 'Token',
-                values: [tokenValue.substring(0, 12) + '...'],
-                iconActions: [(FontAwesomeIcons.copy, null, _copy)],
-              ),
-            ],
-          ),
-        ),
-      ),
-      actions: <Widget>[
-        TextButton(
-          child: const Text('Close'),
-          onPressed: () {
-            Navigator.of(context).pop();
-          },
-        ),
-      ],
-    );
-  }
-
-  List<String> _formatPermissions(String v) {
-    var splt = v.split(';');
-
-    if (splt.length == 0) return ["None"];
-
-    List<String> result = [];
-
-    if (splt.contains("A")) result.add("Admin");
-    if (splt.contains("UR")) result.add("Read Account");
-    if (splt.contains("CR")) result.add("Read Messages");
-    if (splt.contains("CS")) result.add("Send Messages");
-
-    return result;
-  }
-
-  void _copy() {
-    Clipboard.setData(new ClipboardData(text: tokenValue));
-    Toaster.info("Clipboard", 'Copied text to Clipboard');
-    print('================= [CLIPBOARD] =================\n${tokenValue}\n================= [/CLIPBOARD] =================');
-  }
-}

flutter/lib/pages/keytoken_list/keytoken_list.dart

@@ -1,115 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.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/keytoken.dart';
-import 'package:simplecloudnotifier/pages/keytoken_list/keytoken_create_modal.dart';
-import 'package:simplecloudnotifier/pages/keytoken_list/keytoken_created_modal.dart';
-import 'package:simplecloudnotifier/state/application_log.dart';
-import 'package:simplecloudnotifier/state/app_auth.dart';
-import 'package:simplecloudnotifier/pages/keytoken_list/keytoken_list_item.dart';
-
-class KeyTokenListPage extends StatefulWidget {
-  const KeyTokenListPage({super.key});
-
-  @override
-  State<KeyTokenListPage> createState() => _KeyTokenListPageState();
-}
-
-class _KeyTokenListPageState extends State<KeyTokenListPage> {
-  final PagingController<int, KeyToken> _pagingController = PagingController.fromValue(PagingState(nextPageKey: null, itemList: [], error: null), firstPageKey: 0);
-
-  @override
-  void initState() {
-    super.initState();
-
-    _pagingController.addPageRequestListener(_fetchPage);
-
-    _pagingController.refresh();
-  }
-
-  @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-  }
-
-  @override
-  void dispose() {
-    ApplicationLog.debug('KeyTokenListPage::dispose');
-    _pagingController.dispose();
-    super.dispose();
-  }
-
-  Future<void> _fetchPage(int pageKey) async {
-    final acc = Provider.of<AppAuth>(context, listen: false);
-
-    ApplicationLog.debug('Start KeyTokenListPage::_pagingController::_fetchPage [ ${pageKey} ]');
-
-    if (!acc.isAuth()) {
-      _pagingController.error = 'Not logged in';
-      return;
-    }
-
-    try {
-      final items = (await APIClient.getKeyTokenList(acc)).toList();
-
-      items.sort((a, b) => -1 * a.timestampCreated.compareTo(b.timestampCreated));
-
-      _pagingController.value = PagingState(nextPageKey: null, itemList: items, error: null);
-    } catch (exc, trace) {
-      _pagingController.error = exc.toString();
-      ApplicationLog.error('Failed to list keytokens: ' + exc.toString(), trace: trace);
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return SCNScaffold(
-      title: "Keys",
-      showSearch: false,
-      showShare: false,
-      child: Padding(
-        padding: EdgeInsets.fromLTRB(8, 4, 8, 4),
-        child: RefreshIndicator(
-          onRefresh: () => Future.sync(
-            () => _pagingController.refresh(),
-          ),
-          child: PagedListView<int, KeyToken>(
-            pagingController: _pagingController,
-            builderDelegate: PagedChildBuilderDelegate<KeyToken>(
-              itemBuilder: (context, item, index) => KeyTokenListItem(item: item, needsReload: _fullRefresh),
-            ),
-          ),
-        ),
-      ),
-      floatingActionButton: FloatingActionButton(
-        heroTag: 'fab_keytokenlist_plus',
-        onPressed: () {
-          showDialog<void>(
-            context: context,
-            builder: (context) => KeyTokenCreateDialog(onCreated: _created),
-          );
-        },
-        child: const Icon(FontAwesomeIcons.plus),
-      ),
-    );
-  }
-
-  void _created(KeyToken token, String tokValue) {
-    setState(() {
-      _pagingController.itemList?.insert(0, token);
-    });
-
-    showDialog<void>(
-      context: context,
-      builder: (context) => KeyTokenCreatedModal(keytoken: token, tokenValue: tokValue),
-    );
-  }
-
-  void _fullRefresh() {
-    ApplicationLog.debug('KeytokenListPage::fullRefresh');
-    _pagingController.refresh();
-  }
-}

flutter/lib/pages/keytoken_list/keytoken_list_item.dart

@@ -1,116 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:provider/provider.dart';
-import 'package:simplecloudnotifier/api/api_client.dart';
-import 'package:simplecloudnotifier/models/keytoken.dart';
-import 'package:simplecloudnotifier/pages/filtered_message_view/filtered_message_view.dart';
-import 'package:simplecloudnotifier/pages/keytoken_view/keytoken_view.dart';
-import 'package:simplecloudnotifier/state/app_settings.dart';
-import 'package:simplecloudnotifier/utils/navi.dart';
-
-enum KeyTokenListItemMode {
-  Messages,
-  Extended,
-}
-
-class KeyTokenListItem extends StatelessWidget {
-  const KeyTokenListItem({
-    required this.item,
-    required this.needsReload,
-    super.key,
-  });
-
-  final KeyToken item;
-  final void Function()? needsReload;
-
-  @override
-  Widget build(BuildContext context) {
-    final dateFormat = context.select<AppSettings, AppSettingsDateFormat>((v) => v.dateFormat).dateOnlyFormat();
-
-    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: () {
-          Navi.push(context, () => KeyTokenViewPage(keytokenID: item.keytokenID, preloadedData: item, needsReload: needsReload));
-        },
-        child: Padding(
-          padding: const EdgeInsets.all(8),
-          child: Row(
-            children: [
-              Icon(FontAwesomeIcons.solidGearCode, color: Theme.of(context).colorScheme.outline, size: 32),
-              SizedBox(width: 16),
-              Expanded(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.stretch,
-                  children: [
-                    Row(
-                      children: [
-                        Expanded(
-                          child: Text(
-                            item.name,
-                            style: const TextStyle(fontWeight: FontWeight.bold),
-                          ),
-                        ),
-                        Text(
-                          (item.timestampLastUsed == null) ? '' : dateFormat.format(DateTime.parse(item.timestampLastUsed!).toLocal()),
-                          style: const TextStyle(fontSize: 14),
-                        ),
-                      ],
-                    ),
-                    SizedBox(height: 4),
-                    Row(
-                      crossAxisAlignment: CrossAxisAlignment.end,
-                      children: [
-                        Expanded(
-                          child: Text(
-                            "Permissions: " + _formatPermissions(item.permissions, item.allChannels, item.channels),
-                            style: TextStyle(color: Theme.of(context).textTheme.bodyLarge?.color?.withAlpha(160)),
-                          ),
-                        ),
-                        Text(item.messagesSent.toString(), style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold)),
-                      ],
-                    ),
-                  ],
-                ),
-              ),
-              SizedBox(width: 4),
-              GestureDetector(
-                onTap: () {
-                  Navi.push(context, () => FilteredMessageViewPage(title: item.name, filter: MessageFilter(usedKeys: [item.keytokenID])));
-                },
-                child: Padding(
-                  padding: const EdgeInsets.all(8),
-                  child: Icon(FontAwesomeIcons.solidEnvelopes, color: Theme.of(context).colorScheme.onPrimaryContainer.withAlpha(128), size: 24),
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  String _formatPermissions(String v, bool allChannels, List<String> channels) {
-    var splt = v.split(';');
-
-    if (splt.length == 0) return "None";
-
-    var a = splt.contains("A");
-    var ur = splt.contains("UR");
-    var cr = splt.contains("CR");
-    var cs = splt.contains("CS");
-
-    if (a) return "Admin";
-    if (cr && cs && allChannels) return "Read+Send";
-    if (cr && cs && !allChannels) return "Read+Send (${channels.length} channel${channels.length == 1 ? '' : 's'})";
-    if (ur && !cr && !cs) return "Account-Read";
-    if (cr && !cs && !allChannels) return "Read-only (${channels.length} channel${channels.length == 1 ? '' : 's'})";
-    if (cr && !cs && allChannels) return "Read-only";
-    if (cs && !allChannels) return "Send-Only (${channels.length} channel${channels.length == 1 ? '' : 's'})";
-    if (cs && allChannels) return "Send-Only";
-
-    return "{ " + v + " | " + (allChannels ? 'all' : '${channels.length}') + " }";
-  }
-}

flutter/lib/pages/keytoken_view/keytoken_channel_modal.dart

@@ -1,112 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:simplecloudnotifier/models/channel.dart';
-import 'package:simplecloudnotifier/models/keytoken.dart';
-
-class EditKeyTokenChannelsDialog extends StatefulWidget {
-  final List<Channel> ownedChannels;
-  final KeyTokenPreview keytoken;
-
-  final void Function(Set<String>) onUpdateChannels;
-  final void Function() onUpdateSetAllChannels;
-
-  const EditKeyTokenChannelsDialog({
-    required this.ownedChannels,
-    required this.keytoken,
-    required this.onUpdateChannels,
-    required this.onUpdateSetAllChannels,
-    Key? key,
-  }) : super(key: key);
-
-  @override
-  _EditKeyTokenChannelsDialogState createState() => _EditKeyTokenChannelsDialogState();
-}
-
-class _EditKeyTokenChannelsDialogState extends State<EditKeyTokenChannelsDialog> {
-  late bool allChannels;
-  late Set<String> selectedEntries;
-
-  @override
-  void initState() {
-    super.initState();
-    allChannels = widget.keytoken.allChannels;
-    selectedEntries = (widget.keytoken.channels).toSet();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    var ownChannels = widget.ownedChannels.toList();
-    ownChannels.sort((a, b) => a.displayName.toLowerCase().compareTo(b.displayName.toLowerCase()));
-
-    return AlertDialog(
-      title: const Text('Channels'),
-      content: Container(
-        width: 0,
-        height: 400,
-        child: Column(
-          children: [
-            ListTile(
-              contentPadding: EdgeInsets.fromLTRB(8, 0, 8, 0),
-              visualDensity: VisualDensity(horizontal: 0, vertical: -4),
-              title: Text('All Channels'),
-              leading: Icon(
-                allChannels ? Icons.check_box : Icons.check_box_outline_blank,
-                color: Theme.of(context).primaryColor,
-              ),
-              onTap: () {
-                setState(() {
-                  allChannels = !allChannels;
-                });
-              },
-            ),
-            SizedBox(height: 16),
-            if (!allChannels)
-              Expanded(
-                child: ListView.builder(
-                  shrinkWrap: true,
-                  itemBuilder: (builder, index) {
-                    return ListTile(
-                      contentPadding: EdgeInsets.fromLTRB(8, 0, 8, 0),
-                      visualDensity: VisualDensity(horizontal: 0, vertical: -4),
-                      title: Text(ownChannels[index].displayName),
-                      leading: Icon(
-                        selectedEntries.contains(ownChannels[index].channelID) ? Icons.check_box : Icons.check_box_outline_blank,
-                        color: Theme.of(context).primaryColor,
-                      ),
-                      onTap: () {
-                        setState(() {
-                          if (selectedEntries.contains(ownChannels[index].channelID)) {
-                            selectedEntries.remove(ownChannels[index].channelID);
-                          } else {
-                            selectedEntries.add(ownChannels[index].channelID);
-                          }
-                        });
-                      },
-                    );
-                  },
-                  itemCount: ownChannels.length,
-                ),
-              ),
-          ],
-        ),
-      ),
-      actions: <Widget>[
-        TextButton(
-          onPressed: () => Navigator.of(context).pop(),
-          child: Text('Cancel'),
-        ),
-        TextButton(
-          style: TextButton.styleFrom(textStyle: Theme.of(context).textTheme.labelLarge),
-          child: const Text('Update'),
-          onPressed: () {
-            if (allChannels) {
-              widget.onUpdateSetAllChannels();
-            } else {
-              widget.onUpdateChannels(selectedEntries);
-            }
-            Navigator.of(context).pop();
-          },
-        ),
-      ],
-    );
-  }
-}

flutter/lib/pages/keytoken_view/keytoken_permission_modal.dart

@@ -1,82 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:simplecloudnotifier/models/keytoken.dart';
-
-class EditKeyTokenPermissionsDialog extends StatefulWidget {
-  final KeyTokenPreview keytoken;
-
-  final void Function(String) onUpdatePermissions;
-
-  const EditKeyTokenPermissionsDialog({
-    required this.keytoken,
-    required this.onUpdatePermissions,
-    Key? key,
-  }) : super(key: key);
-
-  @override
-  _EditKeyTokenPermissionsDialogState createState() => _EditKeyTokenPermissionsDialogState();
-}
-
-class _EditKeyTokenPermissionsDialogState extends State<EditKeyTokenPermissionsDialog> {
-  Set<String> selectedPermissions = new Set<String>();
-
-  @override
-  void initState() {
-    super.initState();
-
-    for (var p in widget.keytoken.permissions.split(';')) {
-      if (p.isNotEmpty) selectedPermissions.add(p);
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: const Text('Permissions'),
-      content: Container(
-        width: 0,
-        height: 400,
-        child: ListView.builder(
-          shrinkWrap: true,
-          itemBuilder: (builder, index) {
-            final txt = (['Admin', 'Read messages', 'Send messages', 'Read userdata'])[index];
-            final prm = (['A', 'CR', 'CS', 'UR'])[index];
-
-            return ListTile(
-              contentPadding: EdgeInsets.fromLTRB(8, 0, 8, 0),
-              visualDensity: VisualDensity(horizontal: 0, vertical: -4),
-              title: Text(txt),
-              leading: Icon(
-                selectedPermissions.contains(prm) ? Icons.check_box : Icons.check_box_outline_blank,
-                color: Theme.of(context).primaryColor,
-              ),
-              onTap: () {
-                setState(() {
-                  if (selectedPermissions.contains(prm)) {
-                    selectedPermissions.remove(prm);
-                  } else {
-                    selectedPermissions.add(prm);
-                  }
-                });
-              },
-            );
-          },
-          itemCount: 4,
-        ),
-      ),
-      actions: <Widget>[
-        TextButton(
-          onPressed: () => Navigator.of(context).pop(),
-          child: Text('Cancel'),
-        ),
-        TextButton(
-          style: TextButton.styleFrom(textStyle: Theme.of(context).textTheme.labelLarge),
-          child: const Text('Update'),
-          onPressed: () {
-            widget.onUpdatePermissions(selectedPermissions.join(';'));
-            Navigator.of(context).pop();
-          },
-        ),
-      ],
-    );
-  }
-}

flutter/lib/pages/keytoken_view/keytoken_view.dart

@@ -1,611 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:simplecloudnotifier/api/api_client.dart';
-import 'package:simplecloudnotifier/components/error_display/error_display.dart';
-import 'package:simplecloudnotifier/components/layout/scaffold.dart';
-import 'package:simplecloudnotifier/models/channel.dart';
-import 'package:simplecloudnotifier/models/keytoken.dart';
-import 'package:simplecloudnotifier/models/user.dart';
-import 'package:simplecloudnotifier/pages/filtered_message_view/filtered_message_view.dart';
-import 'package:simplecloudnotifier/pages/keytoken_view/keytoken_channel_modal.dart';
-import 'package:simplecloudnotifier/pages/keytoken_view/keytoken_permission_modal.dart';
-import 'package:simplecloudnotifier/state/app_auth.dart';
-import 'package:simplecloudnotifier/state/app_bar_state.dart';
-import 'package:simplecloudnotifier/state/app_settings.dart';
-import 'package:simplecloudnotifier/state/application_log.dart';
-import 'package:simplecloudnotifier/state/scn_data_cache.dart';
-import 'package:simplecloudnotifier/types/immediate_future.dart';
-import 'package:simplecloudnotifier/utils/dialogs.dart';
-import 'package:simplecloudnotifier/utils/navi.dart';
-import 'package:simplecloudnotifier/utils/toaster.dart';
-import 'package:simplecloudnotifier/utils/ui.dart';
-import 'package:provider/provider.dart';
-
-class KeyTokenViewPage extends StatefulWidget {
-  const KeyTokenViewPage({
-    required this.keytokenID,
-    required this.preloadedData,
-    required this.needsReload,
-    super.key,
-  });
-
-  final String keytokenID;
-  final KeyToken? preloadedData;
-
-  final void Function()? needsReload;
-
-  @override
-  State<KeyTokenViewPage> createState() => _KeyTokenViewPageState();
-}
-
-enum EditState { none, editing, saving }
-
-enum KeyTokenViewPageInitState { loading, okay, error }
-
-class _KeyTokenViewPageState extends State<KeyTokenViewPage> {
-  ImmediateFuture<UserPreview> _futureOwner = ImmediateFuture.ofPending();
-
-  ImmediateFuture<Map<String, ChannelPreview>> _futureAllChannels = ImmediateFuture.ofPending();
-
-  ImmediateFuture<List<Channel>> _futureOwnedChannels = ImmediateFuture.ofPending();
-
-  final TextEditingController _ctrlName = TextEditingController();
-
-  int _loadingIndeterminateCounter = 0;
-
-  EditState _editName = EditState.none;
-  String? _nameOverride = null;
-
-  KeyTokenPreview? keytokenPreview;
-  KeyToken? keytoken;
-
-  KeyTokenViewPageInitState loadingState = KeyTokenViewPageInitState.loading;
-  String errorMessage = '';
-
-  KeyToken? keytokenUserAccAdmin;
-  KeyToken? keytokenUserAccSend;
-
-  @override
-  void initState() {
-    _initStateAsync(true);
-
-    super.initState();
-  }
-
-  Future<void> _initStateAsync(bool usePreload) async {
-    final userAcc = Provider.of<AppAuth>(context, listen: false);
-
-    if (widget.preloadedData != null && usePreload) {
-      keytoken = widget.preloadedData!;
-      keytokenPreview = widget.preloadedData!.toPreview();
-    } else {
-      try {
-        var p = await APIClient.getKeyTokenPreviewByID(userAcc, widget.keytokenID);
-        setState(() {
-          keytokenPreview = p;
-        });
-
-        if (p.ownerUserID == userAcc.userID) {
-          var r = await APIClient.getKeyToken(userAcc, widget.keytokenID);
-          setState(() {
-            keytoken = r;
-          });
-        } else {
-          setState(() {
-            keytoken = null;
-          });
-        }
-      } catch (exc, trace) {
-        ApplicationLog.error('Failed to load data: ' + exc.toString(), trace: trace);
-        Toaster.error("Error", 'Failed to load data');
-        this.errorMessage = 'Failed to load data: ' + exc.toString();
-        this.loadingState = KeyTokenViewPageInitState.error;
-        return;
-      }
-    }
-
-    setState(() {
-      this.loadingState = KeyTokenViewPageInitState.okay;
-
-      assert(keytokenPreview != null);
-
-      if (this.keytokenPreview!.ownerUserID == userAcc.userID) {
-        var cacheUser = userAcc.getUserOrNull();
-        if (cacheUser != null) {
-          _futureOwner = ImmediateFuture.ofValue(cacheUser.toPreview());
-        } else {
-          _futureOwner = ImmediateFuture.ofFuture(_getOwner(userAcc));
-        }
-      } else {
-        _futureOwner = ImmediateFuture.ofFuture(APIClient.getUserPreview(userAcc, this.keytokenPreview!.ownerUserID));
-      }
-    });
-
-    setState(() {
-      _futureAllChannels = ImmediateFuture.ofFuture(APIClient.getChannelList(userAcc, ChannelSelector.allAny).then((lst) async {
-        Map<String, ChannelPreview> result = {};
-
-        for (var c in lst) result[c.channel.channelID] = c.channel.toPreview(c.subscription);
-
-        if (keytokenPreview != null) {
-          for (var cid in keytokenPreview!.channels) {
-            if (!result.containsKey(cid)) {
-              result[cid] = await APIClient.getChannelPreview(userAcc, cid);
-            }
-          }
-        }
-
-        return result;
-      }));
-    });
-
-    setState(() {
-      _futureOwnedChannels = ImmediateFuture.ofFuture(APIClient.getChannelList(userAcc, ChannelSelector.owned).then((p) => p.map((c) => c.channel).toList()));
-    });
-
-    SCNDataCache().getOrQueryTokenByValue(userAcc.userID!, userAcc.tokenAdmin!).then((token) {
-      setState(() {
-        keytokenUserAccAdmin = token;
-      });
-    });
-
-    SCNDataCache().getOrQueryTokenByValue(userAcc.userID!, userAcc.tokenSend!).then((token) {
-      setState(() {
-        keytokenUserAccSend = token;
-      });
-    });
-  }
-
-  @override
-  void dispose() {
-    _ctrlName.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final userAcc = Provider.of<AppAuth>(context, listen: false);
-
-    var title = "Key";
-
-    Widget child;
-
-    if (loadingState == KeyTokenViewPageInitState.loading) {
-      child = Center(child: CircularProgressIndicator());
-    } else if (loadingState == KeyTokenViewPageInitState.error) {
-      child = ErrorDisplay(errorMessage: errorMessage);
-    } else if (loadingState == KeyTokenViewPageInitState.okay && keytokenPreview!.ownerUserID == userAcc.userID) {
-      child = _buildOwnedKeyTokenView(context, this.keytoken!);
-      title = this.keytoken!.name;
-    } else {
-      child = _buildForeignKeyTokenView(context, this.keytokenPreview!);
-      title = keytokenPreview!.name;
-    }
-
-    return SCNScaffold(
-      title: title,
-      showSearch: false,
-      showShare: false,
-      child: child,
-    );
-  }
-
-  Widget _buildOwnedKeyTokenView(BuildContext context, KeyToken keytoken) {
-    final dateFormat = context.select<AppSettings, AppSettingsDateFormat>((v) => v.dateFormat).dateFormat();
-
-    return SingleChildScrollView(
-      child: Padding(
-        padding: const EdgeInsets.fromLTRB(24, 16, 24, 16),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.stretch,
-          children: [
-            SizedBox(height: 8),
-            UI.metaCard(
-              context: context,
-              icon: FontAwesomeIcons.solidIdCardClip,
-              title: 'KeyTokenID',
-              values: [
-                keytoken.keytokenID,
-                if (keytokenUserAccAdmin?.keytokenID == keytoken.keytokenID) '(Currently used as Admin-Token)',
-                if (keytokenUserAccSend?.keytokenID == keytoken.keytokenID) '(Currently used as Send-Token)',
-              ],
-            ),
-            _buildNameCard(context, true),
-            UI.metaCard(
-              context: context,
-              icon: FontAwesomeIcons.solidClock,
-              title: 'Created',
-              values: [dateFormat.format(DateTime.parse(keytoken.timestampCreated).toLocal())],
-            ),
-            UI.metaCard(
-              context: context,
-              icon: FontAwesomeIcons.solidClockTwo,
-              title: 'Last Used',
-              values: [(keytoken.timestampLastUsed == null) ? 'Never' : dateFormat.format(DateTime.parse(keytoken.timestampLastUsed!).toLocal())],
-            ),
-            _buildOwnerCard(context, true),
-            UI.metaCard(
-              context: context,
-              icon: FontAwesomeIcons.solidEnvelope,
-              title: 'Messages',
-              values: [keytoken.messagesSent.toString()],
-              mainAction: () {
-                Navi.push(context, () => FilteredMessageViewPage(title: keytoken.name, filter: MessageFilter(usedKeys: [keytoken.keytokenID])));
-              },
-            ),
-            ..._buildPermissionCard(context, true, keytoken.toPreview()),
-            UI.button(text: "Delete Key", onPressed: _deleteKey, color: Colors.red[900]),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildForeignKeyTokenView(BuildContext context, KeyTokenPreview keytoken) {
-    return SingleChildScrollView(
-      child: Padding(
-        padding: const EdgeInsets.fromLTRB(24, 16, 24, 16),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.stretch,
-          children: [
-            SizedBox(height: 8),
-            UI.metaCard(
-              context: context,
-              icon: FontAwesomeIcons.solidIdCardClip,
-              title: 'KeyTokenID',
-              values: [keytoken.keytokenID],
-            ),
-            _buildNameCard(context, false),
-            _buildOwnerCard(context, false),
-            ..._buildPermissionCard(context, false, keytoken),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildOwnerCard(BuildContext context, bool isOwned) {
-    return FutureBuilder(
-      future: _futureOwner.future,
-      builder: (context, snapshot) {
-        if (snapshot.hasData) {
-          return UI.metaCard(
-            context: context,
-            icon: FontAwesomeIcons.solidUser,
-            title: 'Owner',
-            values: [keytokenPreview!.ownerUserID + (isOwned ? ' (you)' : ''), if (snapshot.data?.username != null) snapshot.data!.username!],
-          );
-        } else {
-          return UI.metaCard(
-            context: context,
-            icon: FontAwesomeIcons.solidUser,
-            title: 'Owner',
-            values: [keytokenPreview!.ownerUserID + (isOwned ? ' (you)' : '')],
-          );
-        }
-      },
-    );
-  }
-
-  Widget _buildNameCard(BuildContext context, bool isOwned) {
-    if (_editName == EditState.editing) {
-      return Padding(
-        padding: EdgeInsets.symmetric(vertical: 4, horizontal: 0),
-        child: UI.box(
-          context: context,
-          padding: EdgeInsets.fromLTRB(16, 2, 4, 2),
-          child: Row(
-            children: [
-              Container(child: Center(child: FaIcon(FontAwesomeIcons.solidInputText, size: 18)), height: 43),
-              SizedBox(width: 16),
-              Expanded(
-                child: TextField(
-                  autofocus: true,
-                  controller: _ctrlName,
-                  decoration: new InputDecoration.collapsed(hintText: 'Name'),
-                ),
-              ),
-              SizedBox(width: 12),
-              SizedBox(width: 4),
-              IconButton(icon: FaIcon(FontAwesomeIcons.solidFloppyDisk), onPressed: _saveName),
-            ],
-          ),
-        ),
-      );
-    } else if (_editName == EditState.none) {
-      return UI.metaCard(
-        context: context,
-        icon: FontAwesomeIcons.solidInputText,
-        title: 'Name',
-        values: [_nameOverride ?? keytokenPreview!.name],
-        iconActions: isOwned ? [(FontAwesomeIcons.penToSquare, null, _showEditName)] : [],
-      );
-    } else if (_editName == EditState.saving) {
-      return Padding(
-        padding: EdgeInsets.symmetric(vertical: 4, horizontal: 0),
-        child: UI.box(
-          context: context,
-          padding: EdgeInsets.fromLTRB(16, 2, 4, 2),
-          child: Row(
-            children: [
-              Container(child: Center(child: FaIcon(FontAwesomeIcons.solidInputText, size: 18)), height: 43),
-              SizedBox(width: 16),
-              Expanded(child: SizedBox()),
-              SizedBox(width: 12),
-              SizedBox(width: 4),
-              Padding(padding: const EdgeInsets.all(8.0), child: SizedBox(width: 18, height: 18, child: CircularProgressIndicator())),
-            ],
-          ),
-        ),
-      );
-    } else {
-      throw 'Invalid EditDisplayNameState: $_editName';
-    }
-  }
-
-  void _showEditName() {
-    setState(() {
-      _ctrlName.text = _nameOverride ?? keytokenPreview?.name ?? '';
-      _editName = EditState.editing;
-    });
-  }
-
-  void _saveName() async {
-    final userAcc = Provider.of<AppAuth>(context, listen: false);
-
-    final newName = _ctrlName.text;
-
-    try {
-      setState(() {
-        _editName = EditState.saving;
-      });
-
-      final newKeyToken = await APIClient.updateKeyToken(userAcc, widget.keytokenID, name: newName);
-
-      setState(() {
-        _editName = EditState.none;
-        _nameOverride = newKeyToken.name;
-      });
-
-      widget.needsReload?.call();
-    } catch (exc, trace) {
-      ApplicationLog.error('Failed to save DisplayName: ' + exc.toString(), trace: trace);
-      Toaster.error("Error", 'Failed to save DisplayName');
-    }
-  }
-
-  Future<UserPreview> _getOwner(AppAuth auth) async {
-    try {
-      await Future.delayed(const Duration(seconds: 0), () {}); // this is annoyingly important - otherwise we call setLoadingIndeterminate directly in initStat() and get an exception....
-
-      _incLoadingIndeterminateCounter(1);
-
-      final owner = APIClient.getUserPreview(auth, keytokenPreview!.ownerUserID);
-
-      //await Future.delayed(const Duration(seconds: 10), () {});
-
-      return owner;
-    } finally {
-      _incLoadingIndeterminateCounter(-1);
-    }
-  }
-
-  void _incLoadingIndeterminateCounter(int delta) {
-    setState(() {
-      _loadingIndeterminateCounter += delta;
-      AppBarState().setLoadingIndeterminate(_loadingIndeterminateCounter > 0);
-    });
-  }
-
-  List<Widget> _buildPermissionCard(BuildContext context, bool isOwned, KeyTokenPreview keyToken) {
-    Widget w1;
-    Widget w2;
-
-    if (isOwned) {
-      w1 = UI.metaCard(
-        context: context,
-        icon: FontAwesomeIcons.solidShieldKeyhole,
-        title: 'Permissions',
-        values: _formatPermissions(keyToken.permissions),
-        iconActions: [(FontAwesomeIcons.penToSquare, null, _editPermissions)],
-      );
-    } else {
-      w1 = UI.metaCard(
-        context: context,
-        icon: FontAwesomeIcons.solidShieldKeyhole,
-        title: 'Permissions',
-        values: _formatPermissions(keyToken.permissions),
-      );
-    }
-
-    w2 = FutureBuilder(
-      future: _futureAllChannels.future,
-      builder: (context, snapshot) {
-        if (snapshot.hasData) {
-          var cmap = snapshot.data!;
-          if (isOwned) {
-            return UI.metaCard(
-              context: context,
-              icon: FontAwesomeIcons.solidSnake,
-              title: 'Channels',
-              values: (keyToken.allChannels) ? (['All Channels']) : (keyToken.channels.isEmpty ? ['(None)'] : (keyToken.channels.map((c) => cmap[c]?.displayName ?? c).toList())),
-              iconActions: [(FontAwesomeIcons.penToSquare, null, _editChannels)],
-            );
-          } else {
-            return UI.metaCard(
-              context: context,
-              icon: FontAwesomeIcons.solidSnake,
-              title: 'Channels',
-              values: (keyToken.allChannels) ? (['All Channels']) : (keyToken.channels.isEmpty ? ['(None)'] : (keyToken.channels.map((c) => cmap[c]?.displayName ?? c).toList())),
-            );
-          }
-        } else {
-          if (isOwned) {
-            return UI.metaCard(
-              context: context,
-              icon: FontAwesomeIcons.solidSnake,
-              title: 'Channels',
-              values: (keyToken.allChannels) ? ['All Channels'] : (keyToken.channels.isEmpty ? ['(None)'] : keyToken.channels),
-              iconActions: [(FontAwesomeIcons.penToSquare, null, _editChannels)],
-            );
-          } else {
-            return UI.metaCard(
-              context: context,
-              icon: FontAwesomeIcons.solidSnake,
-              title: 'Channels',
-              values: (keyToken.allChannels) ? ['All Channels'] : (keyToken.channels.isEmpty ? ['(None)'] : keyToken.channels),
-            );
-          }
-        }
-      },
-    );
-
-    return [w1, w2];
-  }
-
-  List<String> _formatPermissions(String v) {
-    var splt = v.split(';');
-
-    if (splt.length == 0) return ["None"];
-
-    List<String> result = [];
-
-    if (splt.contains("A")) result.add("Admin");
-    if (splt.contains("UR")) result.add("Read Account");
-    if (splt.contains("CR")) result.add("Read Messages");
-    if (splt.contains("CS")) result.add("Send Messages");
-
-    return result;
-  }
-
-  void _editPermissions() async {
-    if (keytokenUserAccAdmin == null || keytokenUserAccAdmin!.keytokenID == keytokenPreview!.keytokenID) {
-      Toaster.error("Error", "You cannot edit the currently used token");
-      return;
-    }
-    if (keytokenUserAccSend == null || keytokenUserAccSend!.keytokenID == keytokenPreview!.keytokenID) {
-      Toaster.error("Error", "You cannot edit the currently used token");
-      return;
-    }
-
-    await showDialog<void>(
-      context: context,
-      builder: (context) => EditKeyTokenPermissionsDialog(
-        keytoken: keytokenPreview!,
-        onUpdatePermissions: _updatePermissions,
-      ),
-    );
-  }
-
-  void _editChannels() async {
-    if (keytokenUserAccAdmin == null || keytokenUserAccAdmin!.keytokenID == keytokenPreview!.keytokenID) {
-      Toaster.error("Error", "You cannot edit the currently used token");
-      return;
-    }
-    if (keytokenUserAccSend == null || keytokenUserAccSend!.keytokenID == keytokenPreview!.keytokenID) {
-      Toaster.error("Error", "You cannot edit the currently used token");
-      return;
-    }
-
-    var ownChannels = (await _futureOwnedChannels.future);
-    ownChannels.sort((a, b) => a.displayName.toLowerCase().compareTo(b.displayName.toLowerCase()));
-
-    await showDialog<void>(
-      context: context,
-      builder: (context) => EditKeyTokenChannelsDialog(
-        ownedChannels: ownChannels,
-        keytoken: keytokenPreview!,
-        onUpdateChannels: _updateChannelsSelected,
-        onUpdateSetAllChannels: _updateChannelsAll,
-      ),
-    );
-  }
-
-  void _deleteKey() async {
-    final acc = Provider.of<AppAuth>(context, listen: false);
-
-    if (keytokenUserAccAdmin == null || keytokenUserAccAdmin!.keytokenID == keytokenPreview!.keytokenID) {
-      Toaster.error("Error", "You cannot delete the currently used token");
-      return;
-    }
-    if (keytokenUserAccSend == null || keytokenUserAccSend!.keytokenID == keytokenPreview!.keytokenID) {
-      Toaster.error("Error", "You cannot delete the currently used token");
-      return;
-    }
-
-    try {
-      final r = await UIDialogs.showConfirmDialog(context, 'Really (permanently) delete this Key?', okText: 'Delete', cancelText: 'Cancel');
-      if (!r) return;
-
-      await APIClient.deleteKeyToken(acc, keytokenPreview!.keytokenID);
-      widget.needsReload?.call();
-
-      Toaster.info('Logout', 'Successfully deleted the key');
-
-      Navi.pop(context);
-    } catch (exc, trace) {
-      Toaster.error("Error", 'Failed to delete key');
-      ApplicationLog.error('Failed to delete key: ' + exc.toString(), trace: trace);
-    }
-  }
-
-  void _updateChannelsSelected(Set<String> selectedEntries) async {
-    final acc = Provider.of<AppAuth>(context, listen: false);
-
-    try {
-      final r = await APIClient.updateKeyToken(acc, widget.keytokenID, channels: selectedEntries.toList(), allChannels: false);
-
-      setState(() {
-        keytoken = r;
-        keytokenPreview = r.toPreview();
-      });
-
-      Toaster.info("Success", "Key updated");
-
-      widget.needsReload?.call();
-    } catch (exc, trace) {
-      ApplicationLog.error('Failed to update key: ' + exc.toString(), trace: trace);
-      Toaster.error("Error", 'Failed to update key');
-    }
-  }
-
-  void _updateChannelsAll() async {
-    final acc = Provider.of<AppAuth>(context, listen: false);
-
-    try {
-      final r = await APIClient.updateKeyToken(acc, widget.keytokenID, channels: [], allChannels: true);
-
-      setState(() {
-        keytoken = r;
-        keytokenPreview = r.toPreview();
-      });
-
-      Toaster.info("Success", "Key updated");
-
-      widget.needsReload?.call();
-    } catch (exc, trace) {
-      ApplicationLog.error('Failed to update key: ' + exc.toString(), trace: trace);
-      Toaster.error("Error", 'Failed to update key');
-    }
-  }
-
-  void _updatePermissions(String perm) async {
-    final acc = Provider.of<AppAuth>(context, listen: false);
-
-    try {
-      final r = await APIClient.updateKeyToken(acc, widget.keytokenID, permissions: perm);
-
-      setState(() {
-        keytoken = r;
-        keytokenPreview = r.toPreview();
-      });
-
-      Toaster.info("Success", "Key updated");
-
-      widget.needsReload?.call();
-    } catch (exc, trace) {
-      ApplicationLog.error('Failed to update key: ' + exc.toString(), trace: trace);
-      Toaster.error("Error", 'Failed to update key');
-    }
-  }
-}

flutter/lib/pages/message_list/message_filter_chiplet.dart

@@ -1,39 +0,0 @@
-import 'package:flutter/src/widgets/icon_data.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-
-enum MessageFilterChipletType {
-  search,
-  plainSearch,
-  channel,
-  sender,
-  timeRange,
-  priority,
-  sendkey,
-}
-
-class MessageFilterChiplet {
-  final String label; // display value
-  final dynamic value; // search/api value
-  final MessageFilterChipletType type;
-
-  MessageFilterChiplet({required this.label, required this.value, required this.type});
-
-  IconData? icon() {
-    switch (type) {
-      case MessageFilterChipletType.search:
-        return FontAwesomeIcons.magnifyingGlass;
-      case MessageFilterChipletType.plainSearch:
-        return FontAwesomeIcons.magnifyingGlassPlus;
-      case MessageFilterChipletType.channel:
-        return FontAwesomeIcons.snake;
-      case MessageFilterChipletType.sender:
-        return FontAwesomeIcons.signature;
-      case MessageFilterChipletType.timeRange:
-        return FontAwesomeIcons.timer;
-      case MessageFilterChipletType.priority:
-        return FontAwesomeIcons.bolt;
-      case MessageFilterChipletType.sendkey:
-        return FontAwesomeIcons.gearCode;
-    }
-  }
-}

flutter/lib/pages/message_list/message_list.dart

@@ -1,18 +1,15 @@
 import 'package:flutter/material.dart';
+import 'package:hive_flutter/hive_flutter.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/models/channel.dart';
-import 'package:simplecloudnotifier/models/scn_message.dart';
+import 'package:simplecloudnotifier/models/message.dart';
-import 'package:simplecloudnotifier/pages/message_list/message_filter_chiplet.dart';
 import 'package:simplecloudnotifier/pages/message_view/message_view.dart';
-import 'package:simplecloudnotifier/state/app_settings.dart';
 import 'package:simplecloudnotifier/state/app_bar_state.dart';
-import 'package:simplecloudnotifier/state/app_events.dart';
 import 'package:simplecloudnotifier/state/application_log.dart';
 import 'package:simplecloudnotifier/state/app_auth.dart';
 import 'package:simplecloudnotifier/pages/message_list/message_list_item.dart';
-import 'package:simplecloudnotifier/state/scn_data_cache.dart';
 import 'package:simplecloudnotifier/utils/navi.dart';
 
 class MessageListPage extends StatefulWidget {
@@ -20,29 +17,28 @@ class MessageListPage extends StatefulWidget {
 
   final bool isVisiblePage;
 
+  //TODO reload on switch to tab
+  //TODO reload on app to foreground
+
   @override
   State<MessageListPage> createState() => _MessageListPageState();
 }
 
 class _MessageListPageState extends State<MessageListPage> with RouteAware {
+  static const _pageSize = 128;
+
   late final AppLifecycleListener _lifecyleListener;
 
-  PagingController<String, SCNMessage> _pagingController = PagingController.fromValue(PagingState(nextPageKey: null, itemList: [], error: null), firstPageKey: '@start');
+  PagingController<String, Message> _pagingController = PagingController.fromValue(PagingState(nextPageKey: null, itemList: [], error: null), firstPageKey: '@start');
 
   Map<String, Channel>? _channels = null;
-  bool _channelsFetched = false;
 
   bool _isInitialized = false;
 
-  List<MessageFilterChiplet> _filterChiplets = [];
-
   @override
   void initState() {
     super.initState();
 
-    AppEvents().subscribeFilterListener(_onAddFilter);
-    AppEvents().subscribeMessageReceivedListener(_onMessageReceivedViaNotification);
-
     _pagingController.addPageRequestListener(_fetchPage);
 
     if (widget.isVisiblePage && !_isInitialized) _realInitState();
@@ -68,15 +64,18 @@ class _MessageListPageState extends State<MessageListPage> with RouteAware {
   void _realInitState() {
     ApplicationLog.debug('MessageListPage::_realInitState');
 
-    if (SCNDataCache().hasMessagesAndChannels()) {
+    final chnCache = Hive.box<Channel>('scn-channel-cache');
+    final msgCache = Hive.box<Message>('scn-message-cache');
+
+    if (chnCache.isNotEmpty && msgCache.isNotEmpty) {
       // ==== Use cache values - and refresh in background
 
-      _channels = SCNDataCache().getChannelMap();
+      _channels = <String, Channel>{for (var v in chnCache.values) v.channelID: v};
 
-      //TODO this is not 100% correct - the message-cache contains (which is right!) all messages, even from unsubscribed channels
+      final cacheMessages = msgCache.values.toList();
-      //TODO what we should do is save another list in SCNDataCache, with the result of the last getMessageList call (page-1) and use that
+      cacheMessages.sort((a, b) => -1 * a.timestamp.compareTo(b.timestamp));
-      //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);
+      _pagingController.value = PagingState(nextPageKey: null, itemList: cacheMessages, error: null);
 
       _backgroundRefresh(true);
     } else {
@@ -96,8 +95,6 @@ class _MessageListPageState extends State<MessageListPage> with RouteAware {
   @override
   void dispose() {
     ApplicationLog.debug('MessageListPage::dispose');
-    AppEvents().unsubscribeFilterListener(_onAddFilter);
-    AppEvents().unsubscribeMessageReceivedListener(_onMessageReceivedViaNotification);
     Navi.modalRouteObserver.unsubscribe(this);
     _pagingController.dispose();
     _lifecyleListener.dispose();
@@ -111,22 +108,17 @@ class _MessageListPageState extends State<MessageListPage> with RouteAware {
 
   @override
   void didPopNext() {
-    if (AppSettings().backgroundRefreshMessageListOnPop) {
+    ApplicationLog.debug('[MessageList::RouteObserver] --> didPopNext (will background-refresh)');
-      ApplicationLog.debug('[MessageList::RouteObserver] --> didPopNext (will background-refresh)');
+    _backgroundRefresh(false);
-      _backgroundRefresh(false);
-    }
   }
 
   void _onLifecycleResume() {
-    if (AppSettings().alwaysBackgroundRefreshMessageListOnLifecycleResume && widget.isVisiblePage) {
+    ApplicationLog.debug('[MessageList::_onLifecycleResume] --> (will background-refresh)');
-      ApplicationLog.debug('[MessageList::_onLifecycleResume] --> (will background-refresh)');
+    _backgroundRefresh(false);
-      _backgroundRefresh(false);
-    }
   }
 
   Future<void> _fetchPage(String thisPageToken) async {
     final acc = Provider.of<AppAuth>(context, listen: false);
-    final cfg = Provider.of<AppSettings>(context, listen: false);
 
     ApplicationLog.debug('Start MessageList::_pagingController::_fetchPage [ ${thisPageToken} ]');
 
@@ -136,19 +128,16 @@ class _MessageListPageState extends State<MessageListPage> with RouteAware {
     }
 
     try {
-      if (_channels == null || !_channelsFetched) {
+      if (_channels == null) {
         final channels = await APIClient.getChannelList(acc, ChannelSelector.allAny);
-        setState(() {
+        _channels = <String, Channel>{for (var v in channels) v.channel.channelID: v.channel};
-          _channels = <String, Channel>{for (var v in channels) v.channel.channelID: v.channel};
-          _channelsFetched = true;
-        });
 
-        SCNDataCache().setChannelCache(channels); // no await
+        _setChannelCache(channels); // no await
       }
 
-      final (npt, newItems) = await APIClient.getMessageList(acc, thisPageToken, pageSize: cfg.messagePageSize, filter: _getFilter());
+      final (npt, newItems) = await APIClient.getMessageList(acc, thisPageToken, pageSize: _pageSize);
 
-      SCNDataCache().addToMessageCache(newItems); // no await
+      _addToMessageCache(newItems); // no await
 
       ApplicationLog.debug('Finished MessageList::_pagingController::_fetchPage [ ${newItems.length} items and npt: ${thisPageToken} --> ${npt} ]');
 
@@ -165,7 +154,6 @@ class _MessageListPageState extends State<MessageListPage> with RouteAware {
 
   Future<void> _backgroundRefresh(bool fullReplaceState) async {
     final acc = Provider.of<AppAuth>(context, listen: false);
-    final cfg = Provider.of<AppSettings>(context, listen: false);
 
     ApplicationLog.debug('Start background refresh of message list (fullReplaceState: $fullReplaceState)');
 
@@ -179,12 +167,12 @@ class _MessageListPageState extends State<MessageListPage> with RouteAware {
         setState(() {
           _channels = <String, Channel>{for (var v in channels) v.channel.channelID: v.channel};
         });
-        SCNDataCache().setChannelCache(channels); // no await
+        _setChannelCache(channels); // no await
       }
 
-      final (npt, newItems) = await APIClient.getMessageList(acc, '@start', pageSize: cfg.messagePageSize);
+      final (npt, newItems) = await APIClient.getMessageList(acc, '@start', pageSize: _pageSize);
 
-      SCNDataCache().addToMessageCache(newItems); // no await
+      _addToMessageCache(newItems); // no await
 
       if (fullReplaceState) {
         // fully replace/reset state
@@ -233,123 +221,49 @@ class _MessageListPageState extends State<MessageListPage> with RouteAware {
   Widget build(BuildContext context) {
     return Padding(
       padding: EdgeInsets.fromLTRB(8, 4, 8, 4),
-      child: Column(
+      child: RefreshIndicator(
-        crossAxisAlignment: CrossAxisAlignment.stretch,
+        onRefresh: () => Future.sync(
-        children: [
+          () => _pagingController.refresh(),
-          if (_filterChiplets.isNotEmpty)
+        ),
-            Wrap(
+        child: PagedListView<String, Message>(
-              alignment: WrapAlignment.start,
+          pagingController: _pagingController,
-              spacing: 5.0,
+          builderDelegate: PagedChildBuilderDelegate<Message>(
-              children: [
+            itemBuilder: (context, item, index) => MessageListItem(
-                for (var chiplet in _filterChiplets) _buildFilterChip(context, chiplet),
+              message: item,
-              ],
+              allChannels: _channels ?? {},
-            ),
+              onPressed: () {
-          Expanded(
+                Navi.push(context, () => MessageViewPage(message: item));
-            child: RefreshIndicator(
+              },
-              onRefresh: () => Future.sync(
-                () => _pagingController.refresh(),
-              ),
-              child: PagedListView<String, SCNMessage>(
-                pagingController: _pagingController,
-                builderDelegate: PagedChildBuilderDelegate<SCNMessage>(
-                  itemBuilder: (context, item, index) => MessageListItem(
-                    message: item,
-                    allChannels: _channels ?? {},
-                    onPressed: () {
-                      Navi.push(context, () => MessageViewPage(messageID: item.messageID, preloadedData: (item,)));
-                    },
-                  ),
-                ),
-              ),
             ),
           ),
-        ],
+        ),
       ),
     );
   }
 
-  Widget _buildFilterChip(BuildContext context, MessageFilterChiplet chiplet) {
+  Future<void> _setChannelCache(List<ChannelWithSubscription> channels) async {
-    return Padding(
+    final cache = Hive.box<Channel>('scn-channel-cache');
-      padding: const EdgeInsets.fromLTRB(0, 2, 0, 2),
+
-      child: InputChip(
+    if (cache.length != channels.length) await cache.clear();
-        avatar: Icon(chiplet.icon()),
+
-        label: Text(chiplet.label),
+    for (var chn in channels) await cache.put(chn.channel.channelID, chn.channel);
-        onDeleted: () => _onRemFilter(chiplet),
-        onPressed: () {/* TODO idk what to do here ? */},
-        visualDensity: VisualDensity(horizontal: -4, vertical: -4),
-      ),
-    );
   }
 
-  void _onAddFilter(List<MessageFilterChipletType> remTypeList, List<MessageFilterChiplet> chiplets) {
+  Future<void> _addToMessageCache(List<Message> newItems) async {
-    setState(() {
+    final cache = Hive.box<Message>('scn-message-cache');
-      final remTypes = remTypeList.toSet();
 
-      _filterChiplets = _filterChiplets.where((element) => !remTypes.contains(element.type)).toList() + chiplets;
+    for (var msg in newItems) await cache.put(msg.messageID, msg);
 
-      _pagingController.refresh();
+    // delete all but the newest 128 messages
-    });
-  }
 
-  void _onRemFilter(MessageFilterChiplet chiplet) {
+    if (cache.length < _pageSize) return;
-    setState(() {
-      _filterChiplets.remove(chiplet);
 
-      _pagingController.refresh();
+    final allValues = cache.values.toList();
-    });
-  }
 
-  void _onMessageReceivedViaNotification(SCNMessage msg) {
+    allValues.sort((a, b) => -1 * a.timestamp.compareTo(b.timestamp));
-    setState(() {
-      _pagingController.itemList = [msg] + (_pagingController.itemList ?? []);
-    });
-  }
 
-  MessageFilter _getFilter() {
+    for (var val in allValues.sublist(_pageSize)) {
-    var filter = MessageFilter();
+      await cache.delete(val.messageID);
-
-    var chipletsChannel = _filterChiplets.where((p) => p.type == MessageFilterChipletType.channel).toList();
-    if (chipletsChannel.isNotEmpty) {
-      filter.channelIDs = chipletsChannel.map((p) => p.value as String).toList();
     }
-
-    var chipletsSearch = _filterChiplets.where((p) => p.type == MessageFilterChipletType.search).toList();
-    if (chipletsSearch.isNotEmpty) {
-      filter.searchFilter = chipletsSearch.map((p) => p.value as String).toList();
-    }
-
-    var chipletsPlainSearch = _filterChiplets.where((p) => p.type == MessageFilterChipletType.plainSearch).toList();
-    if (chipletsPlainSearch.isNotEmpty) {
-      filter.plainSearchFilter = chipletsPlainSearch.map((p) => p.value as String).toList();
-    }
-
-    var chipletsKeyTokens = _filterChiplets.where((p) => p.type == MessageFilterChipletType.sendkey).toList();
-    if (chipletsKeyTokens.isNotEmpty) {
-      filter.usedKeys = chipletsKeyTokens.map((p) => p.value as String).toList();
-    }
-
-    var chipletPriority = _filterChiplets.where((p) => p.type == MessageFilterChipletType.priority).toList();
-    if (chipletPriority.isNotEmpty) {
-      filter.priority = chipletPriority.map((p) => p.value as int).toList();
-    }
-
-    var chipletSender = _filterChiplets.where((p) => p.type == MessageFilterChipletType.sender).toList();
-    if (chipletSender.isNotEmpty) {
-      filter.senderNames = chipletSender.map((p) => p.value as String).toList();
-    }
-
-    var chipletsTimeRange = _filterChiplets.where((p) => p.type == MessageFilterChipletType.timeRange).toList();
-    if (chipletsTimeRange.isNotEmpty) {
-      var t0 = (chipletsTimeRange[0].value as DateTimeRange).start.toLocal();
-      var t1 = (chipletsTimeRange[0].value as DateTimeRange).end.toLocal();
-
-      t0 = DateTime(t0.year, t0.month, t0.day, 0, 0, 0, 0);
-      t1 = DateTime(t1.year, t1.month, t1.day, 23, 59, 59, 999);
-
-      filter.timeAfter = t0;
-      filter.timeBefore = t1;
-    }
-
-    return filter;
   }
 }

flutter/lib/pages/message_list/message_list_item.dart

@@ -2,13 +2,15 @@ import 'dart:math';
 
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:provider/provider.dart';
 import 'package:simplecloudnotifier/models/channel.dart';
-import 'package:simplecloudnotifier/models/scn_message.dart';
+import 'package:simplecloudnotifier/models/message.dart';
-import 'package:simplecloudnotifier/state/app_settings.dart';
+import 'package:intl/intl.dart';
 import 'package:simplecloudnotifier/utils/ui.dart';
 
 class MessageListItem extends StatelessWidget {
+  static final _dateFormat = DateFormat('yyyy-MM-dd kk:mm');
+  static final _lineCount = 3; //TODO setting
+
   const MessageListItem({
     required this.message,
     required this.allChannels,
@@ -16,7 +18,7 @@ class MessageListItem extends StatelessWidget {
     super.key,
   });
 
-  final SCNMessage message;
+  final Message message;
   final Map<String, Channel> allChannels;
   final Null Function() onPressed;
 
@@ -30,9 +32,6 @@ class MessageListItem extends StatelessWidget {
   }
 
   Card buildWithoutChannel(BuildContext context) {
-    final dateFormat = context.select<AppSettings, AppSettingsDateFormat>((v) => v.dateFormat).dateFormat();
-    final previewLineCount = context.select<AppSettings, int>((v) => v.messagePreviewLength);
-
     return Card.filled(
       margin: EdgeInsets.fromLTRB(0, 4, 0, 4),
       shape: BeveledRectangleBorder(borderRadius: BorderRadius.circular(0)),
@@ -58,7 +57,7 @@ class MessageListItem extends StatelessWidget {
                     ),
                   ),
                   Text(
-                    dateFormat.format(DateTime.parse(message.timestamp).toLocal()),
+                    _dateFormat.format(DateTime.parse(message.timestamp).toLocal()),
                     style: const TextStyle(fontWeight: FontWeight.normal, fontSize: 11),
                     overflow: TextOverflow.clip,
                     maxLines: 1,
@@ -71,10 +70,10 @@ class MessageListItem extends StatelessWidget {
                 children: [
                   Expanded(
                     child: Text(
-                      processContent(message.content, previewLineCount),
+                      processContent(message.content),
                       style: TextStyle(color: Theme.of(context).textTheme.bodyLarge?.color?.withAlpha(160)),
                       overflow: TextOverflow.ellipsis,
-                      maxLines: previewLineCount,
+                      maxLines: _lineCount,
                     ),
                   ),
                   if (message.priority == 2) SizedBox(width: 4),
@@ -91,9 +90,6 @@ class MessageListItem extends StatelessWidget {
   }
 
   Card buildWithChannel(BuildContext context) {
-    final dateFormat = context.select<AppSettings, AppSettingsDateFormat>((v) => v.dateFormat).dateFormat();
-    final previewLineCount = context.select<AppSettings, int>((v) => v.messagePreviewLength);
-
     return Card.filled(
       margin: EdgeInsets.fromLTRB(0, 4, 0, 4),
       shape: BeveledRectangleBorder(borderRadius: BorderRadius.circular(0)),
@@ -117,7 +113,7 @@ class MessageListItem extends StatelessWidget {
                   ),
                   Expanded(child: SizedBox()),
                   Text(
-                    dateFormat.format(DateTime.parse(message.timestamp).toLocal()),
+                    _dateFormat.format(DateTime.parse(message.timestamp).toLocal()),
                     style: const TextStyle(fontWeight: FontWeight.normal, fontSize: 11),
                     overflow: TextOverflow.clip,
                     maxLines: 1,
@@ -136,10 +132,10 @@ class MessageListItem extends StatelessWidget {
                 children: [
                   Expanded(
                     child: Text(
-                      processContent(message.content, previewLineCount),
+                      processContent(message.content),
                       style: TextStyle(color: Theme.of(context).textTheme.bodyLarge?.color?.withAlpha(160)),
                       overflow: TextOverflow.ellipsis,
-                      maxLines: previewLineCount,
+                      maxLines: _lineCount,
                     ),
                   ),
                   if (message.priority == 2) SizedBox(width: 4),
@@ -155,7 +151,7 @@ class MessageListItem extends StatelessWidget {
     );
   }
 
-  String processContent(String? v, int lineCount) {
+  String processContent(String? v) {
     if (v == null) {
       return '';
     }
@@ -165,7 +161,7 @@ class MessageListItem extends StatelessWidget {
       return '';
     }
 
-    return lines.sublist(0, min(lineCount, lines.length)).join("\n").trim();
+    return lines.sublist(0, min(_lineCount, lines.length)).join("\n").trim();
   }
 
   String processTitle(String? v) {
@@ -180,11 +176,11 @@ class MessageListItem extends StatelessWidget {
     return v;
   }
 
-  String resolveChannelName(SCNMessage message) {
+  String resolveChannelName(Message message) {
     return allChannels[message.channelID]?.displayName ?? message.channelInternalName;
   }
 
-  bool showChannel(SCNMessage message) {
+  bool showChannel(Message message) {
     return message.channelInternalName != 'main';
   }
 }

flutter/lib/pages/message_view/message_view.dart

@@ -1,60 +1,43 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:share_plus/share_plus.dart';
 import 'package:simplecloudnotifier/api/api_client.dart';
-import 'package:simplecloudnotifier/components/error_display/error_display.dart';
 import 'package:simplecloudnotifier/components/layout/scaffold.dart';
 import 'package:simplecloudnotifier/models/channel.dart';
 import 'package:simplecloudnotifier/models/keytoken.dart';
-import 'package:simplecloudnotifier/models/scn_message.dart';
+import 'package:simplecloudnotifier/models/message.dart';
 import 'package:simplecloudnotifier/models/user.dart';
-import 'package:simplecloudnotifier/pages/channel_view/channel_view.dart';
-import 'package:simplecloudnotifier/pages/filtered_message_view/filtered_message_view.dart';
-import 'package:simplecloudnotifier/pages/keytoken_view/keytoken_view.dart';
 import 'package:simplecloudnotifier/state/app_auth.dart';
 import 'package:simplecloudnotifier/state/app_bar_state.dart';
-import 'package:simplecloudnotifier/state/app_settings.dart';
-import 'package:simplecloudnotifier/utils/navi.dart';
 import 'package:simplecloudnotifier/utils/toaster.dart';
 import 'package:simplecloudnotifier/utils/ui.dart';
 
 class MessageViewPage extends StatefulWidget {
-  const MessageViewPage({
+  const MessageViewPage({super.key, required this.message});
-    super.key,
-    required this.messageID,
-    required this.preloadedData,
-  });
 
-  final String messageID; // Potentially trimmed
+  final Message message; // Potentially trimmed
-  final (SCNMessage,)? preloadedData; // Message is potentially trimmed, whole object is potentially null
 
   @override
   State<MessageViewPage> createState() => _MessageViewPageState();
 }
 
 class _MessageViewPageState extends State<MessageViewPage> {
-  late Future<(SCNMessage, ChannelPreview, KeyTokenPreview, UserPreview)>? mainFuture;
+  late Future<(Message, ChannelPreview, KeyTokenPreview, UserPreview)>? mainFuture;
-  (SCNMessage, ChannelPreview, KeyTokenPreview, UserPreview)? mainFutureSnapshot = null;
+  (Message, ChannelPreview, KeyTokenPreview, UserPreview)? mainFutureSnapshot = null;
-
+  static final _dateFormat = DateFormat('yyyy-MM-dd kk:mm');
-  final ScrollController _controller = ScrollController();
 
   bool _monospaceMode = false;
 
-  SCNMessage? message = null;
-
   @override
   void initState() {
-    if (widget.preloadedData != null) {
-      message = widget.preloadedData!.$1;
-    }
-
     mainFuture = fetchData();
     super.initState();
   }
 
-  Future<(SCNMessage, ChannelPreview, KeyTokenPreview, UserPreview)> fetchData() async {
+  Future<(Message, ChannelPreview, KeyTokenPreview, UserPreview)> fetchData() async {
     try {
       await Future.delayed(const Duration(seconds: 0), () {}); // this is annoyingly important - otherwise we call setLoadingIndeterminate directly in initStat() and get an exception....
 
@@ -62,10 +45,10 @@ class _MessageViewPageState extends State<MessageViewPage> {
 
       final acc = Provider.of<AppAuth>(context, listen: false);
 
-      final msg = await APIClient.getMessage(acc, widget.messageID);
+      final msg = await APIClient.getMessage(acc, widget.message.messageID);
 
       final fut_chn = APIClient.getChannelPreview(acc, msg.channelID);
-      final fut_key = APIClient.getKeyTokenPreviewByID(acc, msg.usedKeyID);
+      final fut_key = APIClient.getKeyTokenPreview(acc, msg.usedKeyID);
       final fut_usr = APIClient.getUserPreview(acc, msg.senderUserID);
 
       final chn = await fut_chn;
@@ -86,7 +69,6 @@ class _MessageViewPageState extends State<MessageViewPage> {
 
   @override
   void dispose() {
-    _controller.dispose();
     super.dispose();
   }
 
@@ -97,16 +79,16 @@ class _MessageViewPageState extends State<MessageViewPage> {
       showSearch: false,
       showShare: true,
       onShare: _share,
-      child: FutureBuilder<(SCNMessage, ChannelPreview, KeyTokenPreview, UserPreview)>(
+      child: FutureBuilder<(Message, ChannelPreview, KeyTokenPreview, UserPreview)>(
         future: mainFuture,
         builder: (context, snapshot) {
           if (snapshot.hasData) {
             final (msg, chn, tok, usr) = snapshot.data!;
             return _buildMessageView(context, msg, chn, tok, usr);
           } else if (snapshot.hasError) {
-            return ErrorDisplay(errorMessage: '${snapshot.error}');
+            return Center(child: Text('${snapshot.error}')); //TODO nice error page
-          } else if (message != null && !this.message!.trimmed) {
+          } else if (!widget.message.trimmed) {
-            return _buildMessageView(context, this.message!, null, null, null);
+            return _buildMessageView(context, widget.message, null, null, null);
           } else {
             return const Center(child: CircularProgressIndicator());
           }
@@ -116,9 +98,7 @@ class _MessageViewPageState extends State<MessageViewPage> {
   }
 
   void _share() async {
-    if (this.message == null) return;
+    var msg = widget.message;
-
-    var msg = this.message!;
     if (mainFutureSnapshot != null) {
       (msg, _, _, _) = mainFutureSnapshot!;
     }
@@ -138,122 +118,37 @@ class _MessageViewPageState extends State<MessageViewPage> {
     }
   }
 
-  Widget _buildMessageView(BuildContext context, SCNMessage message, ChannelPreview? channel, KeyTokenPreview? token, UserPreview? user) {
+  Widget _buildMessageView(BuildContext context, Message message, ChannelPreview? channel, KeyTokenPreview? token, UserPreview? user) {
     final userAccUserID = context.select<AppAuth, String?>((v) => v.userID);
 
-    final child = Padding(
+    return SingleChildScrollView(
-      padding: const EdgeInsets.fromLTRB(24, 16, 24, 16),
+      child: Padding(
-      child: Column(
+        padding: const EdgeInsets.fromLTRB(24, 16, 24, 16),
-        crossAxisAlignment: CrossAxisAlignment.stretch,
+        child: Column(
-        children: [
+          crossAxisAlignment: CrossAxisAlignment.stretch,
-          ..._buildMessageHeader(context, message, channel),
+          children: [
-          SizedBox(height: 8),
+            ..._buildMessageHeader(context, message, channel),
-          if (message.content != null) ..._buildMessageContent(context, message),
+            SizedBox(height: 8),
-          SizedBox(height: 8),
+            if (message.content != null) ..._buildMessageContent(context, message),
-          if (message.senderName != null)
+            SizedBox(height: 8),
-            UI.metaCard(
+            if (message.senderName != null) _buildMetaCard(context, FontAwesomeIcons.solidSignature, 'Sender', [message.senderName!], () => {/*TODO*/}),
-              context: context,
+            _buildMetaCard(context, FontAwesomeIcons.solidGearCode, 'KeyToken', [message.usedKeyID, if (token != null) token.name], () => {/*TODO*/}),
-              icon: FontAwesomeIcons.solidSignature,
+            _buildMetaCard(context, FontAwesomeIcons.solidIdCardClip, 'MessageID', [message.messageID, if (message.userMessageID != null) message.userMessageID!], null),
-              title: 'Sender',
+            _buildMetaCard(context, FontAwesomeIcons.solidSnake, 'Channel', [message.channelID, channel?.displayName ?? message.channelInternalName], () => {/*TODO*/}),
-              values: [message.senderName!],
+            _buildMetaCard(context, FontAwesomeIcons.solidTimer, 'Timestamp', [message.timestamp], null),
-              mainAction: () => {
+            _buildMetaCard(context, FontAwesomeIcons.solidUser, 'User', [if (user != null) user.userID, if (user?.username != null) user!.username!], () => {/*TODO*/}), //TODO
-                Navi.push(context, () => FilteredMessageViewPage(title: message.senderName!, filter: MessageFilter(senderNames: [message.senderName!])))
+            if (message.senderUserID == userAccUserID) UI.button(text: "Delete Message", onPressed: () {/*TODO*/}, color: Colors.red[900]),
-              },
+          ],
-            ),
+        ),
-          UI.metaCard(
-            context: context,
-            icon: FontAwesomeIcons.solidGearCode,
-            title: 'KeyToken',
-            values: [message.usedKeyID, token?.name ?? '...'],
-            mainAction: () {
-              if (message.senderUserID == userAccUserID) {
-                Navi.push(context, () => KeyTokenViewPage(keytokenID: message.usedKeyID, preloadedData: null, needsReload: null));
-              } else {
-                Navi.push(context, () => FilteredMessageViewPage(title: token?.name ?? message.usedKeyID, filter: MessageFilter(usedKeys: [message.usedKeyID])));
-              }
-            },
-          ),
-          UI.metaCard(
-            context: context,
-            icon: FontAwesomeIcons.solidIdCardClip,
-            title: 'MessageID',
-            values: [message.messageID, message.userMessageID ?? ''],
-          ),
-          UI.metaCard(
-            context: context,
-            icon: FontAwesomeIcons.solidSnake,
-            title: 'Channel',
-            values: [message.channelID, channel?.displayName ?? message.channelInternalName],
-            mainAction: (channel != null)
-                ? () {
-                    Navi.push(context, () => ChannelViewPage(channelID: channel.channelID, preloadedData: null, needsReload: null));
-                  }
-                : null,
-          ),
-          UI.metaCard(
-            context: context,
-            icon: FontAwesomeIcons.solidTimer,
-            title: 'Timestamp',
-            values: [message.timestamp],
-          ),
-          UI.metaCard(
-            context: context,
-            icon: FontAwesomeIcons.solidUser,
-            title: 'User',
-            values: [user?.userID ?? message.senderUserID, user?.username ?? ''],
-            mainAction: () => Navi.push(context, () => FilteredMessageViewPage(title: user?.username ?? message.senderUserID, filter: MessageFilter(senderUserID: [message.senderUserID]))),
-          ),
-          UI.metaCard(
-            context: context,
-            icon: FontAwesomeIcons.solidBolt,
-            title: 'Priority',
-            values: [_prettyPrintPriority(message.priority)],
-            mainAction: () => Navi.push(context, () => FilteredMessageViewPage(title: "Priority ${message.priority}", filter: MessageFilter(priority: [message.priority]))),
-          ),
-          if (message.senderUserID == userAccUserID)
-            UI.button(
-                text: "Delete Message",
-                onPressed: () {
-                  Toaster.info("Not Implemented", "... will be implemented in a later version"); // TODO
-                },
-                color: Colors.red[900]),
-        ],
       ),
     );
-
-    var showScrollbar = false;
-    if (!_monospaceMode && (message.content ?? '').length > 4096) showScrollbar = true;
-    if (_monospaceMode && (message.content ?? '').split('\n').length > 64) showScrollbar = true;
-
-    if (showScrollbar) {
-      return Padding(
-        padding: const EdgeInsets.fromLTRB(0, 0, 6, 0),
-        child: Scrollbar(
-          thickness: 12.0,
-          radius: Radius.circular(6),
-          thumbVisibility: false,
-          interactive: true,
-          controller: _controller,
-          child: SingleChildScrollView(
-            controller: _controller,
-            child: child,
-          ),
-        ),
-      );
-    } else {
-      return SingleChildScrollView(
-        child: child,
-      );
-    }
   }
 
-  String _resolveChannelName(ChannelPreview? channel, SCNMessage message) {
+  String _resolveChannelName(ChannelPreview? channel, Message message) {
     return channel?.displayName ?? message.channelInternalName;
   }
 
-  List<Widget> _buildMessageHeader(BuildContext context, SCNMessage message, ChannelPreview? channel) {
+  List<Widget> _buildMessageHeader(BuildContext context, Message message, ChannelPreview? channel) {
-    final dateFormat = context.select<AppSettings, AppSettingsDateFormat>((v) => v.dateFormat).dateFormat();
-
     return [
       Row(
         children: [
@@ -264,7 +159,7 @@ class _MessageViewPageState extends State<MessageViewPage> {
             fontSize: 16,
           ),
           Expanded(child: SizedBox()),
-          Text(dateFormat.format(DateTime.parse(message.timestamp)), style: const TextStyle(fontSize: 14)),
+          Text(_dateFormat.format(DateTime.parse(message.timestamp)), style: const TextStyle(fontSize: 14)),
         ],
       ),
       SizedBox(height: 8),
@@ -272,7 +167,7 @@ class _MessageViewPageState extends State<MessageViewPage> {
     ];
   }
 
-  List<Widget> _buildMessageContent(BuildContext context, SCNMessage message) {
+  List<Widget> _buildMessageContent(BuildContext context, Message message) {
     return [
       Row(
         children: [
@@ -283,7 +178,6 @@ class _MessageViewPageState extends State<MessageViewPage> {
             onPressed: () {
               Clipboard.setData(new ClipboardData(text: message.content ?? ''));
               Toaster.info("Clipboard", 'Copied text to Clipboard');
-              print('================= [CLIPBOARD] =================\n${message.content}\n================= [/CLIPBOARD] =================');
             },
             icon: FontAwesomeIcons.copy,
           ),
@@ -319,20 +213,43 @@ class _MessageViewPageState extends State<MessageViewPage> {
     ];
   }
 
-  String _preformatTitle(SCNMessage message) {
+  Widget _buildMetaCard(BuildContext context, IconData icn, String title, List<String> values, void Function()? action) {
-    return message.title.replaceAll('\n', '').replaceAll('\r', '').replaceAll('\t', ' ');
+    final container = UI.box(
-  }
+      context: context,
+      padding: EdgeInsets.fromLTRB(16, 2, 4, 2),
+      child: Row(
+        children: [
+          FaIcon(icn, size: 18),
+          SizedBox(width: 16),
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(title, style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold)),
+              for (final val in values) Text(val, style: const TextStyle(fontSize: 14)),
+            ],
+          ),
+        ],
+      ),
+    );
 
-  String _prettyPrintPriority(int priority) {
+    if (action == null) {
-    switch (priority) {
+      return Padding(
-      case 0:
+        padding: EdgeInsets.symmetric(vertical: 4, horizontal: 0),
-        return 'Low (0)';
+        child: container,
-      case 1:
+      );
-        return 'Normal (1)';
+    } else {
-      case 2:
+      return Padding(
-        return 'High (2)';
+        padding: EdgeInsets.symmetric(vertical: 4, horizontal: 0),
-      default:
+        child: InkWell(
-        return 'Unknown ($priority)';
+          splashColor: Theme.of(context).splashColor,
+          onTap: action,
+          child: container,
+        ),
+      );
     }
   }
+
+  String _preformatTitle(Message message) {
+    return message.title.replaceAll('\n', '').replaceAll('\r', '').replaceAll('\t', ' ');
+  }
 }