Update SDK (v1.1.1)

.github/workflows/benchmark.yml

@@ -25,13 +25,13 @@ jobs:
       - name: Setup Flutter
         uses: subosito/flutter-action@v2.8.0
         with:
-          flutter-version: '3.32.4'
+          flutter-version: '3.35.4'
           channel: 'stable'
 
       - name: Setup Dependencies
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y ninja-build libgtk-3-dev libolm3 libmpv-dev mpv ffmpeg libmimalloc-dev
+          sudo apt-get install -y ninja-build libgtk-3-dev libmpv-dev mpv ffmpeg libmimalloc-dev
 
 
       - name: Configure Flutter

.github/workflows/build.yml

@@ -10,7 +10,7 @@ env:
 
 jobs:
   build-windows:
-    runs-on: windows-latest
+    runs-on: windows-2022
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -20,7 +20,7 @@ jobs:
       - name: Setup Flutter
         uses: subosito/flutter-action@v2.8.0
         with:
-          flutter-version: '3.32.4'
+          flutter-version: '3.35.4'
           channel: 'stable'
 
       - name: Configure Flutter
@@ -48,7 +48,7 @@ jobs:
       - name: Setup Flutter 
         uses: subosito/flutter-action@v2.8.0
         with:
-          flutter-version: '3.32.4'
+          flutter-version: '3.35.4'
           channel: 'stable'
 
       - name: Setup Java
@@ -59,7 +59,7 @@ jobs:
       - name: Setup Tools
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y ninja-build libgtk-3-dev libolm3 libmpv-dev mpv ffmpeg
+          sudo apt-get install -y ninja-build libgtk-3-dev libmpv-dev mpv ffmpeg
 
       - name: Code Generation
         run: |
@@ -82,7 +82,7 @@ jobs:
       - name: Setup Flutter 
         uses: subosito/flutter-action@v2.8.0
         with:
-          flutter-version: '3.32.4'
+          flutter-version: '3.35.4'
           channel: 'stable'
 
       - name: Setup Java
@@ -93,7 +93,7 @@ jobs:
       - name: Setup Tools
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y ninja-build libgtk-3-dev libolm3 libmpv-dev mpv ffmpeg
+          sudo apt-get install -y ninja-build libgtk-3-dev libmpv-dev mpv ffmpeg
 
       - name: Code Generation
         run: |
@@ -117,13 +117,13 @@ jobs:
       - name: Setup Flutter 
         uses: subosito/flutter-action@v2.8.0
         with:
-          flutter-version: '3.32.4'
+          flutter-version: '3.35.4'
           channel: 'stable'
 
       - name: Setup Tools
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y ninja-build libgtk-3-dev libolm3 libmpv-dev mpv ffmpeg libmimalloc-dev webkit2gtk-4.1
+          sudo apt-get install -y ninja-build libgtk-3-dev libmpv-dev mpv ffmpeg libmimalloc-dev webkit2gtk-4.1
 
       - name: Code Generation
         run: |
@@ -150,13 +150,13 @@ jobs:
       - name: Setup Flutter 
         uses: subosito/flutter-action@v2.8.0
         with:
-          flutter-version: '3.32.4'
+          flutter-version: '3.35.4'
           channel: 'stable'
 
       - name: Setup Tools
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y ninja-build libgtk-3-dev libolm3 libmpv-dev mpv ffmpeg
+          sudo apt-get install -y ninja-build libgtk-3-dev libmpv-dev mpv ffmpeg
 
       - name: Code Generation
         run: |

.github/workflows/integration-test.yml

@@ -22,13 +22,13 @@ jobs:
       - name: Setup Flutter  ╰(✿˙ᗜ˙)੭━☆ﾟ.*･｡ﾟ
         uses: subosito/flutter-action@v2.8.0
         with:
-          flutter-version: '3.32.4'
+          flutter-version: '3.35.4'
           channel: 'stable'
 
       - name: Setup Tools  ᕙ|” ◉ ◡ ◉ ”|ᕗ
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y ninja-build libgtk-3-dev libolm3 libmpv-dev mpv ffmpeg libmimalloc-dev 
+          sudo apt-get install -y ninja-build libgtk-3-dev libmpv-dev mpv ffmpeg libmimalloc-dev 
 
       - name: Start Synapse  [◯ ‸ ◯]
         run: |

.github/workflows/release.yml

@@ -12,7 +12,7 @@ env:
 
 jobs:
   release-windows:
-    runs-on: windows-latest
+    runs-on: windows-2022
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -22,21 +22,9 @@ jobs:
       - name: Setup Flutter
         uses: subosito/flutter-action@v2.8.0
         with:
-          flutter-version: '3.32.4'
+          flutter-version: '3.35.4'
           channel: 'stable'
 
-      - name: Clone Olm
-        run: |
-          git clone https://gitlab.matrix.org/matrix-org/olm.git
-          cd ./olm
-          git checkout 7e0c8277032e40308987257b711b38af8d77cc69
-
-      - name: Build Olm
-        run: |
-          cd ./olm
-          cmake -DCMAKE_BUILD_TYPE=Release . -A x64 -Bbuild
-          cmake --build build --config Release
-
       - name: Configure Flutter
         run: flutter config --enable-windows-desktop
 
@@ -51,14 +39,6 @@ jobs:
           cd .\commet
           dart run scripts/build_release.dart --platform windows --version_tag ${{ github.event.release.tag_name || 'v0.0.0-artifact' }} --git_hash ${{ github.sha }}
 
-      - name: Include libolm
-        run: |
-          dir
-          dir .\olm
-          dir .\commet
-          dir .\commet\build\windows
-          move .\olm\build\Release\olm.dll .\commet\build\windows\x64\runner\Release\libolm.dll
-
       - name: Archive 
         run: tar -a -c -f commet-windows.zip -C .\commet\build\windows\x64\runner\ Release
 
@@ -92,7 +72,7 @@ jobs:
       - name: Setup Flutter 
         uses: subosito/flutter-action@v2.8.0
         with:
-          flutter-version: '3.32.4'
+          flutter-version: '3.35.4'
           channel: 'stable'
 
       - name: Setup Java
@@ -103,7 +83,7 @@ jobs:
       - name: Setup Tools
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y ninja-build libgtk-3-dev libolm3 libmpv-dev mpv ffmpeg
+          sudo apt-get install -y ninja-build libgtk-3-dev libmpv-dev mpv ffmpeg
 
       - name: Code Generation
         run: |
@@ -149,7 +129,7 @@ jobs:
       - name: Setup Flutter 
         uses: subosito/flutter-action@v2.8.0
         with:
-          flutter-version: '3.32.4'
+          flutter-version: '3.35.4'
           channel: 'stable'
 
       - name: Setup Java
@@ -160,7 +140,7 @@ jobs:
       - name: Setup Tools
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y ninja-build libgtk-3-dev libolm3 libmpv-dev mpv ffmpeg
+          sudo apt-get install -y ninja-build libgtk-3-dev libmpv-dev mpv ffmpeg
 
       - name: Code Generation
         run: |
@@ -211,13 +191,13 @@ jobs:
       - name: Setup Flutter 
         uses: subosito/flutter-action@v2.8.0
         with:
-          flutter-version: '3.32.4'
+          flutter-version: '3.35.4'
           channel: 'stable'
 
       - name: Setup Tools
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y ninja-build libgtk-3-dev libolm3 libmpv-dev mpv ffmpeg libmimalloc-dev webkit2gtk-4.1
+          sudo apt-get install -y ninja-build libgtk-3-dev libmpv-dev mpv ffmpeg libmimalloc-dev webkit2gtk-4.1 libasound2-dev
 
       - name: Code Generation
         run: |
@@ -269,13 +249,13 @@ jobs:
       - name: Setup Flutter 
         uses: subosito/flutter-action@v2.8.0
         with:
-          flutter-version: '3.32.4'
+          flutter-version: '3.35.4'
           channel: 'stable'
 
       - name: Setup Tools
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y ninja-build libgtk-3-dev libolm3 libmpv-dev mpv ffmpeg libmimalloc-dev flatpak-builder flatpak webkit2gtk-4.1
+          sudo apt-get install -y ninja-build libgtk-3-dev libmpv-dev mpv ffmpeg libmimalloc-dev flatpak-builder flatpak webkit2gtk-4.1
 
       - name: Code Generation
         run: |
@@ -290,7 +270,7 @@ jobs:
       - name: Create Flatpak
         run: | 
           sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-          sudo flatpak install -y flathub org.freedesktop.Platform//24.08 org.freedesktop.Sdk//24.08
+          sudo flatpak install -y flathub org.gnome.Platform//48 org.gnome.Sdk//48
           mkdir -p commet/linux/flatpak/commet
           cp -r $PROJECT_PATH/build/linux/x64/release/bundle $PROJECT_PATH/linux/flatpak/commet/bundle
           version=$(echo ${{ github.event.release.tag_name || 'v0.0.0-artifact' }} | grep -oP '[0-9]+([.][0-9]+)+')
@@ -330,13 +310,13 @@ jobs:
       - name: Setup Flutter 
         uses: subosito/flutter-action@v2.8.0
         with:
-          flutter-version: '3.32.4'
+          flutter-version: '3.35.4'
           channel: 'stable'
 
       - name: Setup Tools
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y ninja-build libgtk-3-dev libolm3 libmpv-dev mpv ffmpeg libmimalloc-dev webkit2gtk-4.1
+          sudo apt-get install -y ninja-build libgtk-3-dev libmpv-dev mpv ffmpeg libmimalloc-dev webkit2gtk-4.1
 
       - name: Code Generation
         run: |
@@ -383,30 +363,27 @@ jobs:
       - name: Setup Flutter 
         uses: subosito/flutter-action@v2.8.0
         with:
-          flutter-version: '3.32.4'
+          flutter-version: '3.35.4'
           channel: 'stable'
 
       - name: Setup Tools
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y ninja-build libgtk-3-dev libolm3 libmpv-dev mpv ffmpeg webkit2gtk-4.1
+          sudo apt-get install -y ninja-build libgtk-3-dev libmpv-dev mpv ffmpeg webkit2gtk-4.1
 
       - name: Code Generation
         run: |
           cd $PROJECT_PATH
           dart run scripts/codegen.dart
-
-      - name: Include Olm
+
+      - uses: moonrepo/setup-rust@v1
+      - run: rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu
+
+      - name: Prepare web
         run: |
           cd $PROJECT_PATH
-          cd assets/js
-          rm -r package
-          curl -L 'https://github.com/famedly/olm/releases/download/v2.0.0/olm.zip' > olm.zip
-          sha256sum -c <<< '644bbc7cdcf5931fb64c1b556a3672830ca2af6615caa814458785043895c6df olm.zip'
-          unzip olm.zip
-          rm olm.zip
-          mv javascript package
-
+          ./scripts/prepare-web.sh
+
       - name: Build Web
         run: |
           cd $PROJECT_PATH

.github/workflows/static-analysis.yml

@@ -19,13 +19,13 @@ jobs:
       - name: Setup Flutter  ╰(✿˙ᗜ˙)੭━☆ﾟ.*･｡ﾟ
         uses: subosito/flutter-action@v2.8.0
         with:
-          flutter-version: '3.32.4'
+          flutter-version: '3.35.4'
           channel: 'stable'
 
       - name: Setup Tools  ᕙ|” ◉ ◡ ◉ ”|ᕗ
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y ninja-build libgtk-3-dev libolm3 libmpv-dev mpv libmimalloc-dev
+          sudo apt-get install -y ninja-build libgtk-3-dev libmpv-dev mpv libmimalloc-dev
 
       - name: Configure Flutter (∩｀-´)⊃━☆ﾟ.*･｡ﾟ
         run: flutter config --enable-linux-desktop

.gitignore

@@ -3,3 +3,6 @@ commet/coverage/lcov.info
 commet/assets/js/package/olm.js
 commet/assets/js/package/olm.wasm
 commet/assets/js/package/olm_legacy.js
+commet/.vodozemac/
+commet/assets/vodozemac/vodozemac_bindings_dart_bg.wasm
+commet/assets/vodozemac/vodozemac_bindings_dart.js

README.md

@@ -42,7 +42,7 @@ Help translate Commet to your language on [Weblate](https://hosted.weblate.org/p
 </a>
 
 # Development
-Commet is built using [Flutter](https://flutter.dev), currently v3.32.4 
+Commet is built using [Flutter](https://flutter.dev), currently v3.35.4 
 
 This repo currently has a monorepo structure, containing two flutter projects: Commet and Tiamat. Commet is the main client, and Tiamat is a sort of wrapper around Material with some extra goodies, which is used to maintain a consistent style across the app. Tiamat may eventually be moved to its own repo, but for now it is maintained here for ease of development.
 ## Building
@@ -52,7 +52,7 @@ This repo currently has a monorepo structure, containing two flutter projects: C
 ### 2. Install Libraries
 Commet requires some additional libraries to be built 
 ```bash
-sudo apt-get install -y ninja-build libgtk-3-dev libolm3 libmpv-dev mpv ffmpeg libmimalloc-dev
+sudo apt-get install -y ninja-build libgtk-3-dev libmpv-dev mpv ffmpeg libmimalloc-dev
 ```
 
 ### 3. Fetch Dependencies

commet/analysis_options.yaml

@@ -1,5 +1,3 @@
-include: package:flutter_lints/flutter.yaml
-
 analyzer:
   errors:
     curly_braces_in_flow_control_structures: ignore
@@ -8,4 +6,5 @@ analyzer:
     - lib/generated/*.dart
     - lib/generated/l10n/*.dart
     - lib/main.widgetbook.dart
-    - integration_test/**
+    - integration_test/**
+    - lib/generated/**

commet/android/build.gradle

@@ -15,7 +15,7 @@ subprojects {
         if (project.plugins.hasPlugin("com.android.application") ||
                 project.plugins.hasPlugin("com.android.library")) {
             project.android {
-                compileSdkVersion 35
+                compileSdkVersion 36
                 buildToolsVersion "34.0.0"
             }
         }

commet/integration_test/README.md

@@ -2,7 +2,6 @@
 
 To run unit tests, there are a few prerequisites.
 
- - Make sure you have `libolm3` installed `sudo apt install libolm3`
  - Run Code Generation [scripts/codegen.dart](../scripts/codegen.dart)
  - Configure environment variables [. scripts/setup-env.sh](../scripts/setup-env.sh)
  - Start the synapse docker server [scripts/integration-server-synapse.sh](../scripts/integration-server-synapse.sh)

commet/lib/client/call_manager.dart

@@ -126,7 +126,7 @@ class CallManager {
     player = null;
   }
 
-  onCallStateChanged(VoipSession event) {
+  void onCallStateChanged(VoipSession event) {
     if (event.state == VoipState.connected ||
         event.state == VoipState.connecting) {
       stopRingtone();

commet/lib/client/client_manager.dart

@@ -9,10 +9,8 @@ import 'package:commet/client/matrix/matrix_client.dart';
 import 'package:commet/client/stale_info.dart';
 import 'package:commet/client/tasks/client_connection_status_task.dart';
 import 'package:commet/main.dart';
-import 'package:commet/ui/pages/developer/app_inspector/value_reflector_widget.dart';
 import 'package:commet/utils/notifying_list.dart';
 
-@Reflector()
 class ClientManager {
   final Map<String, Client> _clients = {};