.cargo/config.toml

@@ -2,8 +2,6 @@
 rustflags = ["-Ctarget-feature=+crt-static"]
 [target.i686-pc-windows-msvc]
 rustflags = ["-C", "target-feature=+crt-static", "-C", "link-args=/NODEFAULTLIB:MSVCRT"]
-[target.aarch64-pc-windows-msvc]
-rustflags = ["-Ctarget-feature=+crt-static"]
 [target.'cfg(target_os="macos")']
 rustflags = [
     "-C", "link-args=-sectcreate __CGPreLoginApp __cgpreloginapp /dev/null",

.claude/commands/reflection.md

@@ -0,0 +1,56 @@
+You are an expert in prompt engineering, specializing in optimizing AI code assistant instructions. Your task is to analyze and improve the instructions for Claude Code.
+Follow these steps carefully:
+
+1. Analysis Phase:
+Review the chat history in your context window.
+
+Then, examine the current Claude instructions, commands and config
+<claude_instructions>
+/CLAUDE.md
+/.claude/commands/*
+**/CLAUDE.md
+.claude/settings.json
+.claude/settings.local.json
+</claude_instructions>
+
+Analyze the chat history, instructions, commands and config to identify areas that could be improved. Look for:
+- Inconsistencies in Claude's responses
+- Misunderstandings of user requests
+- Areas where Claude could provide more detailed or accurate information
+- Opportunities to enhance Claude's ability to handle specific types of queries or tasks
+- New commands or improvements to a commands name, function or response
+- Permissions and MCPs we've approved locally that we should add to the config, especially if we've added new tools or require them for the command to work
+
+2. Interaction Phase:
+Present your findings and improvement ideas to the human. For each suggestion:
+a) Explain the current issue you've identified
+b) Propose a specific change or addition to the instructions
+c) Describe how this change would improve Claude's performance
+
+Wait for feedback from the human on each suggestion before proceeding. If the human approves a change, move it to the implementation phase. If not, refine your suggestion or move on to the next idea.
+
+3. Implementation Phase:
+For each approved change:
+a) Clearly state the section of the instructions you're modifying
+b) Present the new or modified text for that section
+c) Explain how this change addresses the issue identified in the analysis phase
+
+4. Output Format:
+Present your final output in the following structure:
+
+<analysis>
+[List the issues identified and potential improvements]
+</analysis>
+
+<improvements>
+[For each approved improvement:
+1. Section being modified
+2. New or modified instruction text
+3. Explanation of how this addresses the identified issue]
+</improvements>
+
+<final_instructions>
+[Present the complete, updated set of instructions for Claude, incorporating all approved changes]
+</final_instructions>
+
+Remember, your goal is to enhance Claude's performance and consistency while maintaining the core functionality and purpose of the AI assistant. Be thorough in your analysis, clear in your explanations, and precise in your implementations.

.github/patches/apply_flutter_3.44_source_patches.sh

@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-# Applies the Flutter 3.44-only source/pubspec changes on the fly, in CI only.
-#
-# Windows arm64 needs Flutter >= 3.44 (the first stable release shipping an arm64 Dart SDK +
-# engine), which renamed DialogTheme/TabBarTheme -> *Data and needs newer extended_text/
-# google_fonts. Every other platform is still on Flutter 3.24.5, where the old names/versions
-# are required, so these changes are kept OUT of the committed sources and applied here instead.
-#
-# Used by BOTH the Windows arm64 build (flutter-build.yml) and its dedicated bridge artifact
-# (bridge.yml) so they share an identical 3.44 source state -- the generated *.freezed.dart must
-# compile against the same Flutter/freezed version the arm64 build resolves.
-#
-# Remove this script (and commit the changes) once upstream bumps Flutter across the board.
-#
-# Run from the repository root. sed is used (not a git-apply patch) because the checked-out
-# sources are CRLF on the windows-11-arm runner; the substitutions below are anchor-free and
-# therefore CRLF-safe.
-set -euo pipefail
-
-# ThemeData API renames (Flutter 3.27+):
-sed -i 's/dialogTheme: DialogTheme(/dialogTheme: DialogThemeData(/g' flutter/lib/common.dart
-sed -i 's/tabBarTheme: const TabBarTheme(/tabBarTheme: const TabBarThemeData(/g' flutter/lib/common.dart
-sed -i '/static ThemeData lightTheme = ThemeData(/,/static ThemeData darkTheme = ThemeData(/s/dialogTheme: DialogThemeData(/dialogTheme: DialogThemeData(\
-      backgroundColor: Colors.white,/' flutter/lib/common.dart
-sed -i '/static ThemeData darkTheme = ThemeData(/,/scrollbarTheme: scrollbarThemeDark,/s/dialogTheme: DialogThemeData(/dialogTheme: DialogThemeData(\
-      backgroundColor: Color(0xFF18191E),/' flutter/lib/common.dart
-# Dependency bumps required by the newer Dart/Flutter:
-sed -i 's/extended_text: 14.0.0/extended_text: 15.0.2/' flutter/pubspec.yaml
-sed -i 's/google_fonts: \^6.2.1/google_fonts: ^8.1.0/' flutter/pubspec.yaml
-
-# Fail loudly if any expected string drifted, so we never silently build unpatched:
-grep -qF 'dialogTheme: DialogThemeData(' flutter/lib/common.dart
-grep -qF 'tabBarTheme: const TabBarThemeData(' flutter/lib/common.dart
-grep -qF 'backgroundColor: Colors.white,' flutter/lib/common.dart
-grep -qF 'backgroundColor: Color(0xFF18191E),' flutter/lib/common.dart
-grep -qF 'extended_text: 15.0.2' flutter/pubspec.yaml
-grep -qF 'google_fonts: ^8.1.0' flutter/pubspec.yaml
-
-git --no-pager diff -- flutter/lib/common.dart flutter/pubspec.yaml

.github/workflows/bridge.yml

@@ -7,6 +7,7 @@ on:
 
 env:
   CARGO_EXPAND_VERSION: "1.0.95"
+  FLUTTER_VERSION: "3.22.3"
   FLUTTER_RUST_BRIDGE_VERSION: "1.80.1"
   RUST_VERSION: "1.75" # https://github.com/rustdesk/rustdesk/discussions/7503
 
@@ -17,25 +18,14 @@ jobs:
       fail-fast: false
       matrix:
         job:
-          # Default bridge for every platform still on Flutter 3.24.5 (generated with 3.22.3).
           - {
               target: x86_64-unknown-linux-gnu,
               os: ubuntu-22.04,
               extra-build-args: "",
-              flutter-version: "3.22.3",
-              artifact-name: "bridge-artifact",
-            }
-          # Dedicated bridge for the Windows arm64 build (Flutter 3.44); runs in parallel.
-          - {
-              target: x86_64-unknown-linux-gnu,
-              os: ubuntu-22.04,
-              extra-build-args: "",
-              flutter-version: "3.44.0",
-              artifact-name: "bridge-artifact-flutter-3.44",
             }
     steps:
       - name: Checkout source code
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -59,28 +49,28 @@ jobs:
             wget
 
       - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # v1
+        uses: dtolnay/rust-toolchain@v1
         with:
           toolchain: ${{ env.RUST_VERSION }}
           targets: ${{ matrix.job.target }}
           components: "rustfmt"
 
-      - uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
+      - uses: Swatinem/rust-cache@v2
         with:
           prefix-key: bridge-${{ matrix.job.os }}
 
       - name: Cache Bridge
         id: cache-bridge
-        uses: actions/cache@6f8efc29b200d32929f49075959781ed54ec270c # v3
+        uses: actions/cache@v3
         with:
           path: /tmp/flutter_rust_bridge
-          key: bridge-${{ matrix.job.flutter-version }}
+          key: vcpkg-${{ matrix.job.arch }}
 
       - name: Install flutter
-        uses: subosito/flutter-action@1a449444c387b1966244ae4d4f8c696479add0b2 # v2
+        uses: subosito/flutter-action@v2
         with:
           channel: "stable"
-          flutter-version: ${{ matrix.job.flutter-version }}
+          flutter-version: ${{ env.FLUTTER_VERSION }}
           cache: true
 
       - name: Install flutter rust bridge deps
@@ -88,15 +78,7 @@ jobs:
         run: |
           cargo install cargo-expand --version ${{ env.CARGO_EXPAND_VERSION }} --locked
           cargo install flutter_rust_bridge_codegen --version ${{ env.FLUTTER_RUST_BRIDGE_VERSION }} --features "uuid" --locked
-          if [[ "${{ matrix.job.flutter-version }}" == "3.22.3" ]]; then
-            # Default Flutter 3.22.3: extended_text 14 needs a newer Dart, so downgrade for resolution.
-            sed -i -e 's/extended_text: 14.0.0/extended_text: 13.0.0/g' flutter/pubspec.yaml
-          else
-            # Flutter 3.44 bridge for Windows arm64: match that build's source/pubspec state so the
-            # generated *.freezed.dart compiles against the same Flutter/freezed it resolves.
-            bash .github/patches/apply_flutter_3.44_source_patches.sh
-          fi
-          pushd flutter && flutter pub get && popd
+          pushd flutter && sed -i -e 's/extended_text: 14.0.0/extended_text: 13.0.0/g' pubspec.yaml && flutter pub get && popd
 
       - name: Run flutter rust bridge
         run: |
@@ -104,9 +86,9 @@ jobs:
           cp ./flutter/macos/Runner/bridge_generated.h ./flutter/ios/Runner/bridge_generated.h
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@master
         with:
-          name: ${{ matrix.job.artifact-name }}
+          name: bridge-artifact
           path: |
             ./src/bridge_generated.rs
             ./src/bridge_generated.io.rs

.github/workflows/ci.yml

@@ -29,13 +29,13 @@ jobs:
   #   name: Ensure 'cargo fmt' has been run
   #   runs-on: ubuntu-20.04
   #   steps:
-  #   - uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1
+  #   - uses: actions-rs/toolchain@v1
   #     with:
   #       toolchain: stable
   #       default: true
   #       profile: minimal
   #       components: rustfmt
-  #   - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
+  #   - uses: actions/checkout@v3
   #   - run: cargo fmt -- --check
 
   # min_version:
@@ -43,24 +43,24 @@ jobs:
   #   runs-on: ubuntu-20.04
   #   steps:
   #   - name: Checkout source code
-  #     uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
+  #     uses: actions/checkout@v3
   #     with:
   #       submodules: recursive
 
   #   - name: Install rust toolchain (v${{ env.MIN_SUPPORTED_RUST_VERSION }})
-  #     uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1
+  #     uses: actions-rs/toolchain@v1
   #     with:
   #       toolchain: ${{ env.MIN_SUPPORTED_RUST_VERSION }}
   #       default: true
   #       profile: minimal # minimal component installation (ie, no documentation)
   #       components: clippy
   #   - name: Run clippy (on minimum supported rust version to prevent warnings we can't fix)
-  #     uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # v1
+  #     uses: actions-rs/cargo@v1
   #     with:
   #       command: clippy
   #       args: --locked --all-targets --all-features -- --allow clippy::unknown_clippy_lints
   #   - name: Run tests
-  #     uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # v1
+  #     uses: actions-rs/cargo@v1
   #     with:
   #       command: test
   #       args: --locked
@@ -81,33 +81,18 @@ jobs:
           # - { target: x86_64-apple-darwin         , os: macos-10.15                   }
           # - { target: x86_64-pc-windows-gnu       , os: windows-2022                  }
           # - { target: x86_64-pc-windows-msvc      , os: windows-2022                  }
-          # - { target: aarch64-pc-windows-msvc     , os: windows-11-arm                }
-          - { target: x86_64-unknown-linux-gnu    , os: ubuntu-24.04                  }
+          - { target: x86_64-unknown-linux-gnu    , os: ubuntu-22.04                  }
           # - { target: x86_64-unknown-linux-musl   , os: ubuntu-20.04, use-cross: true }
     steps:
-    - name: Free Disk Space (Ubuntu)
-      if: runner.os == 'Linux'
-      # jlumbroso/free-disk-space@v1.3.1 is used in .github\workflows\flutter-build.yml
-      # But pinning to a specific version to avoid unexpected issues is preferred.
-      uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
-      with:
-        tool-cache: false
-        android: true
-        dotnet: true
-        haskell: true
-        large-packages: false
-        docker-images: true
-        swap-storage: false
-
     - name: Export GitHub Actions cache environment variables
-      uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
+      uses: actions/github-script@v6
       with:
         script: |
           core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
           core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
 
     - name: Checkout source code
-      uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+      uses: actions/checkout@v4
       with:
         submodules: recursive
 
@@ -146,7 +131,7 @@ jobs:
         esac
 
     - name: Setup vcpkg with Github Actions binary cache
-      uses: lukka/run-vcpkg@b1a0dd252f06b9e25b3c022a9a03bd7a427fb6a2 # v11
+      uses: lukka/run-vcpkg@v11
       with:
         vcpkgDirectory: /opt/artifacts/vcpkg
         vcpkgGitCommitId: ${{ env.VCPKG_COMMIT_ID }}
@@ -157,7 +142,7 @@ jobs:
       shell: bash
 
     - name: Install Rust toolchain
-      uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # v1
+      uses: dtolnay/rust-toolchain@v1
       with:
         toolchain: stable
         targets: ${{ matrix.job.target }}
@@ -173,10 +158,10 @@ jobs:
         cargo -V
         rustc -V
 
-    - uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
+    - uses: Swatinem/rust-cache@v2
 
     - name: Build
-      uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # v1
+      uses: actions-rs/cargo@v1
       with:
         use-cross: ${{ matrix.job.use-cross }}
         command: build
@@ -244,7 +229,7 @@ jobs:
         echo "CARGO_TEST_OPTIONS=${CARGO_TEST_OPTIONS}" >> $GITHUB_OUTPUT
 
     - name: Run tests
-      uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # v1
+      uses: actions-rs/cargo@v1
       with:
         use-cross: ${{ matrix.job.use-cross }}
         command: test

.github/workflows/clear-cache.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clear cache
-        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
+        uses: actions/github-script@v7
         with:
           script: |
             console.log("About to clear")
@@ -30,7 +30,7 @@ jobs:
             console.log("Clear completed")
             
       - name: Purge cache # Above seems not clear thouroughly, so add this to double clear
-        uses: MyAlbum/purge-cache@881eb5957687193fa612bf74c0042adc78ea5e54 # v2
+        uses: MyAlbum/purge-cache@v2
         with:
           accessed: true # Purge caches by their last accessed time (default)
           created: false # Purge caches by their created time (default)

.github/workflows/fdroid.yml

@@ -31,7 +31,7 @@ jobs:
         shell: bash
 
       - name: Publish RustDesk version file
-        uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
+        uses: softprops/action-gh-release@v1
         with:
           prerelease: true
           tag_name: "fdroid-version"

.github/workflows/playground.yml

@@ -17,7 +17,7 @@ env:
   TAG_NAME: "nightly"
   VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
   VCPKG_COMMIT_ID: "120deac3062162151622ca4860575a33844ba10b"
-  VERSION: "1.4.8"
+  VERSION: "1.4.2"
   NDK_VERSION: "r26d"
   #signing keys env variable checks
   ANDROID_SIGNING_KEY: "${{ secrets.ANDROID_SIGNING_KEY }}"
@@ -79,21 +79,21 @@ jobs:
             }
     steps:
       - name: Export GitHub Actions cache environment variables
-        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
+        uses: actions/github-script@v6
         with:
           script: |
             core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
             core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
 
       - name: Checkout source code
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
+        uses: actions/checkout@v3
         with:
           ref: ${{ matrix.job.ref }}
           submodules: recursive
 
       - name: Import the codesign cert
         if: env.MACOS_P12_BASE64 != null
-        uses: apple-actions/import-codesign-certs@253ddeeac23f2bdad1646faac5c8c2832e800071 # v1
+        uses: apple-actions/import-codesign-certs@v1
         with:
           p12-file-base64: ${{ secrets.MACOS_P12_BASE64 }}
           p12-password: ${{ secrets.MACOS_P12_PASSWORD }}
@@ -107,7 +107,7 @@ jobs:
 
       - name: Import notarize key
         if: env.MACOS_P12_BASE64 != null
-        uses: timheuer/base64-to-file@adaa40c0c581f276132199d4cf60afa07ce60eac # v1.2
+        uses: timheuer/base64-to-file@v1.2
         with:
           # https://gregoryszorc.com/docs/apple-codesign/stable/apple_codesign_rcodesign.html#notarizing-and-stapling
           fileName: rustdesk.json
@@ -129,19 +129,19 @@ jobs:
           brew install llvm create-dmg nasm pkg-config
 
       - name: Install flutter
-        uses: subosito/flutter-action@1a449444c387b1966244ae4d4f8c696479add0b2 # v2
+        uses: subosito/flutter-action@v2
         with:
           channel: "stable"
           flutter-version: ${{ matrix.job.flutter }}
 
       - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # v1
+        uses: dtolnay/rust-toolchain@v1
         with:
           toolchain: ${{ env.RUST_VERSION }}
           targets: ${{ matrix.job.target }}
           components: "rustfmt"
 
-      - uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
+      - uses: Swatinem/rust-cache@v2
         with:
           prefix-key: ${{ matrix.job.os }}
 
@@ -156,7 +156,7 @@ jobs:
           ~/.cargo/bin/flutter_rust_bridge_codegen --rust-input ./src/flutter_ffi.rs --dart-output ./flutter/lib/generated_bridge.dart --c-output ./flutter/macos/Runner/bridge_generated.h
 
       - name: Setup vcpkg with Github Actions binary cache
-        uses: lukka/run-vcpkg@b1a0dd252f06b9e25b3c022a9a03bd7a427fb6a2 # v11
+        uses: lukka/run-vcpkg@v11
         with:
           vcpkgGitCommitId: ${{ env.VCPKG_COMMIT_ID }}
 
@@ -165,7 +165,7 @@ jobs:
           $VCPKG_ROOT/vcpkg install --x-install-root="$VCPKG_ROOT/installed"
           
       - name: Restore from cache and install vcpkg
-        uses: lukka/run-vcpkg@8a5116de2b552d6fc8894e9774aacaf2e5db4823 # v7 2026-05-26
+        uses: lukka/run-vcpkg@v7
         if: false
         with:
           setupOnly: true
@@ -222,7 +222,7 @@ jobs:
           done
 
       - name: Publish DMG package
-        uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
+        uses: softprops/action-gh-release@v1
         with:
           prerelease: true
           tag_name: ${{ env.TAG_NAME }}
@@ -247,7 +247,7 @@ jobs:
             }
     steps:
       - name: Checkout source code
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
+        uses: actions/checkout@v3
         with:
           ref: ${{ matrix.job.ref }}
           submodules: recursive
@@ -290,13 +290,13 @@ jobs:
                wget
 
       - name: Install flutter
-        uses: subosito/flutter-action@1a449444c387b1966244ae4d4f8c696479add0b2 # v2
+        uses: subosito/flutter-action@v2
         with:
           channel: "stable"
           flutter-version: ${{ env.FLUTTER_VERSION }}
 
       - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # v1
+        uses: dtolnay/rust-toolchain@v1
         with:
           toolchain: ${{ env.RUST_VERSION }}
           components: "rustfmt"
@@ -310,14 +310,14 @@ jobs:
           pushd flutter ; flutter pub get ; popd
           ~/.cargo/bin/flutter_rust_bridge_codegen --rust-input ./src/flutter_ffi.rs --dart-output ./flutter/lib/generated_bridge.dart
 
-      - uses: nttld/setup-ndk@ed92fe6cadad69be94a966a7ee3271275e62f779 # v1
+      - uses: nttld/setup-ndk@v1
         id: setup-ndk
         with:
           ndk-version: ${{ env.NDK_VERSION }}
           add-to-path: true
 
       - name: Setup vcpkg with Github Actions binary cache
-        uses: lukka/run-vcpkg@b1a0dd252f06b9e25b3c022a9a03bd7a427fb6a2 # v11
+        uses: lukka/run-vcpkg@v11
         with:
           vcpkgDirectory: /opt/artifacts/vcpkg
           vcpkgGitCommitId: ${{ env.VCPKG_COMMIT_ID }}
@@ -395,7 +395,7 @@ jobs:
           mkdir -p signed-apk; pushd signed-apk
           mv ../rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.apk ./rustdesk-test-${{ matrix.job.ref }}-${{ matrix.job.ndk }}.apk
 
-      - uses: r0adkll/sign-android-release@349ebdef58775b1e0d8099458af0816dc79b6407 # v1
+      - uses: r0adkll/sign-android-release@v1
         name: Sign app APK
         if: env.ANDROID_SIGNING_KEY != null
         id: sign-rustdesk
@@ -410,7 +410,7 @@ jobs:
           BUILD_TOOLS_VERSION: "30.0.2"
 
       - name: Publish signed apk package
-        uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
+        uses: softprops/action-gh-release@v1
         with:
           prerelease: true
           tag_name: ${{ env.TAG_NAME }}

.github/workflows/third-party-RustDeskTempTopMostWindow.yml

@@ -39,21 +39,22 @@ jobs:
       build_output_dir: RustDeskTempTopMostWindow/WindowInjection/${{ inputs.platform }}/${{ inputs.configuration }}
     steps:
       - name: Add MSBuild to PATH
-        uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2
+        uses: microsoft/setup-msbuild@v2
 
       - name: Download the source code
         run: |
           git clone https://github.com/rustdesk-org/RustDeskTempTopMostWindow RustDeskTempTopMostWindow
 
+        # Build. commit 53b548a5398624f7149a382000397993542ad796 is tag v0.3
       - name: Build the project
         run: |
-          cd RustDeskTempTopMostWindow && git checkout ecd8d6a139eee76845ea66423fb739af450fda90
+          cd RustDeskTempTopMostWindow && git checkout 53b548a5398624f7149a382000397993542ad796
           msbuild ${{ env.project_path }} -p:Configuration=${{ inputs.configuration }} -p:Platform=${{ inputs.platform }} /p:TargetVersion=${{ inputs.target_version }}
 
       - name: Archive build artifacts
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@master
         if: ${{ inputs.upload-artifact }}
         with:
-            name: topmostwindow-artifacts-${{ inputs.platform }}
+            name: topmostwindow-artifacts
             path: |
               ./${{ env.build_output_dir }}/WindowInjection.dll

.github/workflows/wf-cliprdr-ci.yml

@@ -1,85 +0,0 @@
-name: wf-cliprdr CI
-
-on:
-  workflow_dispatch:
-  pull_request:
-    paths:
-      - "libs/clipboard/src/windows/**"
-      - "tests/test_invariant_wf_cliprdr.c"
-      - ".github/workflows/wf-cliprdr-ci.yml"
-  push:
-    branches:
-      - master
-    paths:
-      - "libs/clipboard/src/windows/**"
-      - "tests/test_invariant_wf_cliprdr.c"
-      - ".github/workflows/wf-cliprdr-ci.yml"
-
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  test:
-    name: wf_cliprdr invariant test
-    runs-on: windows-2022
-
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
-        with:
-          persist-credentials: false
-
-      - name: Set up MSVC
-        uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756
-        with:
-          arch: x64
-
-      - name: Setup vcpkg with GitHub Actions binary cache
-        uses: lukka/run-vcpkg@b1a0dd252f06b9e25b3c022a9a03bd7a427fb6a2 # v11
-        with:
-          vcpkgDirectory: C:\vcpkg
-          doNotCache: false
-
-      - name: Install vcpkg dependency
-        shell: pwsh
-        run: |
-          & "$env:VCPKG_ROOT\vcpkg.exe" install check:x64-windows --classic --x-install-root="$env:VCPKG_ROOT\installed"
-
-      - name: Build test
-        shell: pwsh
-        run: |
-          $testRoot = Join-Path $env:GITHUB_WORKSPACE 'build\wf-cliprdr'
-          New-Item -ItemType Directory -Force $testRoot | Out-Null
-
-          $testSource = (($env:GITHUB_WORKSPACE -replace '\\', '/') + '/tests/test_invariant_wf_cliprdr.c')
-          $cmakeLists = @(
-            'cmake_minimum_required(VERSION 3.20)'
-            'project(test_invariant_wf_cliprdr C)'
-            ''
-            'set(CMAKE_C_STANDARD 11)'
-            'set(CMAKE_C_STANDARD_REQUIRED ON)'
-            'set(CMAKE_C_EXTENSIONS OFF)'
-            ''
-            'find_package(check CONFIG REQUIRED)'
-            ''
-            'add_executable(test_invariant_wf_cliprdr'
-            '  "TEST_SOURCE"'
-            ')'
-            ''
-            'target_link_libraries(test_invariant_wf_cliprdr PRIVATE'
-            '  $<$<TARGET_EXISTS:Check::check>:Check::check>'
-            '  $<$<NOT:$<TARGET_EXISTS:Check::check>>:Check::checkShared>'
-            ')'
-          ) -join [Environment]::NewLine
-          $cmakeLists.Replace('TEST_SOURCE', $testSource) | Set-Content -NoNewline (Join-Path $testRoot 'CMakeLists.txt')
-
-          cmake -S $testRoot -B (Join-Path $testRoot 'out') -G "Visual Studio 17 2022" -A x64 -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_ROOT\scripts\buildsystems\vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x64-windows
-          cmake --build (Join-Path $testRoot 'out') --config Release
-
-      - name: Run test
-        shell: pwsh
-        run: .\build\wf-cliprdr\out\Release\test_invariant_wf_cliprdr.exe

.github/workflows/winget.yml

@@ -0,0 +1,15 @@
+name: Publish to WinGet
+on:
+  release:
+    types: [released]
+  workflow_dispatch:
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: vedantmgoyal9/winget-releaser@main
+        with:
+          identifier: RustDesk.RustDesk
+          version: "1.4.2"
+          release-tag: "1.4.2"
+          token: ${{ secrets.WINGET_TOKEN }}

.gitignore

@@ -3,7 +3,6 @@
 .vscode
 .idea
 .DS_Store
-.env
 libsciter-gtk.so
 src/ui/inline.rs
 extractor

AGENTS.md

@@ -1,86 +0,0 @@
-# RustDesk Guide
-
-## Project Layout
-
-### Directory Structure
-* `src/` Rust app
-* `src/server/` audio / clipboard / input / video / network
-* `src/platform/` platform-specific code
-* `src/ui/` legacy Sciter UI (deprecated)
-* `flutter/` current UI
-* `libs/hbb_common/` config / proto / shared utils
-* `libs/scrap/` screen capture
-* `libs/enigo/` input control
-* `libs/clipboard/` clipboard
-* `libs/hbb_common/src/config.rs` all options
-
-### Key Components
-- **Remote Desktop Protocol**: Custom protocol implemented in `src/rendezvous_mediator.rs` for communicating with rustdesk-server
-- **Screen Capture**: Platform-specific screen capture in `libs/scrap/`
-- **Input Handling**: Cross-platform input simulation in `libs/enigo/`
-- **Audio/Video Services**: Real-time audio/video streaming in `src/server/`
-- **File Transfer**: Secure file transfer implementation in `libs/hbb_common/`
-
-### UI Architecture
-- **Legacy UI**: Sciter-based (deprecated) - files in `src/ui/`
-- **Modern UI**: Flutter-based - files in `flutter/`
-  - Desktop: `flutter/lib/desktop/`
-  - Mobile: `flutter/lib/mobile/`
-  - Shared: `flutter/lib/common/` and `flutter/lib/models/`
-
-## Rust Rules
-
-* Avoid `unwrap()` / `expect()` in production code.
-* Exceptions:
-
-  * tests;
-  * lock acquisition where failure means poisoning, not normal control flow.
-* Otherwise prefer `Result` + `?` or explicit handling.
-* Do not ignore errors silently.
-* Avoid unnecessary `.clone()`.
-* Prefer borrowing when practical.
-* Do not add dependencies unless needed.
-* Keep code simple and idiomatic.
-
-## Tokio Rules
-
-* Assume a Tokio runtime already exists.
-* Never create nested runtimes.
-* Never call `Runtime::block_on()` inside Tokio / async code.
-* Do not hide runtime creation inside helpers or libraries.
-* Do not hold locks across `.await`.
-* Prefer `.await`, `tokio::spawn`, channels.
-* Use `spawn_blocking` or dedicated threads for blocking work.
-* Do not use `std::thread::sleep()` in async code.
-
-## Editing Hygiene
-
-* Change only what is required.
-* Prefer the smallest valid diff.
-* Do not refactor unrelated code.
-* Do not make formatting-only changes.
-* Keep naming/style consistent with nearby code.
-
-## Localization (`src/lang/*.rs`)
-
-Each file is a `HashMap<key, translation>`. Layout:
-
-* `template.rs` is the master list of every key. **Never edit it** as part of translation work.
-* `en.rs` holds only the keys whose English display text differs from the key itself.
-* Every other file (`de.rs`, `fr.rs`, …) carries the full key set; an untranslated entry has an empty value: `("key", "")`.
-
-### Finding the English source for a key
-
-When filling an empty entry, determine the source English text with this rule:
-
-* If `key` exists in `en.rs` **with a non-empty value**, that value is the source text (look it up in `en.rs`).
-* Otherwise the **key string itself is the source text** (the key is already plain English).
-
-Then translate that source into the file's target language (infer the language from the file's existing non-empty entries / filename).
-
-### Translation hygiene
-
-* Only fill empty values. Never change keys, and never touch existing non-empty translations.
-* Preserve placeholders (`{}`) and escape sequences (`\n`, `\"`) exactly as in the source.
-* Do not translate brand or technical tokens: `RustDesk`, `Socks5`, `TLS`, `UAC`, `Wayland`, `X11`, `TCP`, `UDP`, `2FA`, `RDP`, `D3D`, etc.
-* Copy URL values (e.g. `doc_*` keys) verbatim from `en.rs`.

CLAUDE.md

@@ -1 +1,91 @@
-AGENTS.md
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Development Commands
+
+### Build Commands
+- `cargo run` - Build and run the desktop application (requires libsciter library)
+- `python3 build.py --flutter` - Build Flutter version (desktop)
+- `python3 build.py --flutter --release` - Build Flutter version in release mode
+- `python3 build.py --hwcodec` - Build with hardware codec support
+- `python3 build.py --vram` - Build with VRAM feature (Windows only)
+- `cargo build --release` - Build Rust binary in release mode
+- `cargo build --features hwcodec` - Build with specific features
+
+### Flutter Mobile Commands
+- `cd flutter && flutter build android` - Build Android APK
+- `cd flutter && flutter build ios` - Build iOS app
+- `cd flutter && flutter run` - Run Flutter app in development mode
+- `cd flutter && flutter test` - Run Flutter tests
+
+### Testing
+- `cargo test` - Run Rust tests
+- `cd flutter && flutter test` - Run Flutter tests
+
+### Platform-Specific Build Scripts
+- `flutter/build_android.sh` - Android build script
+- `flutter/build_ios.sh` - iOS build script
+- `flutter/build_fdroid.sh` - F-Droid build script
+
+## Project Architecture
+
+### Directory Structure
+- **`src/`** - Main Rust application code
+  - `src/ui/` - Legacy Sciter UI (deprecated, use Flutter instead)
+  - `src/server/` - Audio/clipboard/input/video services and network connections
+  - `src/client.rs` - Peer connection handling
+  - `src/platform/` - Platform-specific code
+- **`flutter/`** - Flutter UI code for desktop and mobile
+- **`libs/`** - Core libraries
+  - `libs/hbb_common/` - Video codec, config, network wrapper, protobuf, file transfer utilities
+  - `libs/scrap/` - Screen capture functionality
+  - `libs/enigo/` - Platform-specific keyboard/mouse control
+  - `libs/clipboard/` - Cross-platform clipboard implementation
+
+### Key Components
+- **Remote Desktop Protocol**: Custom protocol implemented in `src/rendezvous_mediator.rs` for communicating with rustdesk-server
+- **Screen Capture**: Platform-specific screen capture in `libs/scrap/`
+- **Input Handling**: Cross-platform input simulation in `libs/enigo/`
+- **Audio/Video Services**: Real-time audio/video streaming in `src/server/`
+- **File Transfer**: Secure file transfer implementation in `libs/hbb_common/`
+
+### UI Architecture
+- **Legacy UI**: Sciter-based (deprecated) - files in `src/ui/`
+- **Modern UI**: Flutter-based - files in `flutter/`
+  - Desktop: `flutter/lib/desktop/`
+  - Mobile: `flutter/lib/mobile/`
+  - Shared: `flutter/lib/common/` and `flutter/lib/models/`
+
+## Important Build Notes
+
+### Dependencies
+- Requires vcpkg for C++ dependencies: `libvpx`, `libyuv`, `opus`, `aom`
+- Set `VCPKG_ROOT` environment variable
+- Download appropriate Sciter library for legacy UI support
+
+### Ignore Patterns
+When working with files, ignore these directories:
+- `target/` - Rust build artifacts
+- `flutter/build/` - Flutter build output
+- `flutter/.dart_tool/` - Flutter tooling files
+
+### Cross-Platform Considerations
+- Windows builds require additional DLLs and virtual display drivers
+- macOS builds need proper signing and notarization for distribution
+- Linux builds support multiple package formats (deb, rpm, AppImage)
+- Mobile builds require platform-specific toolchains (Android SDK, Xcode)
+
+### Feature Flags
+- `hwcodec` - Hardware video encoding/decoding
+- `vram` - VRAM optimization (Windows only)
+- `flutter` - Enable Flutter UI
+- `unix-file-copy-paste` - Unix file clipboard support
+- `screencapturekit` - macOS ScreenCaptureKit (macOS only)
+
+### Config
+All configurations or options are under `libs/hbb_common/src/config.rs` file, 4 types:
+- Settings
+- Local
+- Display
+- Built-in

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rustdesk"
-version = "1.4.8"
+version = "1.4.2"
 authors = ["rustdesk <info@rustdesk.com>"]
 edition = "2021"
 build= "build.rs"
@@ -76,14 +76,13 @@ crossbeam-queue = "0.3"
 hex = "0.4"
 chrono = "0.4"
 cidr-utils = "0.5"
+libloading = "0.8"
 fon = "0.6"
 zip = "0.6"
 shutdown_hooks = "0.1"
 totp-rs = { version = "5.4", default-features = false, features = ["gen_secret", "otpauth"] }
 stunclient = "0.4"
 kcp-sys= { git = "https://github.com/rustdesk-org/kcp-sys"}
-reqwest = { version = "0.12", features = ["blocking", "socks", "json", "native-tls", "rustls-tls", "rustls-tls-native-roots", "gzip"], default-features=false }
-
 [target.'cfg(not(target_os = "linux"))'.dependencies]
 # https://github.com/rustdesk/rustdesk/discussions/10197, not use cpal on linux
 cpal = { git = "https://github.com/rustdesk-org/cpal", branch = "osx-screencapturekit" }
@@ -122,19 +121,10 @@ winapi = { version = "0.3", features = [
 ] }
 windows = { version = "0.61", features = [
     "Win32",
-    "Win32_Foundation",
-    "Win32_Security",
-    "Win32_Security_Authorization",
-    "Win32_Storage_FileSystem",
     "Win32_System",
     "Win32_System_Diagnostics",
-    "Win32_System_Diagnostics_ToolHelp",
-    "Win32_System_Environment",
-    "Win32_System_IO",
-    "Win32_System_Memory",
-    "Win32_System_Pipes",
     "Win32_System_Threading",
-    "Win32_UI_Shell",
+    "Win32_System_Diagnostics_ToolHelp",
 ] }
 winreg = "0.11"
 windows-service = "0.6"
@@ -160,7 +150,7 @@ piet-coregraphics = "0.6"
 foreign-types = "0.3"
 
 [target.'cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))'.dependencies]
-tray-icon = { git = "https://github.com/tauri-apps/tray-icon", version = "0.21.3" }
+tray-icon = { git = "https://github.com/tauri-apps/tray-icon" }
 tao = { git = "https://github.com/rustdesk-org/tao", branch = "dev" }
 image = "0.24"
 
@@ -175,8 +165,14 @@ fontdb = "0.23"
 bytemuck = "1.23"
 ttf-parser = "0.25"
 
+[target.'cfg(any(target_os = "macos", target_os = "windows"))'.dependencies]
+# https://github.com/rustdesk/rustdesk-server-pro/issues/189, using native-tls for better tls support
+reqwest = { git = "https://github.com/rustdesk-org/reqwest", features = ["blocking", "socks", "json", "native-tls", "gzip"], default-features=false }
+
+[target.'cfg(not(any(target_os = "macos", target_os = "windows")))'.dependencies]
+reqwest = { git = "https://github.com/rustdesk-org/reqwest", features = ["blocking", "socks", "json", "rustls-tls", "rustls-tls-native-roots", "gzip"], default-features=false }
+
 [target.'cfg(target_os = "linux")'.dependencies]
-libxdo-sys = "0.11"
 psimple = { package = "libpulse-simple-binding", version = "2.27" }
 pulse = { package = "libpulse-binding", version = "2.27" }
 rust-pulsectl = { git = "https://github.com/rustdesk-org/pulsectl" }
@@ -185,6 +181,7 @@ evdev = { git="https://github.com/rustdesk-org/evdev" }
 dbus = "0.9"
 dbus-crossroads = "0.5"
 pam = { git="https://github.com/rustdesk-org/pam" }
+users = { version = "0.11" }
 x11-clipboard = {git="https://github.com/clslaid/x11-clipboard", branch = "feat/store-batch", optional = true}
 x11rb =  {version = "0.12", features = ["all-extensions"], optional = true}
 percent-encoding = {version = "2.3", optional = true}
@@ -195,9 +192,6 @@ termios = "0.3"
 terminfo = "0.8"
 winit = "0.30"
 
-[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
-openssl = { version = "0.10", features = ["vendored"] }
-
 [target.'cfg(target_os = "android")'.dependencies]
 android_logger = "0.13"
 jni = "0.21"
@@ -207,11 +201,6 @@ android-wakelock = { git = "https://github.com/rustdesk-org/android-wakelock" }
 members = ["libs/scrap", "libs/hbb_common", "libs/enigo", "libs/clipboard", "libs/virtual_display", "libs/virtual_display/dylib", "libs/portable", "libs/remote_printer"]
 exclude = ["vdi/host", "examples/custom_plugin"]
 
-# Patch libxdo-sys to use a stub implementation that doesn't require libxdo
-# This allows building and running on systems without libxdo installed (e.g., Wayland-only)
-[patch.crates-io]
-libxdo-sys = { path = "libs/libxdo-sys-stub" }
-
 [package.metadata.winres]
 LegalCopyright = "Copyright © 2025 Purslane Ltd. All rights reserved."
 ProductName = "RustDesk"
@@ -245,6 +234,3 @@ panic = 'abort'
 strip = true
 #opt-level = 'z' # only have smaller size after strip
 rpath = true
-
-[profile.dev]
-debug = 1

GEMINI.md

@@ -1 +0,0 @@
-AGENTS.md

README.md

@@ -4,7 +4,7 @@
   <a href="#how-to-build-with-docker">Docker</a> •
   <a href="#file-structure">Structure</a> •
   <a href="#snapshot">Snapshot</a><br>
-  [<a href="docs/README-UA.md">Українська</a>] | [<a href="docs/README-CS.md">česky</a>] | [<a href="docs/README-ZH.md">中文</a>] | [<a href="docs/README-HU.md">Magyar</a>] | [<a href="docs/README-ES.md">Español</a>] | [<a href="docs/README-FA.md">فارسی</a>] | [<a href="docs/README-FR.md">Français</a>] | [<a href="docs/README-DE.md">Deutsch</a>] | [<a href="docs/README-PL.md">Polski</a>] | [<a href="docs/README-ID.md">Indonesian</a>] | [<a href="docs/README-FI.md">Suomi</a>] | [<a href="docs/README-ML.md">മലയാളം</a>] | [<a href="docs/README-JP.md">日本語</a>] | [<a href="docs/README-NL.md">Nederlands</a>] | [<a href="docs/README-IT.md">Italiano</a>] | [<a href="docs/README-RU.md">Русский</a>] | [<a href="docs/README-PTBR.md">Português (Brasil)</a>] | [<a href="docs/README-EO.md">Esperanto</a>] | [<a href="docs/README-KR.md">한국어</a>] | [<a href="docs/README-AR.md">العربي</a>] | [<a href="docs/README-VN.md">Tiếng Việt</a>] | [<a href="docs/README-DA.md">Dansk</a>] | [<a href="docs/README-GR.md">Ελληνικά</a>] | [<a href="docs/README-TR.md">Türkçe</a>] | [<a href="docs/README-NO.md">Norsk</a>] | [<a href="docs/README-RO.md">Română</a>]<br>
+  [<a href="docs/README-UA.md">Українська</a>] | [<a href="docs/README-CS.md">česky</a>] | [<a href="docs/README-ZH.md">中文</a>] | [<a href="docs/README-HU.md">Magyar</a>] | [<a href="docs/README-ES.md">Español</a>] | [<a href="docs/README-FA.md">فارسی</a>] | [<a href="docs/README-FR.md">Français</a>] | [<a href="docs/README-DE.md">Deutsch</a>] | [<a href="docs/README-PL.md">Polski</a>] | [<a href="docs/README-ID.md">Indonesian</a>] | [<a href="docs/README-FI.md">Suomi</a>] | [<a href="docs/README-ML.md">മലയാളം</a>] | [<a href="docs/README-JP.md">日本語</a>] | [<a href="docs/README-NL.md">Nederlands</a>] | [<a href="docs/README-IT.md">Italiano</a>] | [<a href="docs/README-RU.md">Русский</a>] | [<a href="docs/README-PTBR.md">Português (Brasil)</a>] | [<a href="docs/README-EO.md">Esperanto</a>] | [<a href="docs/README-KR.md">한국어</a>] | [<a href="docs/README-AR.md">العربي</a>] | [<a href="docs/README-VN.md">Tiếng Việt</a>] | [<a href="docs/README-DA.md">Dansk</a>] | [<a href="docs/README-GR.md">Ελληνικά</a>] | [<a href="docs/README-TR.md">Türkçe</a>] | [<a href="docs/README-NO.md">Norsk</a>]<br>
   <b>We need your help to translate this README, <a href="https://github.com/rustdesk/rustdesk/tree/master/src/lang">RustDesk UI</a> and <a href="https://github.com/rustdesk/doc.rustdesk.com">RustDesk Doc</a> to your native language</b>
 </p>
 

appimage/AppImageBuilder-aarch64.yml

@@ -18,7 +18,7 @@ AppDir:
     id: rustdesk
     name: rustdesk
     icon: rustdesk
-    version: 1.4.8
+    version: 1.4.2
     exec: usr/share/rustdesk/rustdesk
     exec_args: $@
   apt:

appimage/AppImageBuilder-x86_64.yml

@@ -18,7 +18,7 @@ AppDir:
     id: rustdesk
     name: rustdesk
     icon: rustdesk
-    version: 1.4.8
+    version: 1.4.2
     exec: usr/share/rustdesk/rustdesk
     exec_args: $@
   apt:

build.py

@@ -17,8 +17,7 @@ osx = platform.platform().startswith(
 hbb_name = 'rustdesk' + ('.exe' if windows else '')
 exe_path = 'target/release/' + hbb_name
 if windows:
-    win_arch = 'arm64' if platform.machine().lower() in ('arm64', 'aarch64') else 'x64'
-    flutter_build_dir = f'build/windows/{win_arch}/runner/Release/'
+    flutter_build_dir = 'build/windows/x64/runner/Release/'
 elif osx:
     flutter_build_dir = 'build/macos/Build/Products/Release/'
 else:
@@ -173,7 +172,7 @@ def generate_build_script_for_docker():
             # flutter_rust_bridge
             dart pub global activate ffigen --version 5.0.1
             pushd /tmp && git clone https://github.com/SoLongAndThanksForAllThePizza/flutter_rust_bridge --depth=1 && popd
-            pushd /tmp/flutter_rust_bridge/frb_codegen && cargo install --path . --locked && popd
+            pushd /tmp/flutter_rust_bridge/frb_codegen && cargo install --path . && popd
             pushd flutter && flutter pub get && popd
             ~/.cargo/bin/flutter_rust_bridge_codegen --rust-input ./src/flutter_ffi.rs --dart-output ./flutter/lib/generated_bridge.dart
             # install vcpkg
@@ -300,7 +299,7 @@ Version: %s
 Architecture: %s
 Maintainer: rustdesk <info@rustdesk.com>
 Homepage: https://rustdesk.com
-Depends: libgtk-3-0t64 | libgtk-3-0, libxcb-randr0, libxdo3 | libxdo4, libxfixes3, libxcb-shape0, libxcb-xfixes0, libasound2t64 | libasound2, libsystemd0, curl, libva2, libva-drm2, libva-x11-2, libgstreamer-plugins-base1.0-0, libpam0g, gstreamer1.0-pipewire%s
+Depends: libgtk-3-0, libxcb-randr0, libxdo3, libxfixes3, libxcb-shape0, libxcb-xfixes0, libasound2, libsystemd0, curl, libva2, libva-drm2, libva-x11-2, libgstreamer-plugins-base1.0-0, libpam0g, gstreamer1.0-pipewire%s
 Recommends: libayatana-appindicator3-1
 Description: A remote control software.
 
@@ -318,7 +317,7 @@ def ffi_bindgen_function_refactor():
 
 def build_flutter_deb(version, features):
     if not skip_cargo:
-        system2(f'cargo build --locked --features {features} --lib --release')
+        system2(f'cargo build --features {features} --lib --release')
         ffi_bindgen_function_refactor()
     os.chdir('flutter')
     system2('flutter build linux --release')
@@ -406,17 +405,12 @@ def build_flutter_dmg(version, features):
     if not skip_cargo:
         # set minimum osx build target, now is 10.14, which is the same as the flutter xcode project
         system2(
-            f'MACOSX_DEPLOYMENT_TARGET=10.14 cargo build --locked --features {features} --release')
+            f'MACOSX_DEPLOYMENT_TARGET=10.14 cargo build --features {features} --release')
     # copy dylib
     system2(
         "cp target/release/liblibrustdesk.dylib target/release/librustdesk.dylib")
     os.chdir('flutter')
-    # cargo builds a single-arch dylib for the host; restrict Xcode to the same arch
-    # so the universal-by-default ARCHS_STANDARD doesn't try to link a missing slice.
-    # FLUTTER_XCODE_* env vars are forwarded to xcodebuild as build settings.
-    mac_arch = 'arm64' if platform.machine().lower() in ('arm64', 'aarch64') else 'x86_64'
-    system2(
-        f'FLUTTER_XCODE_ARCHS={mac_arch} FLUTTER_XCODE_ONLY_ACTIVE_ARCH=YES flutter build macos --release')
+    system2('flutter build macos --release')
     system2('cp -rf ../target/release/service ./build/macos/Build/Products/Release/RustDesk.app/Contents/MacOS/')
     '''
     system2(
@@ -428,7 +422,7 @@ def build_flutter_dmg(version, features):
 
 def build_flutter_arch_manjaro(version, features):
     if not skip_cargo:
-        system2(f'cargo build --locked --features {features} --lib --release')
+        system2(f'cargo build --features {features} --lib --release')
     ffi_bindgen_function_refactor()
     os.chdir('flutter')
     system2('flutter build linux --release')
@@ -439,7 +433,7 @@ def build_flutter_arch_manjaro(version, features):
 
 def build_flutter_windows(version, features, skip_portable_pack):
     if not skip_cargo:
-        system2(f'cargo build --locked --features {features} --lib --release')
+        system2(f'cargo build --features {features} --lib --release')
         if not os.path.exists("target/release/librustdesk.dll"):
             print("cargo build failed, please check rust source code.")
             exit(-1)
@@ -495,13 +489,13 @@ def main():
     if windows:
         # build virtual display dynamic library
         os.chdir('libs/virtual_display/dylib')
-        system2('cargo build --locked --release')
+        system2('cargo build --release')
         os.chdir('../../..')
 
         if flutter:
             build_flutter_windows(version, features, args.skip_portable_pack)
             return
-        system2('cargo build --locked --release --features ' + features)
+        system2('cargo build --release --features ' + features)
         # system2('upx.exe target/release/rustdesk.exe')
         system2('mv target/release/rustdesk.exe target/release/RustDesk.exe')
         pa = os.environ.get('P')
@@ -512,21 +506,20 @@ def main():
                 'target\\release\\rustdesk.exe')
         else:
             print('Not signed')
-        os.makedirs(res_dir, exist_ok=True)
         system2(
             f'cp -rf target/release/RustDesk.exe {res_dir}')
         os.chdir('libs/portable')
         system2('pip3 install -r requirements.txt')
         system2(
             f'python3 ./generate.py -f ../../{res_dir} -o . -e ../../{res_dir}/rustdesk-{version}-win7-install.exe')
-        system2(f'mv ../../{res_dir}/rustdesk-{version}-win7-install.exe ../..')
+        system2('mv ../../{res_dir}/rustdesk-{version}-win7-install.exe ../..')
     elif os.path.isfile('/usr/bin/pacman'):
         # pacman -S -needed base-devel
         system2("sed -i 's/pkgver=.*/pkgver=%s/g' res/PKGBUILD" % version)
         if flutter:
             build_flutter_arch_manjaro(version, features)
         else:
-            system2('cargo build --locked --release --features ' + features)
+            system2('cargo build --release --features ' + features)
             system2('git checkout src/ui/common.tis')
             system2('strip target/release/rustdesk')
             system2('ln -s res/pacman_install && ln -s res/PKGBUILD')
@@ -535,7 +528,7 @@ def main():
             version, version))
         # pacman -U ./rustdesk.pkg.tar.zst
     elif os.path.isfile('/usr/bin/yum'):
-        system2('cargo build --locked --release --features ' + features)
+        system2('cargo build --release --features ' + features)
         system2('strip target/release/rustdesk')
         system2(
             "sed -i 's/Version:    .*/Version:    %s/g' res/rpm.spec" % version)
@@ -545,7 +538,7 @@ def main():
                 version, version))
         # yum localinstall rustdesk.rpm
     elif os.path.isfile('/usr/bin/zypper'):
-        system2('cargo build --locked --release --features ' + features)
+        system2('cargo build --release --features ' + features)
         system2('strip target/release/rustdesk')
         system2(
             "sed -i 's/Version:    .*/Version:    %s/g' res/rpm-suse.spec" % version)
@@ -564,7 +557,7 @@ def main():
                 #     'mv target/release/bundle/deb/rustdesk*.deb ./flutter/rustdesk.deb')
                 build_flutter_deb(version, features)
         else:
-            system2('cargo --locked bundle --release --features ' + features)
+            system2('cargo bundle --release --features ' + features)
             if osx:
                 system2(
                     'strip target/release/bundle/osx/RustDesk.app/Contents/MacOS/rustdesk')

build.rs

@@ -18,7 +18,7 @@ fn build_mac() {
             b.flag("-DNO_InputMonitoringAuthStatus=1");
         }
     }
-    b.flag("-std=c++17").file(file).compile("macos");
+    b.file(file).compile("macos");
     println!("cargo:rerun-if-changed={}", file);
 }
 

docs/CODE_OF_CONDUCT-FR.md

@@ -1,143 +0,0 @@
-
-# Code de conduite des contributeurs
-
-## Notre engagement
-
-En tant que membres, contributeurs et responsables, nous nous engageons à faire
-de la participation à notre communauté une expérience exempte de harcèlement pour
-tous, indépendamment de l'âge, de la taille corporelle, du handicap visible ou
-invisible, de l'origine ethnique, des caractéristiques sexuelles, de l'identité
-et de l'expression de genre, du niveau d'expérience, de l'éducation, du statut
-socio-économique, de la nationalité, de l'apparence personnelle, de la race, de
-la religion ou de l'identité et de l'orientation sexuelle.
-
-Nous nous engageons à agir et à interagir de manière à contribuer à une
-communauté ouverte, accueillante, diversifiée, inclusive et saine.
-
-## Nos standards
-
-Exemples de comportements qui contribuent à un environnement positif pour notre
-communauté :
-
-* Faire preuve d'empathie et de bienveillance envers les autres
-* Respecter les opinions, les points de vue et les expériences différents
-* Donner et accepter gracieusement les retours constructifs
-* Assumer ses responsabilités, s'excuser auprès des personnes affectées par nos
-  erreurs et apprendre de l'expérience
-* Se concentrer sur ce qui est le mieux non seulement pour nous en tant
-  qu'individus, mais pour l'ensemble de la communauté
-
-Exemples de comportements inacceptables :
-
-* L'utilisation de langage ou d'images à caractère sexuel, et les attentions ou
-  avances sexuelles de quelque nature que ce soit
-* Le trolling, les commentaires insultants ou désobligeants, et les attaques
-  personnelles ou politiques
-* Le harcèlement public ou privé
-* La publication d'informations privées d'autrui, telles qu'une adresse physique
-  ou électronique, sans autorisation explicite
-* Tout autre comportement qui pourrait raisonnablement être considéré comme
-  inapproprié dans un cadre professionnel
-
-## Responsabilités en matière d'application
-
-Les responsables de la communauté sont chargés de clarifier et d'appliquer nos
-standards de comportement acceptable et prendront des mesures correctives
-appropriées et équitables en réponse à tout comportement qu'ils jugent
-inapproprié, menaçant, offensant ou nuisible.
-
-Les responsables de la communauté ont le droit et la responsabilité de
-supprimer, modifier ou rejeter les commentaires, commits, code, modifications
-du wiki, issues et autres contributions qui ne sont pas conformes à ce Code de
-conduite, et communiqueront les raisons de leurs décisions de modération le cas
-échéant.
-
-## Portée
-
-Ce Code de conduite s'applique dans tous les espaces communautaires, et
-s'applique également lorsqu'une personne représente officiellement la communauté
-dans les espaces publics. Les exemples de représentation de notre communauté
-incluent l'utilisation d'une adresse e-mail officielle, la publication via un
-compte de réseau social officiel, ou le fait d'agir en tant que représentant
-désigné lors d'un événement en ligne ou hors ligne.
-
-## Application
-
-Les cas de comportements abusifs, harcelants ou autrement inacceptables peuvent
-être signalés aux responsables de la communauté chargés de l'application à
-[info@rustdesk.com](mailto:info@rustdesk.com).
-Toutes les plaintes seront examinées et feront l'objet d'une enquête rapide et
-équitable.
-
-Tous les responsables de la communauté sont tenus de respecter la vie privée et
-la sécurité de la personne ayant signalé un incident.
-
-## Directives d'application
-
-Les responsables de la communauté suivront ces Directives d'impact communautaire
-pour déterminer les conséquences de toute action qu'ils jugent en violation de ce
-Code de conduite :
-
-### 1. Correction
-
-**Impact communautaire** : Utilisation d'un langage inapproprié ou autre
-comportement jugé non professionnel ou indésirable dans la communauté.
-
-**Conséquence** : Un avertissement écrit et privé de la part des responsables de
-la communauté, expliquant la nature de la violation et pourquoi le comportement
-était inapproprié. Des excuses publiques peuvent être demandées.
-
-### 2. Avertissement
-
-**Impact communautaire** : Une violation par un incident isolé ou une série
-d'actions.
-
-**Conséquence** : Un avertissement avec des conséquences en cas de comportement
-répété. Aucune interaction avec les personnes impliquées, y compris les
-interactions non sollicitées avec les personnes chargées d'appliquer le Code de
-conduite, pendant une période déterminée. Cela inclut d'éviter les interactions
-dans les espaces communautaires ainsi que dans les canaux externes comme les
-réseaux sociaux. Le non-respect de ces conditions peut entraîner une exclusion
-temporaire ou permanente.
-
-### 3. Exclusion temporaire
-
-**Impact communautaire** : Une violation grave des standards communautaires, y
-compris un comportement inapproprié persistant.
-
-**Conséquence** : Une exclusion temporaire de toute interaction ou communication
-publique avec la communauté pendant une période déterminée. Aucune interaction
-publique ou privée avec les personnes impliquées, y compris les interactions non
-sollicitées avec les personnes chargées d'appliquer le Code de conduite, n'est
-autorisée pendant cette période. Le non-respect de ces conditions peut entraîner
-une exclusion permanente.
-
-### 4. Exclusion permanente
-
-**Impact communautaire** : Démontrer un schéma de violation des standards
-communautaires, y compris un comportement inapproprié persistant, le harcèlement
-d'une personne, ou une agression envers des catégories de personnes ou leur
-dénigrement.
-
-**Conséquence** : Une exclusion permanente de toute interaction publique au sein
-de la communauté.
-
-## Attribution
-
-Ce Code de conduite est adapté du [Contributor Covenant][homepage], version 2.0,
-disponible à l'adresse
-[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
-
-Les Directives d'impact communautaire ont été inspirées par
-[l'échelle d'application du code de conduite de Mozilla][Mozilla CoC].
-
-Pour des réponses aux questions fréquentes sur ce code de conduite, consultez la
-FAQ à l'adresse [https://www.contributor-covenant.org/faq][FAQ]. Des traductions
-sont disponibles à l'adresse
-[https://www.contributor-covenant.org/translations][translations].
-
-[homepage]: https://www.contributor-covenant.org
-[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
-[Mozilla CoC]: https://github.com/mozilla/diversity
-[FAQ]: https://www.contributor-covenant.org/faq
-[translations]: https://www.contributor-covenant.org/translations

docs/CODE_OF_CONDUCT-RO.md

@@ -1,85 +0,0 @@
-# Codul de Conduită al Contributorilor
-
-## Angajamentul Nostru
-
-Noi, ca membri, contribuitori și lideri, ne angajăm să facem ca participarea în comunitatea noastră să fie o experiență fără hărțuire pentru toată lumea, indiferent de vârstă, dimensiunea corpului, dizabilități vizibile sau invizibile, etnie, caracteristici sexuale, identitate și exprimare de gen, nivel de experiență, educație, statut socio-economic, naționalitate, aspect personal, rasă, religie sau identitate și orientare sexuală.
-
-Ne angajăm să acționăm și să interacționăm în moduri care contribuie la o comunitate deschisă, primitoare, diversă, incluzivă și sănătoasă.
-
-## Standardele Noastre
-
-Exemple de comportamente care contribuie la un mediu pozitiv pentru comunitatea noastră includ:
-
-* Demonstrarea empatiei și a bunătății față de ceilalți
-* Respectarea opiniilor, punctelor de vedere și experiențelor diferite
-* Oferirea și acceptarea cu grație a feedback-ului constructiv
-* Asumarea responsabilității și cererea de scuze celor afectați de greșelile noastre și învățarea din experiență
-* Concentrarea pe ceea ce este cel mai bun nu doar pentru noi ca indivizi, ci pentru întreaga comunitate
-
-Exemple de comportamente inacceptabile includ:
-
-* Utilizarea limbajului sau imaginilor sexualizate, precum și atenția sau avansurile sexuale de orice fel
-* Trollare, insulte sau comentarii denigratoare și atacuri personale sau politice
-* Hărțuire publică sau privată
-* Publicarea informațiilor private ale altora, cum ar fi adresa fizică sau de e-mail, fără permisiunea explicită
-* Alte comportamente care ar putea fi considerate inadecvate într-un cadru profesional
-
-## Responsabilități de Aplicare
-
-Liderii comunității sunt responsabili pentru clarificarea și aplicarea standardelor noastre de comportament acceptabil și vor lua măsuri corective adecvate și echitabile ca răspuns la orice comportament pe care îl consideră inadecvat, amenințător, ofensator sau dăunător.
-
-Liderii comunității au dreptul și responsabilitatea de a elimina, edita sau respinge comentarii, commit-uri, cod, editări wiki, probleme și alte contribuții care nu se aliniază acestui Cod de Conduită și vor comunica motivele pentru deciziile de moderare atunci când este cazul.
-
-## Domeniu de Aplicare
-
-Acest Cod de Conduită se aplică în toate spațiile comunității și se aplică și atunci când un individ reprezintă oficial comunitatea în spații publice.  
-Exemple de reprezentare a comunității includ utilizarea unei adrese de e-mail oficiale, postarea printr-un cont oficial de social media sau acționarea ca reprezentant desemnat la un eveniment online sau offline.
-
-## Aplicare
-
-Cazurile de comportament abuziv, hărțuitor sau altfel inacceptabil pot fi raportate liderilor comunității responsabili pentru aplicare la [info@rustdesk.com](mailto:info@rustdesk.com).  
-Toate plângerile vor fi revizuite și investigate prompt și corect.
-
-Toți liderii comunității sunt obligați să respecte confidențialitatea și securitatea persoanei care raportează orice incident.
-
-## Ghiduri de Aplicare
-
-Liderii comunității vor urma aceste Ghiduri privind Impactul Comunității pentru a stabili consecințele pentru orice acțiune pe care o consideră o încălcare a acestui Cod de Conduită:
-
-### 1. Corectare
-
-**Impact asupra comunității**: Utilizarea limbajului neadecvat sau alte comportamente considerate neprofesionale sau nedorite în comunitate.
-
-**Consecință**: O avertizare scrisă și privată din partea liderilor comunității, oferind claritate asupra naturii încălcării și o explicație despre motivul pentru care comportamentul a fost inadecvat. Poate fi cerută o scuză publică.
-
-### 2. Avertisment
-
-**Impact asupra comunității**: Încălcare printr-un incident singular sau o serie de acțiuni.
-
-**Consecință**: Un avertisment cu consecințe pentru continuarea comportamentului. Nicio interacțiune cu persoanele implicate, inclusiv interacțiuni nesolicitate cu cei care aplică Codul de Conduită, pentru o perioadă specificată. Aceasta include evitarea interacțiunilor în spațiile comunității, precum și pe canale externe, cum ar fi rețelele sociale. Încălcarea acestor termeni poate duce la o suspendare temporară sau permanentă.
-
-### 3. Suspendare Temporară
-
-**Impact asupra comunității**: O încălcare serioasă a standardelor comunității, inclusiv comportament neadecvat susținut.
-
-**Consecință**: Suspendare temporară de la orice tip de interacțiune sau comunicare publică cu comunitatea pentru o perioadă specificată. Nicio interacțiune publică sau privată cu persoanele implicate, inclusiv interacțiuni nesolicitate cu cei care aplică Codul de Conduită, nu este permisă în această perioadă. Încălcarea acestor termeni poate duce la o interdicție permanentă.
-
-### 4. Interdicție Permanentă
-
-**Impact asupra comunității**: Demonstrând un tipar de încălcare a standardelor comunității, inclusiv comportament neadecvat susținut, hărțuire a unei persoane sau agresiune față de sau denigrare a unor grupuri de persoane.
-
-**Consecință**: Interdicție permanentă de la orice tip de interacțiune publică în cadrul comunității.
-
-## Atribuire
-
-Acest Cod de Conduită este adaptat din [Contributor Covenant][homepage], versiunea 2.0, disponibil la [https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
-
-Ghidurile privind Impactul Comunității au fost inspirate de [scara de aplicare a codului de conduită Mozilla][Mozilla CoC].
-
-Pentru răspunsuri la întrebări frecvente despre acest cod de conduită, vezi FAQ la [https://www.contributor-covenant.org/faq][FAQ]. Traduceri sunt disponibile la [https://www.contributor-covenant.org/translations][translations].
-
-[homepage]: https://www.contributor-covenant.org
-[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
-[Mozilla CoC]: https://github.com/mozilla/diversity
-[FAQ]: https://www.contributor-covenant.org/faq
-[translations]: https://www.contributor-covenant.org/translations

docs/CONTRIBUTING-FR.md

@@ -1,55 +0,0 @@
-
-# Contribuer à RustDesk
-
-RustDesk accueille les contributions de tous. Voici les directives si vous
-envisagez de nous aider :
-
-## Contributions
-
-Les contributions à RustDesk ou à ses dépendances doivent être soumises sous
-forme de pull requests GitHub. Chaque pull request sera examinée par un
-contributeur principal (une personne ayant la permission d'intégrer des
-correctifs) et sera soit intégrée dans la branche principale, soit accompagnée
-de retours sur les modifications requises. Toutes les contributions doivent
-suivre ce format, même celles des contributeurs principaux.
-
-Si vous souhaitez travailler sur une issue, veuillez d'abord la revendiquer en
-commentant sur l'issue GitHub indiquant que vous souhaitez la traiter. Cela
-permet d'éviter les efforts en double de la part des contributeurs sur la même
-issue.
-
-## Liste de vérification pour les pull requests
-
-- Partez de la branche master et, si nécessaire, effectuez un rebase sur la
-  branche master actuelle avant de soumettre votre pull request. Si elle ne
-  fusionne pas proprement avec master, il vous sera peut-être demandé de
-  rebaser vos modifications.
-
-- Les commits doivent être aussi petits que possible, tout en s'assurant que
-  chaque commit est correct de manière indépendante (c.-à-d. que chaque commit
-  doit compiler et passer les tests).
-
-- Les commits doivent être accompagnés d'une signature Developer Certificate of
-  Origin (http://developercertificate.org), indiquant que vous (et votre
-  employeur le cas échéant) acceptez d'être liés par les termes de la
-  [licence du projet](../LICENCE). Dans git, il s'agit de l'option `-s` de
-  `git commit`.
-
-- Si votre correctif n'est pas examiné ou si vous avez besoin qu'une personne
-  spécifique l'examine, vous pouvez @-mentionner un relecteur pour demander une
-  revue dans la pull request ou un commentaire, ou vous pouvez demander une
-  revue par [e-mail](mailto:info@rustdesk.com).
-
-- Ajoutez des tests relatifs au bug corrigé ou à la nouvelle fonctionnalité.
-
-Pour des instructions git spécifiques, consultez le
-[GitHub workflow 101](https://github.com/servo/servo/wiki/GitHub-workflow).
-
-## Conduite
-
-https://github.com/rustdesk/rustdesk/blob/master/docs/CODE_OF_CONDUCT.md
-
-## Communication
-
-Les contributeurs de RustDesk se retrouvent fréquemment sur
-[Discord](https://discord.gg/nDceKgxnkV).

docs/CONTRIBUTING-RO.md

@@ -1,31 +0,0 @@
-# Contribuții la RustDesk
-
-RustDesk primește cu plăcere contribuții din partea tuturor. Iată ghidurile dacă te gândești să ne ajuți:
-
-## Contribuții
-
-Contribuțiile la RustDesk sau la dependențele sale ar trebui făcute sub forma de pull request-uri pe GitHub. Fiecare pull request va fi revizuit de un contributor principal (cineva cu permisiunea de a aplica patch-uri) și fie va fi integrat în arborele principal, fie vor fi oferite sugestii pentru modificările necesare. Toate contribuțiile trebuie să urmeze acest format, chiar și cele ale contributorilor principali.
-
-Dacă dorești să lucrezi la o problemă, te rugăm să o revendici mai întâi comentând pe GitHub issue-ul pe care vrei să lucrezi. Aceasta previne eforturi duplicate din partea contributorilor asupra aceleiași probleme.
-
-## Lista de verificare pentru Pull Request
-
-- Creează un branch din branch-ul `master` și, dacă este necesar, fă rebase la branch-ul `master` curent înainte de a trimite pull request-ul. Dacă nu se poate integra curat cu `master`, ți se poate cere să faci rebase la modificările tale.
-
-- Commit-urile ar trebui să fie cât mai mici posibil, asigurând totodată că fiecare commit este corect independent (adică fiecare commit ar trebui să compileze și să treacă testele).
-
-- Commit-urile trebuie să fie însoțite de un semnătura Developer Certificate of Origin (http://developercertificate.org), care indică faptul că tu (și angajatorul tău, dacă este cazul) ești de acord să respecți termenii [licenței proiectului](../LICENCE). În git, aceasta este opțiunea `-s` la `git commit`.
-
-- Dacă patch-ul tău nu este revizuit sau ai nevoie ca o anumită persoană să-l revizuiască, poți @-reply unui reviewer cerând o revizuire în pull request sau într-un comentariu, sau poți solicita o revizuire prin [email](mailto:info@rustdesk.com).
-
-- Adaugă teste relevante pentru bug-ul corectat sau pentru funcționalitatea nouă.
-
-Pentru instrucțiuni specifice git, vezi [GitHub workflow 101](https://github.com/servo/servo/wiki/GitHub-workflow).
-
-## Conduită
-
-[Codul de Conduită RustDesk](https://github.com/rustdesk/rustdesk/blob/master/docs/CODE_OF_CONDUCT.md)
-
-## Comunicare
-
-Contributorii RustDesk frecventează [Discord](https://discord.gg/nDceKgxnkV).

docs/README-DE.md

@@ -1,14 +1,15 @@
 <p align="center">
-  <img src="../res/logo-header.svg" alt="RustDesk - Dein Remote-Desktop"><br>
+  <img src="../res/logo-header.svg" alt="RustDesk - Your remote desktop"><br>
+  <a href="#freie-öffentliche-server">Server</a> •
   <a href="#grobe-schritte-zum-kompilieren">Kompilieren</a> •
   <a href="#auf-docker-kompilieren">Docker</a> •
   <a href="#dateistruktur">Dateistruktur</a> •
   <a href="#screenshots">Screenshots</a><br>
-  [<a href="docs/README-UA.md">Українська</a>] | [<a href="docs/README-CS.md">česky</a>] | [<a href="docs/README-ZH.md">中文</a>] | [<a href="docs/README-HU.md">Magyar</a>] | [<a href="docs/README-ES.md">Español</a>] | [<a href="docs/README-FA.md">فارسی</a>] | [<a href="docs/README-FR.md">Français</a>] | [<a href="docs/README-DE.md">Deutsch</a>] | [<a href="docs/README-PL.md">Polski</a>] | [<a href="docs/README-ID.md">Indonesian</a>] | [<a href="docs/README-FI.md">Suomi</a>] | [<a href="docs/README-ML.md">മലയാളം</a>] | [<a href="docs/README-JP.md">日本語</a>] | [<a href="docs/README-NL.md">Nederlands</a>] | [<a href="docs/README-IT.md">Italiano</a>] | [<a href="docs/README-RU.md">Русский</a>] | [<a href="docs/README-PTBR.md">Português (Brasil)</a>] | [<a href="docs/README-EO.md">Esperanto</a>] | [<a href="docs/README-KR.md">한국어</a>] | [<a href="docs/README-AR.md">العربي</a>] | [<a href="docs/README-VN.md">Tiếng Việt</a>] | [<a href="docs/README-DA.md">Dansk</a>] | [<a href="docs/README-GR.md">Ελληνικά</a>] | [<a href="docs/README-TR.md">Türkçe</a>] | [<a href="docs/README-NO.md">Norsk</a>] | [<a href="docs/README-RO.md">Română</a>]<br>
+  [<a href="../README.md">English</a>] | [<a href="README-UA.md">Українська</a>] | [<a href="README-CS.md">česky</a>] | [<a href="README-ZH.md">中文</a>] | [<a href="README-HU.md">Magyar</a>] | [<a href="README-ES.md">Español</a>] | [<a href="README-FA.md">فارسی</a>] | [<a href="README-FR.md">Français</a>] | [<a href="README-PL.md">Polski</a>] | [<a href="README-ID.md">Indonesian</a>] | [<a href="README-FI.md">Suomi</a>] | [<a href="README-ML.md">മലയാളം</a>] | [<a href="README-JP.md">日本語</a>] | [<a href="README-NL.md">Nederlands</a>] | [<a href="README-IT.md">Italiano</a>] | [<a href="README-RU.md">Русский</a>] | [<a href="README-PTBR.md">Português (Brasil)</a>] | [<a href="README-EO.md">Esperanto</a>] | [<a href="README-KR.md">한국어</a>] | [<a href="README-AR.md">العربي</a>] | [<a href="README-VN.md">Tiếng Việt</a>] | [<a href="README-DA.md">Dansk</a>] | [<a href="README-GR.md">Ελληνικά</a>]<br>
   <b>Wir brauchen Ihre Hilfe, um dieses README, die <a href="https://github.com/rustdesk/rustdesk/tree/master/src/lang">RustDesk-Benutzeroberfläche</a> und die <a href="https://github.com/rustdesk/doc.rustdesk.com">Dokumentation</a> in Ihre Muttersprache zu übersetzen.</b>
 </p>
 
-> [!Caution]
+> [!Vorsicht]
 > **Haftungsausschluss bei Missbrauch::** <br>
 > Die Entwickler von RustDesk billigen oder unterstützen keine unethische oder illegale Nutzung dieser Software. Missbrauch, wie unbefugter Zugriff, unbefugte Kontrolle oder Verletzung der Privatsphäre, verstößt strikt gegen unsere Richtlinien. Die Autoren sind nicht verantwortlich für jeglichen Missbrauch der Anwendung.
 
@@ -27,14 +28,11 @@ RustDesk heißt jegliche Mitarbeit willkommen. Schauen Sie sich [CONTRIBUTING-DE
 
 [**Programm herunterladen**](https://github.com/rustdesk/rustdesk/releases)
 
-[**Nightly Builds**](https://github.com/rustdesk/rustdesk/releases/tag/nightly)
+[**Nächtliche Erstellung**](https://github.com/rustdesk/rustdesk/releases/tag/nightly)
 
-[<img src="https://f-droid.org/badge/get-it-on.png"
+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
     alt="Get it on F-Droid"
     height="80">](https://f-droid.org/en/packages/com.carriez.flutter_hbb)
-[<img src="https://flathub.org/api/badge?svg&locale=en"
-    alt="Get it on Flathub"
-    height="80">](https://flathub.org/apps/com.rustdesk.RustDesk)
 
 ## Abhängigkeiten
 
@@ -66,19 +64,18 @@ Bitte laden Sie die dynamische Bibliothek Sciter selbst herunter.
 ```sh
 sudo apt install -y zip g++ gcc git curl wget nasm yasm libgtk-3-dev clang libxcb-randr0-dev libxdo-dev \
         libxfixes-dev libxcb-shape0-dev libxcb-xfixes0-dev libasound2-dev libpulse-dev cmake make \
-        libclang-dev ninja-build libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libpam0g-dev
+        libclang-dev ninja-build libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev
 ```
 
 ### openSUSE Tumbleweed
 
 ```sh
-sudo zypper install gcc-c++ git curl wget nasm yasm gcc gtk3-devel clang libxcb-devel libXfixes-devel cmake alsa-lib-devel gstreamer-devel gstreamer-plugins-base-devel xdotool-devel pam-devel
+sudo zypper install gcc-c++ git curl wget nasm yasm gcc gtk3-devel clang libxcb-devel libXfixes-devel cmake alsa-lib-devel gstreamer-devel gstreamer-plugins-base-devel xdotool-devel
 ```
-
 ### Fedora 28 (CentOS 8)
 
 ```sh
-sudo yum -y install gcc-c++ git curl wget nasm yasm gcc gtk3-devel clang libxcb-devel libxdo-devel libXfixes-devel pulseaudio-libs-devel cmake alsa-lib-devel gstreamer1-devel gstreamer1-plugins-base-devel pam-devel
+sudo yum -y install gcc-c++ git curl wget nasm yasm gcc gtk3-devel clang libxcb-devel libxdo-devel libXfixes-devel pulseaudio-libs-devel cmake alsa-lib-devel
 ```
 
 ### Arch (Manjaro)
@@ -117,7 +114,7 @@ cd
 ```sh
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
 source $HOME/.cargo/env
-git clone --recurse-submodules https://github.com/rustdesk/rustdesk
+git clone https://github.com/rustdesk/rustdesk
 cd rustdesk
 mkdir -p target/debug
 wget https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so
@@ -132,7 +129,6 @@ Beginnen Sie damit, das Repository zu klonen und den Docker-Container zu bauen:
 ```sh
 git clone https://github.com/rustdesk/rustdesk
 cd rustdesk
-git submodule update --init --recursive
 docker build -t "rustdesk-builder" .
 ```
 
@@ -161,7 +157,6 @@ Bitte stellen Sie sicher, dass Sie diese Befehle im Stammverzeichnis des RustDes
 - **[libs/hbb_common](https://github.com/rustdesk/rustdesk/tree/master/libs/hbb_common)**: Video-Codec, Konfiguration, TCP/UDP-Wrapper, Protokoll-Puffer, fs-Funktionen für Dateitransfer und ein paar andere nützliche Funktionen
 - **[libs/scrap](https://github.com/rustdesk/rustdesk/tree/master/libs/scrap)**: Bildschirmaufnahme
 - **[libs/enigo](https://github.com/rustdesk/rustdesk/tree/master/libs/enigo)**: Plattformspezifische Maus- und Tastatursteuerung
-- **[libs/clipboard](https://github.com/rustdesk/rustdesk/tree/master/libs/clipboard)**: Datei kopieren und einfügen Implementierung für Windows, Linux, macOS.
 - **[src/ui](https://github.com/rustdesk/rustdesk/tree/master/src/ui)**: GUI
 - **[src/server](https://github.com/rustdesk/rustdesk/tree/master/src/server)**: Audio/Zwischenablage/Eingabe/Videodienste und Netzwerkverbindungen
 - **[src/client.rs](https://github.com/rustdesk/rustdesk/tree/master/src/client.rs)**: Starten einer Peer-Verbindung
@@ -172,11 +167,10 @@ Bitte stellen Sie sicher, dass Sie diese Befehle im Stammverzeichnis des RustDes
 
 ## Screenshots
 
-![Verbindungsmanager](https://github.com/rustdesk/rustdesk/assets/28412477/db82d4e7-c4bc-4823-8e6f-6af7eadf7651)
+![image](https://user-images.githubusercontent.com/71636191/113112362-ae4deb80-923b-11eb-957d-ff88daad4f06.png)
 
-![Verbunden zu einem Windows PC](https://github.com/rustdesk/rustdesk/assets/28412477/9baa91e9-3362-4d06-aa1a-7518edcbd7ea)
+![image](https://user-images.githubusercontent.com/71636191/113112619-f705a480-923b-11eb-911d-97e984ef52b6.png)
 
-![Dateiübertragung](https://github.com/rustdesk/rustdesk/assets/28412477/39511ad3-aa9a-4f8c-8947-1cce286a46ad)
-
-![TCP-Tunneling](https://github.com/rustdesk/rustdesk/assets/28412477/78e8708f-e87e-4570-8373-1360033ea6c5)
+![image](https://user-images.githubusercontent.com/71636191/113112857-3fbd5d80-923c-11eb-9836-768325faf906.png)
 
+![image](https://user-images.githubusercontent.com/71636191/135385039-38fdbd72-379a-422d-b97f-33df71fb1cec.png)

docs/README-FR.md

@@ -34,9 +34,9 @@ Les versions de bureau utilisent [sciter](https://sciter.com/) pour l'interface
 - Installez [vcpkg](https://github.com/microsoft/vcpkg), et définissez correctement la variable d'environnement `VCPKG_ROOT`.
 
   - Windows : vcpkg install libvpx:x64-windows-static libyuv:x64-windows-static opus:x64-windows-static aom:x64-windows-static
-  - Linux/macOS : vcpkg install libvpx libyuv opus aom
+  - Linux/Osx : vcpkg install libvpx libyuv opus aom
 
-- Exécutez `cargo run`
+- Exécuter `cargo run`
 
 ## Comment compiler/build sous Linux
 
@@ -93,7 +93,7 @@ cd rustdesk
 mkdir -p target/debug
 wget https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so
 mv libsciter-gtk.so target/debug
-cargo run
+Exécution du cargo
 ```
 
 ## Comment construire avec Docker

docs/README-KR.md

@@ -1,10 +1,10 @@
 <p align="center">
   <img src="../res/logo-header.svg" alt="RustDesk - Your remote desktop"><br>
-  <a href="#빌드를_위한_원시_단계">빌드</a> •
-  <a href="#Docker로_빌드하는_방법">Docker</a> •
-  <a href="#파일_구조">구조</a> •
-  <a href="#스크린샷">스냅샷</a><br>
-  [<a href="../README.md">English</a>] | [<a href="README-UA.md">Українська</a>] | [<a href="README-CS.md">česky</a>] | [<a href="README-ZH.md">中文</a>] | [<a href="README-HU.md">Magyar</a>] | [<a href="README-ES.md">Español</a>] | [<a href="README-FA.md">فارسی</a>] | [<a href="README-FR.md">Français</a>] | [<a href="README-DE.md">Deutsch</a>] | [<a href="README-PL.md">Polski</a>] | [<a href="README-ID.md">Indonesian</a>] | [<a href="README-FI.md">Suomi</a>] | [<a href="README-ML.md">മലയാളം</a>] | [<a href="README-JP.md">日本語</a>] | [<a href="README-NL.md">Nederlands</a>] | [<a href="README-IT.md">Italiano</a>] | [<a href="README-RU.md">Русский</a>] | [<a href="README-PTBR.md">Português (Brasil)</a>] | [<a href="README-EO.md">Esperanto</a>] | [<a href="README-KR.md">한국어</a>] | [<a href="README-AR.md">العربي</a>] | [<a href="README-VN.md">Tiếng Việt</a>] | [<a href="README-DA.md">Dansk</a>] | [<a href="README-GR.md">Ελληνικά</a>] | [<a href="README-TR.md">Türkçe</a>] | [<a href="README-NO.md">Norsk</a>] | [<a href="README-RO.md">Română</a>]<br>
+  <a href="#빌드를 위한 원시 단계">빌드</a> •
+  <a href="#Docker로 빌드하는 방법">Docker</a> •
+  <a href="#파일 구조">구조</a> •
+  <a href="#스크린샷">스냇샷</a><br>
+  [<a href="../README.md">English</a>] | [<a href="README-UA.md">Українська</a>] | [<a href="README-CS.md">česky</a>] | [<a href="README-ZH.md">中文</a>] | [<a href="README-HU.md">Magyar</a>] | [<a href="README-ES.md">Español</a>] | [<a href="README-FA.md">فارسی</a>] | [<a href="README-FR.md">Français</a>] | [<a href="README-DE.md">Deutsch</a>] | [<a href="README-PL.md">Polski</a>] | [<a href="README-ID.md">Indonesian</a>] | [<a href="README-FI.md">Suomi</a>] | [<a href="README-ML.md">മലയാളം</a>] | [<a href="README-JP.md">日本語</a>] | [<a href="README-NL.md">Nederlands</a>] | [<a href="README-IT.md">Italiano</a>] | [<a href="README-RU.md">Русский</a>] | [<a href="README-PTBR.md">Português (Brasil)</a>] | [<a href="README-EO.md">Esperanto</a>] | [<a href="README-KR.md">한국어</a>] | [<a href="README-AR.md">العربي</a>] | [<a href="README-VN.md">Tiếng Việt</a>] | [<a href="README-DA.md">Dansk</a>] | [<a href="README-GR.md">Ελληνικά</a>] | [<a href="README-TR.md">Türkçe</a>] | [<a href="README-NO.md">Norsk</a>]<br>
   <b>이 README, <a href="https://github.com/rustdesk/rustdesk/tree/master/src/lang">RustDesk UI</a> 및 <a href="https://github.com/rustdesk/doc.rustdesk.com">RustDesk 문서</a>를 귀하의 모국어로 번역하는 데 도움이 필요합니다</b>
 </p>
 
@@ -46,9 +46,9 @@ Sciter 동적 라이브러리를 직접 다운로드하세요.
 [Linux](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so) |
 [macOS](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.osx/libsciter.dylib)
 
-## 빌드를_위한_원시_단계
+## 빌드를 위한 원시 단계
 
-- Rust 개발 환경과 C++ 빌드 환경 준비
+- Rust 개발 환경과 C++ 빌드 환경을 준비합니다
 
 - [vcpkg](https://github.com/microsoft/vcpkg)를 설치하고 `VCPKG_ROOT` 환경 변수를 올바르게 설정합니다
 
@@ -125,7 +125,7 @@ mv libsciter-gtk.so target/debug
 VCPKG_ROOT=$HOME/vcpkg cargo run
 ```
 
-## Docker로_빌드하는_방법
+## Docker로 빌드하는 방법
 
 먼저 리포지토리를 복제하고 Docker 컨테이너를 빌드합니다:
 
@@ -156,7 +156,7 @@ target/release/rustdesk
 
 RustDesk 리포지토리의 루트에서 이러한 명령을 실행하고 있는지 확인하세요. 그렇지 않으면 응용 프로그램이 필요한 리소스를 찾지 못할 수 있습니다. 또한 `install` 또는 `run` 과 같은 다른 cargo 하위 명령은 호스트가 아닌 컨테이너 내부에 프로그램을 설치하거나 실행하므로 현재 이 방법을 통해 지원되지 않는다는 점에 유의하세요.
 
-## 파일_구조
+## 파일 구조
 
 - **[libs/hbb_common](https://github.com/rustdesk/rustdesk/tree/master/libs/hbb_common)**: 비디오 코덱, 구성, tcp/udp wrapper, protobuf, 파일 전송을 위한 fs 함수 및 기타 유틸리티 함수
 - **[libs/scrap](https://github.com/rustdesk/rustdesk/tree/master/libs/scrap)**: 화면 캡쳐

docs/README-PL.md

@@ -13,9 +13,7 @@ Porozmawiaj z nami na: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](http
 
 [![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-Zaawansowane%20Funkcje-blue)](https://rustdesk.com/pricing.html)
 
-## O projekcie
-
-RustDesk to wieloplatformowe oprogramowanie do zdalnego pulpitu, napisane w języku Rust, zaprojektowane z myślą o prostocie wdrożenia, bezpieczeństwie i pełnej kontroli użytkownika nad danymi. Aplikacja działa od razu po uruchomieniu i nie wymaga skomplikowanej konfiguracji. Możesz skorzystać z naszego darmowego serwera publicznego, [skonfigurować własny](https://rustdesk.com/server), lub [napisać własny serwer](https://github.com/rustdesk/rustdesk-server-demo).
+Kolejny program do zdalnego pulpitu, napisany w Rust. Działa od samego początku, nie wymaga konfiguracji. Masz pełną kontrolę nad swoimi danymi, bez obaw o bezpieczeństwo. Możesz skorzystać z naszego darmowego serwera publicznego, [skonfigurować własny](https://rustdesk.com/server), lub [napisać własny serwer](https://github.com/rustdesk/rustdesk-server-demo).
 
 ![image](https://user-images.githubusercontent.com/71636191/171661982-430285f0-2e12-4b1d-9957-4a58e375304d.png) 
 
@@ -33,7 +31,7 @@ RustDesk zaprasza do współpracy każdego. Zobacz [`docs/CONTRIBUTING-PL.md`](C
 
 ## Zależności
 
-Wersje desktopowe korzystają z biblioteki [sciter](https://sciter.com/) jako silnika GUI. Bibliotekę Sciter należy pobrać i zainstalować samodzielnie.
+Wersje desktopowe używają [sciter](https://sciter.com/) dla GUI, proszę pobrać samodzielnie bibliotekę sciter.
 
 [Windows](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.win/x64/sciter.dll) |
 [Linux](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so) |

docs/README-PTBR.md

@@ -1,82 +1,55 @@
 <p align="center">
   <img src="../res/logo-header.svg" alt="RustDesk - Seu desktop remoto"><br>
-  <a href="#compilar">Compilar</a> •
-  <a href="#como-compilar-com-o-docker">Docker</a> •
+  <a href="#servidores-públicos-grátis">Servidores</a> •
+  <a href="#compilação-crua">Compilar</a> •
+  <a href="#como-compilar-com-docker">Docker</a> •
   <a href="#estrutura-de-arquivos">Estrutura</a> •
-  <a href="#capturas-de-tela">Capturas de Tela</a><br>
-  [<a href="../README.md">Inglês</a>] | [<a href="docs/README-UA.md">Ucraniano</a>] | [<a href="docs/README-CS.md">Tcheco</a>] | [<a href="docs/README-ZH.md">Chinês</a>] | [<a href="docs/README-HU.md">Húngaro</a>] | [<a href="docs/README-ES.md">Espanhol</a>] | [<a href="docs/README-FA.md">Persa</a>] | [<a href="docs/README-FR.md">Francês</a>] | [<a href="docs/README-DE.md">Alemão</a>] | [<a href="docs/README-PL.md">Polonês</a>] | [<a href="docs/README-ID.md">Indonésio</a>] | [<a href="docs/README-FI.md">Finlandês</a>] | [<a href="docs/README-ML.md">Malaiala</a>] | [<a href="docs/README-JP.md">Japonês</a>] | [<a href="docs/README-NL.md">Holandês</a>] | [<a href="docs/README-IT.md">Italiano</a>] | [<a href="docs/README-RU.md">Russo</a>] | [<a href="docs/README-EO.md">Esperanto</a>] | [<a href="docs/README-KR.md">Coreano</a>] | [<a href="docs/README-AR.md">Árabe</a>] | [<a href="docs/README-VN.md">Vietnamita</a>] | [<a href="docs/README-DA.md">Dinamarquês</a>] | [<a href="docs/README-GR.md">Grego</a>] | [<a href="docs/README-TR.md">Turco</a>] | [<a href="docs/README-NO.md">Norueguês</a>] | [<a href="docs/README-RO.md">Romeno</a>]<br>
-  <b>Precisamos da sua ajuda para traduzir este README, a <a href="https://github.com/rustdesk/rustdesk/tree/master/src/lang">Interface do RustDesk</a> e a <a href="https://github.com/rustdesk/doc.rustdesk.com">Documentação do RustDesk</a> para o seu idioma nativo</b>
+  <a href="#screenshots">Screenshots</a><br>
+  [<a href="../README.md">English</a>] | [<a href="README-UA.md">Українська</a>] | [<a href="README-CS.md">česky</a>] | [<a href="README-ZH.md">中文</a>] | [<a href="README-HU.md">Magyar</a>] | [<a href="README-ES.md">Español</a>] | [<a href="README-FA.md">فارسی</a>] | [<a href="README-FR.md">Français</a>] | [<a href="README-DE.md">Deutsch</a>] | [<a href="README-PL.md">Polski</a>] | [<a href="README-ID.md">Indonesian</a>] | [<a href="README-FI.md">Suomi</a>] | [<a href="README-ML.md">മലയാളം</a>] | [<a href="README-JP.md">日本語</a>] | [<a href="README-NL.md">Nederlands</a>] | [<a href="README-IT.md">Italiano</a>] | [<a href="README-RU.md">Русский</a>] | [<a href="README-EO.md">Esperanto</a>] | [<a href="README-KR.md">한국어</a>] | [<a href="README-AR.md">العربي</a>] | [<a href="README-VN.md">Tiếng Việt</a>] | [<a href="README-GR.md">Ελληνικά</a>]<br>
+  <b>Precisamos de sua ajuda para traduzir este README e a <a href="https://github.com/rustdesk/rustdesk/tree/master/src/lang">UI do RustDesk</a> para sua língua nativa</b>
 </p>
 
-> [!Caution]
-> **Aviso de Isenção de Responsabilidade por Uso Indevido:** <br>
-> Os desenvolvedores do RustDesk não toleram ou apoiam qualquer uso antiético ou ilegal deste software. O uso indevido, como acesso não autorizado, controle ou invasão de privacidade, viola estritamente nossas diretrizes. Os autores não são responsáveis por qualquer uso indevido do aplicativo.
-
-
 Converse conosco: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk)
 
-[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-Advanced%20Features-blue)](https://rustdesk.com/pricing.html)
+[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-Recursos%20Avan%C3%A7ados-blue)](https://rustdesk.com/pricing.html)
 
-Mais uma solução de desktop remoto, escrita em Rust. Funciona imediatamente, sem necessidade de configuração. Você tem controle total dos seus dados, sem preocupações com segurança. Você pode usar nosso servidor de conexão/retransmissão (rendezvous/relay), [configurar o seu próprio](https://rustdesk.com/server) ou [escrever seu próprio servidor de conexão/retransmissão](https://github.com/rustdesk/rustdesk-server-demo).
+Mais um software de desktop remoto, escrito em Rust. Funciona por padrão, sem necessidade de configuração. Você tem completo controle de seus dados, sem se preocupar com segurança. Você pode usar nossos servidores de rendezvous/relay, [configurar seu próprio](https://rustdesk.com/server), ou [escrever seu próprio servidor de rendezvous/relay](https://github.com/rustdesk/rustdesk-server-demo).
 
-![image](https://user-images.githubusercontent.com/71636191/171661982-430285f0-2e12-4b1d-9957-4a58e375304d.png)
+RustDesk acolhe contribuições de todos. Leia [`docs/CONTRIBUTING.md`](CONTRIBUTING.md) para ver como começar.
 
-O RustDesk acolhe a contribuição de todos. Veja [CONTRIBUTING.md](docs/CONTRIBUTING.md) para ajuda em como começar.
-
-[**Perguntas Frequentes (FAQ)**](https://github.com/rustdesk/rustdesk/wiki/FAQ)
-
-[**DOWNLOAD DOS BINÁRIOS**](https://github.com/rustdesk/rustdesk/releases)
-
-[**VERSÕES NIGHTLY (EM DESENVOLVIMENTO)**](https://github.com/rustdesk/rustdesk/releases/tag/nightly)
-
-[<img src="https://f-droid.org/badge/get-it-on.png"
-    alt="Baixe no F-Droid"
-    height="80">](https://f-droid.org/en/packages/com.carriez.flutter_hbb)
-[<img src="https://flathub.org/api/badge?svg&locale=en"
-    alt="Baixe no Flathub"
-    height="80">](https://flathub.org/apps/com.rustdesk.RustDesk)
+[**DOWNLOAD DE BINÁRIOS**](https://github.com/rustdesk/rustdesk/releases)
 
 ## Dependências
 
-As versões de desktop usam Flutter ou Sciter (descontinuado) para a interface gráfica (GUI). Este tutorial é apenas para o Sciter, por ser mais fácil e amigável para começar. Verifique nosso [CI](https://github.com/rustdesk/rustdesk/blob/master/.github/workflows/flutter-build.yml) para instruções de compilação da versão em Flutter.
-
-Por favor, faça o download da biblioteca dinâmica do Sciter por conta própria.
+Versões de desktop utilizam [sciter](https://sciter.com/) para a GUI, por favor baixe a biblioteca dinâmica sciter por conta própria.
 
 [Windows](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.win/x64/sciter.dll) |
 [Linux](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so) |
-[macOS](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.osx/libsciter.dylib)
+[MacOS](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.osx/libsciter.dylib)
 
-## Passos básicos para compilar
+## Compilação crua
 
-- Prepare seu ambiente de desenvolvimento Rust e o ambiente de compilação C++
+- Prepare seu ambiente de desenvolvimento Rust e ambiente de compilação C++
 
-- Instale o [vcpkg](https://github.com/microsoft/vcpkg) e configure a variável de ambiente `VCPKG_ROOT` corretamente
+- Instale [vcpkg](https://github.com/microsoft/vcpkg), e configure a variável de ambiente `VCPKG_ROOT` corretamente
 
-  - Windows: `vcpkg install libvpx:x64-windows-static libyuv:x64-windows-static opus:x64-windows-static aom:x64-windows-static`
-  - Linux/macOS: `vcpkg install libvpx libyuv opus aom`
+  - Windows: vcpkg install libvpx:x64-windows-static libyuv:x64-windows-static opus:x64-windows-static aom:x64-windows-static
+  - Linux/MacOS: vcpkg install libvpx libyuv opus aom
 
 - Execute `cargo run`
 
-## [Compilar](https://rustdesk.com/docs/en/dev/build/)
-
-## Como Compilar no Linux
+## Como compilar no Linux
 
 ### Ubuntu 18 (Debian 10)
 
 ```sh
-sudo apt install -y zip g++ gcc git curl wget nasm yasm libgtk-3-dev clang libxcb-randr0-dev libxdo-dev         libxfixes-dev libxcb-shape0-dev libxcb-xfixes0-dev libasound2-dev libpulse-dev cmake make         libclang-dev ninja-build libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libpam0g-dev
-```
-
-### openSUSE Tumbleweed
-
-```sh
-sudo zypper install gcc-c++ git curl wget nasm yasm gcc gtk3-devel clang libxcb-devel libXfixes-devel cmake alsa-lib-devel gstreamer-devel gstreamer-plugins-base-devel xdotool-devel pam-devel
+sudo apt install -y g++ gcc git curl wget nasm yasm libgtk-3-dev clang libxcb-randr0-dev libxdo-dev libxfixes-dev libxcb-shape0-dev libxcb-xfixes0-dev libasound2-dev libpulse-dev cmake
 ```
 
 ### Fedora 28 (CentOS 8)
 
 ```sh
-sudo yum -y install gcc-c++ git curl wget nasm yasm gcc gtk3-devel clang libxcb-devel libxdo-devel libXfixes-devel pulseaudio-libs-devel cmake alsa-lib-devel gstreamer1-devel gstreamer1-plugins-base-devel pam-devel
+sudo yum -y install gcc-c++ git curl wget nasm yasm gcc gtk3-devel clang libxcb-devel libxdo-devel libXfixes-devel pulseaudio-libs-devel cmake alsa-lib-devel
 ```
 
 ### Arch (Manjaro)
@@ -85,7 +58,7 @@ sudo yum -y install gcc-c++ git curl wget nasm yasm gcc gtk3-devel clang libxcb-
 sudo pacman -Syu --needed unzip git cmake gcc curl wget yasm nasm zip make pkg-config clang gtk3 xdotool libxcb libxfixes alsa-lib pipewire
 ```
 
-### Instalar o vcpkg
+### Instale vcpkg
 
 ```sh
 git clone https://github.com/microsoft/vcpkg
@@ -97,7 +70,7 @@ export VCPKG_ROOT=$HOME/vcpkg
 vcpkg/vcpkg install libvpx libyuv opus aom
 ```
 
-### Corrigir o libvpx (Para Fedora)
+### Conserte libvpx (Para o Fedora)
 
 ```sh
 cd vcpkg/buildtrees/libvpx/src
@@ -110,12 +83,12 @@ cp libvpx.a $HOME/vcpkg/installed/x64-linux/lib/
 cd
 ```
 
-### Compilar
+### Compile
 
 ```sh
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
 source $HOME/.cargo/env
-git clone --recurse-submodules https://github.com/rustdesk/rustdesk
+git clone https://github.com/rustdesk/rustdesk
 cd rustdesk
 mkdir -p target/debug
 wget https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so
@@ -123,57 +96,57 @@ mv libsciter-gtk.so target/debug
 VCPKG_ROOT=$HOME/vcpkg cargo run
 ```
 
-## Como compilar com o Docker
+## Como compilar com Docker
 
-Comece clonando o repositório e construindo o contêiner Docker:
+Comece clonando o repositório e montando o container docker:
 
 ```sh
 git clone https://github.com/rustdesk/rustdesk
 cd rustdesk
-git submodule update --init --recursive
 docker build -t "rustdesk-builder" .
 ```
 
-Depois, cada vez que precisar compilar o aplicativo, execute o seguinte comando:
+Então, sempre que precisar compilar a aplicação, execute este comando:
 
 ```sh
 docker run --rm -it -v $PWD:/home/user/rustdesk -v rustdesk-git-cache:/home/user/.cargo/git -v rustdesk-registry-cache:/home/user/.cargo/registry -e PUID="$(id -u)" -e PGID="$(id -g)" rustdesk-builder
 ```
 
-Note que a primeira compilação pode demorar mais até que as dependências sejam armazenadas em cache; as compilações subsequentes serão mais rápidas. Além disso, se você precisar especificar argumentos diferentes para o comando de compilação, poderá fazê-lo ao final do comando na posição `<ARGUMENTOS-OPCIONAIS>`. Por exemplo, se você quiser compilar uma versão de lançamento (release) otimizada, executaria o comando acima seguido de `--release`. O executável resultante estará disponível na pasta `target` do seu sistema e pode ser executado com:
+Note que a primeira compilação pode demorar mais antes que as dependências sejam armazenadas em cache, as compilações subsequentes serão mais rápidas. Adicionalmente, se você precisar especificar argumentos diferentes para o comando de compilação, você pode fazê-lo ao final do comando na posição do `<OPTIONAL-ARGS>`. Por exemplo, se você gostaria de compilar uma versão de release otimizada, você executaria o comando acima seguido de `--release`. O executável gerado estará disponível no diretório alvo no seu sistema, e pode ser executado com:
 
 ```sh
 target/debug/rustdesk
 ```
 
-Ou, se estiver executando o executável de lançamento:
+Ou, se estiver rodando um executável de release:
 
 ```sh
 target/release/rustdesk
 ```
 
-Certifique-se de executar esses comandos a partir da raiz do repositório do RustDesk, do contrário o aplicativo pode não encontrar os recursos necessários. Note também que outros subcomandos do cargo, como `install` ou `run`, não são suportados atualmente por este método, pois instalariam ou executariam o programa dentro do contêiner em vez de no sistema hospedeiro.
+Por favor verifique que está executando estes comandos da raiz do repositório do RustDesk, senão a aplicação pode não encontrar os recursos necessários. Note também que outros subcomandos do cargo como `install` ou `run` não são suportados atualmente via este método, já que eles iriam instalar ou rodar o programa dentro do container ao invés do host.
 
-## Estrutura de Arquivos
+## Estrutura de arquivos
 
-- **[libs/hbb_common](https://github.com/rustdesk/rustdesk/tree/master/libs/hbb_common)**: codec de vídeo, configuração, encapsulador (wrapper) tcp/udp, protobuf, funções de sistema de arquivos para transferência de arquivos e algumas outras funções utilitárias.
-- **[libs/scrap](https://github.com/rustdesk/rustdesk/tree/master/libs/scrap)**: captura de tela.
-- **[libs/enigo](https://github.com/rustdesk/rustdesk/tree/master/libs/enigo)**: controle de teclado/mouse específico de cada plataforma.
-- **[libs/clipboard](https://github.com/rustdesk/rustdesk/tree/master/libs/clipboard)**: implementação de copiar e colar arquivos para Windows, Linux e macOS.
-- **[src/ui](https://github.com/rustdesk/rustdesk/tree/master/src/ui)**: interface Sciter antiga (descontinuada).
-- **[src/server](https://github.com/rustdesk/rustdesk/tree/master/src/server)**: serviços de áudio/área de transferência/entrada/vídeo e conexões de rede.
-- **[src/client.rs](https://github.com/rustdesk/rustdesk/tree/master/src/client.rs)**: inicia uma conexão direta (peer connection).
-- **[src/rendezvous_mediator.rs](https://github.com/rustdesk/rustdesk/tree/master/src/rendezvous_mediator.rs)**: Comunica-se com o [rustdesk-server](https://github.com/rustdesk/rustdesk-server), aguarda por conexão remota direta (perfuração de túnel TCP / hole punching) ou retransmitida.
-- **[src/platform](https://github.com/rustdesk/rustdesk/tree/master/src/platform)**: código específico de cada plataforma.
-- **[flutter](https://github.com/rustdesk/rustdesk/tree/master/flutter)**: código Flutter para desktop e dispositivos móveis.
-- **[flutter/web/js](https://github.com/rustdesk/rustdesk/tree/master/flutter/web/v1/js)**: JavaScript para o cliente web do Flutter.
+- **[libs/hbb_common](https://github.com/rustdesk/rustdesk/tree/master/libs/hbb_common)**: codec de vídeo, configurações, wrapper de tcp/udp, protobuf, funções de sistema de arquivos para transferência de arquivos, e outras funções utilitárias
+- **[libs/scrap](https://github.com/rustdesk/rustdesk/tree/master/libs/scrap)**: captura de tela
+- **[libs/enigo](https://github.com/rustdesk/rustdesk/tree/master/libs/enigo)**: controle de teclado/mouse específico a cada plataforma
+- **[src/ui](https://github.com/rustdesk/rustdesk/tree/master/src/ui)**: GUI
+- **[src/server](https://github.com/rustdesk/rustdesk/tree/master/src/server)**: serviços de áudio/área de transferência/entrada/vídeo, e conexões de rede
+- **[src/client.rs](https://github.com/rustdesk/rustdesk/tree/master/src/client.rs)**: iniciar uma conexão "peer to peer"
+- **[src/rendezvous_mediator.rs](https://github.com/rustdesk/rustdesk/tree/master/src/rendezvous_mediator.rs)**: Comunicação com [rustdesk-server](https://github.com/rustdesk/rustdesk-server), aguardar pela conexão remota direta (TCP hole punching) ou conexão indireta (relayed)
+- **[src/platform](https://github.com/rustdesk/rustdesk/tree/master/src/platform)**: código específico a cada plataforma
 
-## Capturas de Tela
+> [!Cuidadob]
+> **Aviso de uso indevido:** <br>
+> Os desenvolvedores do RustDesk não aprovam nem apoiam qualquer uso antiético ou ilegal deste software. O uso indevido, como acesso não autorizado, controle ou invasão de privacidade, é estritamente contra nossas diretrizes. Os autores não são responsáveis por qualquer uso indevido da aplicação.
 
-![Gerenciador de Conexões](https://github.com/rustdesk/rustdesk/assets/28412477/db82d4e7-c4bc-4823-8e6f-6af7eadf7651)
+## Screenshots
 
-![Conectado a um PC Windows](https://github.com/rustdesk/rustdesk/assets/28412477/9baa91e9-3362-4d06-aa1a-7518edcbd7ea)
+![image](https://user-images.githubusercontent.com/71636191/113112362-ae4deb80-923b-11eb-957d-ff88daad4f06.png)
 
-![Transferência de Arquivos](https://github.com/rustdesk/rustdesk/assets/28412477/39511ad3-aa9a-4f8c-8947-1cce286a46ad)
+![image](https://user-images.githubusercontent.com/71636191/113112619-f705a480-923b-11eb-911d-97e984ef52b6.png)
 
-![Tunelamento TCP](https://github.com/rustdesk/rustdesk/assets/28412477/78e8708f-e87e-4570-8373-1360033ea6c5)
+![image](https://user-images.githubusercontent.com/71636191/113112857-3fbd5d80-923c-11eb-9836-768325faf906.png)
+
+![image](https://user-images.githubusercontent.com/71636191/135385039-38fdbd72-379a-422d-b97f-33df71fb1cec.png)

docs/README-RO.md

@@ -1,181 +0,0 @@
-<p align="center">
-  <img src="../res/logo-header.svg" alt="RustDesk - desktopul tău la distanță"><br>
-  <a href="../README.md#raw-steps-to-build">Construire</a> •
-  <a href="../README.md#how-to-build-with-docker">Docker</a> •
-  <a href="../README.md#file-structure">Structură</a> •
-  <a href="../README.md#snapshot">Capturi</a><br>
-  [<a href="README-UA.md">Українська</a>] | [<a href="README-CS.md">česky</a>] | [<a href="README-ZH.md">中文</a>] | [<a href="README-HU.md">Magyar</a>] | [<a href="README-ES.md">Español</a>] | [<a href="README-FA.md">فارسی</a>] | [<a href="README-FR.md">Français</a>] | [<a href="README-DE.md">Deutsch</a>] | [<a href="README-PL.md">Polski</a>] | [<a href="README-ID.md">Indonesian</a>] | [<a href="README-FI.md">Suomi</a>] | [<a href="README-ML.md">മലയാളം</a>] | [<a href="README-JP.md">日本語</a>] | [<a href="README-NL.md">Nederlands</a>] | [<a href="README-IT.md">Italiano</a>] | [<a href="README-RU.md">Русский</a>] | [<a href="README-PTBR.md">Português (Brasil)</a>] | [<a href="README-EO.md">Esperanto</a>] | [<a href="README-KR.md">한국어</a>] | [<a href="README-AR.md">العربي</a>] | [<a href="README-VN.md">Tiếng Việt</a>] | [<a href="README-DA.md">Dansk</a>] | [<a href="README-GR.md">Ελληνικά</a>] | [<a href="README-TR.md">Türkçe</a>] | [<a href="README-NO.md">Norsk</a>] | [<a href="README-RO.md">Română</a>]<br>
-  <b>Avem nevoie de ajutorul tău pentru a traduce acest README, <a href="https://github.com/rustdesk/rustdesk/tree/master/src/lang">RustDesk UI</a> și <a href="https://github.com/rustdesk/doc.rustdesk.com">RustDesk Doc</a> în limba ta maternă</b>
-</p>
-
-> [!Atenție]
-> **Declinare de responsabilitate privind utilizarea abuzivă:** <br>
-> Dezvoltatorii RustDesk nu susțin sau aprobă utilizarea neetică sau ilegală a acestui software. Utilizarea abuzivă, cum ar fi accesul neautorizat, controlul sau invadarea intimității, este strict împotriva regulilor noastre. Autorii nu sunt responsabili pentru utilizarea necorespunzătoare a aplicației.
-
-
-Conversați cu noi: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk)
-
-[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-Advanced%20Features-blue)](https://rustdesk.com/pricing.html)
-
-Încă o soluție de desktop la distanță scrisă în Rust. Funcționează imediat, fără configurare necesară. Ai control total asupra datelor tale, fără probleme de securitate. Poți folosi serverul nostru de rendezvous/relay, [să-ți configurezi propriul server](https://rustdesk.com/server) sau [să scrii propriul server de rendezvous/relay](https://github.com/rustdesk/rustdesk-server-demo).
-
-![imagine](https://user-images.githubusercontent.com/71636191/171661982-430285f0-2e12-4b1d-9957-4a58e375304d.png)
-
-RustDesk primește contribuții de la oricine. Vezi [CONTRIBUTING.md](../docs/CONTRIBUTING.md) pentru ajutor la început.
-
-[**ÎNTREBĂRI FRECVENTE (FAQ)**](https://github.com/rustdesk/rustdesk/wiki/FAQ)
-
-[**DESCĂRCARE BINARE**](https://github.com/rustdesk/rustdesk/releases)
-
-[**BUILD NIGHTLY**](https://github.com/rustdesk/rustdesk/releases/tag/nightly)
-
-[<img src="https://f-droid.org/badge/get-it-on.png"
-    alt="Get it on F-Droid"
-    height="80">](https://f-droid.org/en/packages/com.carriez.flutter_hbb)
-[<img src="https://flathub.org/api/badge?svg&locale=en"
-    alt="Get it on Flathub"
-    height="80">](https://flathub.org/apps/com.rustdesk.RustDesk)
-
-## Dependențe
-
-Versiunile desktop folosesc Flutter sau Sciter (depreciat) pentru interfață; acest ghid este pentru Sciter doar, deoarece este mai ușor și mai prietenos pentru început. Vezi [CI](https://github.com/rustdesk/rustdesk/blob/master/.github/workflows/flutter-build.yml) pentru construire cu Flutter.
-
-Te rugăm să descarci singur librăria dinamică Sciter.
-
-[Windows](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.win/x64/sciter.dll) |
-[Linux](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so) |
-[macOS](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.osx/libsciter.dylib)
-
-## Pași pentru construire (Raw Steps to build)
-
-- Pregătește mediul de dezvoltare Rust și mediul de construire C++
-
-- Instalează [vcpkg](https://github.com/microsoft/vcpkg) și setează corect variabila de mediu `VCPKG_ROOT`
-
-  - Windows: vcpkg install libvpx:x64-windows-static libyuv:x64-windows-static opus:x64-windows-static aom:x64-windows-static
-  - Linux/macOS: vcpkg install libvpx libyuv opus aom
-
-- rulează `cargo run`
-
-## [Construire](https://rustdesk.com/docs/en/dev/build/)
-
-## Cum se construiește pe Linux
-
-### Ubuntu 18 (Debian 10)
-
-```sh
-sudo apt install -y zip g++ gcc git curl wget nasm yasm libgtk-3-dev clang libxcb-randr0-dev libxdo-dev \
-        libxfixes-dev libxcb-shape0-dev libxcb-xfixes0-dev libasound2-dev libpulse-dev cmake make \
-        libclang-dev ninja-build libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libpam0g-dev
-```
-
-### openSUSE Tumbleweed
-
-```sh
-sudo zypper install gcc-c++ git curl wget nasm yasm gcc gtk3-devel clang libxcb-devel libXfixes-devel cmake alsa-lib-devel gstreamer-devel gstreamer-plugins-base-devel xdotool-devel pam-devel
-```
-
-### Fedora 28 (CentOS 8)
-
-```sh
-sudo yum -y install gcc-c++ git curl wget nasm yasm gcc gtk3-devel clang libxcb-devel libxdo-devel libXfixes-devel pulseaudio-libs-devel cmake alsa-lib-devel gstreamer1-devel gstreamer1-plugins-base-devel pam-devel
-```
-
-### Arch (Manjaro)
-
-```sh
-sudo pacman -Syu --needed unzip git cmake gcc curl wget yasm nasm zip make pkg-config clang gtk3 xdotool libxcb libxfixes alsa-lib pipewire
-```
-
-### Instalează vcpkg
-
-```sh
-git clone https://github.com/microsoft/vcpkg
-cd vcpkg
-git checkout 2023.04.15
-cd ..
-vcpkg/bootstrap-vcpkg.sh
-export VCPKG_ROOT=$HOME/vcpkg
-vcpkg/vcpkg install libvpx libyuv opus aom
-```
-
-### Repară libvpx (Pentru Fedora)
-
-```sh
-cd vcpkg/buildtrees/libvpx/src
-cd *
-./configure
-sed -i 's/CFLAGS+=-I/CFLAGS+=-fPIC -I/g' Makefile
-sed -i 's/CXXFLAGS+=-I/CXXFLAGS+=-fPIC -I/g' Makefile
-make
-cp libvpx.a $HOME/vcpkg/installed/x64-linux/lib/
-cd
-```
-
-### Build
-
-```sh
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
-source $HOME/.cargo/env
-git clone --recurse-submodules https://github.com/rustdesk/rustdesk
-cd rustdesk
-mkdir -p target/debug
-wget https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so
-mv libsciter-gtk.so target/debug
-VCPKG_ROOT=$HOME/vcpkg cargo run
-```
-
-## Cum să construiești cu Docker
-
-Începe prin clonarea repository-ului și construirea imaginii Docker:
-
-```sh
-git clone https://github.com/rustdesk/rustdesk
-cd rustdesk
-git submodule update --init --recursive
-docker build -t "rustdesk-builder" .
-```
-
-Apoi, de fiecare dată când trebuie să construiești aplicația, rulează comanda următoare:
-
-```sh
-docker run --rm -it -v $PWD:/home/user/rustdesk -v rustdesk-git-cache:/home/user/.cargo/git -v rustdesk-registry-cache:/home/user/.cargo/registry -e PUID="$(id -u)" -e PGID="$(id -g)" rustdesk-builder
-```
-
-Reține că prima construire poate dura mai mult până când dependențele sunt în cache; construirile ulterioare vor fi mai rapide. De asemenea, dacă trebuie să specifici argumente diferite comenzii de build, le poți adăuga la finalul comenzii în poziția `<OPTIONAL-ARGS>`. De exemplu, pentru a construi o versiune optimizată de release, adaugă `--release`. Executabilul rezultat va fi disponibil în folderul `target` pe sistemul tău, și poate fi rulat cu:
-
-```sh
-target/debug/rustdesk
-```
-
-Sau, dacă rulezi un executabil release:
-
-```sh
-target/release/rustdesk
-```
-
-Asigură-te că rulezi aceste comenzi din rădăcina repository-ului RustDesk, altfel aplicația poate să nu găsească resursele necesare. De asemenea, reține că alte subcomenzi cargo, cum ar fi `install` sau `run`, nu sunt acceptate în prezent prin această metodă, deoarece ar instala sau rula programul în interiorul containerului în loc de gazdă.
-
-## Structura fișierelor
-
-- **[libs/hbb_common](https://github.com/rustdesk/rustdesk/tree/master/libs/hbb_common)**: codec video, config, wrapper tcp/udp, protobuf, funcții fs pentru transfer de fișiere și alte funcții utilitare
-- **[libs/scrap](https://github.com/rustdesk/rustdesk/tree/master/libs/scrap)**: capturare ecran
-- **[libs/enigo](https://github.com/rustdesk/rustdesk/tree/master/libs/enigo)**: control tastatură/mouse specific platformei
-- **[libs/clipboard](https://github.com/rustdesk/rustdesk/tree/master/libs/clipboard)**: implementare copy/paste pentru fișiere pentru Windows, Linux, macOS.
-- **[src/ui](https://github.com/rustdesk/rustdesk/tree/master/src/ui)**: interfață Sciter învechită (depreciată)
-- **[src/server](https://github.com/rustdesk/rustdesk/tree/master/src/server)**: servicii audio/clipboard/input/video și conexiuni de rețea
-- **[src/client.rs](https://github.com/rustdesk/rustdesk/tree/master/src/client.rs)**: inițiază o conexiune peer
-- **[src/rendezvous_mediator.rs](https://github.com/rustdesk/rustdesk/tree/master/src/rendezvous_mediator.rs)**: comunică cu [rustdesk-server](https://github.com/rustdesk/rustdesk-server), așteaptă conexiune directă remote (TCP hole punching) sau prin relay
-- **[src/platform](https://github.com/rustdesk/rustdesk/tree/master/src/platform)**: cod specific platformei
-- **[flutter](https://github.com/rustdesk/rustdesk/tree/master/flutter)**: cod Flutter pentru desktop și mobil
-- **[flutter/web/js](https://github.com/rustdesk/rustdesk/tree/master/flutter/web/v1/js)**: JavaScript pentru clientul Flutter web
-
-## Capturi de ecran
-
-![Connection Manager](https://github.com/rustdesk/rustdesk/assets/28412477/db82d4e7-c4bc-4823-8e6f-6af7eadf7651)
-
-![Connected to a Windows PC](https://github.com/rustdesk/rustdesk/assets/28412477/9baa91e9-3362-4d06-aa1a-7518edcbd7ea)
-
-![File Transfer](https://github.com/rustdesk/rustdesk/assets/28412477/39511ad3-aa9a-4f8c-8947-1cce286a46ad)
-
-![TCP Tunneling](https://github.com/rustdesk/rustdesk/assets/28412477/78e8708f-e87e-4570-8373-1360033ea6c5)

docs/README-RU.md

@@ -167,7 +167,7 @@ target/release/rustdesk
 - **[src/ui](https://github.com/rustdesk/rustdesk/tree/master/src/ui)**: графический пользовательский интерфейс на Sciter (устаревшее)
 - **[src/server](https://github.com/rustdesk/rustdesk/tree/master/src/server)**: сервисы аудио, буфера обмена, ввода, видео и сетевых подключений
 - **[src/client.rs](https://github.com/rustdesk/rustdesk/tree/master/src/client.rs)**: одноранговое соединение
-- **[src/rendezvous_mediator.rs](https://github.com/rustdesk/rustdesk/tree/master/src/rendezvous_mediator.rs)**: связь с [сервером RustDesk](https://github.com/rustdesk/rustdesk-server), ожидает удаленного прямого (через TCP hole punching) или ретранслируемого соединения
+- **[src/rendezvous_mediator.rs](https://github.com/rustdesk/rustdesk/tree/master/src/rendezvous_mediator.rs)**: связь с [сервером Rustdesk](https://github.com/rustdesk/rustdesk-server), ожидает удаленного прямого (через TCP hole punching) или ретранслируемого соединения
 - **[src/platform](https://github.com/rustdesk/rustdesk/tree/master/src/platform)**: специфичный для платформы код
 - **[flutter](https://github.com/rustdesk/rustdesk/tree/master/flutter)**: код Flutter для ПК-версии и мобильных устройств
 - **[flutter/web/js](https://github.com/rustdesk/rustdesk/tree/master/flutter/web/v1/js)**: JavaScript для Web-клиента Flutter

docs/README-TR.md

@@ -7,37 +7,34 @@
   <a href="#file-structure">Dosya Yapısı</a> •
   <a href="#snapshot">Ekran Görüntüleri</a><br>
   [<a href="docs/README-UA.md">Українська</a>] | [<a href="docs/README-CS.md">česky</a>] | [<a href="docs/README-ZH.md">中文</a>] | [<a href="docs/README-HU.md">Magyar</a>] | [<a href="docs/README-ES.md">Español</a>] | [<a href="docs/README-FA.md">فارسی</a>] | [<a href="docs/README-FR.md">Français</a>] | [<a href="docs/README-DE.md">Deutsch</a>] | [<a href="docs/README-PL.md">Polski</a>] | [<a href="docs/README-ID.md">Indonesian</a>] | [<a href="docs/README-FI.md">Suomi</a>] | [<a href="docs/README-ML.md">മലയാളം</a>] | [<a href="docs/README-JP.md">日本語</a>] | [<a href="docs/README-NL.md">Nederlands</a>] | [<a href="docs/README-IT.md">Italiano</a>] | [<a href="docs/README-RU.md">Русский</a>] | [<a href="docs/README-PTBR.md">Português (Brasil)</a>] | [<a href="docs/README-EO.md">Esperanto</a>] | [<a href="docs/README-KR.md">한국어</a>] | [<a href="docs/README-AR.md">العربي</a>] | [<a href="docs/README-VN.md">Tiếng Việt</a>] | [<a href="docs/README-DA.md">Dansk</a>] | [<a href="docs/README-GR.md">Ελληνικά</a>]<br>
-  <b>README, <a href="https://github.com/rustdesk/rustdesk/tree/master/src/lang">RustDesk UI</a> ve <a href="https://github.com/rustdesk/doc.rustdesk.com">RustDesk Dökümantasyonu</a>'nu ana dilinize çevirmemiz için yardımınıza ihtiyacımız var</b>
+  <b>README, <a href="https://github.com/rustdesk/rustdesk/tree/master/src/lang">RustDesk UI</a> ve <a href="https://github.com/rustdesk/doc.rustdesk.com">RustDesk Belge</a>'sini ana dilinize çevirmemiz için yardımınıza ihtiyacımız var</b>
 </p>
 
-
-> [!Dikkat]
-> **Yanlış Kullanım Uyarısı:** <br>
-> RustDesk geliştiricileri, bu yazılımın etik olmayan veya yasa dışı kullanımını onaylamaz veya desteklemez. Yetkisiz erişim, kontrol veya gizlilik ihlali gibi kötüye kullanımlar kesinlikle yönergelerimize aykırıdır. Yazarlar, uygulamanın herhangi bir yanlış kullanımından sorumlu değildir.
-
 Bizimle sohbet edin: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk)
 
 [![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-Geli%C5%9Fmi%C5%9F%20%C3%96zellikler-blue)](https://rustdesk.com/pricing.html)
 
-Rust dilinde yazılmış, başka bir uzak masaüstü yazılımı daha. Hiçbir yapılandırma gerekmeksizin, hemen kullanıma hazır. Güvenlik konusunda hiçbir endişe duymadan, verileriniz üzerinde tam kontrole sahip olun. Kendi rendezvous/relay sunucumuzu kullanabilirsiniz, [kendi sunucunuzu kurabilirsiniz](https://rustdesk.com/server) veya [kendi rendezvous/relay sunucunuzu yazabilirsiniz](https://github.com/rustdesk/rustdesk-server-demo).
+Başka bir uzak masaüstü yazılımı daha, Rust dilinde yazılmış. Hemen kullanıma hazır, hiçbir yapılandırma gerektirmez. Verilerinizin tam kontrolünü elinizde tutarsınız ve güvenlikle ilgili endişeleriniz olmaz. Kendi buluş/iletme sunucumuzu kullanabilirsiniz, [kendi sunucunuzu kurabilirsiniz](https://rustdesk.com/server) veya [kendi buluş/iletme sunucunuzu yazabilirsiniz](https://github.com/rustdesk/rustdesk-server-demo).
 
 ![image](https://user-images.githubusercontent.com/71636191/171661982-430285f0-2e12-4b1d-9957-4a58e375304d.png)
 
-RustDesk, herkesin katkısına açıktır. Başlamak için [CONTRIBUTING.md](CONTRIBUTING-TR.md) belgesine göz atın.
+RustDesk, herkesten katkıyı kabul eder. Başlamak için [CONTRIBUTING.md](CONTRIBUTING-TR.md) belgesine göz atın.
 
 [**SSS**](https://github.com/rustdesk/rustdesk/wiki/FAQ)
 
-[**BINARY İNDİR**](https://github.com/rustdesk/rustdesk/releases)
+[**BİNARİ İNDİR**](https://github.com/rustdesk/rustdesk/releases)
 
-[**NIGHTLY DERLEME**](https://github.com/rustdesk/rustdesk/releases/tag/nightly)
+[**NİGHTLY DERLEME**](https://github.com/rustdesk/rustdesk/releases/tag/nightly)
 
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
     alt="F-Droid'de Alın"
     height="80">](https://f-droid.org/en/packages/com.carriez.flutter_hbb)
 
-## Gereksinimler
+## Bağımlılıklar
 
-Masaüstü sürümleri GUI için; [Sciter](https://sciter.com/)(kaldırılacak) veya Flutter kullanır. Sciter daha kolay ve başlamak için daha dostcanlısı, bundan dolayı bu kılavuz sadece Sciter içindir. Flutter sürümünü derlemek için [CI](https://github.com/rustdesk/rustdesk/blob/master/.github/workflows/flutter-build.yml)'ımıza bakın.
+Masaüstü sürümleri GUI için
+
+ [Sciter](https://sciter.com/) veya Flutter kullanır, bu kılavuz sadece Sciter içindir.
 
 Lütfen Sciter dinamik kütüphanesini kendiniz indirin.
 
@@ -49,7 +46,7 @@ Lütfen Sciter dinamik kütüphanesini kendiniz indirin.
 
 - Rust geliştirme ortamınızı ve C++ derleme ortamınızı hazırlayın.
 
-- [vcpkg](https://github.com/microsoft/vcpkg) yükleyin ve `VCPKG_ROOT` ortam değişkenini doğru bir şekilde ayarlayın.
+- [vcpkg](https://github.com/microsoft/vcpkg) yükleyin ve `VCPKG_ROOT` çevresel değişkenini doğru bir şekilde ayarlayın.
 
   - Windows: vcpkg install libvpx:x64-windows-static libyuv:x64-windows-static opus:x64-windows-static aom:x64-windows-static
   - Linux/macOS: vcpkg install libvpx libyuv opus aom
@@ -126,7 +123,7 @@ VCPKG_ROOT=$HOME/vcpkg cargo run
 
 ## Docker ile Derleme Nasıl Yapılır
 
-Önce repository'i klonlayın ve Docker container'ını oluşturun.
+Öncelikle deposunu klonlayın ve Docker konteynerini oluşturun:
 
 ```sh
 git clone https://github.com/rustdesk/rustdesk
@@ -134,40 +131,44 @@ cd rustdesk
 docker build -t "rustdesk-builder" .
 ```
 
-Ardından, uygulamayı her derlemeniz gerektiğinde aşağıdaki komutu çalıştırın:
+Ardından, uygulamayı derlemek için her seferinde aşağıdaki komutu çalıştırın:
 
 ```sh
 docker run --rm -it -v $PWD:/home/user/rustdesk -v rustdesk-git-cache:/home/user/.cargo/git -v rustdesk-registry-cache:/home/user/.cargo/registry -e PUID="$(id -u)" -e PGID="$(id -g)" rustdesk-builder
 ```
 
-Bilin ki ilk derlemeniz gereksinimlerin önbelleği yüklenmesinden ötürü uzun sürebilir, sonraki derlemeleriniz daha hızlı olacaktır. Ayrıca, derleme komutuna isteğe bağlı argümanlar belirtmeniz gerekiyorsa, bunu komutun sonunda ki `<OPTIONAL-ARGS>` yerine yazabilirsiniz. Örneğin, optimize edilmiş bir sürümü derlemek isterseniz, yukarıdaki komutu çalıştırdıktan sonra `--release` ekleyebilirsiniz. Oluşan çalıştırılabilir dosya sisteminizdeki hedef klasöründe bulunacak ve şu komutla çalıştırılabilir olacaktır:
+İlk derleme, bağımlılıklar önbelleğe alınmadan önce daha uzun sürebilir, sonraki derlemeler daha hızlı olacaktır. Ayrıca, derleme komutuna isteğe bağlı argümanlar belirtmeniz gerekiyorsa, bunu
+
+ komutun sonunda `<İSTEĞE BAĞLI-ARGÜMANLAR>` pozisyonunda yapabilirsiniz. Örneğin, optimize edilmiş bir sürümü derlemek isterseniz, yukarıdaki komutu çalıştırdıktan sonra `--release` ekleyebilirsiniz. Oluşan yürütülebilir dosya sisteminizdeki hedef klasöründe bulunacak ve şu komutla çalıştırılabilir:
 
 ```sh
 target/debug/rustdesk
 ```
 
-Veya, yayım çalıştırılabilir dosyası için:
+Veya, yayın yürütülebilir dosyası çalıştırılıyorsa:
 
 ```sh
 target/release/rustdesk
 ```
 
-Lütfen bu komutları RustDesk reposunun root klasöründe çalıştırdığınızdan emin olun, aksi takdirde uygulama gereken kaynakları bulamayabilir. Ayrıca, `install` veya `run` gibi diğer cargo altkomutları şu anda bu yöntem aracılığıyla desteklenmemektedir, çünkü bunlar programı konteyner içinde kurar veya çalıştırır, ana makinede değil.
+Lütfen bu komutları RustDesk deposunun kökünden çalıştırdığınızdan emin olun, aksi takdirde uygulama gereken kaynakları bulamayabilir. Ayrıca, `install` veya `run` gibi diğer cargo altkomutları şu anda bu yöntem aracılığıyla desteklenmemektedir, çünkü bunlar programı konteyner içinde kurar veya çalıştırır ve ana makinede değil.
  
 ## Dosya Yapısı
 
-- **[libs/hbb_common](https://github.com/rustdesk/rustdesk/tree/master/libs/hbb_common)**: video codec, config, tcp/udp wrapper, protobuf, dosya transferi için fs fonksiyonları ve diğer bazı yardımcı işlevler
+- **[libs/hbb_common](https://github.com/rustdesk/rustdesk/tree/master/libs/hbb_common)**: video kodlayıcı, yapılandırma, tcp/udp sarmalayıcı, protobuf, dosya transferi için fs işlevleri ve diğer bazı yardımcı işlevler
 - **[libs/scrap](https://github.com/rustdesk/rustdesk/tree/master/libs/scrap)**: ekran yakalama
 - **[libs/enigo](https://github.com/rustdesk/rustdesk/tree/master/libs/enigo)**: platforma özgü klavye/fare kontrolü
-- **[libs/clipboard](https://github.com/rustdesk/rustdesk/tree/master/libs/clipboard)**: platforma özgü kopyala/yapıştır implementasyonları.
-- **[src/ui](https://github.com/rustdesk/rustdesk/tree/master/src/ui)**: Eski Sciter UI (kaldırılacak)
-- **[src/server](https://github.com/rustdesk/rustdesk/tree/master/src/server)**: ses/pano/input/video servisleri ve ağ bağlantıları
-- **[src/client.rs](https://github.com/rustdesk/rustdesk/tree/master/src/client.rs)**: Eşli bağlantı başlat
-- **[src/rendezvous_mediator.rs](https://github.com/rustdesk/rustdesk/tree/master/src/rendezvous_mediator.rs)**: [rustdesk-server](https://github.com/rustdesk/rustdesk-server) ile iletişime gir, remote direct(TCP delik açma) yada relay bağlantısı için bekle
+- **[src/ui](https://github.com/rustdesk/rustdesk/tree/master/src/ui)**: GUI
+- **[src/server](https://github.com/rustdesk/rustdesk/tree/master/src/server)**: ses/pasta/klavye/video hizmetleri ve ağ bağlantıları
+- **[src/client.rs](https://github.com/rustdesk/rustdesk/tree/master/src/client.rs)**: bir eş bağlantısı başlatır
+- **[src/rendezvous_mediator.rs](https://github.com/rustdesk/rustdesk/tree/master/src/rendezvous_mediator.rs)**: [rustdesk-server](https://github.com/rustdesk/rustdesk-server) ile iletişim kurar, uzak doğrudan (TCP delik vurma) veya iletme bağlantısını bekler
 - **[src/platform](https://github.com/rustdesk/rustdesk/tree/master/src/platform)**: platforma özgü kod
-- **[flutter](https://github.com/rustdesk/rustdesk/tree/master/flutter)**: Masaüstü ve mobil için Flutter kodu
-- **[flutter/web/js](https://github.com/rustdesk/rustdesk/tree/master/flutter/web/v1/js)**: Flutter web istemcisi için JavaScript
+- **[flutter](https://github.com/rustdesk/rustdesk/tree/master/flutter)**: mobil için Flutter kodu
+- **[flutter/web/js](https://github.com/rustdesk/rustdesk/tree/master/flutter/web/js)**: Flutter web istemcisi için JavaScript
 
+> [!Dikkat]
+> **Yanlış Kullanım Uyarısı:** <br>
+> RustDesk geliştiricileri, bu yazılımın etik olmayan veya yasa dışı kullanımını onaylamaz veya desteklemez. Yetkisiz erişim, kontrol veya gizlilik ihlali gibi kötüye kullanımlar kesinlikle yönergelerimize aykırıdır. Yazarlar, uygulamanın herhangi bir yanlış kullanımından sorumlu değildir.
 
 ## Ekran Görüntüleri
 

docs/SECURITY-FR.md

@@ -1,16 +0,0 @@
-
-# Politique de sécurité
-
-## Signaler une vulnérabilité
-
-Nous accordons une très grande importance à la sécurité du projet. Nous
-encourageons tous les utilisateurs à nous signaler toute vulnérabilité qu'ils
-découvrent.
-
-Si vous trouvez une vulnérabilité de sécurité dans le projet RustDesk, veuillez
-la signaler de manière responsable en envoyant un e-mail à info@rustdesk.com.
-
-À ce stade, nous n'avons pas de programme de bug bounty. Nous sommes une petite
-équipe qui s'attaque à un grand défi. Nous vous encourageons vivement à signaler
-toute vulnérabilité de manière responsable afin que nous puissions continuer à
-développer une application sécurisée pour l'ensemble de la communauté.

docs/SECURITY-RO.md

@@ -1,9 +0,0 @@
-# Politica de Securitate
-
-## Raportarea unei Vulnerabilități
-
-Acordăm o mare importanță securității proiectului. Încurajăm toți utilizatorii să ne raporteze orice vulnerabilități pe care le descoperă.  
-Dacă găsești o vulnerabilitate de securitate în proiectul RustDesk, te rugăm să o raportezi responsabil trimițând un e-mail la info@rustdesk.com.
-
-În acest moment, nu avem un program de recompense pentru descoperirea de bug-uri. Suntem o echipă mică care încearcă să rezolve o problemă mare.  
-Te rugăm să raportezi orice vulnerabilitate în mod responsabil, astfel încât să putem continua să construim o aplicație sigură pentru întreaga comunitate.

entrypoint.sh

@@ -33,4 +33,4 @@ if [ -z $release ]; then
 fi
 set -f
 #shellcheck disable=2086
-VCPKG_ROOT=/vcpkg cargo build --locked $argv
+VCPKG_ROOT=/vcpkg cargo build $argv

flatpak/com.rustdesk.RustDesk.metainfo.xml

@@ -18,7 +18,7 @@
       <li> Supports VP8 / VP9 / AV1 software codecs, and H264 / H265 hardware codecs. </li>
       <li> Own your data, easily set up self-hosting solution on your infrastructure. </li>
       <li> P2P connection with end-to-end encryption based on NaCl. </li>
-      <li> No administrative privileges or installation needed for Windows, elevate privilege locally or from remote on demand. </li>
+      <li> No administrative privileges or installation needed for Windows, elevate priviledge locally or from remote on demand. </li>
       <li> We like to keep things simple and will strive to make simpler where possible. </li>
     </ul>
     <p>
@@ -56,4 +56,4 @@
     <control>pointing</control>
   </supports>
   <content_rating type="oars-1.1"/>
-</component>
+</component>

flatpak/rustdesk.json

@@ -55,8 +55,8 @@
   ],
   "finish-args": [
     "--share=ipc",
+    "--socket=fallback-x11",
     "--socket=wayland",
-    "--socket=x11",
     "--share=network",
     "--filesystem=home",
     "--device=dri",

flutter/android/app/build.gradle

@@ -1,6 +1,4 @@
 import com.google.protobuf.gradle.*
-import groovy.json.JsonSlurper
-
 plugins {
     id "com.google.protobuf" version "0.9.4"
     id "com.android.application"
@@ -32,37 +30,8 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-// Add rustls-platform-verifier Android support
-String findRustlsPlatformVerifierMavenDir() {
-    def dependencyText = providers.exec {
-        it.workingDir = new File("../..")
-        commandLine("cargo", "metadata", "--format-version", "1")
-    }.standardOutput.asText.get()
-
-    def dependencyJson = new JsonSlurper().parseText(dependencyText)
-    def pkg = dependencyJson.packages.find { it.name == "rustls-platform-verifier-android" }
-    
-    if (pkg == null) {
-        throw new GradleException("rustls-platform-verifier-android package not found in cargo metadata!")
-    }
-    
-    def manifestPath = file(pkg.manifest_path)
-    def mavenDir = new File(manifestPath.parentFile, "maven")
-    
-    if (!mavenDir.exists()) {
-        throw new GradleException("Maven directory not found at: ${mavenDir.path}")
-    }
-    
-    println("✓ Found rustls-platform-verifier maven repo at: ${mavenDir.path}")
-    return mavenDir.path
-}
-
-
-repositories {
-    maven {
-        url = findRustlsPlatformVerifierMavenDir()
-        metadataSources.artifact()
-    }
+dependencies {
+    implementation 'com.google.protobuf:protobuf-javalite:3.20.1'
 }
 
 protobuf {
@@ -98,7 +67,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.carriez.flutter_hbb"
-        minSdkVersion 22
+        minSdkVersion 21
         targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -128,10 +97,8 @@ flutter {
 }
 
 dependencies {
-    implementation 'com.google.protobuf:protobuf-javalite:3.20.1'
     implementation "androidx.media:media:1.6.0"
     implementation 'com.github.getActivity:XXPermissions:18.5'
     implementation("org.jetbrains.kotlin:kotlin-stdlib") { version { strictly("1.9.10") } }
     implementation 'com.caverock:androidsvg-aar:1.4'
-    implementation "rustls:rustls-platform-verifier:0.1.1"
 }

flutter/android/app/proguard-rules

@@ -1,7 +1,4 @@
 # Keep class members from protobuf generated code.
 -keepclassmembers class * extends com.google.protobuf.GeneratedMessageLite {
   <fields>;
-}
-
-# Keep rustls-platform-verifier classes for JNI
--keep, includedescriptorclasses class org.rustls.platformverifier.** { *; }
+}

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

@@ -23,7 +23,6 @@
     </queries>
 
     <application
-        android:name=".MainApplication"
         android:icon="@mipmap/ic_launcher"
         android:label="RustDesk"
         android:requestLegacyExternalStorage="true"

flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/AudioRecordHandle.kt

@@ -62,13 +62,7 @@ class AudioRecordHandle(private var context: Context, private var isVideoStart:
                 return false
             }
         }
-        val recorder = try {
-            builder.build()
-        } catch (e: Exception) {
-            Log.e(logTag, "createAudioRecorder failed", e)
-            return false
-        }
-        audioRecorder = recorder
+        audioRecorder = builder.build()
         Log.d(logTag, "createAudioRecorder done,minBufferSize:$minBufferSize")
         return true
     }

flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/FloatingWindowService.kt

@@ -311,10 +311,7 @@ class FloatingWindowService : Service(), View.OnTouchListener {
              popupMenu.menu.add(0, idSyncClipboard, 0, translate("Update client clipboard"))
          }
          val idStopService = 2
-         val hideStopService = FFI.getBuildinOption("hide-stop-service") == "Y"
-         if (!hideStopService) {
-             popupMenu.menu.add(0, idStopService, 0, translate("Stop service"))
-         }
+         popupMenu.menu.add(0, idStopService, 0, translate("Stop service"))
          popupMenu.setOnMenuItemClickListener { menuItem ->
              when (menuItem.itemId) {
                  idShowRustDesk -> {
@@ -392,3 +389,4 @@ class FloatingWindowService : Service(), View.OnTouchListener {
         return false
     }
 }
+

flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/MainActivity.kt

@@ -62,13 +62,7 @@ class MainActivity : FlutterActivity() {
             channelTag
         )
         initFlutterChannel(flutterMethodChannel!!)
-        thread {
-            try {
-                setCodecInfo()
-            } catch (e: Exception) {
-                Log.e("MainActivity", "Failed to setCodecInfo: ${e.message}", e)
-            }
-        }
+        thread { setCodecInfo() }
     }
 
     override fun onResume() {

flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/MainApplication.kt

@@ -1,17 +0,0 @@
-package com.carriez.flutter_hbb
-
-import android.app.Application
-import android.util.Log
-import ffi.FFI
-
-class MainApplication : Application() {
-    companion object {
-        private const val TAG = "MainApplication"
-    }
-
-    override fun onCreate() {
-        super.onCreate()
-        Log.d(TAG, "App start")
-        FFI.onAppStart(applicationContext)
-    }
-}

flutter/android/app/src/main/kotlin/ffi.kt

@@ -13,7 +13,6 @@ object FFI {
     }
 
     external fun init(ctx: Context)
-    external fun onAppStart(ctx: Context)
     external fun setClipboardManager(clipboardManager: RdClipboardManager)
     external fun startServer(app_dir: String, custom_client_config: String)
     external fun startService()
@@ -24,7 +23,6 @@ object FFI {
     external fun setFrameRawEnable(name: String, value: Boolean)
     external fun setCodecInfo(info: String)
     external fun getLocalOption(key: String): String
-    external fun getBuildinOption(key: String): String
     external fun onClipboardUpdate(clips: ByteBuffer)
     external fun isServiceClipboardEnabled(): Boolean
 }

flutter/assets/auth-azure.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="199"><path fill="#0089d6" d="M118.432 187.698c32.89-5.81 60.055-10.618 60.367-10.684l.568-.12-31.052-36.935c-17.078-20.314-31.051-37.014-31.051-37.11 0-.182 32.063-88.477 32.243-88.792.06-.105 21.88 37.567 52.893 91.32 29.035 50.323 52.973 91.815 53.195 92.203l.405.707-98.684-.012-98.684-.013 59.8-10.564zM0 176.435c0-.052 14.631-25.451 32.514-56.442l32.514-56.347 37.891-31.799C123.76 14.358 140.867.027 140.935.001c.069-.026-.205.664-.609 1.534s-18.919 40.582-41.145 88.25l-40.41 86.67-29.386.037c-16.162.02-29.385-.005-29.385-.057z"/></svg>

flutter/assets/auth-microsoft.svg

@@ -1 +0,0 @@
-<svg width="48" height="48" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><rect x="4" y="4" width="19" height="19" fill="#f25022"/><rect x="25" y="4" width="19" height="19" fill="#7fba00"/><rect x="4" y="25" width="19" height="19" fill="#00a4ef"/><rect x="25" y="25" width="19" height="19" fill="#ffb900"/></svg>

flutter/assets/display_switcher.svg

@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
-  <g fill="#000000" fill-rule="evenodd">
-    <rect x="4" y="6" width="24" height="16" rx="3"/>
-    <rect x="14.5" y="22" width="3" height="2"/>
-    <rect x="9.5" y="24" width="13" height="2.5" rx="1.25"/>
-  </g>
-</svg>

flutter/assets/keyboard.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" style="isolation:isolate" viewBox="541.937 521.772 32 32"><path fill="none" d="M541.937 521.772h32v32h-32v-32Z"/><path fill-rule="evenodd" d="M552.145 539.981h11.584c.446 0 .808.362.808.808v.536c0 .786-.639 1.425-1.425 1.425h-10.35a1.426 1.426 0 0 1-1.425-1.425v-.536c0-.446.362-.808.808-.808Zm-1.761-3.511h.899c.536 0 .971.435.971.971v.899a.971.971 0 0 1-.971.971h-.899a.971.971 0 0 1-.971-.971v-.899c0-.536.435-.971.971-.971Zm3.552 0h.899c.536 0 .971.435.971.971v.899a.971.971 0 0 1-.971.971h-.899a.972.972 0 0 1-.972-.971v-.899c0-.536.436-.971.972-.971Zm3.551 0h.9c.536 0 .971.435.971.971v.899a.971.971 0 0 1-.971.971h-.9a.971.971 0 0 1-.971-.971v-.899c0-.536.435-.971.971-.971Zm3.552 0h.899c.536 0 .972.435.972.971v.899a.972.972 0 0 1-.972.971h-.899a.971.971 0 0 1-.971-.971v-.899c0-.536.435-.971.971-.971Zm3.552 0h.899c.536 0 .971.435.971.971v.899a.971.971 0 0 1-.971.971h-.899a.971.971 0 0 1-.971-.971v-.899c0-.536.435-.971.971-.971Zm-14.383-3.512h1.25c.44 0 .796.357.796.796v1.25a.796.796 0 0 1-.796.796h-1.25a.796.796 0 0 1-.795-.796v-1.25c0-.439.356-.796.795-.796Zm3.552 0h1.25c.439 0 .796.357.796.796v1.25a.797.797 0 0 1-.796.796h-1.25a.797.797 0 0 1-.796-.796v-1.25c0-.439.357-.796.796-.796Zm3.552 0h1.25c.439 0 .796.357.796.796v1.25a.797.797 0 0 1-.796.796h-1.25a.797.797 0 0 1-.796-.796v-1.25c0-.439.357-.796.796-.796Zm3.552 0h1.25c.439 0 .796.357.796.796v1.25a.797.797 0 0 1-.796.796h-1.25a.797.797 0 0 1-.796-.796v-1.25c0-.439.357-.796.796-.796Zm-9.553-3.85h13.252c1.407 0 2.755.507 3.748 1.409.993.902 1.552 2.127 1.552 3.404v7.702c0 1.277-.559 2.501-1.552 3.403-.993.902-2.341 1.409-3.748 1.409h-13.252c-1.407 0-2.755-.507-3.748-1.409-.993-.902-1.552-2.126-1.552-3.403v-7.702c0-1.277.559-2.502 1.552-3.404.993-.902 2.341-1.409 3.748-1.409Zm13.105 3.85h1.25c.439 0 .795.357.795.796v1.25a.796.796 0 0 1-.795.796h-1.25a.796.796 0 0 1-.796-.796v-1.25c0-.439.356-.796.796-.796Z"/></svg>

flutter/build_fdroid.sh

@@ -7,7 +7,7 @@
 #               2024, Vasyl Gello <vasek.gello@gmail.com>
 #
 
-# The script is invoked by F-Droid builder system step-by-step.
+# The script is invoked by F-Droid builder system ste-by-step.
 #
 # It accepts the following arguments:
 #
@@ -16,6 +16,7 @@
 # - Android architecture to build APK for: armeabi-v7a arm64-v8av x86 x86_64
 # - The build step to execute:
 #
+#   + sudo-deps: as root, install needed Debian packages into builder VM
 #   + prebuild: patch sources and do other stuff before the build
 #   + build: perform actual build of APK file
 #
@@ -183,9 +184,13 @@ prebuild)
 	fi
 
 	# Map NDK version to revision
-	NDK_VERSION="$(curl https://gitlab.com/fdroid/android-sdk-transparency-log/-/raw/master/signed/checksums.json |
-		jq -r ".\"https://dl.google.com/android/repository/android-ndk-${NDK_VERSION}-linux.zip\"[0].\"source.properties\"" |
-		sed -n -E 's/.*Pkg.Revision = ([0-9.]+).*/\1/p')"
+
+	NDK_VERSION="$(wget \
+		-qO- \
+		-H "Accept: application/vnd.github+json" \
+		-H "X-GitHub-Api-Version: 2022-11-28" \
+		'https://api.github.com/repos/android/ndk/releases' |
+		jq -r ".[] | select(.tag_name == \"${NDK_VERSION}\") | .body | match(\"ndkVersion \\\"(.*)\\\"\").captures[0].string")"
 
 	if [ -z "${NDK_VERSION}" ]; then
 		echo "ERROR: Can not map Android NDK codename to revision!" >&2
@@ -311,18 +316,6 @@ prebuild)
 	# `FLUTTER_BRIDGE_VERSION` an restore the pubspec later
 
 	if [ "${FLUTTER_VERSION}" != "${FLUTTER_BRIDGE_VERSION}" ]; then
-		# Find first libclang.so and set BRIDGE_LLVM_PATH
-
-		BRIDGE_LLVM_PATH="$(find /usr/lib/ -name libclang.so | head -n1)"
-
-		if [ -z "${BRIDGE_LLVM_PATH}" ]; then
-			echo 'ERROR: Can not find libclang.so for bridge generator!' >&2
-			exit 1
-		fi
-
-		BRIDGE_LLVM_PATH="$(dirname "${BRIDGE_LLVM_PATH}")"
-		BRIDGE_LLVM_PATH="$(dirname "${BRIDGE_LLVM_PATH}")"
-
 		# Install Flutter bridge version
 
 		prepare_flutter "${FLUTTER_BRIDGE_VERSION}" "${HOME}/flutter"
@@ -351,8 +344,7 @@ prebuild)
 
 		flutter_rust_bridge_codegen \
 			--rust-input ./src/flutter_ffi.rs \
-			--dart-output ./flutter/lib/generated_bridge.dart \
-			--llvm-path "${BRIDGE_LLVM_PATH}"
+			--dart-output ./flutter/lib/generated_bridge.dart
 
 		# Add bridge files to save-list
 
@@ -363,15 +355,13 @@ prebuild)
 		git checkout '*'
 		git clean -dffx
 		git reset
-
-		unset BRIDGE_LLVM_PATH
 	fi
 
 	# Install Flutter version for RustDesk library build
 
 	prepare_flutter "${FLUTTER_VERSION}" "${HOME}/flutter"
 
-	# gms is not in these files now, but we still keep the following line for future reference(maybe).
+	# gms is not in thoes files now, but we still keep the following line for future reference(maybe).
 
 	sed \
 		-i \
@@ -424,9 +414,13 @@ build)
 		.github/workflows/flutter-build.yml)"
 
 	# Map NDK version to revision
-	NDK_VERSION="$(curl https://gitlab.com/fdroid/android-sdk-transparency-log/-/raw/master/signed/checksums.json |
-		jq -r ".\"https://dl.google.com/android/repository/android-ndk-${NDK_VERSION}-linux.zip\"[0].\"source.properties\"" |
-		sed -n -E 's/.*Pkg.Revision = ([0-9.]+).*/\1/p')"
+
+	NDK_VERSION="$(wget \
+		-qO- \
+		-H "Accept: application/vnd.github+json" \
+		-H "X-GitHub-Api-Version: 2022-11-28" \
+		'https://api.github.com/repos/android/ndk/releases' |
+		jq -r ".[] | select(.tag_name == \"${NDK_VERSION}\") | .body | match(\"ndkVersion \\\"(.*)\\\"\").captures[0].string")"
 
 	if [ -z "${NDK_VERSION}" ]; then
 		echo "ERROR: Can not map Android NDK codename to revision!" >&2
@@ -460,7 +454,6 @@ build)
 		--target "${RUST_TARGET}" \
 		--bindgen \
 		build \
-		--locked \
 		--release \
 		--features "${RUSTDESK_FEATURES}"
 

flutter/ios/Runner/Info.plist

@@ -43,8 +43,6 @@
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
-	<key>UIFileSharingEnabled</key>
-	<true/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -62,8 +60,6 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>UISupportsDocumentBrowser</key>
-	<true/>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
 	<key>ITSAppUsesNonExemptEncryption</key>

flutter/ios_arm64.sh

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-cargo build --locked --features flutter,hwcodec --release --target aarch64-apple-ios --lib
+cargo build --features flutter,hwcodec --release --target aarch64-apple-ios --lib

flutter/ios_x64.sh

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-cargo build --locked --features flutter --release --target x86_64-apple-ios --lib
+cargo build --features flutter --release --target x86_64-apple-ios --lib

flutter/lib/common.dart

@@ -13,18 +13,15 @@ import 'package:flutter_hbb/desktop/widgets/refresh_wrapper.dart';
 import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
 import 'package:flutter_hbb/main.dart';
 import 'package:flutter_hbb/models/peer_model.dart';
-import 'package:flutter_hbb/models/peer_tab_model.dart';
 import 'package:flutter_hbb/models/state_model.dart';
 import 'package:flutter_hbb/utils/multi_window_manager.dart';
 import 'package:flutter_hbb/utils/platform_channel.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:get/get.dart';
-import 'package:get/get_rx/src/rx_workers/utils/debouncer.dart';
 import 'package:provider/provider.dart';
 import 'package:uni_links/uni_links.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:uuid/uuid.dart';
-import 'package:wakelock_plus/wakelock_plus.dart';
 import 'package:window_manager/window_manager.dart';
 import 'package:window_size/window_size.dart' as window_size;
 
@@ -45,7 +42,7 @@ import 'package:flutter_hbb/native/win32.dart'
     if (dart.library.html) 'package:flutter_hbb/web/win32.dart';
 import 'package:flutter_hbb/native/common.dart'
     if (dart.library.html) 'package:flutter_hbb/web/common.dart';
-import 'package:flutter_hbb/utils/http_service.dart' as http;
+import 'package:http/http.dart' as http;
 
 final globalKey = GlobalKey<NavigatorState>();
 final navigationBarKey = GlobalKey();
@@ -78,9 +75,6 @@ bool _ignoreDevicePixelRatio = true;
 int windowsBuildNumber = 0;
 DesktopType? desktopType;
 
-// Tolerance used for floating-point position comparisons to avoid precision errors.
-const double _kPositionEpsilon = 1e-6;
-
 bool get isMainDesktopWindow =>
     desktopType == DesktopType.main || desktopType == DesktopType.cm;
 
@@ -112,10 +106,6 @@ enum DesktopType {
   portForward,
 }
 
-bool isDoubleEqual(double a, double b) {
-  return (a - b).abs() < _kPositionEpsilon;
-}
-
 class IconFont {
   static const _family1 = 'Tabbar';
   static const _family2 = 'PeerSearchbar';
@@ -716,17 +706,6 @@ closeConnection({String? id}) {
       stateGlobal.isInMainPage = true;
     } else {
       final controller = Get.find<DesktopTabController>();
-      if (controller.tabType == DesktopTabType.terminal &&
-          controller.onCloseWindow != null) {
-        // Terminal windows are scoped to one peer. The optional id passed to
-        // closeConnection() is that peer id, not a terminal tab key
-        // (${peerId}_${terminalId}). Closing from terminal dialogs should close
-        // the peer's whole terminal window, including all terminal tabs.
-        unawaited(controller.onCloseWindow!().catchError((e, _) {
-          debugPrint('[closeConnection] Failed to close terminal window: $e');
-        }));
-        return;
-      }
       controller.closeBy(id);
     }
   }
@@ -1022,15 +1001,13 @@ makeMobileActionsOverlayEntry(VoidCallback? onHide, {FFI? ffi}) {
   });
 }
 
-void showToast(String text,
-    {Duration timeout = const Duration(seconds: 3),
-    Alignment alignment = const Alignment(0.0, 0.8)}) {
+void showToast(String text, {Duration timeout = const Duration(seconds: 3)}) {
   final overlayState = globalKey.currentState?.overlay;
   if (overlayState == null) return;
   final entry = OverlayEntry(builder: (context) {
     return IgnorePointer(
         child: Align(
-            alignment: alignment,
+            alignment: const Alignment(0.0, 0.8),
             child: Container(
               decoration: BoxDecoration(
                 color: MyTheme.color(context).toastBg,
@@ -1135,23 +1112,18 @@ class CustomAlertDialog extends StatelessWidget {
 
 Widget createDialogContent(String text) {
   final RegExp linkRegExp = RegExp(r'(https?://[^\s]+)');
-  bool hasLink = linkRegExp.hasMatch(text);
-
-  // Early return: no link, use default theme color
-  if (!hasLink) {
-    return SelectableText(text, style: const TextStyle(fontSize: 15));
-  }
-
   final List<TextSpan> spans = [];
   int start = 0;
+  bool hasLink = false;
 
   linkRegExp.allMatches(text).forEach((match) {
+    hasLink = true;
     if (match.start > start) {
       spans.add(TextSpan(text: text.substring(start, match.start)));
     }
     spans.add(TextSpan(
       text: match.group(0) ?? '',
-      style: const TextStyle(
+      style: TextStyle(
         color: Colors.blue,
         decoration: TextDecoration.underline,
       ),
@@ -1169,9 +1141,13 @@ Widget createDialogContent(String text) {
     spans.add(TextSpan(text: text.substring(start)));
   }
 
+  if (!hasLink) {
+    return SelectableText(text, style: const TextStyle(fontSize: 15));
+  }
+
   return SelectableText.rich(
     TextSpan(
-      style: const TextStyle(fontSize: 15),
+      style: TextStyle(color: Colors.black, fontSize: 15),
       children: spans,
     ),
   );
@@ -1590,7 +1566,7 @@ bool option2bool(String option, String value) {
       option == kOptionForceAlwaysRelay) {
     res = value == "Y";
   } else {
-    // "" is true
+    assert(false);
     res = value != "N";
   }
   return res;
@@ -1608,6 +1584,9 @@ String bool2option(String option, bool b) {
       option == kOptionForceAlwaysRelay) {
     res = b ? 'Y' : defaultOptionNo;
   } else {
+    if (option != kOptionEnableUdpPunch && option != kOptionEnableIpv6Punch) {
+      assert(false);
+    }
     res = b ? 'Y' : 'N';
   }
   return res;
@@ -1643,8 +1622,7 @@ bool mainGetPeerBoolOptionSync(String id, String key) {
 // Use `sessionGetToggleOption()` and `sessionToggleOption()` instead.
 // Because all session options use `Y` and `<Empty>` as values.
 
-Future<bool> matchPeer(
-    String searchText, Peer peer, PeerTabIndex peerTabIndex) async {
+Future<bool> matchPeer(String searchText, Peer peer) async {
   if (searchText.isEmpty) {
     return true;
   }
@@ -1655,14 +1633,11 @@ Future<bool> matchPeer(
       peer.username.toLowerCase().contains(searchText)) {
     return true;
   }
-  if (peer.alias.toLowerCase().contains(searchText)) {
-    return true;
+  final alias = peer.alias;
+  if (alias.isEmpty) {
+    return false;
   }
-  if (peerTabShowNote(peerTabIndex) &&
-      peer.note.toLowerCase().contains(searchText)) {
-    return true;
-  }
-  return false;
+  return alias.toLowerCase().contains(searchText);
 }
 
 /// Get the image for the current [platform].
@@ -1692,15 +1667,6 @@ class LastWindowPosition {
   LastWindowPosition(this.width, this.height, this.offsetWidth,
       this.offsetHeight, this.isMaximized, this.isFullscreen);
 
-  bool equals(LastWindowPosition other) {
-    return ((width == other.width) &&
-        (height == other.height) &&
-        (offsetWidth == other.offsetWidth) &&
-        (offsetHeight == other.offsetHeight) &&
-        (isMaximized == other.isMaximized) &&
-        (isFullscreen == other.isFullscreen));
-  }
-
   Map<String, dynamic> toJson() {
     return <String, dynamic>{
       "width": width,
@@ -1740,36 +1706,24 @@ String get windowFramePrefix =>
         ? "incoming_"
         : (bind.isOutgoingOnly() ? "outgoing_" : ""));
 
-typedef WindowKey = ({WindowType type, int? windowId});
-
-LastWindowPosition? _lastWindowPosition = null;
-final Debouncer _saveWindowDebounce = Debouncer(delay: Duration(seconds: 1));
-
 /// Save window position and size on exit
 /// Note that windowId must be provided if it's subwindow
-Future<void> saveWindowPosition(WindowType type,
-    {int? windowId, bool? flush}) async {
+Future<void> saveWindowPosition(WindowType type, {int? windowId}) async {
   if (type != WindowType.Main && windowId == null) {
     debugPrint(
         "Error: windowId cannot be null when saving positions for sub window");
   }
 
-  Offset? position;
-  Size? sz;
+  late Offset position;
+  late Size sz;
   late bool isMaximized;
   bool isFullscreen = stateGlobal.fullscreen.isTrue;
-
   setPreFrame() {
     final pos = bind.getLocalFlutterOption(k: windowFramePrefix + type.name);
     var lpos = LastWindowPosition.loadFromString(pos);
-    if (lpos != null) {
-      if (lpos.offsetWidth != null && lpos.offsetHeight != null) {
-        position = Offset(lpos.offsetWidth!, lpos.offsetHeight!);
-      }
-      if (lpos.width != null && lpos.height != null) {
-        sz = Size(lpos.width!, lpos.height!);
-      }
-    }
+    position = Offset(
+        lpos?.offsetWidth ?? position.dx, lpos?.offsetHeight ?? position.dy);
+    sz = Size(lpos?.width ?? sz.width, lpos?.height ?? sz.height);
   }
 
   switch (type) {
@@ -1809,56 +1763,30 @@ Future<void> saveWindowPosition(WindowType type,
       }
       break;
   }
-  if (isWindows && position != null) {
+  if (isWindows) {
     const kMinOffset = -10000;
     const kMaxOffset = 10000;
-    if (position!.dx < kMinOffset ||
-        position!.dy < kMinOffset ||
-        position!.dx > kMaxOffset ||
-        position!.dy > kMaxOffset) {
+    if (position.dx < kMinOffset ||
+        position.dy < kMinOffset ||
+        position.dx > kMaxOffset ||
+        position.dy > kMaxOffset) {
       debugPrint("Invalid position: $position, ignore saving position");
       return;
     }
   }
 
-  final pos = LastWindowPosition(sz?.width, sz?.height, position?.dx,
-      position?.dy, isMaximized, isFullscreen);
+  final pos = LastWindowPosition(
+      sz.width, sz.height, position.dx, position.dy, isMaximized, isFullscreen);
+  debugPrint(
+      "Saving frame: $windowId: ${pos.width}/${pos.height}, offset:${pos.offsetWidth}/${pos.offsetHeight}, isMaximized:${pos.isMaximized}, isFullscreen:${pos.isFullscreen}");
 
-  final WindowKey key = (type: type, windowId: windowId);
+  await bind.setLocalFlutterOption(
+      k: windowFramePrefix + type.name, v: pos.toString());
 
-  final bool haveNewWindowPosition =
-      (_lastWindowPosition == null) || !pos.equals(_lastWindowPosition!);
-  final bool isPreviousNewWindowPositionPending = _saveWindowDebounce.isRunning;
-
-  if (haveNewWindowPosition || isPreviousNewWindowPositionPending) {
-    _lastWindowPosition = pos;
-
-    if (flush ?? false) {
-      // If a previous update is pending, replace it.
-      _saveWindowDebounce.cancel();
-      await _saveWindowPositionActual(key);
-    } else if (haveNewWindowPosition) {
-      _saveWindowDebounce.call(() => _saveWindowPositionActual(key));
-    }
-  }
-}
-
-Future<void> _saveWindowPositionActual(WindowKey key) async {
-  LastWindowPosition? pos = _lastWindowPosition;
-
-  if (pos != null) {
-    debugPrint(
-        "Saving frame: ${key.windowId}: ${pos.width}/${pos.height}, offset:${pos.offsetWidth}/${pos.offsetHeight}, isMaximized:${pos.isMaximized}, isFullscreen:${pos.isFullscreen}");
-
-    await bind.setLocalFlutterOption(
-        k: windowFramePrefix + key.type.name, v: pos.toString());
-
-    if ((key.type == WindowType.RemoteDesktop ||
-            key.type == WindowType.ViewCamera) &&
-        key.windowId != null) {
-      await _saveSessionWindowPosition(key.type, key.windowId!,
-          pos.isMaximized ?? false, pos.isFullscreen ?? false, pos);
-    }
+  if ((type == WindowType.RemoteDesktop || type == WindowType.ViewCamera) &&
+      windowId != null) {
+    await _saveSessionWindowPosition(
+        type, windowId, isMaximized, isFullscreen, pos);
   }
 }
 
@@ -1924,8 +1852,6 @@ Future<Size> _adjustRestoreMainWindowSize(double? width, double? height) async {
   return Size(restoreWidth, restoreHeight);
 }
 
-// Consider using Rect.contains() instead,
-// though the implementation is not exactly the same.
 bool isPointInRect(Offset point, Rect rect) {
   return point.dx >= rect.left &&
       point.dx <= rect.right &&
@@ -1944,41 +1870,44 @@ Future<Offset?> _adjustRestoreMainWindowOffset(
     return null;
   }
 
+  double? frameLeft;
+  double? frameTop;
+  double? frameRight;
+  double? frameBottom;
+
   if (isDesktop || isWebDesktop) {
-    final screens = await window_size.getScreenList();
-    if (screens.isNotEmpty) {
-      final windowRect = Rect.fromLTWH(left, top, width, height);
-      bool isVisible = false;
-      for (final screen in screens) {
-        final intersection = windowRect.intersect(screen.visibleFrame);
-        if (intersection.width >= 10.0 && intersection.height >= 10.0) {
-          isVisible = true;
-          break;
-        }
-      }
-      if (!isVisible) {
-        return null;
-      }
-      return Offset(left, top);
+    for (final screen in await window_size.getScreenList()) {
+      frameLeft = frameLeft == null
+          ? screen.visibleFrame.left
+          : min(screen.visibleFrame.left, frameLeft);
+      frameTop = frameTop == null
+          ? screen.visibleFrame.top
+          : min(screen.visibleFrame.top, frameTop);
+      frameRight = frameRight == null
+          ? screen.visibleFrame.right
+          : max(screen.visibleFrame.right, frameRight);
+      frameBottom = frameBottom == null
+          ? screen.visibleFrame.bottom
+          : max(screen.visibleFrame.bottom, frameBottom);
     }
   }
-
-  double frameLeft = 0.0;
-  double frameTop = 0.0;
-  double frameRight = ((isDesktop || isWebDesktop)
-          ? kDesktopMaxDisplaySize
-          : kMobileMaxDisplaySize)
-      .toDouble();
-  double frameBottom = ((isDesktop || isWebDesktop)
-          ? kDesktopMaxDisplaySize
-          : kMobileMaxDisplaySize)
-      .toDouble();
-
+  if (frameLeft == null) {
+    frameLeft = 0.0;
+    frameTop = 0.0;
+    frameRight = ((isDesktop || isWebDesktop)
+            ? kDesktopMaxDisplaySize
+            : kMobileMaxDisplaySize)
+        .toDouble();
+    frameBottom = ((isDesktop || isWebDesktop)
+            ? kDesktopMaxDisplaySize
+            : kMobileMaxDisplaySize)
+        .toDouble();
+  }
   final minWidth = 10.0;
-  if ((left + minWidth) > frameRight ||
-      (top + minWidth) > frameBottom ||
+  if ((left + minWidth) > frameRight! ||
+      (top + minWidth) > frameBottom! ||
       (left + width - minWidth) < frameLeft ||
-      top < frameTop) {
+      top < frameTop!) {
     return null;
   } else {
     return Offset(left, top);
@@ -2020,24 +1949,8 @@ Future<bool> restoreWindowPosition(WindowType type,
 
   var lpos = LastWindowPosition.loadFromString(pos);
   if (lpos == null) {
-    debugPrint("No window position saved, trying to center the window.");
-    switch (type) {
-      case WindowType.Main:
-        // Center the main window only if no position is saved (on first run).
-        if (isWindows || isLinux) {
-          await windowManager.center();
-        }
-        // For MacOS, the window is already centered by default.
-        // See https://github.com/rustdesk/rustdesk/blob/9b9276e7524523d7f667fefcd0694d981443df0e/flutter/macos/Runner/Base.lproj/MainMenu.xib#L333
-        // If `<windowPositionMask>` in `<window>` is not set, the window will be centered.
-        break;
-      default:
-        // No need to change the position of a sub window if no position is saved,
-        // since the default position is already centered.
-        // https://github.com/rustdesk/rustdesk/blob/317639169359936f7f9f85ef445ec9774218772d/flutter/lib/utils/multi_window_manager.dart#L163
-        break;
-    }
-    return true;
+    debugPrint("no window position saved, ignoring position restoration");
+    return false;
   }
   if (type == WindowType.RemoteDesktop || type == WindowType.ViewCamera) {
     if (!isRemotePeerPos && windowId != null) {
@@ -2376,19 +2289,6 @@ List<String>? urlLinkToCmdArgs(Uri uri) {
     id = uri.path.substring("/new/".length);
   } else if (uri.authority == "config") {
     if (isAndroid || isIOS) {
-      final allowDeepLinkServerSettings =
-          bind.mainGetBuildinOption(key: kOptionAllowDeepLinkServerSettings) ==
-              'Y';
-      if (!allowDeepLinkServerSettings) {
-        debugPrint(
-            "Ignore rustdesk://config because $kOptionAllowDeepLinkServerSettings is not enabled.");
-        // Keep the user-facing error generic; detailed rejection reason is in debug logs.
-        // Delay toast to avoid missing overlay during cold-start deeplink handling.
-        Timer(Duration(seconds: 1), () {
-          showToast(translate('Failed'));
-        });
-        return null;
-      }
       final config = uri.path.substring("/".length);
       // add a timer to make showToast work
       Timer(Duration(seconds: 1), () {
@@ -2398,24 +2298,11 @@ List<String>? urlLinkToCmdArgs(Uri uri) {
     return null;
   } else if (uri.authority == "password") {
     if (isAndroid || isIOS) {
-      final allowDeepLinkPassword =
-          bind.mainGetBuildinOption(key: kOptionAllowDeepLinkPassword) == 'Y';
-      if (!allowDeepLinkPassword) {
-        debugPrint(
-            "Ignore rustdesk://password because $kOptionAllowDeepLinkPassword is not enabled.");
-        // Keep the user-facing error generic; detailed rejection reason is in debug logs.
-        // Delay toast to avoid missing overlay during cold-start deeplink handling.
-        Timer(Duration(seconds: 1), () {
-          showToast(translate('Failed'));
-        });
-        return null;
-      }
       final password = uri.path.substring("/".length);
       if (password.isNotEmpty) {
         Timer(Duration(seconds: 1), () async {
-          final ok =
-              await bind.mainSetPermanentPasswordWithResult(password: password);
-          showToast(translate(ok ? 'Successful' : 'Failed'));
+          await bind.mainSetPermanentPassword(password: password);
+          showToast(translate('Successful'));
         });
       }
     }
@@ -2711,55 +2598,6 @@ class SimpleWrapper<T> {
   SimpleWrapper(this.value);
 }
 
-/// Wakelock manager with reference counting for desktop.
-/// Ensures wakelock is only disabled when all sessions are closed/minimized.
-///
-/// Note: Each isolate has its own WakelockPlus instance with independent assertion.
-/// As long as one isolate has wakelock enabled, the screen stays awake.
-/// This manager handles multiple tabs within the same isolate.
-class WakelockManager {
-  static final Set<UniqueKey> _enabledKeys = {};
-  // Don't use WakelockPlus.enabled, it causes error on Android:
-  // Unhandled Exception: FormatException: Message corrupted
-  //
-  // On Linux, multiple enable() calls create only one inhibit, but each disable()
-  // only releases if _cookie != null. So we need our own _enabled state to avoid
-  // calling disable() when not enabled.
-  // See: https://github.com/fluttercommunity/wakelock_plus/blob/0c74e5bbc6aefac57b6c96bb7ef987705ed559ec/wakelock_plus/lib/src/wakelock_plus_linux_plugin.dart#L48
-  static bool _enabled = false;
-
-  static void enable(UniqueKey key, {bool isServer = false}) {
-    // Check if we should keep awake during outgoing sessions
-    if (!isServer) {
-      final keepAwake =
-          mainGetLocalBoolOptionSync(kOptionKeepAwakeDuringOutgoingSessions);
-      if (!keepAwake) {
-        return; // Don't enable wakelock if user disabled keep awake
-      }
-    }
-    if (isDesktop) {
-      _enabledKeys.add(key);
-    }
-    if (!_enabled) {
-      _enabled = true;
-      WakelockPlus.enable();
-    }
-  }
-
-  static void disable(UniqueKey key) {
-    if (isDesktop) {
-      _enabledKeys.remove(key);
-      if (_enabledKeys.isNotEmpty) {
-        return;
-      }
-    }
-    if (_enabled) {
-      WakelockPlus.disable();
-      _enabled = false;
-    }
-  }
-}
-
 /// call this to reload current window.
 ///
 /// [Note]
@@ -3033,7 +2871,7 @@ Future<void> updateSystemWindowTheme() async {
 ///
 /// Note: not found a general solution for rust based AVFoundation bingding.
 /// [AVFoundation] crate has compile error.
-const kMacOSPermChannel = MethodChannel("org.rustdesk.rustdesk/host");
+const kMacOSPermChannel = MethodChannel("org.rustdesk.rustdesk/macos");
 
 enum PermissionAuthorizeType {
   undetermined,
@@ -3100,26 +2938,10 @@ Future<void> start_service(bool is_start) async {
 }
 
 Future<bool> canBeBlocked() async {
-  if (isWeb) {
-    // Web can only act as a controller, never as a controlled side,
-    // so it should never be blocked by a remote session.
-    return false;
-  }
-  // First check control permission
-  final controlPermission = await bind.mainGetCommon(
-      key: "is-remote-modify-enabled-by-control-permissions");
-  if (controlPermission == "true") {
-    return false;
-  } else if (controlPermission == "false") {
-    return true;
-  }
-
-  // Check local settings
-  var accessMode = await bind.mainGetOption(key: kOptionAccessMode);
-  var isCustomAccessMode = accessMode != 'full' && accessMode != 'view';
+  var access_mode = await bind.mainGetOption(key: kOptionAccessMode);
   var option = option2bool(kOptionAllowRemoteConfigModification,
       await bind.mainGetOption(key: kOptionAllowRemoteConfigModification));
-  return accessMode == 'view' || (isCustomAccessMode && !option);
+  return access_mode == 'view' || (access_mode.isEmpty && !option);
 }
 
 // to-do: web not implemented
@@ -3713,54 +3535,14 @@ Widget loadPowered(BuildContext context) {
   ).marginOnly(top: 6);
 }
 
-const _kDefaultLogoAsset = 'assets/logo.png';
-const _kLightLogoAsset = 'assets/logo_light.png';
-const _kDarkLogoAsset = 'assets/logo_dark.png';
-
-List<String> _logoAssetCandidatesForBrightness(Brightness brightness) {
-  return brightness == Brightness.dark
-      ? [_kDarkLogoAsset, _kDefaultLogoAsset]
-      : [_kLightLogoAsset, _kDefaultLogoAsset];
-}
-
-Future<String?> _resolveLogoAsset(Brightness brightness) async {
-  for (final asset in _logoAssetCandidatesForBrightness(brightness)) {
-    try {
-      await rootBundle.load(asset);
-      return asset;
-    } on FlutterError {
-      continue;
-    }
-  }
-  return null;
-}
-
-class _Logo extends StatefulWidget {
-  const _Logo();
-
-  @override
-  State<_Logo> createState() => _LogoState();
-}
-
-class _LogoState extends State<_Logo> {
-  final Map<Brightness, Future<String?>> _logoFutures = {};
-
-  Future<String?> _logoFutureFor(Brightness brightness) {
-    return _logoFutures.putIfAbsent(
-      brightness,
-      () => _resolveLogoAsset(brightness),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return FutureBuilder<String?>(
-      future: _logoFutureFor(Theme.of(context).brightness),
-      builder: (BuildContext context, AsyncSnapshot<String?> snapshot) {
-        final asset = snapshot.data;
-        if (asset != null) {
+// max 300 x 60
+Widget loadLogo() {
+  return FutureBuilder<ByteData>(
+      future: rootBundle.load('assets/logo.png'),
+      builder: (BuildContext context, AsyncSnapshot<ByteData> snapshot) {
+        if (snapshot.hasData) {
           final image = Image.asset(
-            asset,
+            'assets/logo.png',
             fit: BoxFit.contain,
             errorBuilder: (ctx, error, stackTrace) {
               return Container();
@@ -3772,14 +3554,9 @@ class _LogoState extends State<_Logo> {
           ).marginOnly(left: 12, right: 12, top: 12);
         }
         return const Offstage();
-      },
-    );
-  }
+      });
 }
 
-// max 300 x 60
-Widget loadLogo() => const _Logo();
-
 Widget loadIcon(double size) {
   return Image.asset('assets/icon.png',
       width: size,
@@ -3927,16 +3704,6 @@ setResizable(bool resizable) {
 
 isOptionFixed(String key) => bind.mainIsOptionFixed(key: key);
 
-bool isChangePermanentPasswordDisabled() =>
-    bind.mainGetBuildinOption(key: kOptionDisableChangePermanentPassword) ==
-    'Y';
-
-bool isChangeIdDisabled() =>
-    bind.mainGetBuildinOption(key: kOptionDisableChangeId) == 'Y';
-
-bool isUnlockPinDisabled() =>
-    bind.mainGetBuildinOption(key: kOptionDisableUnlockPin) == 'Y';
-
 bool? _isCustomClient;
 bool get isCustomClient {
   _isCustomClient ??= bind.isCustomClient();
@@ -4176,66 +3943,3 @@ String decode_http_response(http.Response resp) {
     return resp.body;
   }
 }
-
-bool peerTabShowNote(PeerTabIndex peerTabIndex) {
-  return peerTabIndex == PeerTabIndex.ab || peerTabIndex == PeerTabIndex.group;
-}
-
-// TODO: We should support individual bits combinations in the future.
-// But for now, just keep it simple, because the old code only supports single button.
-// No users have requested multi-button support yet.
-String mouseButtonsToPeer(int buttons) {
-  switch (buttons) {
-    case kPrimaryMouseButton:
-      return 'left';
-    case kSecondaryMouseButton:
-      return 'right';
-    case kMiddleMouseButton:
-      return 'wheel';
-    case kBackMouseButton:
-      return 'back';
-    case kForwardMouseButton:
-      return 'forward';
-    default:
-      return '';
-  }
-}
-
-/// Build an avatar widget from an avatar URL or data URI string.
-/// Returns [fallback] if avatar is empty or cannot be decoded.
-/// [borderRadius] defaults to [size]/2 (circle).
-Widget? buildAvatarWidget({
-  required String avatar,
-  required double size,
-  double? borderRadius,
-  Widget? fallback,
-}) {
-  final trimmed = avatar.trim();
-  if (trimmed.isEmpty) return fallback;
-
-  ImageProvider? imageProvider;
-  if (trimmed.startsWith('data:image/')) {
-    final comma = trimmed.indexOf(',');
-    if (comma > 0) {
-      try {
-        imageProvider = MemoryImage(base64Decode(trimmed.substring(comma + 1)));
-      } catch (_) {}
-    }
-  } else if (trimmed.startsWith('http://') || trimmed.startsWith('https://')) {
-    imageProvider = NetworkImage(trimmed);
-  }
-
-  if (imageProvider == null) return fallback;
-
-  final radius = borderRadius ?? size / 2;
-  return ClipRRect(
-    borderRadius: BorderRadius.circular(radius),
-    child: Image(
-      image: imageProvider,
-      width: size,
-      height: size,
-      fit: BoxFit.cover,
-      errorBuilder: (_, __, ___) => fallback ?? SizedBox.shrink(),
-    ),
-  );
-}

flutter/lib/common/hbbs/hbbs.dart

@@ -25,8 +25,6 @@ enum UserStatus { kDisabled, kNormal, kUnverified }
 // Is all the fields of the user needed?
 class UserPayload {
   String name = '';
-  String displayName = '';
-  String avatar = '';
   String email = '';
   String note = '';
   String? verifier;
@@ -35,8 +33,6 @@ class UserPayload {
 
   UserPayload.fromJson(Map<String, dynamic> json)
       : name = json['name'] ?? '',
-        displayName = json['display_name'] ?? '',
-        avatar = json['avatar'] ?? '',
         email = json['email'] ?? '',
         note = json['note'] ?? '',
         verifier = json['verifier'],
@@ -50,8 +46,6 @@ class UserPayload {
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> map = {
       'name': name,
-      'display_name': displayName,
-      'avatar': avatar,
       'status': status == UserStatus.kDisabled
           ? 0
           : status == UserStatus.kUnverified
@@ -64,14 +58,9 @@ class UserPayload {
   Map<String, dynamic> toGroupCacheJson() {
     final Map<String, dynamic> map = {
       'name': name,
-      'display_name': displayName,
     };
     return map;
   }
-
-  String get displayNameOrName {
-    return displayName.trim().isEmpty ? name : displayName;
-  }
 }
 
 class PeerPayload {
@@ -100,7 +89,6 @@ class PeerPayload {
       "platform": _platform(p.info['os']),
       "hostname": p.info['device_name'],
       "device_group_name": p.device_group_name,
-      "note": p.note,
     });
   }
 

flutter/lib/common/widgets/address_book.dart

@@ -54,9 +54,9 @@ class _AddressBookState extends State<AddressBook> {
                 const LinearProgressIndicator(),
               buildErrorBanner(context,
                   loading: gFFI.abModel.currentAbLoading,
-                  err: gFFI.abModel.abPullError,
+                  err: gFFI.abModel.currentAbPullError,
                   retry: null,
-                  close: gFFI.abModel.clearPullErrors),
+                  close: () => gFFI.abModel.currentAbPullError.value = ''),
               buildErrorBanner(context,
                   loading: gFFI.abModel.currentAbLoading,
                   err: gFFI.abModel.currentAbPushError,
@@ -466,7 +466,6 @@ class _AddressBookState extends State<AddressBook> {
     IDTextEditingController idController = IDTextEditingController(text: '');
     TextEditingController aliasController = TextEditingController(text: '');
     TextEditingController passwordController = TextEditingController(text: '');
-    TextEditingController noteController = TextEditingController(text: '');
     final tags = List.of(gFFI.abModel.currentAbTags);
     var selectedTag = List<dynamic>.empty(growable: true).obs;
     final style = TextStyle(fontSize: 14.0);
@@ -495,11 +494,7 @@ class _AddressBookState extends State<AddressBook> {
             password = passwordController.text;
           }
           String? errMsg2 = await gFFI.abModel.addIdToCurrent(
-              id,
-              aliasController.text.trim(),
-              password,
-              selectedTag,
-              noteController.text);
+              id, aliasController.text.trim(), password, selectedTag);
           if (errMsg2 != null) {
             setState(() {
               isInProgress = false;
@@ -605,24 +600,6 @@ class _AddressBookState extends State<AddressBook> {
                           ),
                         ).workaroundFreezeLinuxMint(),
                       )),
-                row(
-                    label: Text(
-                      translate('Note'),
-                      style: style,
-                    ),
-                    input: Obx(
-                      () => TextField(
-                        controller: noteController,
-                        maxLines: 3,
-                        minLines: 1,
-                        maxLength: 300,
-                        decoration: InputDecoration(
-                          labelText: stateGlobal.isPortrait.isFalse
-                              ? null
-                              : translate('Note'),
-                        ),
-                      ).workaroundFreezeLinuxMint(),
-                    )),
                 if (gFFI.abModel.currentAbTags.isNotEmpty)
                   Align(
                     alignment: Alignment.centerLeft,

flutter/lib/common/widgets/autocomplete.dart

@@ -1,6 +1,3 @@
-import 'dart:async';
-
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hbb/common/formatter/id_formatter.dart';
 import '../../../models/platform_model.dart';
@@ -8,136 +5,27 @@ import 'package:flutter_hbb/models/peer_model.dart';
 import 'package:flutter_hbb/common.dart';
 import 'package:flutter_hbb/common/widgets/peer_card.dart';
 
-@visibleForTesting
-List<Peer> mergeAutocompletePeers({
-  Iterable<Peer> addressBookPeers = const [],
-  Iterable<Peer> groupPeers = const [],
-  Iterable<Peer> lanPeers = const [],
-  Iterable<Peer> recentPeers = const [],
-  Iterable<String> restRecentPeerIds = const [],
-}) {
-  final combinedPeers = <String, Peer>{};
-
-  void addPeer(Peer peer) {
-    if (peer.id.isEmpty) {
-      return;
-    }
-    final existingPeer = combinedPeers[peer.id];
-    if (existingPeer == null) {
-      combinedPeers[peer.id] = Peer.copy(peer);
-    } else if (peer.online) {
-      existingPeer.online = true;
-    }
-  }
-
-  for (final peer in addressBookPeers) {
-    addPeer(peer);
-  }
-  for (final peer in groupPeers) {
-    addPeer(peer);
-  }
-  for (final peer in lanPeers) {
-    addPeer(peer);
-  }
-  for (final peer in recentPeers) {
-    addPeer(peer);
-  }
-  for (final id in restRecentPeerIds) {
-    if (id.isNotEmpty && !combinedPeers.containsKey(id)) {
-      combinedPeers[id] = Peer.fromJson({'id': id});
-    }
-  }
-
-  return combinedPeers.values.toList(growable: false);
-}
-
-@visibleForTesting
-bool updateAutocompletePeerOnlineStates(
-  List<Peer> peers, {
-  required Set<String> onlines,
-  required Set<String> offlines,
-}) {
-  var changed = false;
-  for (final peer in peers) {
-    if (onlines.contains(peer.id)) {
-      if (!peer.online) {
-        peer.online = true;
-        changed = true;
-      }
-    } else if (offlines.contains(peer.id)) {
-      if (peer.online) {
-        peer.online = false;
-        changed = true;
-      }
-    }
-  }
-  return changed;
-}
-
-@visibleForTesting
-List<String> autocompleteOnlineQueryIds(
-  Iterable<Peer> options, {
-  required int limit,
-}) {
-  final ids = <String>[];
-  final seenIds = <String>{};
-  for (final peer in options) {
-    if (peer.id.isEmpty || seenIds.contains(peer.id)) {
-      continue;
-    }
-    seenIds.add(peer.id);
-    ids.add(peer.id);
-    if (ids.length >= limit) {
-      break;
-    }
-  }
-  return ids;
-}
-
 class AllPeersLoader {
   List<Peer> peers = [];
 
   bool _isPeersLoading = false;
   bool _isPeersLoaded = false;
-  Set<String> _lastQueryOnlineIds = {};
-  DateTime _lastQueryOnlineTime = DateTime.fromMillisecondsSinceEpoch(0);
-  Timer? _queryOnlineTimer;
-  List<Peer> _lastQueryOnlineOptions = const [];
-  Set<String> _lastOnlineIds = {};
-  Set<String> _lastOfflineIds = {};
-  final Future<void> Function(List<String> ids) _queryOnlines;
-  final Duration _queryOnlineDebounce;
-  void Function(VoidCallback)? _setState;
-  bool _isCleared = false;
 
   final String _listenerKey = 'AllPeersLoader';
-  static const String _cbQueryOnlines = 'callback_query_onlines';
-  static const Duration _queryOnlineInterval = Duration(seconds: 5);
-  static const Duration _defaultQueryOnlineDebounce =
-      Duration(milliseconds: 300);
-  static const int _maxQueryOnlineOptions = 20;
+
+  late void Function(VoidCallback) setState;
 
   bool get needLoad => !_isPeersLoaded && !_isPeersLoading;
   bool get isPeersLoaded => _isPeersLoaded;
 
-  AllPeersLoader({
-    @visibleForTesting Future<void> Function(List<String> ids)? queryOnlines,
-    @visibleForTesting Duration? queryOnlineDebounce,
-  })  : _queryOnlines = queryOnlines ?? ((ids) => bind.queryOnlines(ids: ids)),
-        _queryOnlineDebounce =
-            queryOnlineDebounce ?? _defaultQueryOnlineDebounce;
+  AllPeersLoader();
 
   void init(void Function(VoidCallback) setState) {
-    _setState = setState;
-    _isCleared = false;
+    this.setState = setState;
     gFFI.recentPeersModel.addListener(_mergeAllPeers);
     gFFI.lanPeersModel.addListener(_mergeAllPeers);
     gFFI.abModel.addPeerUpdateListener(_listenerKey, _mergeAllPeers);
     gFFI.groupModel.addPeerUpdateListener(_listenerKey, _mergeAllPeers);
-    platformFFI.registerEventHandler(_cbQueryOnlines, _listenerKey,
-        (evt) async {
-      _updateOnlineState(evt);
-    });
   }
 
   void clear() {
@@ -145,11 +33,6 @@ class AllPeersLoader {
     gFFI.lanPeersModel.removeListener(_mergeAllPeers);
     gFFI.abModel.removePeerUpdateListener(_listenerKey);
     gFFI.groupModel.removePeerUpdateListener(_listenerKey);
-    platformFFI.unregisterEventHandler(_cbQueryOnlines, _listenerKey);
-    _queryOnlineTimer?.cancel();
-    _lastQueryOnlineOptions = const [];
-    _setState = null;
-    _isCleared = true;
   }
 
   Future<void> getAllPeers() async {
@@ -176,106 +59,50 @@ class AllPeersLoader {
   }
 
   void _mergeAllPeers() {
-    if (_isCleared) {
-      return;
+    Map<String, dynamic> combinedPeers = {};
+    for (var p in gFFI.abModel.allPeers()) {
+      if (!combinedPeers.containsKey(p.id)) {
+        combinedPeers[p.id] = p.toJson();
+      }
     }
-    peers = mergeAutocompletePeers(
-      addressBookPeers: gFFI.abModel.allPeers(),
-      groupPeers: gFFI.groupModel.peers,
-      lanPeers: gFFI.lanPeersModel.peers,
-      recentPeers: gFFI.recentPeersModel.peers,
-      restRecentPeerIds: gFFI.recentPeersModel.restPeerIds,
-    );
-    _applyLastOnlineState(peers);
-    _scheduleSetState(() {
+    for (var p in gFFI.groupModel.peers.map((e) => Peer.copy(e)).toList()) {
+      if (!combinedPeers.containsKey(p.id)) {
+        combinedPeers[p.id] = p.toJson();
+      }
+    }
+
+    List<Peer> parsedPeers = [];
+    for (var peer in combinedPeers.values) {
+      parsedPeers.add(Peer.fromJson(peer));
+    }
+
+    Set<String> peerIds = combinedPeers.keys.toSet();
+    for (final peer in gFFI.lanPeersModel.peers) {
+      if (!peerIds.contains(peer.id)) {
+        parsedPeers.add(peer);
+        peerIds.add(peer.id);
+      }
+    }
+
+    for (final peer in gFFI.recentPeersModel.peers) {
+      if (!peerIds.contains(peer.id)) {
+        parsedPeers.add(peer);
+        peerIds.add(peer.id);
+      }
+    }
+    for (final id in gFFI.recentPeersModel.restPeerIds) {
+      if (!peerIds.contains(id)) {
+        parsedPeers.add(Peer.fromJson({'id': id}));
+        peerIds.add(id);
+      }
+    }
+
+    peers = parsedPeers;
+    setState(() {
       _isPeersLoading = false;
       _isPeersLoaded = true;
     });
   }
-
-  void _updateOnlineState(Map<String, dynamic> evt) {
-    if (_isCleared) {
-      return;
-    }
-    _lastOnlineIds = _splitPeerIds(evt['onlines']);
-    _lastOfflineIds = _splitPeerIds(evt['offlines']);
-    final peersChanged = _applyLastOnlineState(peers);
-    final optionsChanged = _applyLastOnlineState(_lastQueryOnlineOptions);
-    if (peersChanged || optionsChanged) {
-      _scheduleSetState(() {});
-    }
-  }
-
-  void _scheduleSetState(VoidCallback callback) {
-    if (_isCleared) {
-      return;
-    }
-    final setState = _setState;
-    if (setState == null) {
-      callback();
-    } else {
-      setState(callback);
-    }
-  }
-
-  bool _applyLastOnlineState(List<Peer> peers) {
-    return updateAutocompletePeerOnlineStates(
-      peers,
-      onlines: _lastOnlineIds,
-      offlines: _lastOfflineIds,
-    );
-  }
-
-  Set<String> _splitPeerIds(dynamic ids) {
-    if (ids is! String || ids.isEmpty) {
-      return {};
-    }
-    return ids.split(',').where((id) => id.isNotEmpty).toSet();
-  }
-
-  void queryOnlines(Iterable<Peer> options) {
-    if (_isCleared) {
-      return;
-    }
-    _lastQueryOnlineOptions = options.toList(growable: false);
-    final ids = autocompleteOnlineQueryIds(
-      _lastQueryOnlineOptions,
-      limit: _maxQueryOnlineOptions,
-    ).toSet();
-    _queryOnlineTimer?.cancel();
-    _queryOnlineTimer = null;
-    if (ids.isEmpty) {
-      return;
-    }
-    final now = DateTime.now();
-    if (setEquals(ids, _lastQueryOnlineIds) &&
-        now.difference(_lastQueryOnlineTime) < _queryOnlineInterval) {
-      return;
-    }
-
-    _queryOnlineTimer = Timer(_queryOnlineDebounce, () async {
-      try {
-        await _queryOnlines(ids.toList(growable: false));
-        if (_isCleared) {
-          return;
-        }
-        _lastQueryOnlineIds = ids;
-        _lastQueryOnlineTime = DateTime.now();
-      } catch (e) {
-        debugPrint('query autocomplete online state failed: $e');
-      }
-    });
-  }
-
-  @visibleForTesting
-  void updateOnlineStateForTesting(Map<String, dynamic> evt) {
-    _updateOnlineState(evt);
-  }
-
-  @visibleForTesting
-  bool applyLastOnlineStateForTesting(List<Peer> peers) {
-    return _applyLastOnlineState(peers);
-  }
 }
 
 class AutocompletePeerTile extends StatefulWidget {

flutter/lib/common/widgets/custom_scale_base.dart

@@ -1,156 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:debounce_throttle/debounce_throttle.dart';
-import 'package:flutter_hbb/consts.dart';
-import 'package:flutter_hbb/models/model.dart';
-import 'package:flutter_hbb/models/platform_model.dart';
-import 'package:flutter_hbb/utils/scale.dart';
-import 'package:flutter_hbb/common.dart';
-
-/// Base class providing shared custom scale control logic for both mobile and desktop widgets.
-/// Implementations must provide [ffi] and [onScaleChanged] getters.
-abstract class CustomScaleControls<T extends StatefulWidget> extends State<T> {
-  /// FFI instance for session interaction
-  FFI get ffi;
-
-  /// Callback invoked when scale value changes
-  ValueChanged<int>? get onScaleChanged;
-
-  late int _scaleValue;
-  late final Debouncer<int> _debouncerScale;
-  // Normalized slider position in [0, 1]. We map it nonlinearly to percent.
-  double _scalePos = 0.0;
-
-  int get scaleValue => _scaleValue;
-  double get scalePos => _scalePos;
-
-  int mapPosToPercent(double p) => _mapPosToPercent(p);
-
-  static const int minPercent = kScaleCustomMinPercent;
-  static const int pivotPercent = kScaleCustomPivotPercent; // 100% should be at 1/3 of track
-  static const int maxPercent = kScaleCustomMaxPercent;
-  static const double pivotPos = kScaleCustomPivotPos; // first 1/3 → up to 100%
-  static const double detentEpsilon = kScaleCustomDetentEpsilon; // snap range around pivot (~0.6%)
-
-  // Clamp helper for local use
-  int _clampScale(int v) => clampCustomScalePercent(v);
-
-  // Map normalized position [0,1] → percent [5,1000] with 100 at 1/3 width.
-  int _mapPosToPercent(double p) {
-    if (p <= 0.0) return minPercent;
-    if (p >= 1.0) return maxPercent;
-    if (p <= pivotPos) {
-      final q = p / pivotPos; // 0..1
-      final v = minPercent + q * (pivotPercent - minPercent);
-      return _clampScale(v.round());
-    } else {
-      final q = (p - pivotPos) / (1.0 - pivotPos); // 0..1
-      final v = pivotPercent + q * (maxPercent - pivotPercent);
-      return _clampScale(v.round());
-    }
-  }
-
-  // Map percent [5,1000] → normalized position [0,1]
-  double _mapPercentToPos(int percent) {
-    final p = _clampScale(percent);
-    if (p <= pivotPercent) {
-      final q = (p - minPercent) / (pivotPercent - minPercent);
-      return q * pivotPos;
-    } else {
-      final q = (p - pivotPercent) / (maxPercent - pivotPercent);
-      return pivotPos + q * (1.0 - pivotPos);
-    }
-  }
-
-  // Snap normalized position to the pivot when close to it
-  double _snapNormalizedPos(double p) {
-    if ((p - pivotPos).abs() <= detentEpsilon) return pivotPos;
-    if (p < 0.0) return 0.0;
-    if (p > 1.0) return 1.0;
-    return p;
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    _scaleValue = 100;
-    _debouncerScale = Debouncer<int>(
-      kDebounceCustomScaleDuration,
-      onChanged: (v) async {
-        await _applyScale(v);
-      },
-      initialValue: _scaleValue,
-    );
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      try {
-        final v = await getSessionCustomScalePercent(ffi.sessionId);
-        if (mounted) {
-          setState(() {
-            _scaleValue = v;
-            _scalePos = _mapPercentToPos(v);
-          });
-        }
-      } catch (e, st) {
-        debugPrint('[CustomScale] Failed to get initial value: $e');
-        debugPrintStack(stackTrace: st);
-      }
-    });
-  }
-
-  Future<void> _applyScale(int v) async {
-    v = clampCustomScalePercent(v);
-    setState(() {
-      _scaleValue = v;
-    });
-    try {
-      await bind.sessionSetFlutterOption(
-          sessionId: ffi.sessionId,
-          k: kCustomScalePercentKey,
-          v: v.toString());
-      final curStyle = await bind.sessionGetViewStyle(sessionId: ffi.sessionId);
-      if (curStyle != kRemoteViewStyleCustom) {
-        await bind.sessionSetViewStyle(
-            sessionId: ffi.sessionId, value: kRemoteViewStyleCustom);
-      }
-      await ffi.canvasModel.updateViewStyle();
-      if (isMobile) {
-        HapticFeedback.selectionClick();
-      }
-      onScaleChanged?.call(v);
-    } catch (e, st) {
-      debugPrint('[CustomScale] Apply failed: $e');
-      debugPrintStack(stackTrace: st);
-    }
-  }
-
-  void nudgeScale(int delta) {
-    final next = _clampScale(_scaleValue + delta);
-    setState(() {
-      _scaleValue = next;
-      _scalePos = _mapPercentToPos(next);
-    });
-    onScaleChanged?.call(next);
-    _debouncerScale.value = next;
-  }
-
-  @override
-  void dispose() {
-    _debouncerScale.cancel();
-    super.dispose();
-  }
-
-  void onSliderChanged(double v) {
-    final snapped = _snapNormalizedPos(v);
-    final next = _mapPosToPercent(snapped);
-    if (next != _scaleValue || snapped != _scalePos) {
-      setState(() {
-        _scalePos = snapped;
-        _scaleValue = next;
-      });
-      onScaleChanged?.call(next);
-      _debouncerScale.value = next;
-    }
-  }
-}

flutter/lib/common/widgets/dialog.dart

@@ -7,29 +7,20 @@ import 'package:flutter/services.dart';
 import 'package:flutter_hbb/common/shared_state.dart';
 import 'package:flutter_hbb/common/widgets/setting_widgets.dart';
 import 'package:flutter_hbb/consts.dart';
-import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
 import 'package:flutter_hbb/models/peer_model.dart';
 import 'package:flutter_hbb/models/peer_tab_model.dart';
 import 'package:flutter_hbb/models/state_model.dart';
 import 'package:get/get.dart';
 import 'package:qr_flutter/qr_flutter.dart';
-import 'package:flutter_hbb/utils/http_service.dart' as http;
 
 import '../../common.dart';
 import '../../models/model.dart';
 import '../../models/platform_model.dart';
 import 'address_book.dart';
 
-void clientClose(SessionID sessionId, FFI ffi) async {
-  if (allowAskForNoteAtEndOfConnection(ffi, true)) {
-    if (await showConnEndAuditDialogCloseCanceled(ffi: ffi)) {
-      return;
-    }
-    closeConnection();
-  } else {
-    msgBox(sessionId, 'info', 'Close', 'Are you sure to close the connection?',
-        '', ffi.dialogManager);
-  }
+void clientClose(SessionID sessionId, OverlayDialogManager dialogManager) {
+  msgBox(sessionId, 'info', 'Close', 'Are you sure to close the connection?',
+      '', dialogManager);
 }
 
 abstract class ValidationRule {
@@ -1518,71 +1509,56 @@ showSetOSAccount(
   });
 }
 
-Widget buildNoteTextField({
-  required TextEditingController controller,
-  required VoidCallback onEscape,
-}) {
-  final focusNode = FocusNode(
-    onKey: (FocusNode node, RawKeyEvent evt) {
-      if (evt.logicalKey.keyLabel == 'Enter') {
-        if (evt is RawKeyDownEvent) {
-          int pos = controller.selection.base.offset;
-          controller.text =
-              '${controller.text.substring(0, pos)}\n${controller.text.substring(pos)}';
-          controller.selection =
-              TextSelection.fromPosition(TextPosition(offset: pos + 1));
-        }
-        return KeyEventResult.handled;
-      }
-      if (evt.logicalKey.keyLabel == 'Esc') {
-        if (evt is RawKeyDownEvent) {
-          onEscape();
-        }
-        return KeyEventResult.handled;
-      } else {
-        return KeyEventResult.ignored;
-      }
-    },
-  );
-
-  return TextField(
-    autofocus: true,
-    keyboardType: TextInputType.multiline,
-    textInputAction: TextInputAction.newline,
-    decoration: InputDecoration(
-      hintText: translate('input note here'),
-      border: OutlineInputBorder(
-        borderRadius: BorderRadius.circular(8),
-      ),
-      contentPadding: EdgeInsets.all(12),
-    ),
-    minLines: 5,
-    maxLines: null,
-    maxLength: 256,
-    controller: controller,
-    focusNode: focusNode,
-  ).workaroundFreezeLinuxMint();
-}
-
 showAuditDialog(FFI ffi) async {
-  final controller = TextEditingController(
-      text: bind.sessionGetLastAuditNote(sessionId: ffi.sessionId));
+  final controller = TextEditingController(text: ffi.auditNote);
   ffi.dialogManager.show((setState, close, context) {
     submit() {
       var text = controller.text;
       bind.sessionSendNote(sessionId: ffi.sessionId, note: text);
+      ffi.auditNote = text;
       close();
     }
 
+    late final focusNode = FocusNode(
+      onKey: (FocusNode node, RawKeyEvent evt) {
+        if (evt.logicalKey.keyLabel == 'Enter') {
+          if (evt is RawKeyDownEvent) {
+            int pos = controller.selection.base.offset;
+            controller.text =
+                '${controller.text.substring(0, pos)}\n${controller.text.substring(pos)}';
+            controller.selection =
+                TextSelection.fromPosition(TextPosition(offset: pos + 1));
+          }
+          return KeyEventResult.handled;
+        }
+        if (evt.logicalKey.keyLabel == 'Esc') {
+          if (evt is RawKeyDownEvent) {
+            close();
+          }
+          return KeyEventResult.handled;
+        } else {
+          return KeyEventResult.ignored;
+        }
+      },
+    );
+
     return CustomAlertDialog(
       title: Text(translate('Note')),
       content: SizedBox(
           width: 250,
           height: 120,
-          child: buildNoteTextField(
+          child: TextField(
+            autofocus: true,
+            keyboardType: TextInputType.multiline,
+            textInputAction: TextInputAction.newline,
+            decoration: const InputDecoration.collapsed(
+              hintText: 'input note here',
+            ),
+            maxLines: null,
+            maxLength: 256,
             controller: controller,
-            onEscape: close,
-          )),
+            focusNode: focusNode,
+          ).workaroundFreezeLinuxMint()),
       actions: [
         dialogButton('Cancel', onPressed: close, isOutline: true),
         dialogButton('OK', onPressed: submit)
@@ -1593,223 +1569,6 @@ showAuditDialog(FFI ffi) async {
   });
 }
 
-bool allowAskForNoteAtEndOfConnection(FFI? ffi, bool closedByControlling) {
-  if (ffi == null) {
-    return false;
-  }
-  return mainGetLocalBoolOptionSync(kOptionAllowAskForNoteAtEndOfConnection) &&
-      bind
-          .sessionGetAuditServerSync(sessionId: ffi.sessionId, typ: "conn")
-          .isNotEmpty &&
-      bind.sessionGetAuditGuid(sessionId: ffi.sessionId).isNotEmpty &&
-      bind.sessionGetLastAuditNote(sessionId: ffi.sessionId).isEmpty &&
-      (!closedByControlling ||
-          bind.willSessionCloseCloseSession(sessionId: ffi.sessionId));
-}
-
-// return value: close canceled
-//  true: return
-//  false: go on
-Future<bool> desktopTryShowTabAuditDialogCloseCancelled(
-    {required String id, required DesktopTabController tabController}) async {
-  try {
-    final page =
-        tabController.state.value.tabs.firstWhere((tab) => tab.key == id).page;
-    final ffi = (page as dynamic).ffi;
-    final res = await showConnEndAuditDialogCloseCanceled(ffi: ffi);
-    return res;
-  } catch (e) {
-    debugPrint('Failed to show audit dialog: $e');
-    return false;
-  }
-}
-
-// return value:
-//  true: return
-//  false: go on
-Future<bool> showConnEndAuditDialogCloseCanceled(
-    {required FFI ffi, String? type, String? title, String? text}) async {
-  final res = await _showConnEndAuditDialogCloseCanceled(
-      ffi: ffi, type: type, title: title, text: text);
-  if (res == true) {
-    return true;
-  }
-  return false;
-}
-
-// return value:
-//  true: return
-//  false / null: go on
-Future<bool?> _showConnEndAuditDialogCloseCanceled({
-  required FFI ffi,
-  String? type,
-  String? title,
-  String? text,
-}) async {
-  final closedByControlling = type == null;
-  final showDialog = allowAskForNoteAtEndOfConnection(ffi, closedByControlling);
-  if (!showDialog) {
-    return false;
-  }
-  ffi.dialogManager.dismissAll();
-
-  Future<void> updateAuditNoteByGuid(String auditGuid, String note) async {
-    debugPrint('Updating audit note for GUID: $auditGuid, note: $note');
-    try {
-      final apiServer = await bind.mainGetApiServer();
-      if (apiServer.isEmpty) {
-        debugPrint('API server is empty, cannot update audit note');
-        return;
-      }
-      final url = '$apiServer/api/audit';
-      var headers = getHttpHeaders();
-      headers['Content-Type'] = "application/json";
-      final body = jsonEncode({
-        'guid': auditGuid,
-        'note': note,
-      });
-
-      final response = await http.put(
-        Uri.parse(url),
-        headers: headers,
-        body: body,
-      );
-
-      if (response.statusCode == 200) {
-        debugPrint('Successfully updated audit note for GUID: $auditGuid');
-      } else {
-        debugPrint(
-            'Failed to update audit note. Status: ${response.statusCode}, Body: ${response.body}');
-      }
-    } catch (e) {
-      debugPrint('Error updating audit note: $e');
-    }
-  }
-
-  final controller = TextEditingController();
-  bool askForNote =
-      mainGetLocalBoolOptionSync(kOptionAllowAskForNoteAtEndOfConnection);
-  final isOptFixed = isOptionFixed(kOptionAllowAskForNoteAtEndOfConnection);
-  bool isInProgress = false;
-
-  return await ffi.dialogManager.show<bool>((setState, close, context) {
-    cancel() {
-      close(true);
-    }
-
-    set() async {
-      if (isInProgress) return;
-      setState(() {
-        isInProgress = true;
-      });
-      var text = controller.text;
-      if (text.isNotEmpty) {
-        await updateAuditNoteByGuid(
-                bind.sessionGetAuditGuid(sessionId: ffi.sessionId), text)
-            .timeout(const Duration(seconds: 6), onTimeout: () {
-          debugPrint('updateAuditNoteByGuid timeout after 6s');
-        });
-      }
-      // Save the "ask for note" preference
-      if (!isOptFixed) {
-        await mainSetLocalBoolOption(
-            kOptionAllowAskForNoteAtEndOfConnection, askForNote);
-      }
-    }
-
-    submit() async {
-      await set();
-      close(false);
-    }
-
-    final buttons = [
-      dialogButton('OK', onPressed: isInProgress ? null : submit)
-    ];
-    if (type == 'relay-hint' || type == 'relay-hint2') {
-      buttons.add(dialogButton('Retry', onPressed: () async {
-        await set();
-        close(true);
-        ffi.ffiModel.reconnect(ffi.dialogManager, ffi.sessionId, false);
-      }));
-      if (type == 'relay-hint2') {
-        buttons.add(dialogButton('Connect via relay', onPressed: () async {
-          await set();
-          close(true);
-          ffi.ffiModel.reconnect(ffi.dialogManager, ffi.sessionId, true);
-        }));
-      }
-    }
-    if (closedByControlling) {
-      buttons.add(dialogButton('Cancel',
-          onPressed: isInProgress ? null : cancel, isOutline: true));
-    }
-
-    Widget content;
-    if (closedByControlling) {
-      content = SelectionArea(
-          child: msgboxContent(
-              'info', 'Close', 'Are you sure to close the connection?'));
-    } else {
-      content =
-          SelectionArea(child: msgboxContent(type, title ?? '', text ?? ''));
-    }
-
-    return CustomAlertDialog(
-      title: null,
-      content: SizedBox(
-          width: 350,
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              content,
-              const SizedBox(height: 16),
-              SizedBox(
-                height: 120,
-                child: buildNoteTextField(
-                  controller: controller,
-                  onEscape: cancel,
-                ),
-              ),
-              if (!isOptFixed) ...[
-                const SizedBox(height: 8),
-                InkWell(
-                  onTap: () {
-                    setState(() {
-                      askForNote = !askForNote;
-                    });
-                  },
-                  child: Row(
-                    children: [
-                      Checkbox(
-                        value: askForNote,
-                        onChanged: (value) {
-                          setState(() {
-                            askForNote = value ?? false;
-                          });
-                        },
-                      ),
-                      Expanded(
-                        child: Text(
-                          translate('note-at-conn-end-tip'),
-                          style: const TextStyle(fontSize: 13),
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-              ],
-              if (isInProgress)
-                const LinearProgressIndicator().marginOnly(top: 4),
-            ],
-          )),
-      actions: buttons,
-      onSubmit: submit,
-      onCancel: cancel,
-    );
-  });
-}
-
 void showConfirmSwitchSidesDialog(
     SessionID sessionId, String id, OverlayDialogManager dialogManager) async {
   dialogManager.show((setState, close, context) {
@@ -2024,49 +1783,6 @@ void editAbTagDialog(
   });
 }
 
-void editAbPeerNoteDialog(String id) {
-  var isInProgress = false;
-  final currentNote = gFFI.abModel.getPeerNote(id);
-  var controller = TextEditingController(text: currentNote);
-
-  gFFI.dialogManager.show((setState, close, context) {
-    submit() async {
-      setState(() {
-        isInProgress = true;
-      });
-      await gFFI.abModel.changeNote(id: id, note: controller.text);
-      close();
-    }
-
-    return CustomAlertDialog(
-      title: Text(translate("Edit note")),
-      content: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          TextField(
-            controller: controller,
-            autofocus: true,
-            maxLines: 3,
-            minLines: 1,
-            maxLength: 300,
-            decoration: InputDecoration(
-              labelText: translate('Note'),
-            ),
-          ).workaroundFreezeLinuxMint(),
-          // NOT use Offstage to wrap LinearProgressIndicator
-          if (isInProgress) const LinearProgressIndicator(),
-        ],
-      ),
-      actions: [
-        dialogButton("Cancel", onPressed: close, isOutline: true),
-        dialogButton("OK", onPressed: submit),
-      ],
-      onSubmit: submit,
-      onCancel: close,
-    );
-  });
-}
-
 void renameDialog(
     {required String oldName,
     FormFieldValidator<String>? validator,
@@ -2362,20 +2078,15 @@ void showWindowsSessionsDialog(
 
     return CustomAlertDialog(
       title: null,
-      content: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          msgboxContent(type, title, text).marginOnly(bottom: 12),
-          ComboBox(
-              keys: sids,
-              values: names,
-              initialKey: selectedUserValue,
-              onChanged: (value) {
-                selectedUserValue = value;
-              }),
-        ],
-      ),
+      content: msgboxContent(type, title, text),
       actions: [
+        ComboBox(
+            keys: sids,
+            values: names,
+            initialKey: selectedUserValue,
+            onChanged: (value) {
+              selectedUserValue = value;
+            }),
         dialogButton('Connect', onPressed: submit, isOutline: false),
       ],
     );

flutter/lib/common/widgets/gestures.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/widgets.dart';
-import 'package:flutter_hbb/common/widgets/remote_input.dart';
 
 enum GestureState {
   none,
@@ -25,7 +24,6 @@ class CustomTouchGestureRecognizer extends ScaleGestureRecognizer {
   GestureDragStartCallback? onOneFingerPanStart;
   GestureDragUpdateCallback? onOneFingerPanUpdate;
   GestureDragEndCallback? onOneFingerPanEnd;
-  GestureDragCancelCallback? onOneFingerPanCancel;
 
   // twoFingerScale : scale + pan event
   GestureScaleStartCallback? onTwoFingerScaleStart;
@@ -98,12 +96,6 @@ class CustomTouchGestureRecognizer extends ScaleGestureRecognizer {
           if (onTwoFingerScaleEnd != null) {
             onTwoFingerScaleEnd!(d);
           }
-          if (isSpecialHoldDragActive) {
-            // If we are in special drag mode, we need to reset the state.
-            // Otherwise, the next `onTwoFingerScaleUpdate()` will handle a wrong `focalPoint`.
-            _currentState = GestureState.none;
-            return;
-          }
           break;
         case GestureState.threeFingerVerticalDrag:
           debugPrint("ThreeFingerState.vertical onEnd");
@@ -170,27 +162,6 @@ class CustomTouchGestureRecognizer extends ScaleGestureRecognizer {
 
   DragEndDetails _getDragEndDetails(ScaleEndDetails d) =>
       DragEndDetails(velocity: d.velocity);
-
-  @override
-  void rejectGesture(int pointer) {
-    super.rejectGesture(pointer);
-    switch (_currentState) {
-      case GestureState.oneFingerPan:
-        if (onOneFingerPanCancel != null) {
-          onOneFingerPanCancel!();
-        }
-        break;
-      case GestureState.twoFingerScale:
-        // Reset scale state if needed, currently self-contained
-        break;
-      case GestureState.threeFingerVerticalDrag:
-        // Reset drag state if needed, currently self-contained
-        break;
-      default:
-        break;
-    }
-    _currentState = GestureState.none;
-  }
 }
 
 class HoldTapMoveGestureRecognizer extends GestureRecognizer {
@@ -739,7 +710,6 @@ RawGestureDetector getMixinGestureDetector({
   GestureDragStartCallback? onOneFingerPanStart,
   GestureDragUpdateCallback? onOneFingerPanUpdate,
   GestureDragEndCallback? onOneFingerPanEnd,
-  GestureDragCancelCallback? onOneFingerPanCancel,
   GestureScaleUpdateCallback? onTwoFingerScaleUpdate,
   GestureScaleEndCallback? onTwoFingerScaleEnd,
   GestureDragUpdateCallback? onThreeFingerVerticalDragUpdate,
@@ -788,7 +758,6 @@ RawGestureDetector getMixinGestureDetector({
             ..onOneFingerPanStart = onOneFingerPanStart
             ..onOneFingerPanUpdate = onOneFingerPanUpdate
             ..onOneFingerPanEnd = onOneFingerPanEnd
-            ..onOneFingerPanCancel = onOneFingerPanCancel
             ..onTwoFingerScaleUpdate = onTwoFingerScaleUpdate
             ..onTwoFingerScaleEnd = onTwoFingerScaleEnd
             ..onThreeFingerVerticalDragUpdate = onThreeFingerVerticalDragUpdate;

flutter/lib/common/widgets/login.dart

@@ -20,39 +20,9 @@ const kOpSvgList = [
   'okta',
   'facebook',
   'azure',
-  'auth0',
-  'microsoft'
+  'auth0'
 ];
 
-class _OidcProviderBranding {
-  final String label;
-  final String iconKey;
-
-  const _OidcProviderBranding({
-    required this.label,
-    required this.iconKey,
-  });
-}
-
-_OidcProviderBranding _oidcProviderBranding(String op) {
-  switch (op.toLowerCase()) {
-    case 'azure':
-      return _OidcProviderBranding(
-        label: 'Microsoft',
-        iconKey: 'microsoft',
-      );
-    default:
-      return _OidcProviderBranding(
-        label: {
-              'github': 'GitHub',
-              'gitlab': 'GitLab',
-            }[op.toLowerCase()] ??
-            toCapitalized(op),
-        iconKey: op.toLowerCase(),
-      );
-  }
-}
-
 class _IconOP extends StatelessWidget {
   final String op;
   final String? icon;
@@ -103,8 +73,11 @@ class ButtonOP extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final branding = _oidcProviderBranding(op);
-    final buttonLabel = translate("Continue with {${branding.label}}");
+    final opLabel = {
+          'github': 'GitHub',
+          'gitlab': 'GitLab'
+        }[op.toLowerCase()] ??
+        toCapitalized(op);
     return Row(children: [
       Container(
         height: height,
@@ -121,7 +94,7 @@ class ButtonOP extends StatelessWidget {
                 SizedBox(
                   width: 30,
                   child: _IconOP(
-                    op: branding.iconKey,
+                    op: op,
                     icon: icon,
                     margin: EdgeInsets.only(right: 5),
                   ),
@@ -129,7 +102,8 @@ class ButtonOP extends StatelessWidget {
                 Expanded(
                   child: FittedBox(
                     fit: BoxFit.scaleDown,
-                    child: Center(child: Text(buttonLabel)),
+                    child: Center(
+                        child: Text('${translate("Continue with")} $opLabel')),
                   ),
                 ),
               ],
@@ -250,59 +224,21 @@ class _WidgetOPState extends State<WidgetOP> {
           return Offstage(
             offstage:
                 _failedMsg.isEmpty && widget.curOP.value != widget.config.op,
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.center,
-              children: [
-                if (_stateMsg.isNotEmpty && _failedMsg.isEmpty)
-                  Padding(
-                    padding: const EdgeInsets.only(top: 8.0),
-                    child: SelectableText(
-                      translate(_stateMsg),
-                      style: DefaultTextStyle.of(context)
-                          .style
-                          .copyWith(fontSize: 12),
-                    ),
-                  ),
-                if (_failedMsg.isNotEmpty)
-                  Padding(
-                    padding: const EdgeInsets.only(top: 8.0),
-                    child: Builder(builder: (context) {
-                      final errorColor =
-                          Theme.of(context).colorScheme.error;
-                      final bgColor = Theme.of(context)
-                          .colorScheme
-                          .errorContainer
-                          .withOpacity(0.3);
-                      return Container(
-                        padding: const EdgeInsets.symmetric(
-                            horizontal: 8.0, vertical: 6.0),
-                        decoration: BoxDecoration(
-                          color: bgColor,
-                          borderRadius: BorderRadius.circular(4.0),
+            child: RichText(
+              text: TextSpan(
+                text: '$_stateMsg  ',
+                style:
+                    DefaultTextStyle.of(context).style.copyWith(fontSize: 12),
+                children: <TextSpan>[
+                  TextSpan(
+                    text: _failedMsg,
+                    style: DefaultTextStyle.of(context).style.copyWith(
+                          fontSize: 14,
+                          color: Colors.red,
                         ),
-                        child: Row(
-                          mainAxisSize: MainAxisSize.min,
-                          children: [
-                            Icon(Icons.error_outline,
-                                color: errorColor, size: 16),
-                            const SizedBox(width: 6),
-                            Flexible(
-                              child: SelectableText(
-                                translate(_failedMsg),
-                                style: DefaultTextStyle.of(context)
-                                    .style
-                                    .copyWith(
-                                      fontSize: 13,
-                                      color: errorColor,
-                                    ),
-                              ),
-                            ),
-                          ],
-                        ),
-                      );
-                    }),
                   ),
-              ],
+                ],
+              ),
             ),
           );
         }),
@@ -464,8 +400,6 @@ Future<bool?> loginDialog() async {
   String? passwordMsg;
   var isInProgress = false;
   final RxString curOP = ''.obs;
-  // Track hover state for the close icon
-  bool isCloseHovered = false;
 
   final loginOptions = [].obs;
   Future.delayed(Duration.zero, () async {
@@ -623,27 +557,21 @@ Future<bool?> loginDialog() async {
         Text(
           translate('Login'),
         ).marginOnly(top: MyTheme.dialogPadding),
-        MouseRegion(
-          onEnter: (_) => setState(() => isCloseHovered = true),
-          onExit: (_) => setState(() => isCloseHovered = false),
-          child: InkWell(
-            child: Icon(
-              Icons.close,
-              size: 25,
-              // No need to handle the branch of null.
-              // Because we can ensure the color is not null when debug.
-              color: isCloseHovered
-                  ? Colors.white
-                  : Theme.of(context)
-                      .textTheme
-                      .titleLarge
-                      ?.color
-                      ?.withOpacity(0.55),
-            ),
-            onTap: onDialogCancel,
-            hoverColor: Colors.red,
-            borderRadius: BorderRadius.circular(5),
+        InkWell(
+          child: Icon(
+            Icons.close,
+            size: 25,
+            // No need to handle the branch of null.
+            // Because we can ensure the color is not null when debug.
+            color: Theme.of(context)
+                .textTheme
+                .titleLarge
+                ?.color
+                ?.withOpacity(0.55),
           ),
+          onTap: onDialogCancel,
+          hoverColor: Colors.red,
+          borderRadius: BorderRadius.circular(5),
         ).marginOnly(top: 10, right: 15),
       ],
     );

flutter/lib/common/widgets/my_group.dart

@@ -158,18 +158,12 @@ class _MyGroupState extends State<MyGroup> {
     return Obx(() {
       final userItems = gFFI.groupModel.users.where((p0) {
         if (searchAccessibleItemNameText.isNotEmpty) {
-          final search = searchAccessibleItemNameText.value.toLowerCase();
-          return p0.name.toLowerCase().contains(search) ||
-              p0.displayNameOrName.toLowerCase().contains(search);
+          return p0.name
+              .toLowerCase()
+              .contains(searchAccessibleItemNameText.value.toLowerCase());
         }
         return true;
       }).toList();
-      // Count occurrences of each displayNameOrName to detect duplicates
-      final displayNameCount = <String, int>{};
-      for (final u in userItems) {
-        final dn = u.displayNameOrName;
-        displayNameCount[dn] = (displayNameCount[dn] ?? 0) + 1;
-      }
       final deviceGroupItems = gFFI.groupModel.deviceGroups.where((p0) {
         if (searchAccessibleItemNameText.isNotEmpty) {
           return p0.name
@@ -183,8 +177,7 @@ class _MyGroupState extends State<MyGroup> {
           itemCount: deviceGroupItems.length + userItems.length,
           itemBuilder: (context, index) => index < deviceGroupItems.length
               ? _buildDeviceGroupItem(deviceGroupItems[index])
-              : _buildUserItem(userItems[index - deviceGroupItems.length],
-                  displayNameCount));
+              : _buildUserItem(userItems[index - deviceGroupItems.length]));
       var maxHeight = max(MediaQuery.of(context).size.height / 6, 100.0);
       return Obx(() => stateGlobal.isPortrait.isFalse
           ? listView(false)
@@ -192,14 +185,8 @@ class _MyGroupState extends State<MyGroup> {
     });
   }
 
-  Widget _buildUserItem(UserPayload user, Map<String, int> displayNameCount) {
+  Widget _buildUserItem(UserPayload user) {
     final username = user.name;
-    final dn = user.displayNameOrName;
-    final isDuplicate = (displayNameCount[dn] ?? 0) > 1;
-    final displayName =
-        isDuplicate && user.displayName.trim().isNotEmpty
-            ? '${user.displayName} (@$username)'
-            : dn;
     return InkWell(onTap: () {
       isSelectedDeviceGroup.value = false;
       if (selectedAccessibleItemName.value != username) {
@@ -235,14 +222,14 @@ class _MyGroupState extends State<MyGroup> {
                     alignment: Alignment.center,
                     child: Center(
                       child: Text(
-                        displayName.characters.first.toUpperCase(),
+                        username.characters.first.toUpperCase(),
                         style: TextStyle(color: Colors.white),
                         textAlign: TextAlign.center,
                       ),
                     ),
                   ),
                 ).marginOnly(right: 4),
-                if (isMe) Flexible(child: Text(displayName)),
+                if (isMe) Flexible(child: Text(username)),
                 if (isMe)
                   Flexible(
                     child: Container(
@@ -259,7 +246,7 @@ class _MyGroupState extends State<MyGroup> {
                       ),
                     ),
                   ),
-                if (!isMe) Expanded(child: Text(displayName)),
+                if (!isMe) Expanded(child: Text(username)),
               ],
             ).paddingSymmetric(vertical: 4),
           ),

flutter/lib/common/widgets/overlay.dart

@@ -50,7 +50,6 @@ class DraggableChatWindow extends StatelessWidget {
           )
         : Draggable(
             checkKeyboard: true,
-            checkScreenSize: true,
             position: draggablePositions.chatWindow,
             width: width,
             height: height,
@@ -396,10 +395,7 @@ class _DraggableState extends State<Draggable> {
     _chatModel?.setChatWindowPosition(position);
   }
 
-  checkScreenSize() {
-    // Ensure the draggable always stays within current screen bounds
-    widget.position.tryAdjust(widget.width, widget.height, 1);
-  }
+  checkScreenSize() {}
 
   checkKeyboard() {
     final bottomHeight = MediaQuery.of(context).viewInsets.bottom;
@@ -521,12 +517,6 @@ class IOSDraggableState extends State<IOSDraggable> {
     _lastBottomHeight = bottomHeight;
   }
 
-  @override
-  void initState() {
-    super.initState();
-    position.tryAdjust(_width, _height, 1);
-  }
-
   @override
   Widget build(BuildContext context) {
     checkKeyboard();

flutter/lib/common/widgets/peer_card.dart

@@ -127,10 +127,6 @@ class _PeerCardState extends State<_PeerCard>
     );
   }
 
-  bool _showNote(Peer peer) {
-    return peerTabShowNote(widget.tab) && peer.note.isNotEmpty;
-  }
-
   makeChild(bool isPortrait, Peer peer) {
     final name = hideUsernameOnCard == true
         ? peer.hostname
@@ -138,8 +134,6 @@ class _PeerCardState extends State<_PeerCard>
     final greyStyle = TextStyle(
         fontSize: 11,
         color: Theme.of(context).textTheme.titleLarge?.color?.withOpacity(0.6));
-    final showNote = _showNote(peer);
-
     return Row(
       mainAxisSize: MainAxisSize.max,
       children: [
@@ -191,44 +185,14 @@ class _PeerCardState extends State<_PeerCard>
                           style: Theme.of(context).textTheme.titleSmall,
                         )),
                       ]).marginOnly(top: isPortrait ? 0 : 2),
-                      Row(
-                        children: [
-                          Flexible(
-                            child: Tooltip(
-                              message: name,
-                              waitDuration: const Duration(seconds: 1),
-                              child: Align(
-                                alignment: Alignment.centerLeft,
-                                child: Text(
-                                  name,
-                                  style: isPortrait ? null : greyStyle,
-                                  textAlign: TextAlign.start,
-                                  overflow: TextOverflow.ellipsis,
-                                ),
-                              ),
-                            ),
-                          ),
-                          if (showNote)
-                            Expanded(
-                              child: Tooltip(
-                                message: peer.note,
-                                waitDuration: const Duration(seconds: 1),
-                                child: Align(
-                                  alignment: Alignment.centerLeft,
-                                  child: Text(
-                                    peer.note,
-                                    style: isPortrait ? null : greyStyle,
-                                    textAlign: TextAlign.start,
-                                    overflow: TextOverflow.ellipsis,
-                                  ).marginOnly(
-                                      left: peerCardUiType.value ==
-                                              PeerUiType.list
-                                          ? 32
-                                          : 4),
-                                ),
-                              ),
-                            )
-                        ],
+                      Align(
+                        alignment: Alignment.centerLeft,
+                        child: Text(
+                          name,
+                          style: isPortrait ? null : greyStyle,
+                          textAlign: TextAlign.start,
+                          overflow: TextOverflow.ellipsis,
+                        ),
                       ),
                     ],
                   ).marginOnly(top: 2),
@@ -314,7 +278,7 @@ class _PeerCardState extends State<_PeerCard>
                                 padding: const EdgeInsets.all(6),
                                 child:
                                     getPlatformImage(peer.platform, size: 60),
-                              ),
+                              ).marginOnly(top: 4),
                               Row(
                                 children: [
                                   Expanded(
@@ -333,26 +297,8 @@ class _PeerCardState extends State<_PeerCard>
                                   ),
                                 ],
                               ),
-                              if (_showNote(peer))
-                                Row(
-                                  children: [
-                                    Expanded(
-                                        child: Tooltip(
-                                      message: peer.note,
-                                      waitDuration: const Duration(seconds: 1),
-                                      child: Text(
-                                        peer.note,
-                                        style: const TextStyle(
-                                            color: Colors.white38,
-                                            fontSize: 10),
-                                        textAlign: TextAlign.center,
-                                        overflow: TextOverflow.ellipsis,
-                                      ),
-                                    ))
-                                  ],
-                                ),
                             ],
-                          ).paddingOnly(top: 4.0, left: 4.0, right: 4.0),
+                          ).paddingAll(4.0),
                         ),
                       ],
                     ),
@@ -1188,7 +1134,6 @@ class AddressBookPeerCard extends BasePeerCard {
       if (gFFI.abModel.currentAbTags.isNotEmpty) {
         menuItems.add(_editTagAction(peer.id));
       }
-      menuItems.add(_editNoteAction(peer.id));
     }
     final addressbooks = gFFI.abModel.addressBooksCanWrite();
     if (gFFI.peerTabModel.currentTab == PeerTabIndex.ab.index) {
@@ -1228,21 +1173,6 @@ class AddressBookPeerCard extends BasePeerCard {
     );
   }
 
-  @protected
-  MenuEntryBase<String> _editNoteAction(String id) {
-    return MenuEntryButton<String>(
-      childBuilder: (TextStyle? style) => Text(
-        translate('Edit note'),
-        style: style,
-      ),
-      proc: () {
-        editAbPeerNoteDialog(id);
-      },
-      padding: super.menuPadding,
-      dismissOnClicked: true,
-    );
-  }
-
   @protected
   @override
   Future<String> _getAlias(String id) async =>

flutter/lib/common/widgets/peers_view.dart

@@ -71,12 +71,10 @@ class _PeersView extends StatefulWidget {
   final Peers peers;
   final PeerFilter? peerFilter;
   final PeerCardBuilder peerCardBuilder;
-  final PeerTabIndex peerTabIndex;
 
   const _PeersView(
       {required this.peers,
       required this.peerCardBuilder,
-      required this.peerTabIndex,
       this.peerFilter,
       Key? key})
       : super(key: key);
@@ -397,8 +395,8 @@ class _PeersViewState extends State<_PeersView>
       return peers;
     }
     searchText = searchText.toLowerCase();
-    final matches = await Future.wait(
-        peers.map((peer) => matchPeer(searchText, peer, widget.peerTabIndex)));
+    final matches =
+        await Future.wait(peers.map((peer) => matchPeer(searchText, peer)));
     final filteredList = List<Peer>.empty(growable: true);
     for (var i = 0; i < peers.length; i++) {
       if (matches[i]) {
@@ -443,10 +441,7 @@ abstract class BasePeersView extends StatelessWidget {
         break;
     }
     return _PeersView(
-        peers: peers,
-        peerFilter: peerFilter,
-        peerCardBuilder: peerCardBuilder,
-        peerTabIndex: peerTabIndex);
+        peers: peers, peerFilter: peerFilter, peerCardBuilder: peerCardBuilder);
   }
 }
 
@@ -570,14 +565,11 @@ class MyGroupPeerView extends BasePeersView {
   static bool filter(Peer peer) {
     final model = gFFI.groupModel;
     if (model.searchAccessibleItemNameText.isNotEmpty) {
-      final text = model.searchAccessibleItemNameText.value.toLowerCase();
-      final searchPeersOfUser = model.users.any((user) =>
-          user.name == peer.loginName &&
-          (user.name.toLowerCase().contains(text) ||
-              user.displayNameOrName.toLowerCase().contains(text)));
-      final searchPeersOfDeviceGroup =
-          peer.device_group_name.toLowerCase().contains(text) &&
-              model.deviceGroups.any((g) => g.name == peer.device_group_name);
+      final text = model.searchAccessibleItemNameText.value;
+      final searchPeersOfUser = peer.loginName.contains(text) &&
+          model.users.any((user) => user.name == peer.loginName);
+      final searchPeersOfDeviceGroup = peer.device_group_name.contains(text) &&
+          model.deviceGroups.any((g) => g.name == peer.device_group_name);
       if (!searchPeersOfUser && !searchPeersOfDeviceGroup) {
         return false;
       }

flutter/lib/common/widgets/remote_input.dart

@@ -31,7 +31,7 @@ class RawKeyFocusScope extends StatelessWidget {
     // https://github.com/flutter/flutter/issues/154053
     final useRawKeyEvents = isLinux && !isWeb;
     // FIXME: On Windows, `AltGr` will generate `Alt` and `Control` key events,
-    // while `Alt` and `Control` are separated key events for en-US input method.
+    // while `Alt` and `Control` are seperated key events for en-US input method.
     return FocusScope(
         autofocus: true,
         child: Focus(
@@ -51,13 +51,6 @@ class RawKeyFocusScope extends StatelessWidget {
   }
 }
 
-// For virtual mouse when using the mouse mode on mobile.
-// Special hold-drag mode: one finger holds a button (left/right button), another finger pans.
-// This flag is to override the scale gesture to a pan gesture.
-bool isSpecialHoldDragActive = false;
-// Cache the last focal point to calculate deltas in special hold-drag mode.
-Offset _lastSpecialHoldDragFocalPoint = Offset.zero;
-
 class RawTouchGestureDetectorRegion extends StatefulWidget {
   final Widget child;
   final FFI ffi;
@@ -104,12 +97,6 @@ class _RawTouchGestureDetectorRegionState
   bool _touchModePanStarted = false;
   Offset _doubleFinerTapPosition = Offset.zero;
 
-  // For mouse mode, we need to block the events when the cursor is in a blocked area.
-  // So we need to cache the last tap down position.
-  Offset? _lastTapDownPositionForMouseMode;
-  // Cache global position for onTap (which lacks position info).
-  Offset? _lastTapDownGlobalPosition;
-
   FFI get ffi => widget.ffi;
   FfiModel get ffiModel => widget.ffiModel;
   InputModel get inputModel => widget.inputModel;
@@ -125,20 +112,11 @@ class _RawTouchGestureDetectorRegionState
   }
 
   bool isNotTouchBasedDevice() {
-    return !kTouchBasedDeviceKinds.contains(lastDeviceKind);
-  }
-
-  // Mobile, mouse mode.
-  // Check if should block the mouse tap event (`_lastTapDownPositionForMouseMode`).
-  bool shouldBlockMouseModeEvent() {
-    return _lastTapDownPositionForMouseMode != null &&
-        ffi.cursorModel.shouldBlock(_lastTapDownPositionForMouseMode!.dx,
-            _lastTapDownPositionForMouseMode!.dy);
+    return !kTouchBasedDeviceKinds.contains(lastDeviceKind); 
   }
 
   onTapDown(TapDownDetails d) async {
     lastDeviceKind = d.kind;
-    _lastTapDownGlobalPosition = d.globalPosition;
     if (isNotTouchBasedDevice()) {
       return;
     }
@@ -146,8 +124,6 @@ class _RawTouchGestureDetectorRegionState
       _lastPosOfDoubleTapDown = d.localPosition;
       // Desktop or mobile "Touch mode"
       _lastTapDownDetails = d;
-    } else {
-      _lastTapDownPositionForMouseMode = d.localPosition;
     }
   }
 
@@ -157,16 +133,11 @@ class _RawTouchGestureDetectorRegionState
     if (isNotTouchBasedDevice()) {
       return;
     }
-    // Filter duplicate touch tap events on iOS (Magic Mouse issue).
-    if (inputModel.shouldIgnoreTouchTap(d.globalPosition)) {
-      return;
-    }
     if (handleTouch) {
       final isMoved =
           await ffi.cursorModel.move(d.localPosition.dx, d.localPosition.dy);
       if (isMoved) {
-        // If pan already handled 'down', don't send it again.
-        if (lastTapDownDetails != null && !_touchModePanStarted) {
+        if (lastTapDownDetails != null) {
           await inputModel.tapDown(MouseButtons.left);
         }
         await inputModel.tapUp(MouseButtons.left);
@@ -178,17 +149,7 @@ class _RawTouchGestureDetectorRegionState
     if (isNotTouchBasedDevice()) {
       return;
     }
-    // Filter duplicate touch tap events on iOS (Magic Mouse issue).
-    final lastPos = _lastTapDownGlobalPosition;
-    if (lastPos != null && inputModel.shouldIgnoreTouchTap(lastPos)) {
-      return;
-    }
     if (!handleTouch) {
-      // Cannot use `_lastTapDownDetails` because Flutter calls `onTapUp` before `onTap`, clearing the cached details.
-      // Using `_lastTapDownPositionForMouseMode` instead.
-      if (shouldBlockMouseModeEvent()) {
-        return;
-      }
       // Mobile, "Mouse mode"
       await inputModel.tap(MouseButtons.left);
     }
@@ -202,8 +163,6 @@ class _RawTouchGestureDetectorRegionState
     if (handleTouch) {
       _lastPosOfDoubleTapDown = d.localPosition;
       await ffi.cursorModel.move(d.localPosition.dx, d.localPosition.dy);
-    } else {
-      _lastTapDownPositionForMouseMode = d.localPosition;
     }
   }
 
@@ -218,12 +177,6 @@ class _RawTouchGestureDetectorRegionState
         !ffi.cursorModel.isInRemoteRect(_lastPosOfDoubleTapDown)) {
       return;
     }
-    // Check if the position is in a blocked area when using the mouse mode.
-    if (!handleTouch) {
-      if (shouldBlockMouseModeEvent()) {
-        return;
-      }
-    }
     await inputModel.tap(MouseButtons.left);
     await inputModel.tap(MouseButtons.left);
   }
@@ -245,8 +198,6 @@ class _RawTouchGestureDetectorRegionState
             .move(_cacheLongPressPosition.dx, _cacheLongPressPosition.dy);
         await inputModel.tapDown(MouseButtons.left);
       }
-    } else {
-      _lastTapDownPositionForMouseMode = d.localPosition;
     }
   }
 
@@ -271,10 +222,6 @@ class _RawTouchGestureDetectorRegionState
         if (!isMoved) {
           return;
         }
-      } else {
-        if (shouldBlockMouseModeEvent()) {
-          return;
-        }
       }
       await inputModel.tap(MouseButtons.right);
     } else {
@@ -327,7 +274,6 @@ class _RawTouchGestureDetectorRegionState
       return;
     }
     if (!handleTouch) {
-      if (isSpecialHoldDragActive) return;
       await inputModel.sendMouse('down', MouseButtons.left);
     }
   }
@@ -337,7 +283,6 @@ class _RawTouchGestureDetectorRegionState
       return;
     }
     if (!handleTouch) {
-      if (isSpecialHoldDragActive) return;
       await ffi.cursorModel.updatePan(d.delta, d.localPosition, handleTouch);
     }
   }
@@ -385,10 +330,7 @@ class _RawTouchGestureDetectorRegionState
         await ffi.cursorModel
             .move(_cacheLongPressPosition.dx, _cacheLongPressPosition.dy);
       }
-      // In relative mouse mode, skip mouse down - only send movement via sendMobileRelativeMouseMove
-      if (!inputModel.relativeMouseMode.value) {
-        await inputModel.sendMouse('down', MouseButtons.left);
-      }
+      await inputModel.sendMouse('down', MouseButtons.left);
       await ffi.cursorModel.move(d.localPosition.dx, d.localPosition.dy);
     } else {
       final offset = ffi.cursorModel.offset;
@@ -413,12 +355,7 @@ class _RawTouchGestureDetectorRegionState
     if (handleTouch && !_touchModePanStarted) {
       return;
     }
-    // In relative mouse mode, send delta directly without position tracking.
-    if (inputModel.relativeMouseMode.value) {
-      await inputModel.sendMobileRelativeMouseMove(d.delta.dx, d.delta.dy);
-    } else {
-      await ffi.cursorModel.updatePan(d.delta, d.localPosition, handleTouch);
-    }
+    await ffi.cursorModel.updatePan(d.delta, d.localPosition, handleTouch);
   }
 
   onOneFingerPanEnd(DragEndDetails d) async {
@@ -430,47 +367,22 @@ class _RawTouchGestureDetectorRegionState
       ffi.cursorModel.clearRemoteWindowCoords();
     }
     if (handleTouch) {
-      // In relative mouse mode, skip mouse up - matches the skipped mouse down in onOneFingerPanStart
-      if (!inputModel.relativeMouseMode.value) {
-        await inputModel.sendMouse('up', MouseButtons.left);
-      }
+      await inputModel.sendMouse('up', MouseButtons.left);
     }
   }
 
-  // Reset `_touchModePanStarted` if the one-finger pan gesture is cancelled
-  // or rejected by the gesture arena. Without this, the flag can remain
-  // stuck in the "started" state and cause issues such as the Magic Mouse
-  // double-click problem on iPad with magic mouse.
-  onOneFingerPanCancel() {
-    _touchModePanStarted = false;
-  }
-
   // scale + pan event
   onTwoFingerScaleStart(ScaleStartDetails d) {
     _lastTapDownDetails = null;
     if (isNotTouchBasedDevice()) {
       return;
     }
-    if (isSpecialHoldDragActive) {
-      // Initialize the last focal point to calculate deltas manually.
-      _lastSpecialHoldDragFocalPoint = d.focalPoint;
-    }
   }
 
   onTwoFingerScaleUpdate(ScaleUpdateDetails d) async {
     if (isNotTouchBasedDevice()) {
       return;
     }
-
-    // If in special drag mode, perform a pan instead of a scale.
-    if (isSpecialHoldDragActive) {
-      // Calculate delta manually to avoid the jumpy behavior.
-      final delta = d.focalPoint - _lastSpecialHoldDragFocalPoint;
-      _lastSpecialHoldDragFocalPoint = d.focalPoint;
-      await ffi.cursorModel.updatePan(delta * 2.0, d.focalPoint, handleTouch);
-      return;
-    }
-
     if ((isDesktop || isWebDesktop)) {
       final scale = ((d.scale - _scale) * 1000).toInt();
       _scale = d.scale;
@@ -508,9 +420,7 @@ class _RawTouchGestureDetectorRegionState
       // No idea why we need to set the view style to "" here.
       // bind.sessionSetViewStyle(sessionId: sessionId, value: "");
     }
-    if (!isSpecialHoldDragActive) {
-      await inputModel.sendMouse('up', MouseButtons.left);
-    }
+    await inputModel.sendMouse('up', MouseButtons.left);
   }
 
   get onHoldDragCancel => null;
@@ -578,7 +488,6 @@ class _RawTouchGestureDetectorRegionState
         instance
           ..onOneFingerPanUpdate = onOneFingerPanUpdate
           ..onOneFingerPanEnd = onOneFingerPanEnd
-          ..onOneFingerPanCancel = onOneFingerPanCancel
           ..onTwoFingerScaleStart = onTwoFingerScaleStart
           ..onTwoFingerScaleUpdate = onTwoFingerScaleUpdate
           ..onTwoFingerScaleEnd = onTwoFingerScaleEnd

flutter/lib/common/widgets/setting_widgets.dart

@@ -230,6 +230,7 @@ List<(String, String)> otherDefaultSettings() {
     ('Disable clipboard', kOptionDisableClipboard),
     ('Lock after session end', kOptionLockAfterSessionEnd),
     ('Privacy mode', kOptionPrivacyMode),
+    if (isMobile) ('Touch mode', kOptionTouchMode),
     ('True color (4:4:4)', kOptionI444),
     ('Reverse mouse wheel', kKeyReverseMouseWheel),
     ('swap-left-right-mouse', kOptionSwapLeftRightMouse),

flutter/lib/common/widgets/toolbar.dart

@@ -6,91 +6,13 @@ import 'package:flutter/services.dart';
 import 'package:flutter_hbb/common.dart';
 import 'package:flutter_hbb/common/shared_state.dart';
 import 'package:flutter_hbb/common/widgets/dialog.dart';
-import 'package:flutter_hbb/common/widgets/login.dart';
 import 'package:flutter_hbb/consts.dart';
 import 'package:flutter_hbb/desktop/widgets/remote_toolbar.dart';
 import 'package:flutter_hbb/models/model.dart';
 import 'package:flutter_hbb/models/platform_model.dart';
-import 'package:flutter_hbb/utils/multi_window_manager.dart';
 import 'package:get/get.dart';
-import 'package:url_launcher/url_launcher.dart';
 
 bool isEditOsPassword = false;
-const String kPeerOptionAllowWaylandKeyboard = 'allow-wayland-keyboard';
-const String kWaylandKeyboardIssueUrl =
-    'https://github.com/rustdesk/rustdesk/issues/14586';
-final Set<String> _waylandKeyboardPromptSuppressedConnectionIds = <String>{};
-
-Future<bool> openWaylandKeyboardIssueUrl() {
-  return launchUrl(
-    Uri.parse(kWaylandKeyboardIssueUrl),
-    mode: LaunchMode.externalApplication,
-  );
-}
-
-bool isWaylandKeyboardPromptSuppressedForConnection(String connectionId) {
-  return _waylandKeyboardPromptSuppressedConnectionIds.contains(connectionId);
-}
-
-void setWaylandKeyboardPromptSuppressedForConnection(
-    String connectionId, bool suppressed) {
-  if (suppressed) {
-    _waylandKeyboardPromptSuppressedConnectionIds.add(connectionId);
-  } else {
-    _waylandKeyboardPromptSuppressedConnectionIds.remove(connectionId);
-  }
-}
-
-void clearWaylandKeyboardPromptSuppressedForConnection(String connectionId) {
-  _waylandKeyboardPromptSuppressedConnectionIds.remove(connectionId);
-}
-
-bool shouldShowWaylandKeyboardPrompt({
-  required String connectionId,
-  required bool isWaylandPeer,
-  required bool allowWaylandKeyboardRemembered,
-}) {
-  return isWaylandPeer &&
-      !allowWaylandKeyboardRemembered &&
-      !isWaylandKeyboardPromptSuppressedForConnection(connectionId);
-}
-
-Widget waylandKeyboardScopeChip(BuildContext context, String text) {
-  final colorScheme = Theme.of(context).colorScheme;
-  return Container(
-    padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
-    decoration: BoxDecoration(
-      borderRadius: BorderRadius.circular(999),
-      border: Border.all(color: colorScheme.primary.withOpacity(0.35)),
-    ),
-    child: Text(
-      text,
-      style: Theme.of(
-        context,
-      ).textTheme.bodySmall?.copyWith(fontWeight: FontWeight.w600),
-    ),
-  );
-}
-
-bool _isWindowsMode1PrivacyImpl(String privacyModeImpl) {
-  return privacyModeImpl == kPrivacyModeImplMag ||
-      privacyModeImpl == kPrivacyModeImplExcludeFromCapture;
-}
-
-// macOS privacy mode blacks out all online displays. Windows Mode 1 also
-// covers every local monitor with privacy overlay windows, so remote display
-// switching does not weaken local privacy protection.
-//
-// Keep this separate from the capture backend capability. The legacy Windows
-// magnifier capturer is not reliable for multi-monitor capture; WebRTC's
-// screen_capturer_win_magnifier also disables it when SM_CMONITORS != 1:
-// https://webrtc.googlesource.com/src/+/1845922d5a1bf9c27deeffb4a8c8daea124434c1/modules/desktop_capture/win/screen_capturer_win_magnifier.cc
-bool allowDisplaySwitchInPrivacyMode(PeerInfo pi, String privacyModeImpl) {
-  return pi.platform == kPeerPlatformMacOS ||
-      (pi.platform == kPeerPlatformWindows &&
-          _isWindowsMode1PrivacyImpl(privacyModeImpl) &&
-          versionCmp(pi.version, '1.4.8') >= 0);
-}
 
 class TTextMenu {
   final Widget child;
@@ -163,179 +85,12 @@ handleOsPasswordAction(
   }
 }
 
-void showWaylandKeyboardInputWarningDialog(
-    {required String id,
-    required String connectionId,
-    required FFI ffi,
-    required Future<void> Function() onEnable}) {
-  bool remember = false;
-  bool consentInProgress = false;
-  bool dialogClosed = false;
-
-  final dialogFuture = ffi.dialogManager.show((setState, close, context) {
-    void safeSetState(VoidCallback fn) {
-      if (dialogClosed) {
-        return;
-      }
-      try {
-        setState(fn);
-      } catch (e) {
-        debugPrint('Ignore setState after dialog disposal: $e');
-      }
-    }
-
-    void closeDialog() {
-      if (dialogClosed) {
-        return;
-      }
-      dialogClosed = true;
-      close();
-    }
-
-    Future<void> enableAndContinue() async {
-      if (consentInProgress || dialogClosed) {
-        return;
-      }
-      consentInProgress = true;
-      safeSetState(() {});
-      try {
-        await onEnable();
-      } catch (e, st) {
-        debugPrint('Failed to enable Wayland keyboard input consent: $e');
-        debugPrintStack(stackTrace: st);
-        consentInProgress = false;
-        safeSetState(() {});
-        return;
-      }
-
-      ffi.inputModel.keyboardInputAllowed = true;
-      var rememberPersisted = true;
-      if (remember) {
-        try {
-          await bind.mainSetPeerOption(
-              id: id,
-              key: kPeerOptionAllowWaylandKeyboard,
-              value: bool2option(kPeerOptionAllowWaylandKeyboard, true));
-        } catch (e) {
-          rememberPersisted = false;
-          debugPrint('Failed to persist Wayland keyboard input consent: $e');
-        }
-      }
-      // Always suppress prompt for current connection after explicit consent.
-      setWaylandKeyboardPromptSuppressedForConnection(connectionId, true);
-      closeDialog();
-      if (remember && !rememberPersisted) {
-        // It's a rare edge case that persisting the user's choice fails.
-        // Failed to persist the user's choice, but still allow keyboard input for current session.
-        showToast(translate('Failed'));
-      }
-    }
-
-    void cancel() {
-      if (consentInProgress) {
-        return;
-      }
-      closeDialog();
-    }
-
-    return CustomAlertDialog(
-      title: null,
-      content: Column(
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          msgboxContent(
-            '',
-            'wayland-keyboard-input-disabled-tip',
-            'wayland-keyboard-input-consent-tip',
-          ),
-          SizedBox(height: isMobile ? 2 : 6),
-          if (isMobile) ...[
-            Text(
-              translate('wayland-keyboard-input-applies-to-tip'),
-              style: Theme.of(
-                context,
-              ).textTheme.bodyMedium?.copyWith(fontWeight: FontWeight.w600),
-            ).marginOnly(bottom: 6),
-            Wrap(
-              spacing: 6,
-              runSpacing: 6,
-              children: [
-                waylandKeyboardScopeChip(
-                    context, translate('Send clipboard keystrokes')),
-                waylandKeyboardScopeChip(
-                    context, translate('wayland-soft-keyboard-input-label')),
-              ],
-            ).marginOnly(bottom: 10),
-          ],
-          TextButton(
-            onPressed: consentInProgress
-                ? null
-                : () async {
-                    try {
-                      final opened = await openWaylandKeyboardIssueUrl();
-                      if (!opened) {
-                        // Opening this optional help link almost never fails in
-                        // normal desktop environments. Keep the result handled
-                        // for review hygiene, but avoid a low-value user toast.
-                        debugPrint('Failed to open Wayland keyboard issue URL');
-                      }
-                    } catch (e) {
-                      debugPrint(
-                          'Failed to open Wayland keyboard issue URL: $e');
-                    }
-                  },
-            style: TextButton.styleFrom(
-              foregroundColor: Colors.blue,
-              padding: EdgeInsets.zero,
-              minimumSize: Size.zero,
-              tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-            ),
-            child: Text(
-              translate('Why this happens'),
-              style: const TextStyle(decoration: TextDecoration.underline),
-            ),
-          ).marginOnly(bottom: 6),
-          CheckboxListTile(
-            value: remember,
-            dense: true,
-            contentPadding: EdgeInsets.zero,
-            controlAffinity: ListTileControlAffinity.leading,
-            title: Text(translate('remember-wayland-keyboard-choice-tip')),
-            onChanged: consentInProgress
-                ? null
-                : (v) {
-                    safeSetState(() => remember = v == true);
-                  },
-          ),
-        ],
-      ),
-      actions: [
-        dialogButton(
-          'Cancel',
-          onPressed: consentInProgress ? null : cancel,
-          isOutline: true,
-        ),
-        dialogButton(
-          'OK',
-          onPressed:
-              consentInProgress ? null : () => unawaited(enableAndContinue()),
-        ),
-      ],
-      onCancel: consentInProgress ? null : cancel,
-      onSubmit: consentInProgress ? null : () => unawaited(enableAndContinue()),
-    );
-  }, clickMaskDismiss: false, backDismiss: false);
-  unawaited(dialogFuture.whenComplete(() => dialogClosed = true));
-}
-
 List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
   final ffiModel = ffi.ffiModel;
   final pi = ffiModel.pi;
   final perms = ffiModel.permissions;
   final sessionId = ffi.sessionId;
   final isDefaultConn = ffi.connType == ConnType.defaultConn;
-  final isWaylandPeer = pi.platform == kPeerPlatformLinux && pi.isWayland;
 
   List<TTextMenu> v = [];
   // elevation
@@ -385,60 +140,11 @@ List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
     v.add(TTextMenu(
         child: Text(translate('Send clipboard keystrokes')),
         onPressed: () async {
-          Future<void> sendClipboardKeystrokes() async {
-            ClipboardData? data = await Clipboard.getData(Clipboard.kTextPlain);
-            if (data != null && data.text != null) {
-              bind.sessionInputString(
-                  sessionId: sessionId, value: data.text ?? "");
-            }
+          ClipboardData? data = await Clipboard.getData(Clipboard.kTextPlain);
+          if (data != null && data.text != null) {
+            bind.sessionInputString(
+                sessionId: sessionId, value: data.text ?? "");
           }
-
-          final allowWaylandKeyboard =
-              mainGetPeerBoolOptionSync(id, kPeerOptionAllowWaylandKeyboard);
-          if (shouldShowWaylandKeyboardPrompt(
-            connectionId: sessionId.toString(),
-            isWaylandPeer: isWaylandPeer,
-            allowWaylandKeyboardRemembered: allowWaylandKeyboard,
-          )) {
-            ffi.inputModel.keyboardInputAllowed = false;
-            showWaylandKeyboardInputWarningDialog(
-              id: id,
-              connectionId: sessionId.toString(),
-              ffi: ffi,
-              onEnable: sendClipboardKeystrokes,
-            );
-            return;
-          }
-          await sendClipboardKeystrokes();
-        }));
-  }
-  if (isDefaultConn &&
-      isWaylandPeer &&
-      (mainGetPeerBoolOptionSync(id, kPeerOptionAllowWaylandKeyboard) ||
-          isWaylandKeyboardPromptSuppressedForConnection(
-              sessionId.toString()))) {
-    v.add(TTextMenu(
-        child: Text(translate('wayland-keyboard-input-reset-choice-tip')),
-        onPressed: () async {
-          var persistedCleared = false;
-          try {
-            await bind.mainSetPeerOption(
-                id: id,
-                key: kPeerOptionAllowWaylandKeyboard,
-                value: bool2option(kPeerOptionAllowWaylandKeyboard, false));
-            persistedCleared = true;
-          } catch (e) {
-            debugPrint(
-                'Failed to clear persisted Wayland keyboard permission: $e');
-          } finally {
-            clearWaylandKeyboardPromptSuppressedForConnection(
-                sessionId.toString());
-            ffi.inputModel.keyboardInputAllowed = false;
-            if (isMobile) {
-              await ffi.invokeMethod("enable_soft_keyboard", false);
-            }
-          }
-          showToast(translate(persistedCleared ? 'Successful' : 'Failed'));
         }));
   }
   // reset canvas
@@ -487,26 +193,14 @@ List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
     );
   }
   // note
-  if (isDefaultConn && !bind.isDisableAccount()) {
+  if (isDefaultConn &&
+      bind
+          .sessionGetAuditServerSync(sessionId: sessionId, typ: "conn")
+          .isNotEmpty) {
     v.add(
       TTextMenu(
           child: Text(translate('Note')),
-          onPressed: () async {
-            bool isLogin =
-                bind.mainGetLocalOption(key: 'access_token').isNotEmpty;
-            if (!isLogin) {
-              final res = await loginDialog();
-              if (res != true) return;
-              // Desktop: send message to main window to refresh login status
-              // Web: login is required before connection, so no need to refresh
-              // Mobile: same isolate, no need to send message
-              if (isDesktop) {
-                rustDeskWinManager.call(
-                    WindowType.Main, kWindowRefreshCurrentUser, "");
-              }
-            }
-            showAuditDialog(ffi);
-          }),
+          onPressed: () => showAuditDialog(ffi)),
     );
   }
   // divider
@@ -567,6 +261,7 @@ List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
       isDesktop &&
       ffiModel.keyboard &&
       pi.platform != kPeerPlatformAndroid &&
+      pi.platform != kPeerPlatformMacOS &&
       versionCmp(pi.version, '1.2.0') >= 0 &&
       bind.peerGetSessionsCount(id: id, connType: ffi.connType.index) == 1) {
     v.add(TTextMenu(
@@ -668,11 +363,6 @@ Future<List<TRadioMenu<String>>> toolbarViewStyle(
         child: Text(translate('Scale adaptive')),
         value: kRemoteViewStyleAdaptive,
         groupValue: groupValue,
-        onChanged: onChanged),
-    TRadioMenu<String>(
-        child: Text(translate('Scale custom')),
-        value: kRemoteViewStyleCustom,
-        groupValue: groupValue,
         onChanged: onChanged)
   ];
 }
@@ -976,10 +666,8 @@ Future<List<TToggleMenu>> toolbarDisplayToggle(
         child: Text(translate('Lock after session end'))));
   }
 
-  final privacyModeState = PrivacyModeState.find(id);
   if (pi.isSupportMultiDisplay &&
-      (privacyModeState.isEmpty ||
-          allowDisplaySwitchInPrivacyMode(pi, privacyModeState.value)) &&
+      PrivacyModeState.find(id).isEmpty &&
       pi.displaysCount.value > 1 &&
       bind.mainGetUserDefaultOption(key: kKeyShowMonitorsToolbar) == 'Y') {
     final value =
@@ -1053,38 +741,23 @@ List<TToggleMenu> toolbarPrivacyMode(
   final ffiModel = ffi.ffiModel;
   final pi = ffiModel.pi;
   final sessionId = ffi.sessionId;
-  final hasPrivacyModePermission =
-      ffiModel.permissions['privacy_mode'] != false;
 
-  // Backend revocation already attempts to turn privacy mode off.
-  // Still keep this menu when privacy mode is active, so users can turn it off
-  // if there is a sync delay, version mismatch, or off attempt failure.
-  if (!hasPrivacyModePermission && privacyModeState.isEmpty) {
-    return []; // No permission and not active, hide options.
-  }
-
-  bool checkDisplayAllowedForPrivacyMode(String targetImplKey, bool turnOn) {
-    if (!turnOn ||
-        allowDisplaySwitchInPrivacyMode(pi, targetImplKey) ||
-        (ffiModel.pi.currentDisplay == 0 &&
-            !bind.sessionIsMultiUiSession(sessionId: sessionId))) {
-      return true;
-    }
-    msgBox(sessionId, 'custom-nook-nocancel-hasclose', 'info',
-        'Please switch to Display 1 first', '', ffi.dialogManager);
-    return false;
-  }
-
-  getDefaultMenu(Future<void> Function(SessionID sid, String opt) toggleFunc,
-      String targetImplKey) {
-    final enabled = !ffiModel.viewOnly &&
-        (hasPrivacyModePermission || privacyModeState.isNotEmpty);
+  getDefaultMenu(Future<void> Function(SessionID sid, String opt) toggleFunc) {
+    final enabled = !ffi.ffiModel.viewOnly;
     return TToggleMenu(
         value: privacyModeState.isNotEmpty,
         onChanged: enabled
             ? (value) {
                 if (value == null) return;
-                if (!checkDisplayAllowedForPrivacyMode(targetImplKey, value)) {
+                if (ffiModel.pi.currentDisplay != 0 &&
+                    ffiModel.pi.currentDisplay != kAllDisplayValue) {
+                  msgBox(
+                      sessionId,
+                      'custom-nook-nocancel-hasclose',
+                      'info',
+                      'Please switch to Display 1 first',
+                      '',
+                      ffi.dialogManager);
                   return;
                 }
                 final option = 'privacy-mode';
@@ -1102,7 +775,7 @@ List<TToggleMenu> toolbarPrivacyMode(
       getDefaultMenu((sid, opt) async {
         bind.sessionToggleOption(sessionId: sid, value: opt);
         togglePrivacyModeTime = DateTime.now();
-      }, kPrivacyModeImplMag)
+      })
     ];
   }
   if (privacyModeImpls.isEmpty) {
@@ -1116,35 +789,21 @@ List<TToggleMenu> toolbarPrivacyMode(
         bind.sessionTogglePrivacyMode(
             sessionId: sid, implKey: implKey, on: privacyModeState.isEmpty);
         togglePrivacyModeTime = DateTime.now();
-      }, implKey)
+      })
     ];
   } else {
-    final visibleImpls = hasPrivacyModePermission
-        ? privacyModeImpls
-        : privacyModeImpls.where((e) {
-            final implKey = (e as List<dynamic>)[0] as String;
-            return privacyModeState.value == implKey;
-          }).toList();
-    return visibleImpls.map((e) {
+    return privacyModeImpls.map((e) {
       final implKey = (e as List<dynamic>)[0] as String;
       final implName = (e)[1] as String;
-      final enabled = !ffiModel.viewOnly &&
-          (hasPrivacyModePermission || privacyModeState.value == implKey);
       return TToggleMenu(
           child: Text(translate(implName)),
           value: privacyModeState.value == implKey,
-          onChanged: enabled
-              ? (value) {
-                  if (value == null) return;
-                  if (value && !hasPrivacyModePermission) return;
-                  if (!checkDisplayAllowedForPrivacyMode(implKey, value)) {
-                    return;
-                  }
-                  togglePrivacyModeTime = DateTime.now();
-                  bind.sessionTogglePrivacyMode(
-                      sessionId: sessionId, implKey: implKey, on: value);
-                }
-              : null);
+          onChanged: (value) {
+            if (value == null) return;
+            togglePrivacyModeTime = DateTime.now();
+            bind.sessionTogglePrivacyMode(
+                sessionId: sessionId, implKey: implKey, on: value);
+          });
     }).toList();
   }
 }
@@ -1153,7 +812,6 @@ List<TToggleMenu> toolbarKeyboardToggles(FFI ffi) {
   final ffiModel = ffi.ffiModel;
   final pi = ffiModel.pi;
   final sessionId = ffi.sessionId;
-  final isDefaultConn = ffi.connType == ConnType.defaultConn;
   List<TToggleMenu> v = [];
 
   // swap key
@@ -1175,34 +833,6 @@ List<TToggleMenu> toolbarKeyboardToggles(FFI ffi) {
         child: Text(translate('Swap control-command key'))));
   }
 
-  // Relative mouse mode (gaming mode).
-  // Only show when server supports MOUSE_TYPE_MOVE_RELATIVE (version >= 1.4.5)
-  // Note: This feature is only available in Flutter client. Sciter client does not support this.
-  // Web client is not supported yet due to Pointer Lock API integration complexity with Flutter's input system.
-  // Wayland is not supported due to cursor warping limitations.
-  // Mobile: This option is now in GestureHelp widget, shown only when joystick is visible.
-  final isWayland = isDesktop && isLinux && bind.mainCurrentIsWayland();
-  if (isDesktop &&
-      isDefaultConn &&
-      !isWeb &&
-      !isWayland &&
-      ffiModel.keyboard &&
-      !ffiModel.viewOnly &&
-      ffi.inputModel.isRelativeMouseModeSupported) {
-    v.add(TToggleMenu(
-        value: ffi.inputModel.relativeMouseMode.value,
-        onChanged: (value) {
-          if (value == null) return;
-          final previousValue = ffi.inputModel.relativeMouseMode.value;
-          final success = ffi.inputModel.setRelativeMouseMode(value);
-          if (!success) {
-            // Revert the observable toggle to reflect the actual state
-            ffi.inputModel.relativeMouseMode.value = previousValue;
-          }
-        },
-        child: Text(translate('Relative mouse mode'))));
-  }
-
   // reverse mouse wheel
   if (ffiModel.keyboard) {
     var optionValue =

flutter/lib/consts.dart

@@ -29,10 +29,6 @@ const String kPlatformAdditionsHasFileClipboard = "has_file_clipboard";
 const String kPlatformAdditionsSupportedPrivacyModeImpl =
     "supported_privacy_mode_impl";
 
-const String kPrivacyModeImplMag = 'privacy_mode_impl_mag';
-const String kPrivacyModeImplExcludeFromCapture =
-    'privacy_mode_impl_exclude_from_capture';
-
 const String kPeerPlatformWindows = "Windows";
 const String kPeerPlatformLinux = "Linux";
 const String kPeerPlatformMacOS = "Mac OS";
@@ -54,7 +50,6 @@ const String kAppTypeDesktopPortForward = "port forward";
 const String kAppTypeDesktopTerminal = "terminal";
 
 const String kWindowMainWindowOnTop = "main_window_on_top";
-const String kWindowRefreshCurrentUser = "refresh_current_user";
 const String kWindowGetWindowInfo = "get_window_info";
 const String kWindowGetScreenList = "get_screen_list";
 // This method is not used, maybe it can be removed.
@@ -63,7 +58,6 @@ const String kWindowActionRebuild = "rebuild";
 const String kWindowEventHide = "hide";
 const String kWindowEventShow = "show";
 const String kWindowConnect = "connect";
-const String kWindowBumpMouse = "bump_mouse";
 
 const String kWindowEventNewRemoteDesktop = "new_remote_desktop";
 const String kWindowEventNewFileTransfer = "new_file_transfer";
@@ -84,7 +78,6 @@ const String kWindowEventOpenMonitorSession = "open_monitor_session";
 
 const String kOptionViewStyle = "view_style";
 const String kOptionScrollStyle = "scroll_style";
-const String kOptionEdgeScrollEdgeThickness = "edge-scroll-edge-thickness";
 const String kOptionImageQuality = "image_quality";
 const String kOptionOpenNewConnInTabs = "enable-open-new-connections-in-tabs";
 const String kOptionTextureRender = "use-texture-render";
@@ -118,9 +111,6 @@ const String kOptionTerminalPersistent = "terminal-persistent";
 const String kOptionEnableTunnel = "enable-tunnel";
 const String kOptionEnableRemoteRestart = "enable-remote-restart";
 const String kOptionEnableBlockInput = "enable-block-input";
-const String kOptionEnablePrivacyMode = "enable-privacy-mode";
-const String kOptionEnablePermChangeInAcceptWindow =
-    "enable-perm-change-in-accept-window";
 const String kOptionAllowRemoteConfigModification =
     "allow-remote-config-modification";
 const String kOptionVerificationMethod = "verification-method";
@@ -128,7 +118,6 @@ const String kOptionApproveMode = "approve-mode";
 const String kOptionAllowNumericOneTimePassword =
     "allow-numeric-one-time-password";
 const String kOptionCollapseToolbar = "collapse_toolbar";
-const String kOptionHideToolbar = "hide-toolbar";
 const String kOptionShowRemoteCursor = "show_remote_cursor";
 const String kOptionFollowRemoteCursor = "follow_remote_cursor";
 const String kOptionFollowRemoteWindow = "follow_remote_window";
@@ -146,10 +135,6 @@ const String kOptionSwapLeftRightMouse = "swap-left-right-mouse";
 const String kOptionCodecPreference = "codec-preference";
 const String kOptionRemoteMenubarDragLeft = "remote-menubar-drag-left";
 const String kOptionRemoteMenubarDragRight = "remote-menubar-drag-right";
-const String kOptionRemoteMenubarEdge = "remote-menubar-edge";
-const String kOptionRemoteMenubarFraction = "remote-menubar-frac";
-const String kOptionAllowMultiEdgeToolbarDock =
-    "allow-multi-edge-toolbar-dock";
 const String kOptionHideAbTagsPanel = "hideAbTagsPanel";
 const String kOptionRemoteMenubarState = "remoteMenubarState";
 const String kOptionPeerSorting = "peer-sorting";
@@ -170,39 +155,21 @@ const String kOptionAllowRemoteCmModification = "allow-remote-cm-modification";
 const String kOptionEnableUdpPunch = "enable-udp-punch";
 const String kOptionEnableIpv6Punch = "enable-ipv6-punch";
 const String kOptionEnableTrustedDevices = "enable-trusted-devices";
-const String kOptionShowVirtualMouse = "show-virtual-mouse";
-const String kOptionVirtualMouseScale = "virtual-mouse-scale";
-const String kOptionShowVirtualJoystick = "show-virtual-joystick";
-const String kOptionAllowAskForNoteAtEndOfConnection = "allow-ask-for-note";
-const String kOptionAllowMonitorSwitchMainToolbar = "allow-monitor-switch-main-toolbar";
-const String kOptionAllowMonitorSwitchMinToolbar = "allow-monitor-switch-min-toolbar";
-const String kOptionEnableShowTerminalExtraKeys = "enable-show-terminal-extra-keys";
 
 // network options
 const String kOptionAllowWebSocket = "allow-websocket";
-const String kOptionAllowInsecureTLSFallback = "allow-insecure-tls-fallback";
-const String kOptionDisableUdp = "disable-udp";
-const String kOptionEnableFlutterHttpOnRust = "enable-flutter-http-on-rust";
 
-// builtin options
+// buildin opitons
 const String kOptionHideServerSetting = "hide-server-settings";
 const String kOptionHideProxySetting = "hide-proxy-settings";
 const String kOptionHideWebSocketSetting = "hide-websocket-settings";
-const String kOptionHideStopService = "hide-stop-service";
 const String kOptionHideRemotePrinterSetting = "hide-remote-printer-settings";
 const String kOptionHideSecuritySetting = "hide-security-settings";
 const String kOptionHideNetworkSetting = "hide-network-settings";
 const String kOptionRemovePresetPasswordWarning =
     "remove-preset-password-warning";
-const String kOptionDisableChangePermanentPassword =
-    "disable-change-permanent-password";
-const String kOptionDisableChangeId = "disable-change-id";
-const String kOptionDisableUnlockPin = "disable-unlock-pin";
 const kHideUsernameOnCard = "hide-username-on-card";
 const String kOptionHideHelpCards = "hide-help-cards";
-const String kOptionAllowDeepLinkPassword = "allow-deep-link-password";
-const String kOptionAllowDeepLinkServerSettings =
-    "allow-deep-link-server-settings";
 
 const String kOptionToggleViewOnly = "view-only";
 const String kOptionToggleShowMyCursor = "show-my-cursor";
@@ -211,9 +178,6 @@ const String kOptionDisableFloatingWindow = "disable-floating-window";
 
 const String kOptionKeepScreenOn = "keep-screen-on";
 
-const String kOptionKeepAwakeDuringIncomingSessions = "keep-awake-during-incoming-sessions";
-const String kOptionKeepAwakeDuringOutgoingSessions = "keep-awake-during-outgoing-sessions";
-
 const String kOptionShowMobileAction = "showMobileActions";
 
 const String kUrlActionClose = "close";
@@ -278,33 +242,6 @@ const int kMinTrackpadSpeed = 10;
 const int kDefaultTrackpadSpeed = 100;
 const int kMaxTrackpadSpeed = 1000;
 
-// relative mouse mode
-/// Throttle duration (in milliseconds) for updating pointer lock center during
-/// window move/resize events. Lower values provide more responsive updates but
-/// may cause performance issues during rapid window operations.
-const int kDefaultPointerLockCenterThrottleMs = 100;
-
-/// Minimum server version required for relative mouse mode (MOUSE_TYPE_MOVE_RELATIVE).
-/// Servers older than this version will ignore relative mouse events.
-///
-/// IMPORTANT: This value must be kept in sync with the Rust constant
-/// `MIN_VERSION_RELATIVE_MOUSE_MODE` in `src/common.rs`.
-const String kMinVersionForRelativeMouseMode = '1.4.5';
-
-/// Maximum delta value for relative mouse movement.
-/// Large values could cause issues with i32 overflow on server side,
-/// and no reasonable mouse movement should exceed this bound.
-///
-/// IMPORTANT: This value must be kept in sync with the Rust constant
-/// `MAX_RELATIVE_MOUSE_DELTA` in `src/server/input_service.rs`.
-const int kMaxRelativeMouseDelta = 10000;
-
-/// Debounce duration (in milliseconds) for relative mouse mode toggle.
-/// This prevents double-toggle from race condition between Rust rdev grab loop
-/// and Flutter keyboard handling. Value should be small enough to allow
-/// intentional quick toggles but large enough to prevent accidental double-triggers.
-const int kRelativeMouseModeToggleDebounceMs = 150;
-
 // incomming (should be incoming) is kept, because change it will break the previous setting.
 const String kKeyPrinterIncomingJobAction = 'printer-incomming-job-action';
 const String kValuePrinterIncomingJobDismiss = 'dismiss';
@@ -376,18 +313,12 @@ const kRemoteViewStyleOriginal = 'original';
 /// [kRemoteViewStyleAdaptive] Show remote image scaling by ratio factor.
 const kRemoteViewStyleAdaptive = 'adaptive';
 
-/// [kRemoteViewStyleCustom] Show remote image at a user-defined scale percent.
-const kRemoteViewStyleCustom = 'custom';
-
 /// [kRemoteScrollStyleAuto] Scroll image auto by position.
 const kRemoteScrollStyleAuto = 'scrollauto';
 
 /// [kRemoteScrollStyleBar] Scroll image with scroll bar.
 const kRemoteScrollStyleBar = 'scrollbar';
 
-/// [kRemoteScrollStyleEdge] Scroll image auto at edges.
-const kRemoteScrollStyleEdge = 'scrolledge';
-
 /// [kScrollModeDefault] Mouse or touchpad, the default scroll mode.
 const kScrollModeDefault = 'default';
 
@@ -414,17 +345,6 @@ const Set<PointerDeviceKind> kTouchBasedDeviceKinds = {
   PointerDeviceKind.invertedStylus,
 };
 
-// Scale custom related constants
-const String kCustomScalePercentKey =
-    'custom_scale_percent'; // Flutter option key for storing custom scale percent (integer 5-1000)
-const int kScaleCustomMinPercent = 5;
-const int kScaleCustomPivotPercent = 100; // 100% should be at 1/3 of track
-const int kScaleCustomMaxPercent = 1000;
-const double kScaleCustomPivotPos = 1.0 / 3.0; // first 1/3 → up to 100%
-const double kScaleCustomDetentEpsilon =
-    0.006; // snap range around pivot (~0.6%)
-const Duration kDebounceCustomScaleDuration = Duration(milliseconds: 300);
-
 // ================================ mobile ================================
 
 // Magic numbers, maybe need to avoid it or use a better way to get them.

flutter/lib/desktop/pages/connection_page.dart

@@ -374,7 +374,6 @@ class _ConnectionPageState extends State<ConnectionPage>
                         rdpUsername: '',
                         loginName: '',
                         device_group_name: '',
-                        note: '',
                       );
                       _autocompleteOpts = [emptyPeer];
                     } else {
@@ -398,7 +397,6 @@ class _ConnectionPageState extends State<ConnectionPage>
                                   .contains(textToFind) ||
                               peer.alias.toLowerCase().contains(textToFind))
                           .toList();
-                      _allPeersLoader.queryOnlines(_autocompleteOpts);
                     }
                     return _autocompleteOpts;
                   },
@@ -538,68 +536,64 @@ class _ConnectionPageState extends State<ConnectionPage>
                       builder: (context, setState) {
                         var offset = Offset(0, 0);
                         return Obx(() => InkWell(
-                              child: _menuOpen.value
-                                  ? Transform.rotate(
-                                      angle: pi,
-                                      child: Icon(IconFont.more, size: 14),
-                                    )
-                                  : Icon(IconFont.more, size: 14),
-                              onTapDown: (e) {
-                                offset = e.globalPosition;
-                              },
-                              onTap: () async {
-                                _menuOpen.value = true;
-                                final x = offset.dx;
-                                final y = offset.dy;
-                                await mod_menu
-                                    .showMenu(
-                                  context: context,
-                                  position: RelativeRect.fromLTRB(x, y, x, y),
-                                  items: [
-                                    (
-                                      'Transfer file',
-                                      () => onConnect(isFileTransfer: true)
-                                    ),
-                                    (
-                                      'View camera',
-                                      () => onConnect(isViewCamera: true)
-                                    ),
-                                    (
-                                      '${translate('Terminal')} (beta)',
-                                      () => onConnect(isTerminal: true)
-                                    ),
-                                  ]
-                                      .map((e) => MenuEntryButton<String>(
-                                            childBuilder: (TextStyle? style) =>
-                                                Text(
-                                              translate(e.$1),
-                                              style: style,
-                                            ),
-                                            proc: () => e.$2(),
-                                            padding: EdgeInsets.symmetric(
-                                                horizontal:
-                                                    kDesktopMenuPadding.left),
-                                            dismissOnClicked: true,
-                                          ))
-                                      .map((e) => e.build(
-                                          context,
-                                          const MenuConfig(
-                                              commonColor: CustomPopupMenuTheme
-                                                  .commonColor,
-                                              height:
-                                                  CustomPopupMenuTheme.height,
-                                              dividerHeight:
-                                                  CustomPopupMenuTheme
-                                                      .dividerHeight)))
-                                      .expand((i) => i)
-                                      .toList(),
-                                  elevation: 8,
+                          child: _menuOpen.value
+                              ? Transform.rotate(
+                                  angle: pi,
+                                  child: Icon(IconFont.more, size: 14),
                                 )
-                                    .then((_) {
-                                  _menuOpen.value = false;
-                                });
-                              },
-                            ));
+                              : Icon(IconFont.more, size: 14),
+                          onTapDown: (e) {
+                            offset = e.globalPosition;
+                          },
+                          onTap: () async {
+                            _menuOpen.value = true;
+                            final x = offset.dx;
+                            final y = offset.dy;
+                          await mod_menu
+                              .showMenu(
+                            context: context,
+                            position: RelativeRect.fromLTRB(x, y, x, y),
+                            items: [
+                              (
+                                'Transfer file',
+                                () => onConnect(isFileTransfer: true)
+                              ),
+                              (
+                                'View camera',
+                                () => onConnect(isViewCamera: true)
+                              ),
+                              (
+                                '${translate('Terminal')} (beta)',
+                                () => onConnect(isTerminal: true)
+                              ),
+                            ]
+                                .map((e) => MenuEntryButton<String>(
+                                      childBuilder: (TextStyle? style) => Text(
+                                        translate(e.$1),
+                                        style: style,
+                                      ),
+                                      proc: () => e.$2(),
+                                      padding: EdgeInsets.symmetric(
+                                          horizontal: kDesktopMenuPadding.left),
+                                      dismissOnClicked: true,
+                                    ))
+                                .map((e) => e.build(
+                                    context,
+                                    const MenuConfig(
+                                        commonColor:
+                                            CustomPopupMenuTheme.commonColor,
+                                        height: CustomPopupMenuTheme.height,
+                                        dividerHeight: CustomPopupMenuTheme
+                                            .dividerHeight)))
+                                .expand((i) => i)
+                                .toList(),
+                            elevation: 8,
+                          )
+                              .then((_) {
+                            _menuOpen.value = false;
+                          });
+                        },
+                        ));
                       },
                     ),
                   ),

flutter/lib/desktop/pages/desktop_home_page.dart

@@ -18,7 +18,6 @@ import 'package:flutter_hbb/models/server_model.dart';
 import 'package:flutter_hbb/models/state_model.dart';
 import 'package:flutter_hbb/plugin/ui_manager.dart';
 import 'package:flutter_hbb/utils/multi_window_manager.dart';
-import 'package:flutter_hbb/utils/platform_channel.dart';
 import 'package:get/get.dart';
 import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -450,11 +449,7 @@ class _DesktopHomePageState extends State<DesktopHomePage>
           "${translate("new-version-of-{${bind.mainGetAppNameSync()}}-tip")} (${bind.mainGetNewVersion()}).",
           btnText,
           onPressed,
-          closeButton: true,
-          help: isToUpdate ? 'Changelog' : null,
-          link: isToUpdate
-              ? 'https://github.com/rustdesk/rustdesk/releases/tag/${bind.mainGetNewVersion()}'
-              : null);
+          closeButton: true);
     }
     if (systemError.isNotEmpty) {
       return buildInstallCard("", systemError, "", () {});
@@ -765,23 +760,11 @@ class _DesktopHomePageState extends State<DesktopHomePage>
           'scaleFactor': screen.scaleFactor,
         };
 
-    bool isChattyMethod(String methodName) {
-      switch (methodName) {
-        case kWindowBumpMouse: return true;
-      }
-
-      return false;
-    }
-
     rustDeskWinManager.setMethodHandler((call, fromWindowId) async {
-      if (!isChattyMethod(call.method)) {
-        debugPrint(
+      debugPrint(
           "[Main] call ${call.method} with args ${call.arguments} from window $fromWindowId");
-      }
       if (call.method == kWindowMainWindowOnTop) {
         windowOnTop(null);
-      } else if (call.method == kWindowRefreshCurrentUser) {
-        gFFI.userModel.refreshCurrentUser();
       } else if (call.method == kWindowGetWindowInfo) {
         final screen = (await window_size.getWindowInfo()).screen;
         if (screen == null) {
@@ -810,10 +793,6 @@ class _DesktopHomePageState extends State<DesktopHomePage>
           forceRelay: call.arguments['forceRelay'],
           connToken: call.arguments['connToken'],
         );
-      } else if (call.method == kWindowBumpMouse) {
-        return RdPlatformChannel.instance.bumpMouse(
-          dx: call.arguments['dx'],
-          dy: call.arguments['dy']);
       } else if (call.method == kWindowEventMoveTabToNewWindow) {
         final args = call.arguments.split(',');
         int? windowId;
@@ -908,17 +887,12 @@ class _DesktopHomePageState extends State<DesktopHomePage>
 }
 
 void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
-  final p0 = TextEditingController(text: "");
-  final p1 = TextEditingController(text: "");
+  final pw = await bind.mainGetPermanentPassword();
+  final p0 = TextEditingController(text: pw);
+  final p1 = TextEditingController(text: pw);
   var errMsg0 = "";
   var errMsg1 = "";
-  final localPasswordSet =
-      (await bind.mainGetCommon(key: "local-permanent-password-set")) == "true";
-  final permanentPasswordSet =
-      (await bind.mainGetCommon(key: "permanent-password-set")) == "true";
-  final presetPassword = permanentPasswordSet && !localPasswordSet;
-  var canSubmit = false;
-  final RxString rxPass = "".obs;
+  final RxString rxPass = pw.trim().obs;
   final rules = [
     DigitValidationRule(),
     UppercaseValidationRule(),
@@ -927,21 +901,9 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
     MinCharactersValidationRule(8),
   ];
   final maxLength = bind.mainMaxEncryptLen();
-  final statusTip = localPasswordSet
-      ? translate('password-hidden-tip')
-      : (presetPassword ? translate('preset-password-in-use-tip') : '');
-  final showStatusTipOnMobile =
-      statusTip.isNotEmpty && !isDesktop && !isWebDesktop;
 
   gFFI.dialogManager.show((setState, close, context) {
-    updateCanSubmit() {
-      canSubmit = p0.text.trim().isNotEmpty || p1.text.trim().isNotEmpty;
-    }
-
-    submit() async {
-      if (!canSubmit) {
-        return;
-      }
+    submit() {
       setState(() {
         errMsg0 = "";
         errMsg1 = "";
@@ -964,13 +926,7 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
         });
         return;
       }
-      final ok = await bind.mainSetPermanentPasswordWithResult(password: pass);
-      if (!ok) {
-        setState(() {
-          errMsg0 = '${translate('Prompt')}: ${translate("Failed")}';
-        });
-        return;
-      }
+      bind.mainSetPermanentPassword(password: pass);
       if (pass.isNotEmpty) {
         notEmptyCallback?.call();
       }
@@ -978,20 +934,14 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
     }
 
     return CustomAlertDialog(
-      title: Row(
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
-          Icon(Icons.key, color: MyTheme.accent),
-          Text(translate("Set Password")).paddingOnly(left: 10),
-        ],
-      ),
+      title: Text(translate("Set Password")),
       content: ConstrainedBox(
         constraints: const BoxConstraints(minWidth: 500),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            SizedBox(
-              height: showStatusTipOnMobile ? 0.0 : 6.0,
+            const SizedBox(
+              height: 8.0,
             ),
             Row(
               children: [
@@ -1007,7 +957,6 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
                       rxPass.value = value.trim();
                       setState(() {
                         errMsg0 = '';
-                        updateCanSubmit();
                       });
                     },
                     maxLength: maxLength,
@@ -1019,9 +968,9 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
               children: [
                 Expanded(child: PasswordStrengthIndicator(password: rxPass)),
               ],
-            ).marginOnly(top: 2, bottom: showStatusTipOnMobile ? 2 : 8),
-            SizedBox(
-              height: showStatusTipOnMobile ? 0.0 : 8.0,
+            ).marginSymmetric(vertical: 8),
+            const SizedBox(
+              height: 8.0,
             ),
             Row(
               children: [
@@ -1035,7 +984,6 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
                     onChanged: (value) {
                       setState(() {
                         errMsg1 = '';
-                        updateCanSubmit();
                       });
                     },
                     maxLength: maxLength,
@@ -1043,23 +991,11 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
                 ),
               ],
             ),
-            if (statusTip.isNotEmpty)
-              Row(
-                children: [
-                  Icon(Icons.info, color: Colors.amber, size: 18)
-                      .marginOnly(right: 6),
-                  Expanded(
-                      child: Text(
-                    statusTip,
-                    style: const TextStyle(fontSize: 13, height: 1.1),
-                  ))
-                ],
-              ).marginOnly(top: 6, bottom: 2),
-            SizedBox(
-              height: showStatusTipOnMobile ? 0.0 : 8.0,
+            const SizedBox(
+              height: 8.0,
             ),
             Obx(() => Wrap(
-                  runSpacing: showStatusTipOnMobile ? 2.0 : 8.0,
+                  runSpacing: 8,
                   spacing: 4,
                   children: rules.map((e) {
                     var checked = e.validate(rxPass.value.trim());
@@ -1079,67 +1015,11 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
           ],
         ),
       ),
-      actions: (() {
-        final cancelButton = dialogButton(
-          "Cancel",
-          icon: Icon(Icons.close_rounded),
-          onPressed: close,
-          isOutline: true,
-        );
-        final removeButton = dialogButton(
-          "Remove",
-          icon: Icon(Icons.delete_outline_rounded),
-          onPressed: () async {
-            setState(() {
-              errMsg0 = "";
-              errMsg1 = "";
-            });
-            final ok =
-                await bind.mainSetPermanentPasswordWithResult(password: "");
-            if (!ok) {
-              setState(() {
-                errMsg0 = '${translate('Prompt')}: ${translate("Failed")}';
-              });
-              return;
-            }
-            close();
-          },
-          buttonStyle: ButtonStyle(
-              backgroundColor: MaterialStatePropertyAll(Colors.red)),
-        );
-        final okButton = dialogButton(
-          "OK",
-          icon: Icon(Icons.done_rounded),
-          onPressed: canSubmit ? submit : null,
-        );
-        if (!isDesktop && !isWebDesktop && localPasswordSet) {
-          return [
-            Align(
-              alignment: Alignment.centerRight,
-              child: FittedBox(
-                fit: BoxFit.scaleDown,
-                alignment: Alignment.centerRight,
-                child: Row(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    cancelButton,
-                    const SizedBox(width: 4),
-                    removeButton,
-                    const SizedBox(width: 4),
-                    okButton,
-                  ],
-                ),
-              ),
-            ),
-          ];
-        }
-        return [
-          cancelButton,
-          if (localPasswordSet) removeButton,
-          okButton,
-        ];
-      })(),
-      onSubmit: canSubmit ? submit : null,
+      actions: [
+        dialogButton("Cancel", onPressed: close, isOutline: true),
+        dialogButton("OK", onPressed: submit),
+      ],
+      onSubmit: submit,
       onCancel: close,
     );
   });

flutter/lib/desktop/pages/desktop_setting_page.dart

@@ -11,7 +11,6 @@ import 'package:flutter_hbb/common/widgets/setting_widgets.dart';
 import 'package:flutter_hbb/consts.dart';
 import 'package:flutter_hbb/desktop/pages/desktop_home_page.dart';
 import 'package:flutter_hbb/desktop/pages/desktop_tab_page.dart';
-import 'package:flutter_hbb/desktop/widgets/remote_toolbar.dart';
 import 'package:flutter_hbb/mobile/widgets/dialog.dart';
 import 'package:flutter_hbb/models/platform_model.dart';
 import 'package:flutter_hbb/models/printer_model.dart';
@@ -407,7 +406,6 @@ class _GeneralState extends State<_General> {
   final RxBool serviceStop =
       isWeb ? RxBool(false) : Get.find<RxBool>(tag: 'stop-service');
   RxBool serviceBtnEnabled = true.obs;
-  final GlobalKey _minToolbarOptionKey = GlobalKey();
 
   @override
   Widget build(BuildContext context) {
@@ -459,46 +457,28 @@ class _GeneralState extends State<_General> {
       return const Offstage();
     }
 
-    final hideStopService =
-        bind.mainGetBuildinOption(key: kOptionHideStopService) == 'Y';
-
-    return Obx(() {
-      if (hideStopService && !serviceStop.value) {
-        return const Offstage();
-      }
-
-      return _Card(title: 'Service', children: [
-        _Button(serviceStop.value ? 'Start' : 'Stop', () {
-          () async {
-            serviceBtnEnabled.value = false;
-            await start_service(serviceStop.value);
-            // enable the button after 1 second
-            Future.delayed(const Duration(seconds: 1), () {
-              serviceBtnEnabled.value = true;
-            });
-          }();
-        }, enabled: serviceBtnEnabled.value)
-      ]);
-    });
+    return _Card(title: 'Service', children: [
+      Obx(() => _Button(serviceStop.value ? 'Start' : 'Stop', () {
+            () async {
+              serviceBtnEnabled.value = false;
+              await start_service(serviceStop.value);
+              // enable the button after 1 second
+              Future.delayed(const Duration(seconds: 1), () {
+                serviceBtnEnabled.value = true;
+              });
+            }();
+          }, enabled: serviceBtnEnabled.value))
+    ]);
   }
 
   Widget other() {
-    final showAutoUpdate = isWindows && bind.mainIsInstalled();
+    final showAutoUpdate =
+        isWindows && bind.mainIsInstalled() && !bind.isCustomClient();
     final children = <Widget>[
       if (!isWeb && !bind.isIncomingOnly())
         _OptionCheckBox(context, 'Confirm before closing multiple tabs',
             kOptionEnableConfirmClosingTabs,
             isServer: false),
-      if (!bind.isIncomingOnly())
-        _OptionCheckBox(
-          context,
-          'allow-remote-toolbar-docking-any-edge',
-          kOptionAllowMultiEdgeToolbarDock,
-          isServer: false,
-          update: (_) {
-            reloadAllWindows();
-          },
-        ),
       _OptionCheckBox(context, 'Adaptive bitrate', kOptionEnableAbr),
       if (!isWeb) wallpaper(),
       if (!isWeb && !bind.isIncomingOnly()) ...[
@@ -576,77 +556,10 @@ class _GeneralState extends State<_General> {
         ],
       ],
     ];
-
-    // Add client-side wakelock option for desktop platforms
-    if (!bind.isIncomingOnly()) {
-      children.add(_OptionCheckBox(
-        context,
-        'keep-awake-during-outgoing-sessions-label',
-        kOptionKeepAwakeDuringOutgoingSessions,
-        isServer: false,
-      ));
-    }
-
     if (!isWeb && bind.mainShowOption(key: kOptionAllowLinuxHeadless)) {
       children.add(_OptionCheckBox(
           context, 'Allow linux headless', kOptionAllowLinuxHeadless));
     }
-    if (!bind.isDisableAccount()) {
-      children.add(_OptionCheckBox(
-        context,
-        'note-at-conn-end-tip',
-        kOptionAllowAskForNoteAtEndOfConnection,
-        isServer: false,
-        optSetter: (key, value) async {
-          if (value && !gFFI.userModel.isLogin) {
-            final res = await loginDialog();
-            if (res != true) return;
-          }
-          await mainSetLocalBoolOption(key, value);
-        },
-      ));
-    }
-    children.add(_OptionCheckBox(
-      context,
-      'Show monitor switch button on the main toolbar',
-      kOptionAllowMonitorSwitchMainToolbar,
-      isServer: false,
-      update: (enabled) async {
-        if (!enabled) {
-          await mainSetLocalBoolOption(
-              kOptionAllowMonitorSwitchMinToolbar, false);
-        }
-        if (mounted) setState(() {});
-        reloadAllWindows();
-        if (enabled) {
-          WidgetsBinding.instance.addPostFrameCallback((_) {
-            final ctx = _minToolbarOptionKey.currentContext;
-            if (ctx != null) {
-              Scrollable.ensureVisible(
-                ctx,
-                alignment: 0.5,
-                duration: const Duration(milliseconds: 250),
-                curve: Curves.easeInOut,
-              );
-            }
-          });
-        }
-      },
-    ));
-    if (mainGetLocalBoolOptionSync(kOptionAllowMonitorSwitchMainToolbar)) {
-      children.add(KeyedSubtree(
-        key: _minToolbarOptionKey,
-        child: _OptionCheckBox(
-          context,
-          'Show on the minimized toolbar',
-          kOptionAllowMonitorSwitchMinToolbar,
-          isServer: false,
-          update: (_) {
-            reloadAllWindows();
-          },
-        ).marginOnly(left: _kCheckBoxLeftMargin * 3),
-      ));
-    }
     return _Card(title: 'Other', children: children);
   }
 
@@ -896,8 +809,7 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin {
                 permissions(context),
                 password(context),
                 _Card(title: '2FA', children: [tfa()]),
-                if (!isChangeIdDisabled())
-                  _Card(title: 'ID', children: [changeId()]),
+                _Card(title: 'ID', children: [changeId()]),
                 more(context),
               ]),
             ),
@@ -1114,10 +1026,6 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin {
               _OptionCheckBox(context, 'Enable blocking user input',
                   kOptionEnableBlockInput,
                   enabled: enabled, fakeValue: fakeValue),
-            if (bind.mainSupportedPrivacyModeImpls() != '[]')
-              _OptionCheckBox(
-                  context, 'Enable privacy mode', kOptionEnablePrivacyMode,
-                  enabled: enabled, fakeValue: fakeValue),
             _OptionCheckBox(context, 'Enable remote configuration modification',
                 kOptionAllowRemoteConfigModification,
                 enabled: enabled, fakeValue: fakeValue),
@@ -1165,13 +1073,8 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin {
                             if (value ==
                                     passwordValues[passwordKeys
                                         .indexOf(kUsePermanentPassword)] &&
-                                (await bind.mainGetCommon(
-                                        key: "permanent-password-set")) !=
-                                    "true") {
-                              if (isChangePermanentPasswordDisabled()) {
-                                await callback();
-                                return;
-                              }
+                                (await bind.mainGetPermanentPassword())
+                                    .isEmpty) {
                               setPasswordDialog(notEmptyCallback: callback);
                             } else {
                               await callback();
@@ -1274,9 +1177,9 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin {
                     ],
                   ),
                   enabled: tmpEnabled && !locked),
-            if (usePassword) numericOneTimePassword,
+            numericOneTimePassword,
             if (usePassword) radios[1],
-            if (usePassword && !isChangePermanentPasswordDisabled())
+            if (usePassword)
               _SubButton('Set permanent password', setPasswordDialog,
                   permEnabled && !locked),
             // if (usePassword)
@@ -1295,14 +1198,11 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin {
       ...directIp(context),
       whitelist(),
       ...autoDisconnect(context),
-      _OptionCheckBox(context, 'keep-awake-during-incoming-sessions-label',
-          kOptionKeepAwakeDuringIncomingSessions,
-          reverse: false, enabled: enabled),
       if (bind.mainIsInstalled())
         _OptionCheckBox(context, 'allow-only-conn-window-open-tip',
             'allow-only-conn-window-open',
             reverse: false, enabled: enabled),
-      if (bind.mainIsInstalled() && !isUnlockPinDisabled()) unlockPin()
+      if (bind.mainIsInstalled()) unlockPin()
     ]);
   }
 
@@ -1685,27 +1585,6 @@ class _NetworkState extends State<_Network> with AutomaticKeepAliveClientMixin {
       );
     }
 
-    Widget switchWidget(IconData icon, String title, String tooltipMessage,
-            String optionKey) =>
-        listTile(
-          icon: icon,
-          title: title,
-          showTooltip: true,
-          tooltipMessage: tooltipMessage,
-          trailing: Switch(
-            value: mainGetBoolOptionSync(optionKey),
-            onChanged: locked || isOptionFixed(optionKey)
-                ? null
-                : (value) {
-                    mainSetBoolOption(optionKey, value);
-                    setState(() {});
-                  },
-          ),
-        );
-
-    final outgoingOnly = bind.isOutgoingOnly();
-
-    final divider = const Divider(height: 1, indent: 16, endIndent: 16);
     return _Card(
       title: 'Network',
       children: [
@@ -1717,65 +1596,33 @@ class _NetworkState extends State<_Network> with AutomaticKeepAliveClientMixin {
                 listTile(
                   icon: Icons.dns_outlined,
                   title: 'ID/Relay Server',
-                  onTap: () => showServerSettings(gFFI.dialogManager, setState),
+                  onTap: () => showServerSettings(gFFI.dialogManager),
                 ),
-              if (!hideProxy && !hideServer) divider,
+              if (!hideServer && (!hideProxy || !hideWebSocket))
+                Divider(height: 1, indent: 16, endIndent: 16),
               if (!hideProxy)
                 listTile(
                   icon: Icons.network_ping_outlined,
                   title: 'Socks5/Http(s) Proxy',
                   onTap: changeSocks5Proxy,
                 ),
-              if (!hideWebSocket && (!hideServer || !hideProxy)) divider,
+              if (!hideProxy && !hideWebSocket)
+                Divider(height: 1, indent: 16, endIndent: 16),
               if (!hideWebSocket)
-                switchWidget(
-                    Icons.web_asset_outlined,
-                    'Use WebSocket',
-                    '${translate('websocket_tip')}\n\n${translate('server-oss-not-support-tip')}',
-                    kOptionAllowWebSocket),
-              if (!isWeb)
-                futureBuilder(
-                  future: bind.mainIsUsingPublicServer(),
-                  hasData: (isUsingPublicServer) {
-                    if (isUsingPublicServer) {
-                      return Offstage();
-                    } else {
-                      return Column(
-                        children: [
-                          if (!hideServer || !hideProxy || !hideWebSocket)
-                            divider,
-                          switchWidget(
-                              Icons.no_encryption_outlined,
-                              'Allow insecure TLS fallback',
-                              'allow-insecure-tls-fallback-tip',
-                              kOptionAllowInsecureTLSFallback),
-                          if (!outgoingOnly) divider,
-                          if (!outgoingOnly)
-                            listTile(
-                              icon: Icons.lan_outlined,
-                              title: 'Disable UDP',
-                              showTooltip: true,
-                              tooltipMessage:
-                                  '${translate('disable-udp-tip')}\n\n${translate('server-oss-not-support-tip')}',
-                              trailing: Switch(
-                                value: bind.mainGetOptionSync(
-                                        key: kOptionDisableUdp) ==
-                                    'Y',
-                                onChanged:
-                                    locked || isOptionFixed(kOptionDisableUdp)
-                                        ? null
-                                        : (value) async {
-                                            await bind.mainSetOption(
-                                                key: kOptionDisableUdp,
-                                                value: value ? 'Y' : 'N');
-                                            setState(() {});
-                                          },
-                              ),
-                            ),
-                        ],
-                      );
-                    }
-                  },
+                listTile(
+                  icon: Icons.web_asset_outlined,
+                  title: 'Use WebSocket',
+                  showTooltip: true,
+                  tooltipMessage: 'websocket_tip',
+                  trailing: Switch(
+                    value: mainGetBoolOptionSync(kOptionAllowWebSocket),
+                    onChanged: locked
+                        ? null
+                        : (value) {
+                            mainSetBoolOption(kOptionAllowWebSocket, value);
+                            setState(() {});
+                          },
+                  ),
                 ),
             ],
           ),
@@ -1838,13 +1685,6 @@ class _DisplayState extends State<_Display> {
     }
 
     final groupValue = bind.mainGetUserDefaultOption(key: kOptionScrollStyle);
-
-    onEdgeScrollEdgeThicknessChanged(double value) async {
-      await bind.mainSetUserDefaultOption(
-          key: kOptionEdgeScrollEdgeThickness, value: value.round().toString());
-      setState(() {});
-    }
-
     return _Card(title: 'Default Scroll Style', children: [
       _Radio(context,
           value: kRemoteScrollStyleAuto,
@@ -1856,23 +1696,6 @@ class _DisplayState extends State<_Display> {
           groupValue: groupValue,
           label: 'Scrollbar',
           onChanged: isOptFixed ? null : onChanged),
-      if (!isWeb) ...[
-        _Radio(context,
-            value: kRemoteScrollStyleEdge,
-            groupValue: groupValue,
-            label: 'ScrollEdge',
-            onChanged: isOptFixed ? null : onChanged),
-        Offstage(
-            offstage: groupValue != kRemoteScrollStyleEdge,
-            child: EdgeThicknessControl(
-              value: double.tryParse(bind.mainGetUserDefaultOption(
-                      key: kOptionEdgeScrollEdgeThickness)) ??
-                  100.0,
-              onChanged: isOptionFixed(kOptionEdgeScrollEdgeThickness)
-                  ? null
-                  : onEdgeScrollEdgeThicknessChanged,
-            )),
-      ],
     ]);
   }
 
@@ -1914,9 +1737,9 @@ class _DisplayState extends State<_Display> {
   }
 
   Widget trackpadSpeed(BuildContext context) {
-    final initSpeed =
-        (int.tryParse(bind.mainGetUserDefaultOption(key: kKeyTrackpadSpeed)) ??
-            kDefaultTrackpadSpeed);
+    final initSpeed = (int.tryParse(
+            bind.mainGetUserDefaultOption(key: kKeyTrackpadSpeed)) ??
+        kDefaultTrackpadSpeed);
     final curSpeed = SimpleWrapper(initSpeed);
     void onDebouncer(int v) {
       bind.mainSetUserDefaultOption(
@@ -2081,9 +1904,7 @@ class _AccountState extends State<_Account> {
 
   Widget accountAction() {
     return Obx(() => _Button(
-        gFFI.userModel.userName.value.isEmpty
-            ? 'Login'
-            : '${translate('Logout')} (${gFFI.userModel.accountLabelWithHandle})',
+        gFFI.userModel.userName.value.isEmpty ? 'Login' : 'Logout',
         () => {
               gFFI.userModel.userName.value.isEmpty
                   ? loginDialog()
@@ -2092,65 +1913,24 @@ class _AccountState extends State<_Account> {
   }
 
   Widget useInfo() {
+    text(String key, String value) {
+      return Align(
+        alignment: Alignment.centerLeft,
+        child: SelectionArea(child: Text('${translate(key)}: $value'))
+            .marginSymmetric(vertical: 4),
+      );
+    }
+
     return Obx(() => Offstage(
           offstage: gFFI.userModel.userName.value.isEmpty,
-          child: Container(
-            padding: const EdgeInsets.all(12),
-            decoration: BoxDecoration(
-              color: Theme.of(context).colorScheme.surfaceContainerHighest,
-              borderRadius: BorderRadius.circular(10),
-            ),
-            child: Builder(builder: (context) {
-              final avatarWidget = _buildUserAvatar();
-              return Row(
-                children: [
-                  if (avatarWidget != null) avatarWidget,
-                  const SizedBox(width: 12),
-                  Expanded(
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Text(
-                          gFFI.userModel.displayNameOrUserName,
-                          maxLines: 1,
-                          overflow: TextOverflow.ellipsis,
-                          style: const TextStyle(
-                            fontSize: 16,
-                            fontWeight: FontWeight.w600,
-                          ),
-                        ),
-                        const SizedBox(height: 2),
-                        SelectionArea(
-                          child: Text(
-                            '@${gFFI.userModel.userName.value}',
-                            maxLines: 1,
-                            overflow: TextOverflow.ellipsis,
-                            style: TextStyle(
-                              fontSize: 13,
-                              color:
-                                  Theme.of(context).textTheme.bodySmall?.color,
-                            ),
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                ],
-              );
-            }),
+          child: Column(
+            children: [
+              text('Username', gFFI.userModel.userName.value),
+              // text('Group', gFFI.groupModel.groupName.value),
+            ],
           ),
         )).marginOnly(left: 18, top: 16);
   }
-
-  Widget? _buildUserAvatar() {
-    // Resolve relative avatar path at display time
-    final avatar =
-        bind.mainResolveAvatarUrl(avatar: gFFI.userModel.avatar.value);
-    return buildAvatarWidget(
-      avatar: avatar,
-      size: 44,
-    );
-  }
 }
 
 class _Checkbox extends StatefulWidget {
@@ -2238,9 +2018,7 @@ class _PluginState extends State<_Plugin> {
 
   Widget accountAction() {
     return Obx(() => _Button(
-        gFFI.userModel.userName.value.isEmpty
-            ? 'Login'
-            : '${translate('Logout')} (${gFFI.userModel.accountLabelWithHandle})',
+        gFFI.userModel.userName.value.isEmpty ? 'Login' : 'Logout',
         () => {
               gFFI.userModel.userName.value.isEmpty
                   ? loginDialog()
@@ -2648,49 +2426,6 @@ class WaylandCard extends StatefulWidget {
 
 class _WaylandCardState extends State<WaylandCard> {
   final restoreTokenKey = 'wayland-restore-token';
-  static const _kClearShortcutsInhibitorEventKey =
-      'clear-gnome-shortcuts-inhibitor-permission-res';
-  final _clearShortcutsInhibitorFailedMsg = ''.obs;
-  // Don't show the shortcuts permission reset button for now.
-  // Users can change it manually:
-  //   "Settings" -> "Apps" -> "RustDesk" -> "Permissions" -> "Inhibit Shortcuts".
-  // For resetting(clearing) the permission from the portal permission store, you can
-  // use (replace <desktop-id> with the RustDesk desktop file ID):
-  //   busctl --user call org.freedesktop.impl.portal.PermissionStore \
-  //   /org/freedesktop/impl/portal/PermissionStore org.freedesktop.impl.portal.PermissionStore \
-  //   DeletePermission sss "gnome" "shortcuts-inhibitor" "<desktop-id>"
-  // On a native install this is typically "rustdesk.desktop"; on Flatpak it is usually
-  // the exported desktop ID derived from the Flatpak app-id (e.g. "com.rustdesk.RustDesk.desktop").
-  //
-  // We may add it back in the future if needed.
-  final showResetInhibitorPermission = false;
-
-  @override
-  void initState() {
-    super.initState();
-    if (showResetInhibitorPermission) {
-      platformFFI.registerEventHandler(
-          _kClearShortcutsInhibitorEventKey, _kClearShortcutsInhibitorEventKey,
-          (evt) async {
-        if (!mounted) return;
-        if (evt['success'] == true) {
-          setState(() {});
-        } else {
-          _clearShortcutsInhibitorFailedMsg.value =
-              evt['msg'] as String? ?? 'Unknown error';
-        }
-      });
-    }
-  }
-
-  @override
-  void dispose() {
-    if (showResetInhibitorPermission) {
-      platformFFI.unregisterEventHandler(
-          _kClearShortcutsInhibitorEventKey, _kClearShortcutsInhibitorEventKey);
-    }
-    super.dispose();
-  }
 
   @override
   Widget build(BuildContext context) {
@@ -2698,16 +2433,9 @@ class _WaylandCardState extends State<WaylandCard> {
       future: bind.mainHandleWaylandScreencastRestoreToken(
           key: restoreTokenKey, value: "get"),
       hasData: (restoreToken) {
-        final hasShortcutsPermission = showResetInhibitorPermission &&
-            bind.mainGetCommonSync(
-                    key: "has-gnome-shortcuts-inhibitor-permission") ==
-                "true";
-
         final children = [
           if (restoreToken.isNotEmpty)
             _buildClearScreenSelection(context, restoreToken),
-          if (hasShortcutsPermission)
-            _buildClearShortcutsInhibitorPermission(context),
         ];
         return Offstage(
           offstage: children.isEmpty,
@@ -2752,50 +2480,6 @@ class _WaylandCardState extends State<WaylandCard> {
       ),
     );
   }
-
-  Widget _buildClearShortcutsInhibitorPermission(BuildContext context) {
-    onConfirm() {
-      _clearShortcutsInhibitorFailedMsg.value = '';
-      bind.mainSetCommon(
-          key: "clear-gnome-shortcuts-inhibitor-permission", value: "");
-      gFFI.dialogManager.dismissAll();
-    }
-
-    showConfirmMsgBox() => msgBoxCommon(
-            gFFI.dialogManager,
-            'Confirmation',
-            Text(
-              translate('confirm-clear-shortcuts-inhibitor-permission-tip'),
-            ),
-            [
-              dialogButton('OK', onPressed: onConfirm),
-              dialogButton('Cancel',
-                  onPressed: () => gFFI.dialogManager.dismissAll())
-            ]);
-
-    return Column(children: [
-      Obx(
-        () => _clearShortcutsInhibitorFailedMsg.value.isEmpty
-            ? Offstage()
-            : Align(
-                alignment: Alignment.topLeft,
-                child: Text(_clearShortcutsInhibitorFailedMsg.value,
-                        style: DefaultTextStyle.of(context)
-                            .style
-                            .copyWith(color: Colors.red))
-                    .marginOnly(bottom: 10.0)),
-      ),
-      _Button(
-        'Reset keyboard shortcuts permission',
-        showConfirmMsgBox,
-        tip: 'clear-shortcuts-inhibitor-permission-tip',
-        style: ButtonStyle(
-          backgroundColor: MaterialStateProperty.all<Color>(
-              Theme.of(context).colorScheme.error.withOpacity(0.75)),
-        ),
-      ),
-    ]);
-  }
 }
 
 // ignore: non_constant_identifier_names
@@ -2877,7 +2561,7 @@ Widget _lock(
                           ]).marginSymmetric(vertical: 2)),
                   onPressed: () async {
                     final unlockPin = bind.mainGetUnlockPin();
-                    if (unlockPin.isEmpty || isUnlockPinDisabled()) {
+                    if (unlockPin.isEmpty) {
                       bool checked = await callMainCheckSuperUserPermission();
                       if (checked) {
                         onUnlock();

flutter/lib/desktop/pages/file_manager_page.dart

@@ -3,7 +3,6 @@ import 'dart:io';
 import 'dart:math';
 
 import 'package:extended_text/extended_text.dart';
-import 'package:flutter_hbb/common/widgets/dialog.dart';
 import 'package:flutter_hbb/desktop/widgets/dragable_divider.dart';
 import 'package:percent_indicator/percent_indicator.dart';
 import 'package:desktop_drop/desktop_drop.dart';
@@ -17,6 +16,7 @@ import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
 import 'package:flutter_hbb/models/file_model.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:get/get.dart';
+import 'package:wakelock_plus/wakelock_plus.dart';
 import 'package:flutter_hbb/web/dummy.dart'
     if (dart.library.html) 'package:flutter_hbb/web/web_unique.dart';
 
@@ -52,7 +52,7 @@ enum MouseFocusScope {
 }
 
 class FileManagerPage extends StatefulWidget {
-  FileManagerPage(
+  const FileManagerPage(
       {Key? key,
       required this.id,
       required this.password,
@@ -67,16 +67,9 @@ class FileManagerPage extends StatefulWidget {
   final bool? forceRelay;
   final String? connToken;
   final DesktopTabController? tabController;
-  final SimpleWrapper<State<FileManagerPage>?> _lastState = SimpleWrapper(null);
-
-  FFI get ffi => (_lastState.value! as _FileManagerPageState)._ffi;
 
   @override
-  State<StatefulWidget> createState() {
-    final state = _FileManagerPageState();
-    _lastState.value = state;
-    return state;
-  }
+  State<StatefulWidget> createState() => _FileManagerPageState();
 }
 
 class _FileManagerPageState extends State<FileManagerPage>
@@ -85,7 +78,6 @@ class _FileManagerPageState extends State<FileManagerPage>
 
   final _dropMaskVisible = false.obs; // TODO impl drop mask
   final _overlayKeyState = OverlayKeyState();
-  final _uniqueKey = UniqueKey();
 
   late FFI _ffi;
 
@@ -107,7 +99,9 @@ class _FileManagerPageState extends State<FileManagerPage>
           .showLoading(translate('Connecting...'), onCancel: closeConnection);
     });
     Get.put<FFI>(_ffi, tag: 'ft_${widget.id}');
-    WakelockManager.enable(_uniqueKey);
+    if (!isLinux) {
+      WakelockPlus.enable();
+    }
     if (isWeb) {
       _ffi.ffiModel.updateEventListener(_ffi.sessionId, widget.id);
     }
@@ -125,7 +119,9 @@ class _FileManagerPageState extends State<FileManagerPage>
     model.close().whenComplete(() {
       _ffi.close();
       _ffi.dialogManager.dismissAll();
-      WakelockManager.disable(_uniqueKey);
+      if (!isLinux) {
+        WakelockPlus.disable();
+      }
       Get.delete<FFI>(tag: 'ft_${widget.id}');
     });
     WidgetsBinding.instance.removeObserver(this);
@@ -143,26 +139,12 @@ class _FileManagerPageState extends State<FileManagerPage>
     }
   }
 
-  Widget willPopScope(Widget child) {
-    if (isWeb) {
-      return WillPopScope(
-        onWillPop: () async {
-          clientClose(_ffi.sessionId, _ffi);
-          return false;
-        },
-        child: child,
-      );
-    } else {
-      return child;
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
     super.build(context);
     return Overlay(key: _overlayKeyState.key, initialEntries: [
       OverlayEntry(builder: (_) {
-        return willPopScope(Scaffold(
+        return Scaffold(
           backgroundColor: Theme.of(context).scaffoldBackgroundColor,
           body: Row(
             children: [
@@ -178,7 +160,7 @@ class _FileManagerPageState extends State<FileManagerPage>
               Flexible(flex: 2, child: statusList())
             ],
           ),
-        ));
+        );
       })
     ]);
   }
@@ -278,9 +260,11 @@ class _FileManagerPageState extends State<FileManagerPage>
                                     item.state != JobState.inProgress,
                                 child: LinearPercentIndicator(
                                   animateFromLastPercent: true,
-                                  center: Text(item.percentText),
+                                  center: Text(
+                                    '${(item.finishedSize / item.totalSize * 100).toStringAsFixed(0)}%',
+                                  ),
                                   barRadius: Radius.circular(15),
-                                  percent: item.percent,
+                                  percent: item.finishedSize / item.totalSize,
                                   progressColor: MyTheme.accent,
                                   backgroundColor: Theme.of(context).hoverColor,
                                   lineHeight: kDesktopFileTransferRowHeight,

flutter/lib/desktop/pages/file_manager_tab_page.dart

@@ -3,7 +3,6 @@ import 'dart:convert';
 import 'package:desktop_multi_window/desktop_multi_window.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hbb/common.dart';
-import 'package:flutter_hbb/common/widgets/dialog.dart';
 import 'package:flutter_hbb/consts.dart';
 import 'package:flutter_hbb/models/state_model.dart';
 import 'package:flutter_hbb/desktop/pages/file_manager_page.dart';
@@ -41,15 +40,7 @@ class _FileManagerTabPageState extends State<FileManagerTabPage> {
         label: params['id'],
         selectedIcon: selectedIcon,
         unselectedIcon: unselectedIcon,
-        onTabCloseButton: () async {
-          if (await desktopTryShowTabAuditDialogCloseCancelled(
-            id: params['id'],
-            tabController: tabController,
-          )) {
-            return;
-          }
-          tabController.closeBy(params['id']);
-        },
+        onTabCloseButton: () => tabController.closeBy(params['id']),
         page: FileManagerPage(
           key: ValueKey(params['id']),
           id: params['id'],
@@ -78,15 +69,7 @@ class _FileManagerTabPageState extends State<FileManagerTabPage> {
             label: id,
             selectedIcon: selectedIcon,
             unselectedIcon: unselectedIcon,
-            onTabCloseButton: () async {
-              if (await desktopTryShowTabAuditDialogCloseCancelled(
-                id: id,
-                tabController: tabController,
-              )) {
-                return;
-              }
-              tabController.closeBy(id);
-            },
+            onTabCloseButton: () => tabController.closeBy(id),
             page: FileManagerPage(
               key: ValueKey(id),
               id: id,
@@ -149,14 +132,6 @@ class _FileManagerTabPageState extends State<FileManagerTabPage> {
 
   Future<bool> handleWindowCloseButton() async {
     final connLength = tabController.state.value.tabs.length;
-    if (connLength == 1) {
-      if (await desktopTryShowTabAuditDialogCloseCancelled(
-        id: tabController.state.value.tabs[0].key,
-        tabController: tabController,
-      )) {
-        return false;
-      }
-    }
     if (connLength <= 1) {
       tabController.clear();
       return true;

flutter/lib/desktop/pages/install_page.dart

@@ -65,7 +65,7 @@ class _InstallPageBodyState extends State<_InstallPageBody>
   late final TextEditingController controller;
   final RxBool startmenu = true.obs;
   final RxBool desktopicon = true.obs;
-  final RxBool printer = false.obs;
+  final RxBool printer = true.obs;
   final RxBool showProgress = false.obs;
   final RxBool btnEnabled = true.obs;
 
@@ -80,7 +80,7 @@ class _InstallPageBodyState extends State<_InstallPageBody>
     final installOptions = jsonDecode(bind.installInstallOptions());
     startmenu.value = installOptions['STARTMENUSHORTCUTS'] != '0';
     desktopicon.value = installOptions['DESKTOPSHORTCUTS'] != '0';
-    printer.value = installOptions['PRINTER'] == '1';
+    printer.value = installOptions['PRINTER'] != '0';
   }
 
   @override

flutter/lib/desktop/pages/port_forward_page.dart

@@ -25,7 +25,7 @@ class _PortForward {
 }
 
 class PortForwardPage extends StatefulWidget {
-  PortForwardPage({
+  const PortForwardPage({
     Key? key,
     required this.id,
     required this.password,
@@ -42,16 +42,9 @@ class PortForwardPage extends StatefulWidget {
   final bool? forceRelay;
   final bool? isSharedPassword;
   final String? connToken;
-  final SimpleWrapper<State<PortForwardPage>?> _lastState = SimpleWrapper(null);
-
-  FFI get ffi => (_lastState.value! as _PortForwardPageState)._ffi;
 
   @override
-  State<PortForwardPage> createState() {
-    final state = _PortForwardPageState();
-    _lastState.value = state;
-    return state;
-  }
+  State<PortForwardPage> createState() => _PortForwardPageState();
 }
 
 class _PortForwardPageState extends State<PortForwardPage>

flutter/lib/desktop/pages/remote_page.dart

@@ -3,9 +3,9 @@ import 'dart:async';
 import 'package:desktop_multi_window/desktop_multi_window.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter/scheduler.dart';
 import 'package:get/get.dart';
 import 'package:provider/provider.dart';
+import 'package:wakelock_plus/wakelock_plus.dart';
 import 'package:flutter_hbb/models/state_model.dart';
 
 import '../../consts.dart';
@@ -15,7 +15,6 @@ import '../../common.dart';
 import '../../common/widgets/dialog.dart';
 import '../../common/widgets/toolbar.dart';
 import '../../models/model.dart';
-import '../../models/input_model.dart';
 import '../../models/platform_model.dart';
 import '../../common/shared_state.dart';
 import '../../utils/image.dart';
@@ -73,10 +72,7 @@ class RemotePage extends StatefulWidget {
 }
 
 class _RemotePageState extends State<RemotePage>
-    with
-        AutomaticKeepAliveClientMixin,
-        MultiWindowListener,
-        TickerProviderStateMixin {
+    with AutomaticKeepAliveClientMixin, MultiWindowListener {
   Timer? _timer;
   String keyboardMode = "legacy";
   bool _isWindowBlur = false;
@@ -85,25 +81,17 @@ class _RemotePageState extends State<RemotePage>
   late RxBool _zoomCursor;
   late RxBool _remoteCursorMoved;
   late RxBool _keyboardEnabled;
-  final _uniqueKey = UniqueKey();
 
   var _blockableOverlayState = BlockableOverlayState();
 
   final FocusNode _rawKeyFocusNode = FocusNode(debugLabel: "rawkeyFocusNode");
 
-  // Debounce timer for pointer lock center updates during window events.
-  // Uses kDefaultPointerLockCenterThrottleMs from consts.dart for the duration.
-  Timer? _pointerLockCenterDebounceTimer;
-
   // We need `_instanceIdOnEnterOrLeaveImage4Toolbar` together with `_onEnterOrLeaveImage4Toolbar`
   // to identify the toolbar instance and its callback function.
   int? _instanceIdOnEnterOrLeaveImage4Toolbar;
   Function(bool)? _onEnterOrLeaveImage4Toolbar;
 
   late FFI _ffi;
-  Worker? _waylandKeyboardModeWorker;
-  bool _waylandKeyboardModeNormalized = false;
-  bool _waylandKeyboardModeNormalizing = false;
 
   SessionID get sessionId => _ffi.sessionId;
 
@@ -124,13 +112,11 @@ class _RemotePageState extends State<RemotePage>
     _ffi = FFI(widget.sessionId);
     Get.put<FFI>(_ffi, tag: widget.id);
     _ffi.imageModel.addCallbackOnFirstImage((String peerId) {
-      _ffi.canvasModel.activateLocalCursor();
       showKBLayoutTypeChooserIfNeeded(
           _ffi.ffiModel.pi.platform, _ffi.dialogManager);
       _ffi.recordingModel
           .updateStatus(bind.sessionGetIsRecording(sessionId: _ffi.sessionId));
     });
-    _ffi.canvasModel.initializeEdgeScrollFallback(this);
     _ffi.start(
       widget.id,
       password: widget.password,
@@ -146,7 +132,9 @@ class _RemotePageState extends State<RemotePage>
       _ffi.dialogManager
           .showLoading(translate('Connecting...'), onCancel: closeConnection);
     });
-    WakelockManager.enable(_uniqueKey);
+    if (!isLinux) {
+      WakelockPlus.enable();
+    }
 
     _ffi.ffiModel.updateEventListener(sessionId, widget.id);
     if (!isWeb) bind.pluginSyncUi(syncTo: kAppTypeDesktopRemote);
@@ -177,58 +165,6 @@ class _RemotePageState extends State<RemotePage>
     WidgetsBinding.instance.addPostFrameCallback((_) {
       widget.tabController?.onSelected?.call(widget.id);
     });
-
-    // Register callback to cancel debounce timer when relative mouse mode is disabled
-    _ffi.inputModel.onRelativeMouseModeDisabled =
-        _cancelPointerLockCenterDebounceTimer;
-
-    _waylandKeyboardModeWorker = ever(_ffi.ffiModel.pi.isSet, (bool isSet) {
-      if (isSet) {
-        unawaited(_normalizeWaylandKeyboardModeIfNeeded());
-      }
-    });
-    if (_ffi.ffiModel.pi.isSet.value) {
-      unawaited(_normalizeWaylandKeyboardModeIfNeeded());
-    }
-  }
-
-  Future<void> _normalizeWaylandKeyboardModeIfNeeded() async {
-    if (!mounted ||
-        _waylandKeyboardModeNormalized ||
-        _waylandKeyboardModeNormalizing) {
-      return;
-    }
-    _waylandKeyboardModeNormalizing = true;
-    try {
-      final pi = _ffi.ffiModel.pi;
-      if (pi.platform != kPeerPlatformLinux || !pi.isWayland) return;
-      final mapSupported = bind.sessionIsKeyboardModeSupported(
-          sessionId: sessionId, mode: kKeyMapMode);
-      if (!mapSupported) return;
-      final current = await bind.sessionGetKeyboardMode(sessionId: sessionId);
-      if (!mounted) return;
-      if (current == kKeyMapMode) {
-        _waylandKeyboardModeNormalized = true;
-        return;
-      }
-      await bind.sessionSetKeyboardMode(
-          sessionId: sessionId, value: kKeyMapMode);
-      if (!mounted) return;
-      await _ffi.inputModel.updateKeyboardMode();
-      if (!mounted) return;
-      _waylandKeyboardModeNormalized = true;
-    } catch (e, st) {
-      debugPrint('Failed to normalize Wayland keyboard mode: $e');
-      debugPrintStack(stackTrace: st);
-    } finally {
-      _waylandKeyboardModeNormalizing = false;
-    }
-  }
-
-  /// Cancel the pointer lock center debounce timer
-  void _cancelPointerLockCenterDebounceTimer() {
-    _pointerLockCenterDebounceTimer?.cancel();
-    _pointerLockCenterDebounceTimer = null;
   }
 
   @override
@@ -244,13 +180,6 @@ class _RemotePageState extends State<RemotePage>
       _rawKeyFocusNode.unfocus();
     }
     stateGlobal.isFocused.value = false;
-
-    // When window loses focus, temporarily release relative mouse mode constraints
-    // to allow user to interact with other applications normally.
-    // The cursor will be re-hidden and re-centered when window regains focus.
-    if (_ffi.inputModel.relativeMouseMode.value) {
-      _ffi.inputModel.onWindowBlur();
-    }
   }
 
   @override
@@ -261,12 +190,6 @@ class _RemotePageState extends State<RemotePage>
       _isWindowBlur = false;
     }
     stateGlobal.isFocused.value = true;
-
-    // Restore relative mouse mode constraints when window regains focus.
-    if (_ffi.inputModel.relativeMouseMode.value) {
-      _rawKeyFocusNode.requestFocus();
-      _ffi.inputModel.onWindowFocus();
-    }
   }
 
   @override
@@ -277,59 +200,25 @@ class _RemotePageState extends State<RemotePage>
     if (isWindows) {
       _isWindowBlur = false;
     }
-    WakelockManager.enable(_uniqueKey);
-    // Update pointer lock center when window is restored
-    _updatePointerLockCenterIfNeeded();
+    if (!isLinux) {
+      WakelockPlus.enable();
+    }
   }
 
   // When the window is unminimized, onWindowMaximize or onWindowRestore can be called when the old state was maximized or not.
   @override
   void onWindowMaximize() {
     super.onWindowMaximize();
-    WakelockManager.enable(_uniqueKey);
-    // Update pointer lock center when window is maximized
-    _updatePointerLockCenterIfNeeded();
-  }
-
-  @override
-  void onWindowResize() {
-    super.onWindowResize();
-    // Update pointer lock center when window is resized
-    _updatePointerLockCenterIfNeeded();
-  }
-
-  @override
-  void onWindowMove() {
-    super.onWindowMove();
-    // Update pointer lock center when window is moved
-    _updatePointerLockCenterIfNeeded();
-  }
-
-  /// Update pointer lock center with debouncing to avoid excessive updates
-  /// during rapid window move/resize events.
-  void _updatePointerLockCenterIfNeeded() {
-    if (!_ffi.inputModel.relativeMouseMode.value) return;
-
-    // Cancel any pending update and schedule a new one (debounce pattern)
-    _pointerLockCenterDebounceTimer?.cancel();
-    _pointerLockCenterDebounceTimer = Timer(
-      const Duration(milliseconds: kDefaultPointerLockCenterThrottleMs),
-      () {
-        if (!mounted) return;
-        if (_ffi.inputModel.relativeMouseMode.value) {
-          _ffi.inputModel.updatePointerLockCenter();
-        }
-      },
-    );
+    if (!isLinux) {
+      WakelockPlus.enable();
+    }
   }
 
   @override
   void onWindowMinimize() {
     super.onWindowMinimize();
-    WakelockManager.disable(_uniqueKey);
-    // Release cursor constraints when minimized
-    if (_ffi.inputModel.relativeMouseMode.value) {
-      _ffi.inputModel.onWindowBlur();
+    if (!isLinux) {
+      WakelockPlus.disable();
     }
   }
 
@@ -356,17 +245,6 @@ class _RemotePageState extends State<RemotePage>
     // https://github.com/flutter/flutter/issues/64935
     super.dispose();
     debugPrint("REMOTE PAGE dispose session $sessionId ${widget.id}");
-
-    // Defensive cleanup: ensure host system-key propagation is reset even if
-    // MouseRegion.onExit never fired (e.g., tab closed while cursor inside).
-    if (!isWeb) bind.hostStopSystemKeyPropagate(stopped: true);
-
-    _pointerLockCenterDebounceTimer?.cancel();
-    _pointerLockCenterDebounceTimer = null;
-    _waylandKeyboardModeWorker?.dispose();
-    // Clear callback reference to prevent memory leaks and stale references
-    _ffi.inputModel.onRelativeMouseModeDisabled = null;
-    // Relative mouse mode cleanup is centralized in FFI.close(closeSession: ...).
     _ffi.textureModel.onRemotePageDispose(closeSession);
     if (closeSession) {
       // ensure we leave this session, this is a double check
@@ -377,9 +255,6 @@ class _RemotePageState extends State<RemotePage>
     _ffi.imageModel.disposeImage();
     _ffi.cursorModel.disposeImages();
     _rawKeyFocusNode.dispose();
-    if (closeSession) {
-      clearWaylandKeyboardPromptSuppressedForConnection(sessionId.toString());
-    }
     await _ffi.close(closeSession: closeSession);
     _timer?.cancel();
     _ffi.dialogManager.dismissAll();
@@ -387,7 +262,9 @@ class _RemotePageState extends State<RemotePage>
       await SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual,
           overlays: SystemUiOverlay.values);
     }
-    WakelockManager.disable(_uniqueKey);
+    if (!isLinux) {
+      await WakelockPlus.disable();
+    }
     await Get.delete<FFI>(tag: widget.id);
     removeSharedStates(widget.id);
   }
@@ -471,15 +348,10 @@ class _RemotePageState extends State<RemotePage>
                       }
                     }(),
               // Use Overlay to enable rebuild every time on menu button click.
-              // Hide toolbar when relative mouse mode is active to prevent
-              // cursor from escaping to toolbar area.
-              Obx(() => _ffi.inputModel.relativeMouseMode.value
-                  ? const Offstage()
-                  : _ffi.ffiModel.pi.isSet.isTrue
-                      ? Overlay(initialEntries: [
-                          OverlayEntry(builder: remoteToolbar)
-                        ])
-                      : remoteToolbar(context)),
+              _ffi.ffiModel.pi.isSet.isTrue
+                  ? Overlay(
+                      initialEntries: [OverlayEntry(builder: remoteToolbar)])
+                  : remoteToolbar(context),
               _ffi.ffiModel.pi.isSet.isFalse ? emptyOverlay() : Offstage(),
             ],
           ),
@@ -523,7 +395,7 @@ class _RemotePageState extends State<RemotePage>
     super.build(context);
     return WillPopScope(
         onWillPop: () async {
-          clientClose(sessionId, _ffi);
+          clientClose(sessionId, _ffi.dialogManager);
           return false;
         },
         child: MultiProvider(providers: [
@@ -536,8 +408,6 @@ class _RemotePageState extends State<RemotePage>
   }
 
   void enterView(PointerEnterEvent evt) {
-    _ffi.canvasModel.rearmEdgeScroll();
-
     _cursorOverImage.value = true;
     _firstEnterImage.value = true;
     if (_onEnterOrLeaveImage4Toolbar != null) {
@@ -547,7 +417,6 @@ class _RemotePageState extends State<RemotePage>
         //
       }
     }
-
     // See [onWindowBlur].
     if (!isWindows) {
       if (!_rawKeyFocusNode.hasFocus) {
@@ -558,8 +427,6 @@ class _RemotePageState extends State<RemotePage>
   }
 
   void leaveView(PointerExitEvent evt) {
-    _ffi.canvasModel.disableEdgeScroll();
-
     if (_ffi.ffiModel.keyboard) {
       _ffi.inputModel.tryMoveEdgeOnExit(evt.position);
     }
@@ -573,7 +440,6 @@ class _RemotePageState extends State<RemotePage>
         //
       }
     }
-
     // See [onWindowBlur].
     if (!isWindows) {
       _ffi.inputModel.enterOrLeave(false);
@@ -621,39 +487,33 @@ class _RemotePageState extends State<RemotePage>
 
   Widget getBodyForDesktop(BuildContext context) {
     var paints = <Widget>[
-      MouseRegion(
-        onEnter: (evt) {
-          if (!isWeb) bind.hostStopSystemKeyPropagate(stopped: false);
-        },
-        onExit: (evt) {
-          if (!isWeb) bind.hostStopSystemKeyPropagate(stopped: true);
-        },
-        child: _ViewStyleUpdater(
-          canvasModel: _ffi.canvasModel,
-          inputModel: _ffi.inputModel,
-          child: Builder(builder: (context) {
-            final peerDisplay = CurrentDisplayState.find(widget.id);
-            return Obx(
-              () => _ffi.ffiModel.pi.isSet.isFalse
-                  ? Container(color: Colors.transparent)
-                  : Obx(() {
-                      _ffi.textureModel.updateCurrentDisplay(peerDisplay.value);
-                      return ImagePaint(
-                        id: widget.id,
-                        zoomCursor: _zoomCursor,
-                        cursorOverImage: _cursorOverImage,
-                        keyboardEnabled: _keyboardEnabled,
-                        remoteCursorMoved: _remoteCursorMoved,
-                        listenerBuilder: (child) =>
-                            _buildRawTouchAndPointerRegion(
-                                child, enterView, leaveView),
-                        ffi: _ffi,
-                      );
-                    }),
-            );
-          }),
-        ),
-      )
+      MouseRegion(onEnter: (evt) {
+        if (!isWeb) bind.hostStopSystemKeyPropagate(stopped: false);
+      }, onExit: (evt) {
+        if (!isWeb) bind.hostStopSystemKeyPropagate(stopped: true);
+      }, child: LayoutBuilder(builder: (context, constraints) {
+        final c = Provider.of<CanvasModel>(context, listen: false);
+        Future.delayed(Duration.zero, () => c.updateViewStyle());
+        final peerDisplay = CurrentDisplayState.find(widget.id);
+        return Obx(
+          () => _ffi.ffiModel.pi.isSet.isFalse
+              ? Container(color: Colors.transparent)
+              : Obx(() {
+                  widget.toolbarState.initShow(sessionId);
+                  _ffi.textureModel.updateCurrentDisplay(peerDisplay.value);
+                  return ImagePaint(
+                    id: widget.id,
+                    zoomCursor: _zoomCursor,
+                    cursorOverImage: _cursorOverImage,
+                    keyboardEnabled: _keyboardEnabled,
+                    remoteCursorMoved: _remoteCursorMoved,
+                    listenerBuilder: (child) => _buildRawTouchAndPointerRegion(
+                        child, enterView, leaveView),
+                    ffi: _ffi,
+                  );
+                }),
+        );
+      }))
     ];
 
     if (!_ffi.canvasModel.cursorEmbedded) {
@@ -682,63 +542,6 @@ class _RemotePageState extends State<RemotePage>
   bool get wantKeepAlive => true;
 }
 
-/// A widget that tracks the view size and updates CanvasModel.updateViewStyle()
-/// and InputModel.updateImageWidgetSize() only when size actually changes.
-/// This avoids scheduling post-frame callbacks on every LayoutBuilder rebuild.
-class _ViewStyleUpdater extends StatefulWidget {
-  final CanvasModel canvasModel;
-  final InputModel inputModel;
-  final Widget child;
-
-  const _ViewStyleUpdater({
-    Key? key,
-    required this.canvasModel,
-    required this.inputModel,
-    required this.child,
-  }) : super(key: key);
-
-  @override
-  State<_ViewStyleUpdater> createState() => _ViewStyleUpdaterState();
-}
-
-class _ViewStyleUpdaterState extends State<_ViewStyleUpdater> {
-  Size? _lastSize;
-  bool _callbackScheduled = false;
-
-  @override
-  Widget build(BuildContext context) {
-    return LayoutBuilder(
-      builder: (context, constraints) {
-        final maxWidth = constraints.maxWidth;
-        final maxHeight = constraints.maxHeight;
-        // Guard against infinite constraints (e.g., unconstrained ancestor).
-        if (!maxWidth.isFinite || !maxHeight.isFinite) {
-          return widget.child;
-        }
-        final newSize = Size(maxWidth, maxHeight);
-        if (_lastSize != newSize) {
-          _lastSize = newSize;
-          // Schedule the update for after the current frame to avoid setState during build.
-          // Use _callbackScheduled flag to prevent accumulating multiple callbacks
-          // when size changes rapidly before any callback executes.
-          if (!_callbackScheduled) {
-            _callbackScheduled = true;
-            SchedulerBinding.instance.addPostFrameCallback((_) {
-              _callbackScheduled = false;
-              final currentSize = _lastSize;
-              if (mounted && currentSize != null) {
-                widget.canvasModel.updateViewStyle();
-                widget.inputModel.updateImageWidgetSize(currentSize);
-              }
-            });
-          }
-        }
-        return widget.child;
-      },
-    );
-  }
-}
-
 class ImagePaint extends StatefulWidget {
   final FFI ffi;
   final String id;
@@ -803,29 +606,26 @@ class _ImagePaintState extends State<ImagePaint> {
               cursor: cursorOverImage.isTrue
                   ? c.cursorEmbedded
                       ? SystemMouseCursors.none
-                      // Hide cursor when relative mouse mode is active
-                      : widget.ffi.inputModel.relativeMouseMode.value
-                          ? SystemMouseCursors.none
-                          : keyboardEnabled.isTrue
-                              ? (() {
-                                  if (remoteCursorMoved.isTrue) {
-                                    _lastRemoteCursorMoved = true;
-                                    return SystemMouseCursors.none;
-                                  } else {
-                                    if (_lastRemoteCursorMoved) {
-                                      _lastRemoteCursorMoved = false;
-                                      _firstEnterImage.value = true;
-                                    }
-                                    return _buildCustomCursor(
-                                        context, getCursorScale());
-                                  }
-                                }())
-                              : _buildDisabledCursor(context, getCursorScale())
+                      : keyboardEnabled.isTrue
+                          ? (() {
+                              if (remoteCursorMoved.isTrue) {
+                                _lastRemoteCursorMoved = true;
+                                return SystemMouseCursors.none;
+                              } else {
+                                if (_lastRemoteCursorMoved) {
+                                  _lastRemoteCursorMoved = false;
+                                  _firstEnterImage.value = true;
+                                }
+                                return _buildCustomCursor(
+                                    context, getCursorScale());
+                              }
+                            }())
+                          : _buildDisabledCursor(context, getCursorScale())
                   : MouseCursor.defer,
               onHover: (evt) {},
               child: child);
         });
-    if (c.imageOverflow.isTrue && c.scrollStyle != ScrollStyle.scrollauto) {
+    if (c.imageOverflow.isTrue && c.scrollStyle == ScrollStyle.scrollbar) {
       final paintWidth = c.getDisplayWidth() * s;
       final paintHeight = c.getDisplayHeight() * s;
       final paintSize = Size(paintWidth, paintHeight);
@@ -880,20 +680,9 @@ class _ImagePaintState extends State<ImagePaint> {
 
   Widget _buildScrollAutoNonTextureRender(
       ImageModel m, CanvasModel c, double s) {
-    double sizeScale = s;
-    if (widget.ffi.ffiModel.isPeerLinux) {
-      final displays = widget.ffi.ffiModel.pi.getCurDisplays();
-      if (displays.isNotEmpty) {
-        sizeScale = s / displays[0].scale;
-      }
-    }
     return CustomPaint(
       size: Size(c.size.width, c.size.height),
-      painter: ImagePainter(
-          image: m.image,
-          x: c.x / sizeScale,
-          y: c.y / sizeScale,
-          scale: sizeScale),
+      painter: ImagePainter(image: m.image, x: c.x / s, y: c.y / s, scale: s),
     );
   }
 
@@ -906,19 +695,17 @@ class _ImagePaintState extends State<ImagePaint> {
     if (rect == null) {
       return Container();
     }
-    final isPeerLinux = ffiModel.isPeerLinux;
     final curDisplay = ffiModel.pi.currentDisplay;
     for (var i = 0; i < displays.length; i++) {
       final textureId = widget.ffi.textureModel
           .getTextureId(curDisplay == kAllDisplayValue ? i : curDisplay);
       if (true) {
         // both "textureId.value != -1" and "true" seems ok
-        final sizeScale = isPeerLinux ? s / displays[i].scale : s;
         children.add(Positioned(
           left: (displays[i].x - rect.left) * s + offset.dx,
           top: (displays[i].y - rect.top) * s + offset.dy,
-          width: displays[i].width * sizeScale,
-          height: displays[i].height * sizeScale,
+          width: displays[i].width * s,
+          height: displays[i].height * s,
           child: Obx(() => Texture(
                 textureId: textureId.value,
                 filterQuality:

flutter/lib/desktop/pages/remote_tab_page.dart

@@ -80,15 +80,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
         label: peerId!,
         selectedIcon: selectedIcon,
         unselectedIcon: unselectedIcon,
-        onTabCloseButton: () async {
-          if (await desktopTryShowTabAuditDialogCloseCancelled(
-            id: peerId!,
-            tabController: tabController,
-          )) {
-            return;
-          }
-          tabController.closeBy(peerId!);
-        },
+        onTabCloseButton: () => tabController.closeBy(peerId),
         page: RemotePage(
           key: ValueKey(peerId),
           id: peerId!,
@@ -135,13 +127,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
       body: DesktopTab(
         controller: tabController,
         onWindowCloseButton: handleWindowCloseButton,
-        tail: Row(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            _RelativeMouseModeHint(tabController: tabController),
-            const AddButton(),
-          ],
-        ),
+        tail: const AddButton(),
         selectedBorderColor: MyTheme.accent,
         pageViewBuilder: (pageView) => pageView,
         labelGetter: DesktopTab.tablabelGetter,
@@ -257,11 +243,11 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
       MenuEntryButton<String>(
         childBuilder: (TextStyle? style) => Obx(() => Text(
               translate(
-                  toolbarState.hide.isTrue ? 'Show Toolbar' : 'Hide Toolbar'),
+                  toolbarState.show.isTrue ? 'Hide Toolbar' : 'Show Toolbar'),
               style: style,
             )),
         proc: () {
-          toolbarState.switchHide(sessionId);
+          toolbarState.switchShow(sessionId);
           cancelFunc();
         },
         padding: padding,
@@ -330,13 +316,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
           translate('Close'),
           style: style,
         ),
-        proc: () async {
-          if (await desktopTryShowTabAuditDialogCloseCancelled(
-            id: key,
-            tabController: tabController,
-          )) {
-            return;
-          }
+        proc: () {
           tabController.closeBy(key);
           cancelFunc();
         },
@@ -380,8 +360,6 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
       loopCloseWindow();
     }
     ConnectionTypeState.delete(id);
-    // Clean up relative mouse mode state for this peer.
-    stateGlobal.relativeMouseModeState.remove(id);
     _update_remote_count();
   }
 
@@ -391,14 +369,6 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
 
   Future<bool> handleWindowCloseButton() async {
     final connLength = tabController.length;
-    if (connLength == 1) {
-      if (await desktopTryShowTabAuditDialogCloseCancelled(
-        id: tabController.state.value.tabs[0].key,
-        tabController: tabController,
-      )) {
-        return false;
-      }
-    }
     if (connLength <= 1) {
       tabController.clear();
       return true;
@@ -453,15 +423,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
         label: id,
         selectedIcon: selectedIcon,
         unselectedIcon: unselectedIcon,
-        onTabCloseButton: () async {
-          if (await desktopTryShowTabAuditDialogCloseCancelled(
-            id: id,
-            tabController: tabController,
-          )) {
-            return;
-          }
-          tabController.closeBy(id);
-        },
+        onTabCloseButton: () => tabController.closeBy(id),
         page: RemotePage(
           key: ValueKey(id),
           id: id,
@@ -556,69 +518,3 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
     return returnValue;
   }
 }
-
-/// A widget that displays a hint in the tab bar when relative mouse mode is active.
-/// This helps users remember how to exit relative mouse mode.
-class _RelativeMouseModeHint extends StatelessWidget {
-  final DesktopTabController tabController;
-
-  const _RelativeMouseModeHint({Key? key, required this.tabController})
-      : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Obx(() {
-      // Check if there are any tabs
-      if (tabController.state.value.tabs.isEmpty) {
-        return const SizedBox.shrink();
-      }
-
-      // Get current selected tab's RemotePage
-      final selectedTabInfo = tabController.state.value.selectedTabInfo;
-      if (selectedTabInfo.page is! RemotePage) {
-        return const SizedBox.shrink();
-      }
-
-      final remotePage = selectedTabInfo.page as RemotePage;
-      final String peerId = remotePage.id;
-
-      // Use global state to check relative mouse mode (synced from InputModel).
-      // This avoids timing issues with FFI registration.
-      final isRelativeMouseMode =
-          stateGlobal.relativeMouseModeState[peerId] ?? false;
-
-      if (!isRelativeMouseMode) {
-        return const SizedBox.shrink();
-      }
-
-      return Container(
-        padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
-        margin: const EdgeInsets.only(right: 8),
-        decoration: BoxDecoration(
-          color: Colors.orange.withOpacity(0.2),
-          borderRadius: BorderRadius.circular(4),
-          border: Border.all(color: Colors.orange.withOpacity(0.5)),
-        ),
-        child: Row(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Icon(
-              Icons.mouse,
-              size: 14,
-              color: Colors.orange[700],
-            ),
-            const SizedBox(width: 4),
-            Text(
-              translate(
-                  'rel-mouse-exit-{${isMacOS ? "Cmd+G" : "Ctrl+Alt"}}-tip'),
-              style: TextStyle(
-                fontSize: 11,
-                color: Colors.orange[700],
-              ),
-            ),
-          ],
-        ),
-      );
-    });
-  }
-}

flutter/lib/desktop/pages/server_page.dart

@@ -462,7 +462,23 @@ class _CmHeaderState extends State<_CmHeader>
       child: Row(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          _buildClientAvatar().marginOnly(right: 10.0),
+          Container(
+            width: 70,
+            height: 70,
+            alignment: Alignment.center,
+            decoration: BoxDecoration(
+              color: str2color(client.name),
+              borderRadius: BorderRadius.circular(15.0),
+            ),
+            child: Text(
+              client.name[0],
+              style: TextStyle(
+                fontWeight: FontWeight.bold,
+                color: Colors.white,
+                fontSize: 55,
+              ),
+            ),
+          ).marginOnly(right: 10.0),
           Expanded(
             child: Column(
               mainAxisAlignment: MainAxisAlignment.start,
@@ -566,36 +582,6 @@ class _CmHeaderState extends State<_CmHeader>
 
   @override
   bool get wantKeepAlive => true;
-
-  Widget _buildClientAvatar() {
-    return buildAvatarWidget(
-          avatar: client.avatar,
-          size: 70,
-          borderRadius: 15,
-          fallback: _buildInitialAvatar(),
-        ) ??
-        _buildInitialAvatar();
-  }
-
-  Widget _buildInitialAvatar() {
-    return Container(
-      width: 70,
-      height: 70,
-      alignment: Alignment.center,
-      decoration: BoxDecoration(
-        color: str2color(client.name),
-        borderRadius: BorderRadius.circular(15.0),
-      ),
-      child: Text(
-        client.name.isNotEmpty ? client.name[0] : '?',
-        style: TextStyle(
-          fontWeight: FontWeight.bold,
-          color: Colors.white,
-          fontSize: 55,
-        ),
-      ),
-    );
-  }
 }
 
 class _PrivilegeBoard extends StatefulWidget {
@@ -610,24 +596,19 @@ class _PrivilegeBoard extends StatefulWidget {
 class _PrivilegeBoardState extends State<_PrivilegeBoard> {
   late final client = widget.client;
   Widget buildPermissionIcon(bool enabled, IconData iconData,
-      Function(bool)? onTap, String tooltipText,
-      {required bool canModify}) {
+      Function(bool)? onTap, String tooltipText) {
     return Tooltip(
       message: "$tooltipText: ${enabled ? "ON" : "OFF"}",
       waitDuration: Duration.zero,
       child: Container(
         decoration: BoxDecoration(
-          color: enabled
-              ? (canModify ? MyTheme.accent : MyTheme.accent.withOpacity(0.6))
-              : Colors.grey[700],
+          color: enabled ? MyTheme.accent : Colors.grey[700],
           borderRadius: BorderRadius.circular(10.0),
         ),
         padding: EdgeInsets.all(8.0),
         child: InkWell(
-          onTap: canModify
-              ? () =>
-                  checkClickTime(widget.client.id, () => onTap?.call(!enabled))
-              : null,
+          onTap: () =>
+              checkClickTime(widget.client.id, () => onTap?.call(!enabled)),
           child: Column(
             mainAxisAlignment: MainAxisAlignment.spaceAround,
             children: [
@@ -648,9 +629,6 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
   Widget build(BuildContext context) {
     final crossAxisCount = 4;
     final spacing = 10.0;
-    final canModifyPermission =
-        bind.mainGetBuildinOption(key: kOptionEnablePermChangeInAcceptWindow) !=
-            'N';
     return Container(
       width: double.infinity,
       height: 160.0,
@@ -697,7 +675,6 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
                           });
                         },
                         translate('Enable audio'),
-                        canModify: canModifyPermission,
                       ),
                       buildPermissionIcon(
                         client.recording,
@@ -712,7 +689,6 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
                           });
                         },
                         translate('Enable recording session'),
-                        canModify: canModifyPermission,
                       ),
                     ]
                   : [
@@ -729,7 +705,6 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
                           });
                         },
                         translate('Enable keyboard/mouse'),
-                        canModify: canModifyPermission,
                       ),
                       buildPermissionIcon(
                         client.clipboard,
@@ -744,7 +719,6 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
                           });
                         },
                         translate('Enable clipboard'),
-                        canModify: canModifyPermission,
                       ),
                       buildPermissionIcon(
                         client.audio,
@@ -759,7 +733,6 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
                           });
                         },
                         translate('Enable audio'),
-                        canModify: canModifyPermission,
                       ),
                       buildPermissionIcon(
                         client.file,
@@ -774,7 +747,6 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
                           });
                         },
                         translate('Enable file copy and paste'),
-                        canModify: canModifyPermission,
                       ),
                       buildPermissionIcon(
                         client.restart,
@@ -789,7 +761,6 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
                           });
                         },
                         translate('Enable remote restart'),
-                        canModify: canModifyPermission,
                       ),
                       buildPermissionIcon(
                         client.recording,
@@ -804,7 +775,6 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
                           });
                         },
                         translate('Enable recording session'),
-                        canModify: canModifyPermission,
                       ),
                       // only windows support block input
                       if (isWindows)
@@ -821,23 +791,6 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
                             });
                           },
                           translate('Enable blocking user input'),
-                          canModify: canModifyPermission,
-                        ),
-                      if (bind.mainSupportedPrivacyModeImpls() != '[]')
-                        buildPermissionIcon(
-                          client.privacyMode,
-                          Icons.visibility_off,
-                          (enabled) {
-                            bind.cmSwitchPermission(
-                                connId: client.id,
-                                name: "privacy_mode",
-                                enabled: enabled);
-                            setState(() {
-                              client.privacyMode = enabled;
-                            });
-                          },
-                          translate('Enable privacy mode'),
-                          canModify: canModifyPermission,
                         )
                     ],
             ),

flutter/lib/desktop/pages/terminal_page.dart

@@ -1,4 +1,3 @@
-import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hbb/common.dart';
@@ -9,14 +8,13 @@ import 'package:xterm/xterm.dart';
 import 'terminal_connection_manager.dart';
 
 class TerminalPage extends StatefulWidget {
-  TerminalPage({
+  const TerminalPage({
     Key? key,
     required this.id,
     required this.password,
     required this.tabController,
     required this.isSharedPassword,
     required this.terminalId,
-    required this.tabKey,
     this.forceRelay,
     this.connToken,
   }) : super(key: key);
@@ -28,38 +26,19 @@ class TerminalPage extends StatefulWidget {
   final String? connToken;
   final int terminalId;
 
-  /// Tab key for focus management, passed from parent to avoid duplicate construction
-  final String tabKey;
-  final SimpleWrapper<State<TerminalPage>?> _lastState = SimpleWrapper(null);
-
-  FFI get ffi => (_lastState.value! as _TerminalPageState)._ffi;
-
   @override
-  State<TerminalPage> createState() {
-    final state = _TerminalPageState();
-    _lastState.value = state;
-    return state;
-  }
+  State<TerminalPage> createState() => _TerminalPageState();
 }
 
 class _TerminalPageState extends State<TerminalPage>
     with AutomaticKeepAliveClientMixin {
-  static const EdgeInsets _defaultTerminalPadding =
-      EdgeInsets.symmetric(horizontal: 5.0, vertical: 2.0);
-
   late FFI _ffi;
   late TerminalModel _terminalModel;
-  double? _cellHeight;
-  final FocusNode _terminalFocusNode = FocusNode(canRequestFocus: false);
-  StreamSubscription<DesktopTabState>? _tabStateSubscription;
 
   @override
   void initState() {
     super.initState();
 
-    // Listen for tab selection changes to request focus
-    _tabStateSubscription = widget.tabController.state.listen(_onTabStateChanged);
-
     // Use shared FFI instance from connection manager
     _ffi = TerminalConnectionManager.getConnection(
       peerId: widget.id,
@@ -74,37 +53,18 @@ class _TerminalPageState extends State<TerminalPage>
     debugPrint(
         '[TerminalPage] Terminal model created for terminal ${widget.terminalId}');
 
-    _terminalModel.onResizeExternal = (w, h, pw, ph) {
-      _cellHeight = ph * 1.0;
-
-      // Enable focus once terminal has valid dimensions (first valid resize)
-      if (!_terminalFocusNode.canRequestFocus && w > 0 && h > 0) {
-        _terminalFocusNode.canRequestFocus = true;
-        // Auto-focus if this tab is currently selected
-        _requestFocusIfSelected();
-      }
-
-      // Schedule the setState for the next frame
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        if (mounted) {
-          setState(() {});
-        }
-      });
-    };
-
     // Register this terminal model with FFI for event routing
     _ffi.registerTerminalModel(widget.terminalId, _terminalModel);
 
     // Initialize terminal connection
     WidgetsBinding.instance.addPostFrameCallback((_) {
       widget.tabController.onSelected?.call(widget.id);
-
+      
       // Check if this is a new connection or additional terminal
       // Note: When a connection exists, the ref count will be > 1 after this terminal is added
-      final isExistingConnection =
-          TerminalConnectionManager.hasConnection(widget.id) &&
-              TerminalConnectionManager.getTerminalCount(widget.id) > 1;
-
+      final isExistingConnection = TerminalConnectionManager.hasConnection(widget.id) && 
+          TerminalConnectionManager.getTerminalCount(widget.id) > 1;
+      
       if (!isExistingConnection) {
         // First terminal - show loading dialog, wait for onReady
         _ffi.dialogManager
@@ -119,100 +79,38 @@ class _TerminalPageState extends State<TerminalPage>
 
   @override
   void dispose() {
-    // Cancel tab state subscription to prevent memory leak
-    _tabStateSubscription?.cancel();
     // Unregister terminal model from FFI
     _ffi.unregisterTerminalModel(widget.terminalId);
     _terminalModel.dispose();
-    _terminalFocusNode.dispose();
     // Release connection reference instead of closing directly
     TerminalConnectionManager.releaseConnection(widget.id);
     super.dispose();
   }
 
-  void _onTabStateChanged(DesktopTabState state) {
-    // Check if this tab is now selected and request focus
-    if (state.selected >= 0 && state.selected < state.tabs.length) {
-      final selectedTab = state.tabs[state.selected];
-      if (selectedTab.key == widget.tabKey && mounted) {
-        _requestFocusIfSelected();
-      }
-    }
-  }
-
-  void _requestFocusIfSelected() {
-    if (!mounted || !_terminalFocusNode.canRequestFocus) return;
-    // Use post-frame callback to ensure widget is fully laid out in focus tree
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      // Re-check conditions after frame: mounted, focusable, still selected, not already focused
-      if (!mounted || !_terminalFocusNode.canRequestFocus || _terminalFocusNode.hasFocus) return;
-      final state = widget.tabController.state.value;
-      if (state.selected >= 0 && state.selected < state.tabs.length) {
-        if (state.tabs[state.selected].key == widget.tabKey) {
-          _terminalFocusNode.requestFocus();
-        }
-      }
-    });
-  }
-
-  // This method ensures that the number of visible rows is an integer by computing the
-  // extra space left after dividing the available height by the height of a single
-  // terminal row (`_cellHeight`) and distributing it evenly as top and bottom padding.
-  EdgeInsets _calculatePadding(double heightPx) {
-    final cellHeight = _cellHeight;
-    if (!heightPx.isFinite ||
-        heightPx <= 0 ||
-        cellHeight == null ||
-        !cellHeight.isFinite ||
-        cellHeight <= 0) {
-      return _defaultTerminalPadding;
-    }
-    final rows = (heightPx / cellHeight).floor();
-    if (rows <= 0) {
-      return _defaultTerminalPadding;
-    }
-    final extraSpace = heightPx - rows * cellHeight;
-    if (!extraSpace.isFinite || extraSpace < 0) {
-      return _defaultTerminalPadding;
-    }
-    final topBottom = extraSpace / 2.0;
-    return EdgeInsets.symmetric(
-      horizontal: _defaultTerminalPadding.horizontal / 2,
-      vertical: topBottom,
-    );
-  }
-
   @override
   Widget build(BuildContext context) {
     super.build(context);
     return Scaffold(
       backgroundColor: Theme.of(context).scaffoldBackgroundColor,
-      body: LayoutBuilder(
-        builder: (context, constraints) {
-          final heightPx = constraints.maxHeight;
-          return TerminalView(
-            _terminalModel.terminal,
-            controller: _terminalModel.terminalController,
-            focusNode: _terminalFocusNode,
-            // Note: autofocus is not used here because focus is managed manually
-            // via _onTabStateChanged() to handle tab switching properly.
-            backgroundOpacity: 0.7,
-            padding: _calculatePadding(heightPx),
-            onSecondaryTapDown: (details, offset) async {
-              final selection = _terminalModel.terminalController.selection;
-              if (selection != null) {
-                final text = _terminalModel.terminal.buffer.getText(selection);
-                _terminalModel.terminalController.clearSelection();
-                await Clipboard.setData(ClipboardData(text: text));
-              } else {
-                final data = await Clipboard.getData('text/plain');
-                final text = data?.text;
-                if (text != null) {
-                  _terminalModel.terminal.paste(text);
-                }
-              }
-            },
-          );
+      body: TerminalView(
+        _terminalModel.terminal,
+        controller: _terminalModel.terminalController,
+        autofocus: true,
+        backgroundOpacity: 0.7,
+        padding: const EdgeInsets.symmetric(horizontal: 5.0, vertical: 2.0),
+        onSecondaryTapDown: (details, offset) async {
+          final selection = _terminalModel.terminalController.selection;
+          if (selection != null) {
+            final text = _terminalModel.terminal.buffer.getText(selection);
+            _terminalModel.terminalController.clearSelection();
+            await Clipboard.setData(ClipboardData(text: text));
+          } else {
+            final data = await Clipboard.getData('text/plain');
+            final text = data?.text;
+            if (text != null) {
+              _terminalModel.terminal.paste(text);
+            }
+          }
         },
       ),
     );

flutter/lib/desktop/pages/terminal_tab_page.dart

@@ -4,7 +4,6 @@ import 'package:desktop_multi_window/desktop_multi_window.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hbb/common.dart';
-import 'package:flutter_hbb/common/widgets/dialog.dart';
 import 'package:flutter_hbb/consts.dart';
 import 'package:flutter_hbb/models/state_model.dart';
 import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
@@ -34,10 +33,6 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
   static const IconData selectedIcon = Icons.terminal;
   static const IconData unselectedIcon = Icons.terminal_outlined;
   int _nextTerminalId = 1;
-  // Lightweight idempotency guard for async close operations
-  final Set<String> _closingTabs = {};
-  // When true, all session cleanup should persist (window-level close in progress)
-  bool _windowClosing = false;
 
   _TerminalTabPageState(Map<String, dynamic> params) {
     Get.put(DesktopTabController(tabType: DesktopTabType.terminal));
@@ -46,7 +41,6 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
           .setTitle(getWindowNameWithId(id));
     };
     tabController.onRemoved = (_, id) => onRemoveId(id);
-    tabController.onCloseWindow = _closeWindowFromConnection;
     final terminalId = params['terminalId'] ?? _nextTerminalId++;
     tabController.add(_createTerminalTab(
       peerId: params['id'],
@@ -67,20 +61,27 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
     String? connToken,
   }) {
     final tabKey = '${peerId}_$terminalId';
-    final alias = bind.mainGetPeerOptionSync(id: peerId, key: 'alias');
-    final tabLabel =
-        alias.isNotEmpty ? '$alias #$terminalId' : '$peerId #$terminalId';
     return TabInfo(
       key: tabKey,
-      label: tabLabel,
+      label: '$peerId #$terminalId',
       selectedIcon: selectedIcon,
       unselectedIcon: unselectedIcon,
-      onTabCloseButton: () => _closeTab(tabKey),
+      onTabCloseButton: () async {
+        // Close the terminal session first
+        final ffi = TerminalConnectionManager.getExistingConnection(peerId);
+        if (ffi != null) {
+          final terminalModel = ffi.terminalModels[terminalId];
+          if (terminalModel != null) {
+            await terminalModel.closeTerminal();
+          }
+        }
+        // Then close the tab
+        tabController.closeBy(tabKey);
+      },
       page: TerminalPage(
         key: ValueKey(tabKey),
         id: peerId,
         terminalId: terminalId,
-        tabKey: tabKey,
         password: password,
         isSharedPassword: isSharedPassword,
         tabController: tabController,
@@ -90,161 +91,6 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
     );
   }
 
-  /// Unified tab close handler for all close paths (button, shortcut, programmatic).
-  /// Shows audit dialog, cleans up session if not persistent, then removes the UI tab.
-  Future<void> _closeTab(String tabKey) async {
-    // Idempotency guard: skip if already closing this tab
-    if (_closingTabs.contains(tabKey)) return;
-    _closingTabs.add(tabKey);
-
-    try {
-      // Snapshot peerTabCount BEFORE any await to avoid race with concurrent
-      // _closeAllTabs clearing tabController (which would make the live count
-      // drop to 0 and incorrectly trigger session persistence).
-      // Note: the snapshot may become stale if other individual tabs are closed
-      // during the audit dialog, but this is an acceptable trade-off.
-      int? snapshotPeerTabCount;
-      final parsed = _parseTabKey(tabKey);
-      if (parsed != null) {
-        final (peerId, _) = parsed;
-        snapshotPeerTabCount = tabController.state.value.tabs.where((t) {
-          final p = _parseTabKey(t.key);
-          return p != null && p.$1 == peerId;
-        }).length;
-      }
-
-      if (await desktopTryShowTabAuditDialogCloseCancelled(
-        id: tabKey,
-        tabController: tabController,
-      )) {
-        return;
-      }
-
-      // Close terminal session if not in persistent mode.
-      // Wrapped separately so session cleanup failure never blocks UI tab removal.
-      try {
-        await _closeTerminalSessionIfNeeded(tabKey,
-            peerTabCount: snapshotPeerTabCount);
-      } catch (e) {
-        debugPrint('[TerminalTabPage] Session cleanup failed for $tabKey: $e');
-      }
-      // Always close the tab from UI, regardless of session cleanup result
-      tabController.closeBy(tabKey);
-    } catch (e) {
-      debugPrint('[TerminalTabPage] Error closing tab $tabKey: $e');
-    } finally {
-      _closingTabs.remove(tabKey);
-    }
-  }
-
-  /// Close all tabs with session cleanup.
-  /// Used for window-level close operations (onDestroy, handleWindowCloseButton).
-  /// UI tabs are removed immediately; session cleanup runs in parallel with a
-  /// bounded timeout so window close is not blocked indefinitely.
-  Future<void> _closeAllTabs() async {
-    _windowClosing = true;
-    final tabKeys = tabController.state.value.tabs.map((t) => t.key).toList();
-    // Remove all UI tabs immediately (same instant behavior as the old tabController.clear())
-    // Keep the cleanup target lookup below synchronous before its first await:
-    // it relies on the current frame still retaining each TerminalPage's FFI/model.
-    tabController.clear();
-    // Run session cleanup in parallel with bounded timeout (closeTerminal() has internal 3s timeout).
-    // Skip tabs already being closed by a concurrent _closeTab() to avoid duplicate FFI calls.
-    final futures = tabKeys
-        .where((tabKey) => !_closingTabs.contains(tabKey))
-        .map((tabKey) async {
-      try {
-        await _closeTerminalSessionIfNeeded(tabKey, persistAll: true);
-      } catch (e) {
-        debugPrint('[TerminalTabPage] Session cleanup failed for $tabKey: $e');
-      }
-    }).toList();
-    if (futures.isNotEmpty) {
-      await Future.wait(futures).timeout(
-        const Duration(seconds: 4),
-        onTimeout: () {
-          debugPrint(
-              '[TerminalTabPage] Session cleanup timed out for batch close');
-          return [];
-        },
-      );
-    }
-  }
-
-  /// Close the terminal session on server side based on persistent mode.
-  ///
-  /// [persistAll] controls behavior when persistent mode is enabled:
-  /// - `true` (window close): persist all sessions, don't close any.
-  /// - `false` (tab close): only persist the last session for the peer,
-  ///   close others so only the most recent disconnected session survives.
-  ///
-  /// Note: if [_windowClosing] is true, persistAll is forced to true so that
-  /// in-flight _closeTab() calls don't accidentally close sessions that the
-  /// window-close flow intends to preserve.
-  Future<void> _closeTerminalSessionIfNeeded(String tabKey,
-      {bool persistAll = false, int? peerTabCount}) async {
-    // If window close is in progress, override to persist all sessions
-    // even if this call originated from an individual tab close.
-    if (_windowClosing) {
-      persistAll = true;
-    }
-    final parsed = _parseTabKey(tabKey);
-    if (parsed == null) return;
-    final (peerId, terminalId) = parsed;
-
-    final ffi = TerminalConnectionManager.getExistingConnection(peerId);
-    if (ffi == null) return;
-
-    final isPersistent = bind.sessionGetToggleOptionSync(
-      sessionId: ffi.sessionId,
-      arg: kOptionTerminalPersistent,
-    );
-
-    if (isPersistent) {
-      if (persistAll) {
-        // Window close: persist all sessions
-        return;
-      }
-      // Tab close: only persist if this is the last tab for this peer.
-      // Use the snapshot value if provided (avoids race with concurrent tab removal).
-      final effectivePeerTabCount = peerTabCount ??
-          tabController.state.value.tabs.where((t) {
-            final p = _parseTabKey(t.key);
-            return p != null && p.$1 == peerId;
-          }).length;
-      if (effectivePeerTabCount <= 1) {
-        // Last tab for this peer — persist the session
-        return;
-      }
-      // Not the last tab — fall through to close the session
-    }
-
-    final terminalModel = ffi.terminalModels[terminalId];
-    if (terminalModel != null) {
-      // closeTerminal() has internal 3s timeout, no need for external timeout
-      await terminalModel.closeTerminal();
-    }
-  }
-
-  /// Parse tabKey (format: "peerId_terminalId") into its components.
-  /// Note: peerId may contain underscores, so we use lastIndexOf('_').
-  /// Returns null if tabKey format is invalid.
-  (String peerId, int terminalId)? _parseTabKey(String tabKey) {
-    final lastUnderscore = tabKey.lastIndexOf('_');
-    if (lastUnderscore <= 0) {
-      debugPrint('[TerminalTabPage] Invalid tabKey format: $tabKey');
-      return null;
-    }
-    final terminalIdStr = tabKey.substring(lastUnderscore + 1);
-    final terminalId = int.tryParse(terminalIdStr);
-    if (terminalId == null) {
-      debugPrint('[TerminalTabPage] Invalid terminalId in tabKey: $tabKey');
-      return null;
-    }
-    final peerId = tabKey.substring(0, lastUnderscore);
-    return (peerId, terminalId);
-  }
-
   Widget _tabMenuBuilder(String peerId, CancelFunc cancelFunc) {
     final List<MenuEntryBase<String>> menu = [];
     const EdgeInsets padding = EdgeInsets.only(left: 8.0, right: 5.0);
@@ -328,8 +174,7 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
       } else if (call.method == kWindowEventRestoreTerminalSessions) {
         _restoreSessions(call.arguments);
       } else if (call.method == "onDestroy") {
-        // Clean up sessions before window destruction (bounded wait)
-        await _closeAllTabs();
+        tabController.clear();
       } else if (call.method == kWindowActionRebuild) {
         reloadCurrentWindow();
       } else if (call.method == kWindowEventActiveSession) {
@@ -339,10 +184,7 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
         final currentTab = tabController.state.value.selectedTabInfo;
         assert(call.arguments is String,
             "Expected String arguments for kWindowEventActiveSession, got ${call.arguments.runtimeType}");
-        // Use lastIndexOf to handle peerIds containing underscores
-        final lastUnderscore = currentTab.key.lastIndexOf('_');
-        if (lastUnderscore > 0 &&
-            currentTab.key.substring(0, lastUnderscore) == call.arguments) {
+        if (currentTab.key.startsWith(call.arguments)) {
           windowOnTop(windowId());
           return true;
         }
@@ -371,34 +213,8 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
     final persistentSessions =
         args['persistent_sessions'] as List<dynamic>? ?? [];
     final sortedSessions = persistentSessions.whereType<int>().toList()..sort();
-    var peerId = args['peer_id'] as String? ?? '';
-    if (peerId.isEmpty) {
-      if (tabController.state.value.tabs.isEmpty ||
-          tabController.state.value.selected >=
-              tabController.state.value.tabs.length) {
-        debugPrint('[TerminalTabPage] Skip restore: no selected tab');
-        return;
-      }
-      final currentTab = tabController.state.value.selectedTabInfo;
-      final parsed = _parseTabKey(currentTab.key);
-      if (parsed == null) return;
-      peerId = parsed.$1;
-    }
-    final existingTerminalIds = tabController.state.value.tabs
-        .map((tab) => _parseTabKey(tab.key))
-        .where((parsed) => parsed != null && parsed.$1 == peerId)
-        .map((parsed) => parsed!.$2)
-        .toSet();
-    if (existingTerminalIds.isEmpty) {
-      debugPrint(
-          '[TerminalTabPage] Skip restore: no seed tab for peer $peerId');
-      return;
-    }
     for (final terminalId in sortedSessions) {
-      if (!existingTerminalIds.add(terminalId)) {
-        continue;
-      }
-      _addNewTerminal(peerId, terminalId: terminalId);
+      _addNewTerminalForCurrentPeer(terminalId: terminalId);
       // A delay is required to ensure the UI has sufficient time to update
       // before adding the next terminal. Without this delay, `_TerminalPageState::dispose()`
       // may be called prematurely while the tab widget is still in the tab controller.
@@ -439,7 +255,7 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
           // macOS: Cmd+W (standard for close tab)
           final currentTab = tabController.state.value.selectedTabInfo;
           if (tabController.state.value.tabs.length > 1) {
-            _closeTab(currentTab.key);
+            tabController.closeBy(currentTab.key);
             return true;
           }
         } else if (!isMacOS &&
@@ -448,7 +264,7 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
           // Other platforms: Ctrl+Shift+W (to avoid conflict with Ctrl+W word delete)
           final currentTab = tabController.state.value.selectedTabInfo;
           if (tabController.state.value.tabs.length > 1) {
-            _closeTab(currentTab.key);
+            tabController.closeBy(currentTab.key);
             return true;
           }
         }
@@ -503,10 +319,7 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
   void _addNewTerminal(String peerId, {int? terminalId}) {
     // Find first tab for this peer to get connection parameters
     final firstTab = tabController.state.value.tabs.firstWhere(
-      (tab) {
-        final last = tab.key.lastIndexOf('_');
-        return last > 0 && tab.key.substring(0, last) == peerId;
-      },
+      (tab) => tab.key.startsWith('$peerId\_'),
     );
     if (firstTab.page is TerminalPage) {
       final page = firstTab.page as TerminalPage;
@@ -527,10 +340,11 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
 
   void _addNewTerminalForCurrentPeer({int? terminalId}) {
     final currentTab = tabController.state.value.selectedTabInfo;
-    final parsed = _parseTabKey(currentTab.key);
-    if (parsed == null) return;
-    final (peerId, _) = parsed;
-    _addNewTerminal(peerId, terminalId: terminalId);
+    final parts = currentTab.key.split('_');
+    if (parts.isNotEmpty) {
+      final peerId = parts[0];
+      _addNewTerminal(peerId, terminalId: terminalId);
+    }
   }
 
   @override
@@ -544,9 +358,10 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
           selectedBorderColor: MyTheme.accent,
           labelGetter: DesktopTab.tablabelGetter,
           tabMenuBuilder: (key) {
-            final parsed = _parseTabKey(key);
-            if (parsed == null) return Container();
-            final (peerId, _) = parsed;
+            // Extract peerId from tab key (format: "peerId_terminalId")
+            final parts = key.split('_');
+            if (parts.isEmpty) return Container();
+            final peerId = parts[0];
             return _tabMenuBuilder(peerId, () {});
           },
         ));
@@ -575,11 +390,6 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
     }
   }
 
-  Future<void> _closeWindowFromConnection() async {
-    await _closeAllTabs();
-    await WindowController.fromWindowId(windowId()).close();
-  }
-
   int windowId() {
     return widget.params["windowId"];
   }
@@ -597,16 +407,8 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
 
   Future<bool> handleWindowCloseButton() async {
     final connLength = tabController.state.value.tabs.length;
-    if (connLength == 1) {
-      if (await desktopTryShowTabAuditDialogCloseCancelled(
-        id: tabController.state.value.tabs[0].key,
-        tabController: tabController,
-      )) {
-        return false;
-      }
-    }
     if (connLength <= 1) {
-      await _closeAllTabs();
+      tabController.clear();
       return true;
     } else {
       final bool res;
@@ -617,7 +419,7 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
         res = await closeConfirmDialog();
       }
       if (res) {
-        await _closeAllTabs();
+        tabController.clear();
       }
       return res;
     }

flutter/lib/desktop/pages/view_camera_page.dart

@@ -6,6 +6,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_hbb/common/widgets/remote_input.dart';
 import 'package:get/get.dart';
 import 'package:provider/provider.dart';
+import 'package:wakelock_plus/wakelock_plus.dart';
 import 'package:flutter_hbb/models/state_model.dart';
 
 import '../../consts.dart';
@@ -76,7 +77,6 @@ class _ViewCameraPageState extends State<ViewCameraPage>
   String keyboardMode = "legacy";
   bool _isWindowBlur = false;
   final _cursorOverImage = false.obs;
-  final _uniqueKey = UniqueKey();
 
   var _blockableOverlayState = BlockableOverlayState();
 
@@ -124,7 +124,9 @@ class _ViewCameraPageState extends State<ViewCameraPage>
       _ffi.dialogManager
           .showLoading(translate('Connecting...'), onCancel: closeConnection);
     });
-    WakelockManager.enable(_uniqueKey);
+    if (!isLinux) {
+      WakelockPlus.enable();
+    }
 
     _ffi.ffiModel.updateEventListener(sessionId, widget.id);
     if (!isWeb) bind.pluginSyncUi(syncTo: kAppTypeDesktopRemote);
@@ -183,20 +185,26 @@ class _ViewCameraPageState extends State<ViewCameraPage>
     if (isWindows) {
       _isWindowBlur = false;
     }
-    WakelockManager.enable(_uniqueKey);
+    if (!isLinux) {
+      WakelockPlus.enable();
+    }
   }
 
   // When the window is unminimized, onWindowMaximize or onWindowRestore can be called when the old state was maximized or not.
   @override
   void onWindowMaximize() {
     super.onWindowMaximize();
-    WakelockManager.enable(_uniqueKey);
+    if (!isLinux) {
+      WakelockPlus.enable();
+    }
   }
 
   @override
   void onWindowMinimize() {
     super.onWindowMinimize();
-    WakelockManager.disable(_uniqueKey);
+    if (!isLinux) {
+      WakelockPlus.disable();
+    }
   }
 
   @override
@@ -239,7 +247,9 @@ class _ViewCameraPageState extends State<ViewCameraPage>
       await SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual,
           overlays: SystemUiOverlay.values);
     }
-    WakelockManager.disable(_uniqueKey);
+    if (!isLinux) {
+      await WakelockPlus.disable();
+    }
     await Get.delete<FFI>(tag: widget.id);
     removeSharedStates(widget.id);
   }
@@ -350,7 +360,7 @@ class _ViewCameraPageState extends State<ViewCameraPage>
     super.build(context);
     return WillPopScope(
         onWillPop: () async {
-          clientClose(sessionId, _ffi);
+          clientClose(sessionId, _ffi.dialogManager);
           return false;
         },
         child: MultiProvider(providers: [
@@ -455,6 +465,7 @@ class _ViewCameraPageState extends State<ViewCameraPage>
           () => _ffi.ffiModel.pi.isSet.isFalse
               ? Container(color: Colors.transparent)
               : Obx(() {
+                  widget.toolbarState.initShow(sessionId);
                   _ffi.textureModel.updateCurrentDisplay(peerDisplay.value);
                   return ImagePaint(
                     id: widget.id,
@@ -516,7 +527,7 @@ class _ImagePaintState extends State<ImagePaint> {
 
     bool isViewOriginal() => c.viewStyle.style == kRemoteViewStyleOriginal;
 
-    if (c.imageOverflow.isTrue && c.scrollStyle != ScrollStyle.scrollauto) {
+    if (c.imageOverflow.isTrue && c.scrollStyle == ScrollStyle.scrollbar) {
       final paintWidth = c.getDisplayWidth() * s;
       final paintHeight = c.getDisplayHeight() * s;
       final paintSize = Size(paintWidth, paintHeight);

flutter/lib/desktop/pages/view_camera_tab_page.dart

@@ -6,7 +6,6 @@ import 'package:desktop_multi_window/desktop_multi_window.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hbb/common.dart';
 import 'package:flutter_hbb/common/shared_state.dart';
-import 'package:flutter_hbb/common/widgets/dialog.dart';
 import 'package:flutter_hbb/consts.dart';
 import 'package:flutter_hbb/models/input_model.dart';
 import 'package:flutter_hbb/models/state_model.dart';
@@ -80,15 +79,7 @@ class _ViewCameraTabPageState extends State<ViewCameraTabPage> {
         label: peerId!,
         selectedIcon: selectedIcon,
         unselectedIcon: unselectedIcon,
-        onTabCloseButton: () async {
-          if (await desktopTryShowTabAuditDialogCloseCancelled(
-            id: peerId!,
-            tabController: tabController,
-          )) {
-            return;
-          }
-          tabController.closeBy(peerId!);
-        },
+        onTabCloseButton: () => tabController.closeBy(peerId),
         page: ViewCameraPage(
           key: ValueKey(peerId),
           id: peerId!,
@@ -250,11 +241,11 @@ class _ViewCameraTabPageState extends State<ViewCameraTabPage> {
       MenuEntryButton<String>(
         childBuilder: (TextStyle? style) => Obx(() => Text(
               translate(
-                  toolbarState.hide.isTrue ? 'Show Toolbar' : 'Hide Toolbar'),
+                  toolbarState.show.isTrue ? 'Hide Toolbar' : 'Show Toolbar'),
               style: style,
             )),
         proc: () {
-          toolbarState.switchHide(sessionId);
+          toolbarState.switchShow(sessionId);
           cancelFunc();
         },
         padding: padding,
@@ -296,13 +287,7 @@ class _ViewCameraTabPageState extends State<ViewCameraTabPage> {
           translate('Close'),
           style: style,
         ),
-        proc: () async {
-          if (await desktopTryShowTabAuditDialogCloseCancelled(
-            id: key,
-            tabController: tabController,
-          )) {
-            return;
-          }
+        proc: () {
           tabController.closeBy(key);
           cancelFunc();
         },
@@ -355,14 +340,6 @@ class _ViewCameraTabPageState extends State<ViewCameraTabPage> {
 
   Future<bool> handleWindowCloseButton() async {
     final connLength = tabController.length;
-    if (connLength == 1) {
-      if (await desktopTryShowTabAuditDialogCloseCancelled(
-        id: tabController.state.value.tabs[0].key,
-        tabController: tabController,
-      )) {
-        return false;
-      }
-    }
     if (connLength <= 1) {
       tabController.clear();
       return true;
@@ -416,15 +393,7 @@ class _ViewCameraTabPageState extends State<ViewCameraTabPage> {
         label: id,
         selectedIcon: selectedIcon,
         unselectedIcon: unselectedIcon,
-        onTabCloseButton: () async {
-          if (await desktopTryShowTabAuditDialogCloseCancelled(
-            id: id,
-            tabController: tabController,
-          )) {
-            return;
-          }
-          tabController.closeBy(id);
-        },
+        onTabCloseButton: () => tabController.closeBy(id),
         page: ViewCameraPage(
           key: ValueKey(id),
           id: id,

flutter/lib/desktop/widgets/tabbar_widget.dart

@@ -99,7 +99,6 @@ class DesktopTabController {
   /// index, key
   Function(int, String)? onRemoved;
   Function(String)? onSelected;
-  Future<void> Function()? onCloseWindow;
 
   DesktopTabController(
       {required this.tabType, this.onRemoved, this.onSelected});
@@ -293,6 +292,7 @@ class DesktopTab extends StatefulWidget {
 // ignore: must_be_immutable
 class _DesktopTabState extends State<DesktopTab>
     with MultiWindowListener, WindowListener {
+  final _saveFrameDebounce = Debouncer(delay: Duration(seconds: 1));
   Timer? _macOSCheckRestoreTimer;
   int _macOSCheckRestoreCounter = 0;
 
@@ -370,7 +370,7 @@ class _DesktopTabState extends State<DesktopTab>
 
   void _setMaximized(bool maximize) {
     stateGlobal.setMaximized(maximize);
-    _saveFrame();
+    _saveFrameDebounce.call(_saveFrame);
     setState(() {});
   }
 
@@ -405,29 +405,24 @@ class _DesktopTabState extends State<DesktopTab>
     super.onWindowUnmaximize();
   }
 
-  _saveFrame({bool? flush}) async {
-    try {
-      if (tabType == DesktopTabType.main) {
-        await saveWindowPosition(WindowType.Main, flush: flush);
-      } else if (kWindowType != null && kWindowId != null) {
-        await saveWindowPosition(kWindowType!,
-            windowId: kWindowId, flush: flush);
-      }
-    } catch (e) {
-      debugPrint('Error saving window position: $e');
+  _saveFrame() async {
+    if (tabType == DesktopTabType.main) {
+      await saveWindowPosition(WindowType.Main);
+    } else if (kWindowType != null && kWindowId != null) {
+      await saveWindowPosition(kWindowType!, windowId: kWindowId);
     }
   }
 
   @override
   void onWindowMoved() {
-    _saveFrame();
+    _saveFrameDebounce.call(_saveFrame);
     super.onWindowMoved();
   }
 
   @override
   void onWindowResized() {
-    _saveFrame();
-    super.onWindowResized();
+    _saveFrameDebounce.call(_saveFrame);
+    super.onWindowMoved();
   }
 
   @override
@@ -465,8 +460,6 @@ class _DesktopTabState extends State<DesktopTab>
       });
     }
 
-    await _saveFrame(flush: true);
-
     // hide window on close
     if (isMainWindow) {
       if (rustDeskWinManager.getActiveWindows().contains(kMainWindowId)) {
@@ -593,13 +586,14 @@ class _DesktopTabState extends State<DesktopTab>
   }
 
   Widget _buildBar() {
-    final isIncomingHomePage = bind.isIncomingOnly() && isInHomePage();
     return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
       children: [
         Expanded(
             child: GestureDetector(
                 // custom double tap handler
-                onTap: !isIncomingHomePage && showMaximize
+                onTap: !(bind.isIncomingOnly() && isInHomePage()) &&
+                        showMaximize
                     ? () {
                         final current = DateTime.now().millisecondsSinceEpoch;
                         final elapsed = current - _lastClickTime;
@@ -610,7 +604,7 @@ class _DesktopTabState extends State<DesktopTab>
                               .then((value) => stateGlobal.setMaximized(value));
                         }
                       }
-                    : (isIncomingHomePage ? () {} : null), // Keep tap recognizer for Windows touch.
+                    : null,
                 onPanStart: (_) => startDragging(isMainWindow),
                 onPanCancel: () {
                   // We want to disable dragging of the tab area in the tab bar.
@@ -1085,12 +1079,11 @@ class _TabState extends State<_Tab> with RestorationMixin {
       return ConstrainedBox(
           constraints: BoxConstraints(maxWidth: widget.maxLabelWidth ?? 200),
           child: Tooltip(
-            message:
-                widget.tabType == DesktopTabType.main ? '' : widget.label.value,
+            message: widget.tabType == DesktopTabType.main
+                ? ''
+                : translate(widget.label.value),
             child: Text(
-              widget.tabType == DesktopTabType.main
-                  ? translate(widget.label.value)
-                  : widget.label.value,
+              translate(widget.label.value),
               textAlign: TextAlign.center,
               style: TextStyle(
                   color: isSelected

flutter/lib/main.dart

@@ -27,7 +27,6 @@ import 'common.dart';
 import 'consts.dart';
 import 'mobile/pages/home_page.dart';
 import 'mobile/pages/server_page.dart';
-import 'mobile/widgets/deploy_dialog.dart';
 import 'models/platform_model.dart';
 
 import 'package:flutter_hbb/plugin/handlers.dart'
@@ -576,14 +575,6 @@ _registerEventHandler() {
       NativeUiHandler.instance.onEvent(evt);
     });
   }
-  if (isAndroid) {
-    platformFFI.registerEventHandler(
-        'android_needs_deploy', 'android_needs_deploy', (_) async {
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        showDeployPromptDialog();
-      });
-    });
-  }
 }
 
 Widget keyListenerBuilder(BuildContext context, Widget? child) {

flutter/lib/mobile/pages/connection_page.dart

@@ -182,7 +182,6 @@ class _ConnectionPageState extends State<ConnectionPage> {
                           rdpUsername: '',
                           loginName: '',
                           device_group_name: '',
-                          note: '',
                         );
                         _autocompleteOpts = [emptyPeer];
                       } else {
@@ -207,7 +206,6 @@ class _ConnectionPageState extends State<ConnectionPage> {
                                     .contains(textToFind) ||
                                 peer.alias.toLowerCase().contains(textToFind))
                             .toList();
-                        _allPeersLoader.queryOnlines(_autocompleteOpts);
                       }
                       return _autocompleteOpts;
                     },

flutter/lib/mobile/pages/file_manager_page.dart

@@ -5,17 +5,14 @@ import 'package:flutter_breadcrumb/flutter_breadcrumb.dart';
 import 'package:flutter_hbb/models/file_model.dart';
 import 'package:get/get.dart';
 import 'package:toggle_switch/toggle_switch.dart';
+import 'package:wakelock_plus/wakelock_plus.dart';
 
 import '../../common.dart';
 import '../../common/widgets/dialog.dart';
 
 class FileManagerPage extends StatefulWidget {
   FileManagerPage(
-      {Key? key,
-      required this.id,
-      this.password,
-      this.isSharedPassword,
-      this.forceRelay})
+      {Key? key, required this.id, this.password, this.isSharedPassword, this.forceRelay})
       : super(key: key);
   final String id;
   final String? password;
@@ -71,7 +68,6 @@ class _FileManagerPageState extends State<FileManagerPage> {
       showLocal ? model.localController : model.remoteController;
   FileDirectory get currentDir => currentFileController.directory.value;
   DirectoryOptions get currentOptions => currentFileController.options.value;
-  final _uniqueKey = UniqueKey();
 
   @override
   void initState() {
@@ -86,7 +82,7 @@ class _FileManagerPageState extends State<FileManagerPage> {
           .showLoading(translate('Connecting...'), onCancel: closeConnection);
     });
     gFFI.ffiModel.updateEventListener(gFFI.sessionId, widget.id);
-    WakelockManager.enable(_uniqueKey);
+    WakelockPlus.enable();
   }
 
   @override
@@ -94,9 +90,8 @@ class _FileManagerPageState extends State<FileManagerPage> {
     model.close().whenComplete(() {
       gFFI.close();
       gFFI.dialogManager.dismissAll();
-      WakelockManager.disable(_uniqueKey);
+      WakelockPlus.disable();
     });
-    model.jobController.clear();
     super.dispose();
   }
 
@@ -117,7 +112,8 @@ class _FileManagerPageState extends State<FileManagerPage> {
           leading: Row(children: [
             IconButton(
                 icon: Icon(Icons.close),
-                onPressed: () => clientClose(gFFI.sessionId, gFFI)),
+                onPressed: () =>
+                    clientClose(gFFI.sessionId, gFFI.dialogManager)),
           ]),
           centerTitle: true,
           title: ToggleSwitch(
@@ -355,21 +351,15 @@ class _FileManagerPageState extends State<FileManagerPage> {
         return Offstage();
       }
 
-      // Find the first job that is in progress (the one actually transferring data)
-      // Rust backend processes jobs sequentially, so the first inProgress job is the active one
-      final activeJob = jobTable
-              .firstWhereOrNull((job) => job.state == JobState.inProgress) ??
-          jobTable.last;
-
-      switch (activeJob.state) {
+      switch (jobTable.last.state) {
         case JobState.inProgress:
           return BottomSheetBody(
             leading: CircularProgressIndicator(),
             title: translate("Waiting"),
             text:
-                "${translate("Speed")}:  ${readableFileSize(activeJob.speed)}/s",
+                "${translate("Speed")}:  ${readableFileSize(jobTable.last.speed)}/s",
             onCanceled: () {
-              model.jobController.cancelJob(activeJob.id);
+              model.jobController.cancelJob(jobTable.last.id);
               jobTable.clear();
             },
           );
@@ -377,7 +367,7 @@ class _FileManagerPageState extends State<FileManagerPage> {
           return BottomSheetBody(
             leading: Icon(Icons.check),
             title: "${translate("Successful")}!",
-            text: activeJob.display(),
+            text: jobTable.last.display(),
             onCanceled: () => jobTable.clear(),
           );
         case JobState.error:
@@ -434,7 +424,6 @@ class FileManagerView extends StatefulWidget {
 class _FileManagerViewState extends State<FileManagerView> {
   final _listScrollController = ScrollController();
   final _breadCrumbScroller = ScrollController();
-  late final ascending = Rx<bool>(controller.sortAscending);
 
   bool get isLocal => widget.controller.isLocal;
   FileController get controller => widget.controller;
@@ -646,17 +635,7 @@ class _FileManagerViewState extends State<FileManagerView> {
                             ))
                         .toList();
                   },
-                  onSelected: (sortBy) {
-                    // If selecting the same sort option, flip the order
-                    // If selecting a different sort option, use ascending order
-                    if (controller.sortBy.value == sortBy) {
-                      ascending.value = !controller.sortAscending;
-                    } else {
-                      ascending.value = true;
-                    }
-                    controller.changeSortStyle(sortBy,
-                        ascending: ascending.value);
-                  }),
+                  onSelected: controller.changeSortStyle),
             ],
           )
         ],

flutter/lib/mobile/pages/remote_page.dart

@@ -1,18 +1,18 @@
 import 'dart:async';
+import 'dart:ui' as ui;
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hbb/common/shared_state.dart';
 import 'package:flutter_hbb/common/widgets/toolbar.dart';
 import 'package:flutter_hbb/consts.dart';
-import 'package:flutter_hbb/mobile/widgets/floating_mouse.dart';
-import 'package:flutter_hbb/mobile/widgets/floating_mouse_widgets.dart';
 import 'package:flutter_hbb/mobile/widgets/gesture_help.dart';
 import 'package:flutter_hbb/models/chat_model.dart';
 import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:get/get.dart';
 import 'package:provider/provider.dart';
+import 'package:wakelock_plus/wakelock_plus.dart';
 
 import '../../common.dart';
 import '../../common/widgets/overlay.dart';
@@ -23,7 +23,6 @@ import '../../models/model.dart';
 import '../../models/platform_model.dart';
 import '../../utils/image.dart';
 import '../widgets/dialog.dart';
-import '../widgets/custom_scale_widget.dart';
 
 final initText = '1' * 1024;
 
@@ -64,8 +63,9 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
   bool _showGestureHelp = false;
   String _value = '';
   Orientation? _currentOrientation;
-  final _uniqueKey = UniqueKey();
-  Timer? _iosKeyboardWorkaroundTimer;
+  double _viewInsetsBottom = 0;
+
+  Timer? _timerDidChangeMetrics;
 
   final _blockableOverlayState = BlockableOverlayState();
 
@@ -75,9 +75,6 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
   final FocusNode _physicalFocusNode = FocusNode();
   var _showEdit = false; // use soft keyboard
 
-  Worker? _waylandKeyboardGateWorker;
-  bool _waylandKeyboardGateInitialized = false;
-
   InputModel get inputModel => gFFI.inputModel;
   SessionID get sessionId => gFFI.sessionId;
 
@@ -105,7 +102,9 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
       gFFI.dialogManager
           .showLoading(translate('Connecting...'), onCancel: closeConnection);
     });
-    WakelockManager.enable(_uniqueKey);
+    if (!isWeb) {
+      WakelockPlus.enable();
+    }
     _physicalFocusNode.requestFocus();
     gFFI.inputModel.listenToMouse(true);
     gFFI.qualityMonitorModel.checkShowQualityMonitor(sessionId);
@@ -124,33 +123,11 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
           isKeyboardVisible: keyboardVisibilityController.isVisible);
     });
     WidgetsBinding.instance.addObserver(this);
-
-    inputModel.keyboardInputAllowed = true;
-
-    // Wayland sessions may use clipboard-based text input on the controlled side.
-    // Require explicit user confirmation before allowing soft-keyboard and
-    // clipboard-assisted text input. Physical keyboard events are not gated here.
-    _waylandKeyboardGateWorker = ever(gFFI.ffiModel.pi.isSet, (bool isSet) {
-      if (isSet) {
-        _initWaylandKeyboardGateIfNeeded();
-      }
-    });
-    if (gFFI.ffiModel.pi.isSet.value) {
-      _initWaylandKeyboardGateIfNeeded();
-    }
   }
 
   @override
   Future<void> dispose() async {
     WidgetsBinding.instance.removeObserver(this);
-    // Close the session up-front. `gFFI.close()` below only calls `sessionClose`
-    // after several awaits (canvas save, image update, the `enable_soft_keyboard`
-    // platform call), so if the app is backgrounded while this page is disposing,
-    // dispose can be suspended before reaching it and the connection is never torn
-    // down. The reconnect then re-attaches to the leaked session and is stuck on
-    // "Connecting...". Dispatching it here makes teardown happen synchronously on
-    // pop; the `sessionClose` in `gFFI.close()` becomes a no-op once removed.
-    unawaited(bind.sessionClose(sessionId: sessionId));
     // https://github.com/flutter/flutter/issues/64935
     super.dispose();
     gFFI.dialogManager.hideMobileActionsOverlay(store: false);
@@ -160,16 +137,15 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
     await gFFI.invokeMethod("enable_soft_keyboard", true);
     _mobileFocusNode.dispose();
     _physicalFocusNode.dispose();
-    clearWaylandKeyboardPromptSuppressedForConnection(sessionId.toString());
-    _waylandKeyboardGateWorker?.dispose();
-    inputModel.keyboardInputAllowed = true;
     await gFFI.close();
     _timer?.cancel();
-    _iosKeyboardWorkaroundTimer?.cancel();
+    _timerDidChangeMetrics?.cancel();
     gFFI.dialogManager.dismissAll();
     await SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual,
         overlays: SystemUiOverlay.values);
-    WakelockManager.disable(_uniqueKey);
+    if (!isWeb) {
+      await WakelockPlus.disable();
+    }
     await keyboardSubscription.cancel();
     removeSharedStates(widget.id);
     // `on_voice_call_closed` should be called when the connection is ended.
@@ -191,38 +167,24 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
     gFFI.invokeMethod("try_sync_clipboard");
   }
 
-  bool _shouldGateKeyboardForWayland() {
-    if (!(isAndroid || isIOS)) return false;
-    final pi = gFFI.ffiModel.pi;
-    return pi.platform == kPeerPlatformLinux && pi.isWayland;
-  }
-
-  void _initWaylandKeyboardGateIfNeeded() {
-    if (!mounted) return;
-    if (_waylandKeyboardGateInitialized) return;
-    if (!_shouldGateKeyboardForWayland()) return;
-
-    _waylandKeyboardGateInitialized = true;
-
-    final allowWaylandKeyboard =
-        mainGetPeerBoolOptionSync(widget.id, kPeerOptionAllowWaylandKeyboard);
-    if (!shouldShowWaylandKeyboardPrompt(
-      connectionId: sessionId.toString(),
-      isWaylandPeer: _shouldGateKeyboardForWayland(),
-      allowWaylandKeyboardRemembered: allowWaylandKeyboard,
-    )) {
-      inputModel.keyboardInputAllowed = true;
+  @override
+  void didChangeMetrics() {
+    // If the soft keyboard is visible and the canvas has been changed(panned or scaled)
+    // Don't try reset the view style and focus the cursor.
+    if (gFFI.cursorModel.lastKeyboardIsVisible &&
+        gFFI.canvasModel.isMobileCanvasChanged) {
       return;
     }
 
-    inputModel.keyboardInputAllowed = false;
-
-    // Ensure soft keyboard is not active before user confirms.
-    _showEdit = false;
-    gFFI.invokeMethod("enable_soft_keyboard", false);
-    _mobileFocusNode.unfocus();
-    _physicalFocusNode.requestFocus();
-    setState(() {});
+    final newBottom = MediaQueryData.fromView(ui.window).viewInsets.bottom;
+    _timerDidChangeMetrics?.cancel();
+    _timerDidChangeMetrics = Timer(Duration(milliseconds: 100), () async {
+      // We need this comparation because poping up the floating action will also trigger `didChangeMetrics()`.
+      if (newBottom != _viewInsetsBottom) {
+        gFFI.canvasModel.mobileFocusCanvasCursor();
+        _viewInsetsBottom = newBottom;
+      }
+    });
   }
 
   // to-do: It should be better to use transparent color instead of the bgColor.
@@ -246,24 +208,7 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
           gFFI.ffiModel.pi.version.isNotEmpty) {
         gFFI.invokeMethod("enable_soft_keyboard", false);
       }
-
-      // Workaround for iOS: physical keyboard input fails after virtual keyboard is hidden
-      // https://github.com/flutter/flutter/issues/39900
-      // https://github.com/rustdesk/rustdesk/discussions/11843#discussioncomment-13499698 - Virtual keyboard issue
-      if (isIOS) {
-        _iosKeyboardWorkaroundTimer?.cancel();
-        _iosKeyboardWorkaroundTimer = Timer(Duration(milliseconds: 100), () {
-          if (!mounted) return;
-          _physicalFocusNode.unfocus();
-          _iosKeyboardWorkaroundTimer = Timer(Duration(milliseconds: 50), () {
-            if (!mounted) return;
-            _physicalFocusNode.requestFocus();
-          });
-        });
-      }
     } else {
-      _iosKeyboardWorkaroundTimer?.cancel();
-      _iosKeyboardWorkaroundTimer = null;
       _timer?.cancel();
       _timer = Timer(kMobileDelaySoftKeyboardFocus, () {
         SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual,
@@ -356,7 +301,7 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
                 content == '【】')) {
           // can not only input content[0], because when input ], [ are also auo insert, which cause ] never be input
           bind.sessionInputString(sessionId: sessionId, value: content);
-          _openKeyboardUnlocked();
+          openKeyboard();
           return;
         }
         bind.sessionInputString(sessionId: sessionId, value: content);
@@ -368,9 +313,6 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
 
   // handle mobile virtual keyboard
   void handleSoftKeyboardInput(String newValue) {
-    if (!inputModel.keyboardInputAllowed) {
-      return;
-    }
     if (isIOS) {
       _handleIOSSoftKeyboardInput(newValue);
     } else {
@@ -379,9 +321,6 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
   }
 
   void inputChar(String char) {
-    if (!inputModel.keyboardInputAllowed) {
-      return;
-    }
     if (char == '\n') {
       char = 'VK_RETURN';
     } else if (char == ' ') {
@@ -391,29 +330,6 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
   }
 
   void openKeyboard() {
-    final allowWaylandKeyboard =
-        mainGetPeerBoolOptionSync(widget.id, kPeerOptionAllowWaylandKeyboard);
-    if (shouldShowWaylandKeyboardPrompt(
-      connectionId: sessionId.toString(),
-      isWaylandPeer: _shouldGateKeyboardForWayland(),
-      allowWaylandKeyboardRemembered: allowWaylandKeyboard,
-    )) {
-      inputModel.keyboardInputAllowed = false;
-      showWaylandKeyboardInputWarningDialog(
-        id: widget.id,
-        connectionId: sessionId.toString(),
-        ffi: gFFI,
-        onEnable: () async {
-          _openKeyboardUnlocked();
-        },
-      );
-      return;
-    }
-    _openKeyboardUnlocked();
-  }
-
-  void _openKeyboardUnlocked() {
-    inputModel.keyboardInputAllowed = true;
     gFFI.invokeMethod("enable_soft_keyboard", true);
     // destroy first, so that our _value trick can work
     _value = initText;
@@ -447,7 +363,7 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
 
     return WillPopScope(
       onWillPop: () async {
-        clientClose(sessionId, gFFI);
+        clientClose(sessionId, gFFI.dialogManager);
         return false;
       },
       child: Scaffold(
@@ -565,7 +481,7 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
                       color: Colors.white,
                       icon: Icon(Icons.clear),
                       onPressed: () {
-                        clientClose(sessionId, gFFI);
+                        clientClose(sessionId, gFFI.dialogManager);
                       },
                     ),
                     IconButton(
@@ -650,9 +566,7 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
   }
 
   bool get showCursorPaint =>
-      !gFFI.ffiModel.isPeerAndroid &&
-      !gFFI.canvasModel.cursorEmbedded &&
-      !gFFI.inputModel.relativeMouseMode.value;
+      !gFFI.ffiModel.isPeerAndroid && !gFFI.canvasModel.cursorEmbedded;
 
   Widget getBodyForMobile() {
     final keyboardIsVisible = keyboardVisibilityController.isVisible;
@@ -660,7 +574,7 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
         color: MyTheme.canvasColor,
         child: Stack(children: () {
           final paints = [
-            ImagePaint(ffiModel: gFFI.ffiModel),
+            ImagePaint(),
             Positioned(
               top: 10,
               right: 10,
@@ -703,22 +617,13 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
           if (showCursorPaint) {
             paints.add(CursorPaint(widget.id));
           }
-          if (gFFI.ffiModel.touchMode) {
-            paints.add(FloatingMouse(
-              ffi: gFFI,
-            ));
-          } else {
-            paints.add(FloatingMouseWidgets(
-              ffi: gFFI,
-            ));
-          }
           return paints;
         }()));
   }
 
   Widget getBodyForDesktopWithListener() {
     final ffiModel = Provider.of<FfiModel>(context);
-    var paints = <Widget>[ImagePaint(ffiModel: ffiModel)];
+    var paints = <Widget>[ImagePaint()];
     if (showCursorPaint) {
       final cursor = bind.sessionGetToggleOptionSync(
           sessionId: sessionId, arg: 'show-remote-cursor');
@@ -884,15 +789,13 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
             controller: ScrollController(),
             padding: EdgeInsets.symmetric(vertical: 10),
             child: GestureHelp(
-              touchMode: gFFI.ffiModel.touchMode,
-              onTouchModeChange: (t) {
-                gFFI.ffiModel.toggleTouchMode();
-                final v = gFFI.ffiModel.touchMode ? 'Y' : 'N';
-                bind.mainSetLocalOption(key: kOptionTouchMode, value: v);
-              },
-              virtualMouseMode: gFFI.ffiModel.virtualMouseMode,
-              inputModel: gFFI.inputModel,
-            )));
+                touchMode: gFFI.ffiModel.touchMode,
+                onTouchModeChange: (t) {
+                  gFFI.ffiModel.toggleTouchMode();
+                  final v = gFFI.ffiModel.touchMode ? 'Y' : '';
+                  bind.sessionPeerOption(
+                      sessionId: sessionId, name: kOptionTouchMode, value: v);
+                })));
   }
 
   // * Currently mobile does not enable map mode
@@ -1139,20 +1042,11 @@ class _KeyHelpToolsState extends State<KeyHelpTools> {
 }
 
 class ImagePaint extends StatelessWidget {
-  final FfiModel ffiModel;
-  ImagePaint({Key? key, required this.ffiModel}) : super(key: key);
-
   @override
   Widget build(BuildContext context) {
     final m = Provider.of<ImageModel>(context);
     final c = Provider.of<CanvasModel>(context);
     var s = c.scale;
-    if (ffiModel.isPeerLinux) {
-      final displays = ffiModel.pi.getCurDisplays();
-      if (displays.isNotEmpty) {
-        s = s / displays[0].scale;
-      }
-    }
     final adjust = c.getAdjustY();
     return CustomPaint(
       painter: ImagePainter(
@@ -1220,21 +1114,9 @@ void showOptions(
   if (image != null) {
     displays.add(Padding(padding: const EdgeInsets.only(top: 8), child: image));
   }
-  final privacyModeState = PrivacyModeState.find(id);
-  if (pi.displays.length > 1 &&
-      pi.currentDisplay != kAllDisplayValue &&
-      (privacyModeState.isEmpty ||
-          allowDisplaySwitchInPrivacyMode(pi, privacyModeState.value))) {
+  if (pi.displays.length > 1 && pi.currentDisplay != kAllDisplayValue) {
     final cur = pi.currentDisplay;
     final children = <Widget>[];
-    final isDarkTheme = MyTheme.currentThemeMode() == ThemeMode.dark;
-    final numColorSelected = Colors.white;
-    final numColorUnselected = isDarkTheme ? Colors.grey : Colors.black87;
-    // We can't use `Theme.of(context).primaryColor` here, the color is:
-    // - light theme: 0xff2196f3 (Colors.blue)
-    // - dark theme: 0xff212121 (the canvas color?)
-    final numBgSelected =
-        Theme.of(context).colorScheme.primary.withOpacity(0.6);
     for (var i = 0; i < pi.displays.length; ++i) {
       children.add(InkWell(
           onTap: () {
@@ -1248,12 +1130,13 @@ void showOptions(
               decoration: BoxDecoration(
                   border: Border.all(color: Theme.of(context).hintColor),
                   borderRadius: BorderRadius.circular(2),
-                  color: i == cur ? numBgSelected : null),
+                  color: i == cur
+                      ? Theme.of(context).primaryColor.withOpacity(0.6)
+                      : null),
               child: Center(
                   child: Text((i + 1).toString(),
                       style: TextStyle(
-                          color:
-                              i == cur ? numColorSelected : numColorUnselected,
+                          color: i == cur ? Colors.white : Colors.black87,
                           fontWeight: FontWeight.bold))))));
     }
     displays.add(Padding(
@@ -1278,8 +1161,9 @@ void showOptions(
       await toolbarDisplayToggle(context, id, gFFI);
 
   List<TToggleMenu> privacyModeList = [];
-  if ((gFFI.ffiModel.pi.features.privacyMode && gFFI.ffiModel.keyboard) ||
-      privacyModeState.isNotEmpty) {
+  // privacy mode
+  final privacyModeState = PrivacyModeState.find(id);
+  if (gFFI.ffiModel.keyboard && gFFI.ffiModel.pi.features.privacyMode) {
     privacyModeList = toolbarPrivacyMode(privacyModeState, context, id, gFFI);
     if (privacyModeList.length == 1) {
       displayToggles.add(privacyModeList[0]);
@@ -1305,10 +1189,6 @@ void showOptions(
                     if (v != null) viewStyle.value = v;
                   }
                 : null)),
-      // Show custom scale controls when custom view style is selected
-      Obx(() => viewStyle.value == kRemoteViewStyleCustom
-          ? MobileCustomScaleControls(ffi: gFFI)
-          : const SizedBox.shrink()),
       const Divider(color: MyTheme.border),
       for (var e in imageQualityRadios)
         Obx(() => getRadio<String>(

flutter/lib/mobile/pages/scan_page.dart

@@ -156,7 +156,7 @@ class _ScanPageState extends State<ScanPage> {
     try {
       final sc = ServerConfig.decode(data.substring(7));
       Timer(Duration(milliseconds: 60), () {
-        showServerSettingsWithValue(sc, gFFI.dialogManager, null);
+        showServerSettingsWithValue(sc, gFFI.dialogManager);
       });
     } catch (e) {
       showToast('Invalid QR code');

flutter/lib/mobile/pages/server_page.dart

@@ -61,13 +61,12 @@ class _DropDownAction extends StatelessWidget {
           final isAllowNumericOneTimePassword =
               gFFI.serverModel.allowNumericOneTimePassword;
           return [
-            if (!isChangeIdDisabled())
-              PopupMenuItem(
-                enabled: gFFI.serverModel.connectStatus > 0,
-                value: "changeID",
-                child: Text(translate("Change ID")),
-              ),
-            if (!isChangeIdDisabled()) const PopupMenuDivider(),
+            PopupMenuItem(
+              enabled: gFFI.serverModel.connectStatus > 0,
+              value: "changeID",
+              child: Text(translate("Change ID")),
+            ),
+            const PopupMenuDivider(),
             PopupMenuItem(
               value: 'AcceptSessionsViaPassword',
               child: listTile(
@@ -88,8 +87,7 @@ class _DropDownAction extends StatelessWidget {
             ),
             if (showPasswordOption) const PopupMenuDivider(),
             if (showPasswordOption &&
-                verificationMethod != kUseTemporaryPassword &&
-                !isChangePermanentPasswordDisabled())
+                verificationMethod != kUseTemporaryPassword)
               PopupMenuItem(
                 value: "setPermanentPassword",
                 child: Text(translate("Set permanent password")),
@@ -150,12 +148,7 @@ class _DropDownAction extends StatelessWidget {
             }
 
             if (value == kUsePermanentPassword &&
-                (await bind.mainGetCommon(key: "permanent-password-set")) !=
-                    "true") {
-              if (isChangePermanentPasswordDisabled()) {
-                callback();
-                return;
-              }
+                (await bind.mainGetPermanentPassword()).isEmpty) {
               setPasswordDialog(notEmptyCallback: callback);
             } else {
               callback();
@@ -583,20 +576,10 @@ class _PermissionCheckerState extends State<PermissionChecker> {
   Widget build(BuildContext context) {
     final serverModel = Provider.of<ServerModel>(context);
     final hasAudioPermission = androidVersion >= 30;
-    final hideStopService = isAndroid &&
-        bind.mainGetBuildinOption(key: kOptionHideStopService) == 'Y';
-    final allowPermChangeInAcceptWindow = option2bool(
-        kOptionEnablePermChangeInAcceptWindow,
-        bind.mainGetBuildinOption(
-          key: kOptionEnablePermChangeInAcceptWindow,
-        ));
-    final permissionChangeLocked = isAndroid &&
-        serverModel.clients.any((c) => !c.disconnected) &&
-        !allowPermChangeInAcceptWindow;
     return PaddingCard(
         title: translate("Permissions"),
         child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
-          serverModel.mediaOk && !hideStopService
+          serverModel.mediaOk
               ? ElevatedButton.icon(
                       style: ButtonStyle(
                           backgroundColor:
@@ -606,30 +589,21 @@ class _PermissionCheckerState extends State<PermissionChecker> {
                       label: Text(translate("Stop service")))
                   .marginOnly(bottom: 8)
               : SizedBox.shrink(),
-          if (!hideStopService || !serverModel.mediaOk)
-            PermissionRow(
-                translate("Screen Capture"),
-                serverModel.mediaOk,
-                !serverModel.mediaOk &&
-                        gFFI.userModel.userName.value.isEmpty &&
-                        bind.mainGetLocalOption(key: "show-scam-warning") != "N"
-                    ? () => showScamWarning(context, serverModel)
-                    : serverModel.toggleService),
           PermissionRow(
-            translate("Input Control"),
-            serverModel.inputOk,
-            serverModel.toggleInput,
-          ),
-          PermissionRow(
-            translate("Transfer file"),
-            serverModel.fileOk,
-            serverModel.toggleFile,
-            enabled: !permissionChangeLocked,
-          ),
+              translate("Screen Capture"),
+              serverModel.mediaOk,
+              !serverModel.mediaOk &&
+                      gFFI.userModel.userName.value.isEmpty &&
+                      bind.mainGetLocalOption(key: "show-scam-warning") != "N"
+                  ? () => showScamWarning(context, serverModel)
+                  : serverModel.toggleService),
+          PermissionRow(translate("Input Control"), serverModel.inputOk,
+              serverModel.toggleInput),
+          PermissionRow(translate("Transfer file"), serverModel.fileOk,
+              serverModel.toggleFile),
           hasAudioPermission
               ? PermissionRow(translate("Audio Capture"), serverModel.audioOk,
-                  serverModel.toggleAudio,
-                  enabled: !permissionChangeLocked)
+                  serverModel.toggleAudio)
               : Row(children: [
                   Icon(Icons.info_outline).marginOnly(right: 15),
                   Expanded(
@@ -638,25 +612,19 @@ class _PermissionCheckerState extends State<PermissionChecker> {
                     style: const TextStyle(color: MyTheme.darkGray),
                   ))
                 ]),
-          PermissionRow(
-            translate("Enable clipboard"),
-            serverModel.clipboardOk,
-            serverModel.toggleClipboard,
-            enabled: !permissionChangeLocked,
-          ),
+          PermissionRow(translate("Enable clipboard"), serverModel.clipboardOk,
+              serverModel.toggleClipboard),
         ]));
   }
 }
 
 class PermissionRow extends StatelessWidget {
-  const PermissionRow(this.name, this.isOk, this.onPressed,
-      {Key? key, this.enabled = true})
+  const PermissionRow(this.name, this.isOk, this.onPressed, {Key? key})
       : super(key: key);
 
   final String name;
   final bool isOk;
   final VoidCallback onPressed;
-  final bool enabled;
 
   @override
   Widget build(BuildContext context) {
@@ -665,11 +633,9 @@ class PermissionRow extends StatelessWidget {
         contentPadding: EdgeInsets.all(0),
         title: Text(name),
         value: isOk,
-        onChanged: enabled
-            ? (bool value) {
-                onPressed();
-              }
-            : null);
+        onChanged: (bool value) {
+          onPressed();
+        });
   }
 }
 
@@ -682,8 +648,9 @@ class ConnectionManager extends StatelessWidget {
     return Column(
         children: serverModel.clients
             .map((client) => PaddingCard(
-                title: translate(
-                    client.isFileTransfer ? "Transfer file" : "Share screen"),
+                title: translate(client.isFileTransfer
+                    ? "Transfer file"
+                    : "Share screen"),
                 titleIcon: client.isFileTransfer
                     ? Icon(Icons.folder_outlined)
                     : Icon(Icons.mobile_screen_share),
@@ -869,7 +836,13 @@ class ClientInfo extends StatelessWidget {
                   flex: -1,
                   child: Padding(
                       padding: const EdgeInsets.only(right: 12),
-                      child: _buildAvatar(context))),
+                      child: CircleAvatar(
+                          backgroundColor: str2color(
+                              client.name,
+                              Theme.of(context).brightness == Brightness.light
+                                  ? 255
+                                  : 150),
+                          child: Text(client.name[0])))),
               Expanded(
                   child: Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
@@ -882,20 +855,6 @@ class ClientInfo extends StatelessWidget {
           ),
         ]));
   }
-
-  Widget _buildAvatar(BuildContext context) {
-    final fallback = CircleAvatar(
-      backgroundColor: str2color(client.name,
-          Theme.of(context).brightness == Brightness.light ? 255 : 150),
-      child: Text(client.name.isNotEmpty ? client.name[0] : '?'),
-    );
-    return buildAvatarWidget(
-          avatar: client.avatar,
-          size: 40,
-          fallback: fallback,
-        ) ??
-        fallback;
-  }
 }
 
 void androidChannelInit() {

flutter/lib/mobile/pages/settings_page.dart

@@ -17,7 +17,6 @@ import '../../common/widgets/login.dart';
 import '../../consts.dart';
 import '../../models/model.dart';
 import '../../models/platform_model.dart';
-import '../widgets/deploy_dialog.dart';
 import '../widgets/dialog.dart';
 import 'home_page.dart';
 import 'scan_page.dart';
@@ -72,7 +71,6 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
   var _ignoreBatteryOpt = false;
   var _enableStartOnBoot = false;
   var _checkUpdateOnStartup = false;
-  var _showTerminalExtraKeys = false;
   var _floatingWindowDisabled = false;
   var _keepScreenOn = KeepScreenOn.duringControlled; // relay on floating window
   var _enableAbr = false;
@@ -96,12 +94,7 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
   var _hideWebSocket = false;
   var _enableTrustedDevices = false;
   var _enableUdpPunch = false;
-  var _allowInsecureTlsFallback = false;
-  var _disableUdp = false;
   var _enableIpv6Punch = false;
-  var _isUsingPublicServer = false;
-  var _allowAskForNoteAtEndOfConnection = false;
-  var _preventSleepWhileConnected = true;
 
   _SettingsState() {
     _enableAbr = option2bool(
@@ -116,9 +109,6 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
     _enableHardwareCodec = option2bool(kOptionEnableHwcodec,
         bind.mainGetOptionSync(key: kOptionEnableHwcodec));
     _allowWebSocket = mainGetBoolOptionSync(kOptionAllowWebSocket);
-    _allowInsecureTlsFallback =
-        mainGetBoolOptionSync(kOptionAllowInsecureTLSFallback);
-    _disableUdp = bind.mainGetOptionSync(key: kOptionDisableUdp) == 'Y';
     _autoRecordIncomingSession = option2bool(kOptionAllowAutoRecordIncoming,
         bind.mainGetOptionSync(key: kOptionAllowAutoRecordIncoming));
     _autoRecordOutgoingSession = option2bool(kOptionAllowAutoRecordOutgoing,
@@ -140,12 +130,6 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
     _enableTrustedDevices = mainGetBoolOptionSync(kOptionEnableTrustedDevices);
     _enableUdpPunch = mainGetLocalBoolOptionSync(kOptionEnableUdpPunch);
     _enableIpv6Punch = mainGetLocalBoolOptionSync(kOptionEnableIpv6Punch);
-    _allowAskForNoteAtEndOfConnection =
-        mainGetLocalBoolOptionSync(kOptionAllowAskForNoteAtEndOfConnection);
-    _preventSleepWhileConnected =
-        mainGetLocalBoolOptionSync(kOptionKeepAwakeDuringOutgoingSessions);
-    _showTerminalExtraKeys =
-        mainGetLocalBoolOptionSync(kOptionEnableShowTerminalExtraKeys);
   }
 
   @override
@@ -216,13 +200,6 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
         update = true;
         _buildDate = buildDate;
       }
-
-      final isUsingPublicServer = await bind.mainIsUsingPublicServer();
-      if (_isUsingPublicServer != isUsingPublicServer) {
-        update = true;
-        _isUsingPublicServer = isUsingPublicServer;
-      }
-
       if (update) {
         setState(() {});
       }
@@ -609,23 +586,6 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
       );
     }
 
-    enhancementsTiles.add(
-      SettingsTile.switchTile(
-        initialValue: _showTerminalExtraKeys,
-        title: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
-          Text(translate('Show terminal extra keys')),
-        ]),
-        onToggle: (bool v) async {
-          await mainSetLocalBoolOption(kOptionEnableShowTerminalExtraKeys, v);
-          final newValue =
-              mainGetLocalBoolOptionSync(kOptionEnableShowTerminalExtraKeys);
-          setState(() {
-            _showTerminalExtraKeys = newValue;
-          });
-        },
-      ),
-    );
-
     onFloatingWindowChanged(bool toValue) async {
       if (toValue) {
         if (!await AndroidPermissionManager.check(kSystemAlertWindow)) {
@@ -689,18 +649,8 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
               SettingsTile(
                 title: Obx(() => Text(gFFI.userModel.userName.value.isEmpty
                     ? translate('Login')
-                    : '${translate('Logout')} (${gFFI.userModel.accountLabelWithHandle})')),
-                leading: Obx(() {
-                  final avatar = bind.mainResolveAvatarUrl(
-                      avatar: gFFI.userModel.avatar.value);
-                  return buildAvatarWidget(
-                        avatar: avatar,
-                        size: 28,
-                        borderRadius: null,
-                        fallback: Icon(Icons.person),
-                      ) ??
-                      Icon(Icons.person);
-                }),
+                    : '${translate('Logout')} (${gFFI.userModel.userName.value})')),
+                leading: Icon(Icons.person),
                 onPressed: (context) {
                   if (gFFI.userModel.userName.value.isEmpty) {
                     loginDialog();
@@ -717,25 +667,15 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
                 title: Text(translate('ID/Relay Server')),
                 leading: Icon(Icons.cloud),
                 onPressed: (context) {
-                  showServerSettings(gFFI.dialogManager, (callback) async {
-                    _isUsingPublicServer = await bind.mainIsUsingPublicServer();
-                    setState(callback);
-                  });
+                  showServerSettings(gFFI.dialogManager);
                 }),
-          if (!_hideNetwork && !_hideProxy)
+          if (!isIOS && !_hideNetwork && !_hideProxy)
             SettingsTile(
                 title: Text(translate('Socks5/Http(s) Proxy')),
                 leading: Icon(Icons.network_ping),
                 onPressed: (context) {
                   changeSocks5Proxy();
                 }),
-          if (isAndroid && !bind.isOutgoingOnly())
-            SettingsTile(
-                title: Text(translate('Deploy')),
-                leading: Icon(Icons.cloud_upload),
-                onPressed: (context) {
-                  showDeployDialog();
-                }),
           if (!disabledSettings && !_hideNetwork && !_hideWebSocket)
             SettingsTile.switchTile(
               title: Text(translate('Use WebSocket')),
@@ -751,38 +691,6 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
                       });
                     },
             ),
-          if (!_isUsingPublicServer)
-            SettingsTile.switchTile(
-              title: Text(translate('Allow insecure TLS fallback')),
-              initialValue: _allowInsecureTlsFallback,
-              onToggle: isOptionFixed(kOptionAllowInsecureTLSFallback)
-                  ? null
-                  : (v) async {
-                      await mainSetBoolOption(
-                          kOptionAllowInsecureTLSFallback, v);
-                      final newValue = mainGetBoolOptionSync(
-                          kOptionAllowInsecureTLSFallback);
-                      setState(() {
-                        _allowInsecureTlsFallback = newValue;
-                      });
-                    },
-            ),
-          if (isAndroid && !outgoingOnly && !_isUsingPublicServer)
-            SettingsTile.switchTile(
-              title: Text(translate('Disable UDP')),
-              initialValue: _disableUdp,
-              onToggle: isOptionFixed(kOptionDisableUdp)
-                  ? null
-                  : (v) async {
-                      await bind.mainSetOption(
-                          key: kOptionDisableUdp, value: v ? 'Y' : 'N');
-                      final newValue =
-                          bind.mainGetOptionSync(key: kOptionDisableUdp) == 'Y';
-                      setState(() {
-                        _disableUdp = newValue;
-                      });
-                    },
-            ),
           if (!incomingOnly)
             SettingsTile.switchTile(
               title: Text(translate('Enable UDP hole punching')),
@@ -826,38 +734,7 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
             onPressed: (context) {
               showThemeSettings(gFFI.dialogManager);
             },
-          ),
-          if (!bind.isDisableAccount())
-            SettingsTile.switchTile(
-              title: Text(translate('note-at-conn-end-tip')),
-              initialValue: _allowAskForNoteAtEndOfConnection,
-              onToggle: (v) async {
-                if (v && !gFFI.userModel.isLogin) {
-                  final res = await loginDialog();
-                  if (res != true) return;
-                }
-                await mainSetLocalBoolOption(
-                    kOptionAllowAskForNoteAtEndOfConnection, v);
-                final newValue = mainGetLocalBoolOptionSync(
-                    kOptionAllowAskForNoteAtEndOfConnection);
-                setState(() {
-                  _allowAskForNoteAtEndOfConnection = newValue;
-                });
-              },
-            ),
-          if (!incomingOnly)
-            SettingsTile.switchTile(
-              title:
-                  Text(translate('keep-awake-during-outgoing-sessions-label')),
-              initialValue: _preventSleepWhileConnected,
-              onToggle: (v) async {
-                await mainSetLocalBoolOption(
-                    kOptionKeepAwakeDuringOutgoingSessions, v);
-                setState(() {
-                  _preventSleepWhileConnected = v;
-                });
-              },
-            ),
+          )
         ]),
         if (isAndroid)
           SettingsSection(title: Text(translate('Hardware Codec')), tiles: [

flutter/lib/mobile/pages/terminal_page.dart

@@ -1,16 +1,11 @@
-import 'dart:async';
-import 'dart:math';
-import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hbb/common.dart';
-import 'package:flutter_hbb/common/widgets/dialog.dart';
 import 'package:flutter_hbb/models/model.dart';
 import 'package:flutter_hbb/models/terminal_model.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:xterm/xterm.dart';
 import '../../desktop/pages/terminal_connection_manager.dart';
-import '../../consts.dart';
 
 class TerminalPage extends StatefulWidget {
   const TerminalPage({
@@ -33,18 +28,9 @@ class TerminalPage extends StatefulWidget {
 }
 
 class _TerminalPageState extends State<TerminalPage>
-    with AutomaticKeepAliveClientMixin, WidgetsBindingObserver {
+    with AutomaticKeepAliveClientMixin {
   late FFI _ffi;
   late TerminalModel _terminalModel;
-  double? _cellHeight;
-  double _sysKeyboardHeight = 0;
-  Timer? _keyboardDebounce;
-  final GlobalKey _keyboardKey = GlobalKey();
-  double _keyboardHeight = 0;
-  late bool _showTerminalExtraKeys;
-  // For iOS edge swipe gesture
-  double _swipeStartX = 0;
-  double _swipeCurrentX = 0;
 
   // For web only.
   // 'monospace' does not work on web, use Google Fonts, `??` is only for null safety.
@@ -52,12 +38,9 @@ class _TerminalPageState extends State<TerminalPage>
       ? (GoogleFonts.robotoMono().fontFamily ?? 'monospace')
       : 'monospace';
 
-  SessionID get sessionId => _ffi.sessionId;
-
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance.addObserver(this);
 
     debugPrint(
         '[TerminalPage] Initializing terminal ${widget.terminalId} for peer ${widget.id}');
@@ -76,25 +59,13 @@ class _TerminalPageState extends State<TerminalPage>
     debugPrint(
         '[TerminalPage] Terminal model created for terminal ${widget.terminalId}');
 
-    _terminalModel.onResizeExternal = (w, h, pw, ph) {
-      _cellHeight = ph * 1.0;
-    };
-
     // Register this terminal model with FFI for event routing
     _ffi.registerTerminalModel(widget.terminalId, _terminalModel);
 
-    // Web desktop users have full hardware keyboard access, so the on-screen
-    // terminal extra keys bar is unnecessary and disabled.
-    _showTerminalExtraKeys = !isWebDesktop &&
-        mainGetLocalBoolOptionSync(kOptionEnableShowTerminalExtraKeys);
     // Initialize terminal connection
     WidgetsBinding.instance.addPostFrameCallback((_) {
       _ffi.dialogManager
           .showLoading(translate('Connecting...'), onCancel: closeConnection);
-
-      if (_showTerminalExtraKeys) {
-        _updateKeyboardHeight();
-      }
     });
     _ffi.ffiModel.updateEventListener(_ffi.sessionId, widget.id);
   }
@@ -104,327 +75,40 @@ class _TerminalPageState extends State<TerminalPage>
     // Unregister terminal model from FFI
     _ffi.unregisterTerminalModel(widget.terminalId);
     _terminalModel.dispose();
-    _keyboardDebounce?.cancel();
-    WidgetsBinding.instance.removeObserver(this);
     super.dispose();
     TerminalConnectionManager.releaseConnection(widget.id);
   }
 
-  @override
-  void didChangeMetrics() {
-    super.didChangeMetrics();
-
-    _keyboardDebounce?.cancel();
-    _keyboardDebounce = Timer(const Duration(milliseconds: 20), () {
-      final bottomInset = MediaQuery.of(context).viewInsets.bottom;
-      setState(() {
-        _sysKeyboardHeight = bottomInset;
-      });
-    });
-  }
-
-  void _updateKeyboardHeight() {
-    if (_keyboardKey.currentContext != null) {
-      final renderBox = _keyboardKey.currentContext!.findRenderObject() as RenderBox;
-      _keyboardHeight = renderBox.size.height;
-    }
-  }
-
-  EdgeInsets _calculatePadding(double heightPx) {
-    if (_cellHeight == null) {
-      return const EdgeInsets.symmetric(horizontal: 5.0, vertical: 2.0);
-    }
-    final realHeight = heightPx - _sysKeyboardHeight - _keyboardHeight;
-    final rows = (realHeight / _cellHeight!).floor();
-    final extraSpace = realHeight - rows * _cellHeight!;
-    final topBottom = max(0.0, extraSpace / 2.0);
-    return EdgeInsets.only(left: 5.0, right: 5.0, top: topBottom, bottom: topBottom + _sysKeyboardHeight + _keyboardHeight);
-  }
-
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    return WillPopScope(
-      onWillPop: () async {
-        clientClose(sessionId, _ffi);
-        return false; // Prevent default back behavior
-      },
-      child: buildBody(),
-    );
-  }
-
-  Widget buildBody() {
-    final scaffold = Scaffold(
-      resizeToAvoidBottomInset: false, // Disable automatic layout adjustment; manually control UI updates to prevent flickering when the keyboard shows/hides
+    return Scaffold(
       backgroundColor: Theme.of(context).scaffoldBackgroundColor,
-      body: Stack(
-        children: [
-          Positioned.fill(
-            child: SafeArea(
-              top: true,
-              child: LayoutBuilder(
-                builder: (context, constraints) {
-                  final heightPx = constraints.maxHeight;
-                  return TerminalView(
-                    _terminalModel.terminal,
-                    controller: _terminalModel.terminalController,
-                    autofocus: true,
-                    textStyle: _getTerminalStyle(),
-                    backgroundOpacity: 0.7,
-                    // The following comment is from xterm.dart source code:
-                    // Workaround to detect delete key for platforms and IMEs that do not
-                    // emit a hardware delete event. Preferred on mobile platforms. [false] by
-                    // default.
-                    //
-                    // Android works fine without this workaround.
-                    deleteDetection: isIOS,
-                    padding: _calculatePadding(heightPx),
-                    onSecondaryTapDown: (details, offset) async {
-                      final selection = _terminalModel.terminalController.selection;
-                      if (selection != null) {
-                        final text = _terminalModel.terminal.buffer.getText(selection);
-                        _terminalModel.terminalController.clearSelection();
-                        await Clipboard.setData(ClipboardData(text: text));
-                      } else {
-                        final data = await Clipboard.getData('text/plain');
-                        final text = data?.text;
-                        if (text != null) {
-                          _terminalModel.terminal.paste(text);
-                        }
-                      }
-                    },
-                  );
-                },
-              ),
-            ),
-          ),
-          if (_showTerminalExtraKeys) _buildFloatingKeyboard(),
-          // iOS-style circular close button in top-right corner
-          if (isIOS) _buildCloseButton(),
-        ],
-      ),
-    );
-
-    // Add iOS edge swipe gesture to exit (similar to Android back button)
-    if (isIOS) {
-      return LayoutBuilder(
-        builder: (context, constraints) {
-          final screenWidth = constraints.maxWidth;
-          // Base thresholds on screen width but clamp to reasonable logical pixel ranges
-          // Edge detection region: ~10% of width, clamped between 20 and 80 logical pixels
-          final edgeThreshold = (screenWidth * 0.1).clamp(20.0, 80.0);
-          // Required horizontal movement: ~25% of width, clamped between 80 and 300 logical pixels
-          final swipeThreshold = (screenWidth * 0.25).clamp(80.0, 300.0);
-
-          return RawGestureDetector(
-            behavior: HitTestBehavior.translucent,
-            gestures: <Type, GestureRecognizerFactory>{
-              HorizontalDragGestureRecognizer: GestureRecognizerFactoryWithHandlers<HorizontalDragGestureRecognizer>(
-                () => HorizontalDragGestureRecognizer(
-                  debugOwner: this,
-                  // Only respond to touch input, exclude mouse/trackpad
-                  supportedDevices: kTouchBasedDeviceKinds,
-                ),
-                (HorizontalDragGestureRecognizer instance) {
-                  instance
-                    // Capture initial touch-down position (before touch slop)
-                    ..onDown = (details) {
-                      _swipeStartX = details.localPosition.dx;
-                      _swipeCurrentX = details.localPosition.dx;
-                    }
-                    ..onUpdate = (details) {
-                      _swipeCurrentX = details.localPosition.dx;
-                    }
-                    ..onEnd = (details) {
-                      // Check if swipe started from left edge and moved right
-                      if (_swipeStartX < edgeThreshold && (_swipeCurrentX - _swipeStartX) > swipeThreshold) {
-                        clientClose(sessionId, _ffi);
-                      }
-                      _swipeStartX = 0;
-                      _swipeCurrentX = 0;
-                    }
-                    ..onCancel = () {
-                      _swipeStartX = 0;
-                      _swipeCurrentX = 0;
-                    };
-                },
-              ),
-            },
-            child: scaffold,
-          );
+      body: TerminalView(
+        _terminalModel.terminal,
+        controller: _terminalModel.terminalController,
+        autofocus: true,
+        textStyle: _getTerminalStyle(),
+        backgroundOpacity: 0.7,
+        padding: const EdgeInsets.symmetric(horizontal: 5.0, vertical: 2.0),
+        onSecondaryTapDown: (details, offset) async {
+          final selection = _terminalModel.terminalController.selection;
+          if (selection != null) {
+            final text = _terminalModel.terminal.buffer.getText(selection);
+            _terminalModel.terminalController.clearSelection();
+            await Clipboard.setData(ClipboardData(text: text));
+          } else {
+            final data = await Clipboard.getData('text/plain');
+            final text = data?.text;
+            if (text != null) {
+              _terminalModel.terminal.paste(text);
+            }
+          }
         },
-      );
-    }
-
-    return scaffold;
-  }
-
-  Widget _buildCloseButton() {
-    return Positioned(
-      top: 0,
-      right: 0,
-      child: SafeArea(
-        minimum: const EdgeInsets.only(
-          top: 16, // iOS standard margin
-          right: 16, // iOS standard margin
-        ),
-        child: Semantics(
-          button: true,
-          label: translate('Close'),
-          child: Container(
-            width: 44, // iOS standard tap target size
-            height: 44,
-            decoration: BoxDecoration(
-              color: Colors.black.withOpacity(0.5), // Half transparency
-              shape: BoxShape.circle,
-            ),
-            child: Material(
-              color: Colors.transparent,
-              shape: const CircleBorder(),
-              clipBehavior: Clip.antiAlias,
-              child: InkWell(
-                customBorder: const CircleBorder(),
-                onTap: () {
-                  clientClose(sessionId, _ffi);
-                },
-                child: Tooltip(
-                  message: translate('Close'),
-                  child: const Icon(
-                    Icons.chevron_left, // iOS-style back arrow
-                    color: Colors.white,
-                    size: 28,
-                  ),
-                ),
-              ),
-            ),
-          ),
-        ),
       ),
     );
   }
 
-  Widget _buildFloatingKeyboard() {
-    return AnimatedPositioned(
-      duration: const Duration(milliseconds: 200),
-      left: 0,
-      right: 0,
-      bottom: _sysKeyboardHeight,
-      child: Container(
-        key: _keyboardKey,
-        color: Theme.of(context).scaffoldBackgroundColor,
-        padding: EdgeInsets.zero,
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Row(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                _buildKeyButton('Esc'),
-                const SizedBox(width: 2),
-                _buildKeyButton('/'),
-                const SizedBox(width: 2),
-                _buildKeyButton('|'),
-                const SizedBox(width: 2),
-                _buildKeyButton('Home'),
-                const SizedBox(width: 2),
-                _buildKeyButton('↑'),
-                const SizedBox(width: 2),
-                _buildKeyButton('End'),
-                const SizedBox(width: 2),
-                _buildKeyButton('PgUp'),
-              ],
-            ),
-            Row(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                _buildKeyButton('Tab'),
-                const SizedBox(width: 2),
-                _buildKeyButton('Ctrl+C'),
-                const SizedBox(width: 2),
-                _buildKeyButton('~'),
-                const SizedBox(width: 2),
-                _buildKeyButton('←'),
-                const SizedBox(width: 2),
-                _buildKeyButton('↓'),
-                const SizedBox(width: 2),
-                _buildKeyButton('→'),
-                const SizedBox(width: 2),
-                _buildKeyButton('PgDn'),
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildKeyButton(String label) {
-    return ElevatedButton(
-      onPressed: () {
-        _sendKeyToTerminal(label);
-      },
-      child: Text(label),
-      style: ElevatedButton.styleFrom(
-        minimumSize: const Size(48, 32),
-        padding: EdgeInsets.zero,
-        textStyle: const TextStyle(fontSize: 12),
-        backgroundColor: Theme.of(context).colorScheme.surfaceVariant,
-        foregroundColor: Theme.of(context).colorScheme.onSurfaceVariant,
-      ),
-    );
-  }
-
-  void _sendKeyToTerminal(String key) {
-    String? send;
-
-    switch (key) {
-      case 'Esc':
-        send = '\x1B';
-        break;
-      case 'Tab':
-        send = '\t';
-        break;
-      case 'Ctrl+C':
-        send = '\x03';
-        break;
-
-      case '↑':
-        send = '\x1B[A';
-        break;
-      case '↓':
-        send = '\x1B[B';
-        break;
-      case '→':
-        send = '\x1B[C';
-        break;
-      case '←':
-        send = '\x1B[D';
-        break;
-
-      case 'Home':
-        send = '\x1B[H';
-        break;
-      case 'End':
-        send = '\x1B[F';
-        break;
-      case 'PgUp':
-        send = '\x1B[5~';
-        break;
-      case 'PgDn':
-        send = '\x1B[6~';
-        break;
-
-      default:
-        send = key;
-        break;
-    }
-
-    if (send != null) {
-      _terminalModel.sendVirtualKey(send);
-    }
-  }
-
   // https://github.com/TerminalStudio/xterm.dart/issues/42#issuecomment-877495472
   // https://github.com/TerminalStudio/xterm.dart/issues/198#issuecomment-2526548458
   TerminalStyle _getTerminalStyle() {

flutter/lib/mobile/pages/view_camera_page.dart

@@ -11,6 +11,7 @@ import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:get/get.dart';
 import 'package:provider/provider.dart';
+import 'package:wakelock_plus/wakelock_plus.dart';
 
 import '../../common.dart';
 import '../../common/widgets/overlay.dart';
@@ -61,7 +62,7 @@ class _ViewCameraPageState extends State<ViewCameraPage>
   bool _showGestureHelp = false;
   Orientation? _currentOrientation;
   double _viewInsetsBottom = 0;
-  final _uniqueKey = UniqueKey();
+
   Timer? _timerDidChangeMetrics;
 
   final _blockableOverlayState = BlockableOverlayState();
@@ -99,7 +100,9 @@ class _ViewCameraPageState extends State<ViewCameraPage>
       gFFI.dialogManager
           .showLoading(translate('Connecting...'), onCancel: closeConnection);
     });
-    WakelockManager.enable(_uniqueKey);
+    if (!isWeb) {
+      WakelockPlus.enable();
+    }
     _physicalFocusNode.requestFocus();
     gFFI.inputModel.listenToMouse(true);
     gFFI.qualityMonitorModel.checkShowQualityMonitor(sessionId);
@@ -136,7 +139,9 @@ class _ViewCameraPageState extends State<ViewCameraPage>
     gFFI.dialogManager.dismissAll();
     await SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual,
         overlays: SystemUiOverlay.values);
-    WakelockManager.disable(_uniqueKey);
+    if (!isWeb) {
+      await WakelockPlus.disable();
+    }
     removeSharedStates(widget.id);
     // `on_voice_call_closed` should be called when the connection is ended.
     // The inner logic of `on_voice_call_closed` will check if the voice call is active.
@@ -192,7 +197,7 @@ class _ViewCameraPageState extends State<ViewCameraPage>
 
     return WillPopScope(
       onWillPop: () async {
-        clientClose(sessionId, gFFI);
+        clientClose(sessionId, gFFI.dialogManager);
         return false;
       },
       child: Scaffold(
@@ -305,7 +310,7 @@ class _ViewCameraPageState extends State<ViewCameraPage>
                       color: Colors.white,
                       icon: Icon(Icons.clear),
                       onPressed: () {
-                        clientClose(sessionId, gFFI);
+                        clientClose(sessionId, gFFI.dialogManager);
                       },
                     ),
                     IconButton(
@@ -585,14 +590,6 @@ void showOptions(
   if (pi.displays.length > 1 && pi.currentDisplay != kAllDisplayValue) {
     final cur = pi.currentDisplay;
     final children = <Widget>[];
-    final isDarkTheme = MyTheme.currentThemeMode() == ThemeMode.dark;
-    final numColorSelected = Colors.white;
-    final numColorUnselected = isDarkTheme ? Colors.grey : Colors.black87;
-    // We can't use `Theme.of(context).primaryColor` here, the color is:
-    // - light theme: 0xff2196f3 (Colors.blue)
-    // - dark theme: 0xff212121 (the canvas color?)
-    final numBgSelected =
-        Theme.of(context).colorScheme.primary.withOpacity(0.6);
     for (var i = 0; i < pi.displays.length; ++i) {
       children.add(InkWell(
           onTap: () {
@@ -606,12 +603,13 @@ void showOptions(
               decoration: BoxDecoration(
                   border: Border.all(color: Theme.of(context).hintColor),
                   borderRadius: BorderRadius.circular(2),
-                  color: i == cur ? numBgSelected : null),
+                  color: i == cur
+                      ? Theme.of(context).primaryColor.withOpacity(0.6)
+                      : null),
               child: Center(
                   child: Text((i + 1).toString(),
                       style: TextStyle(
-                          color:
-                              i == cur ? numColorSelected : numColorUnselected,
+                          color: i == cur ? Colors.white : Colors.black87,
                           fontWeight: FontWeight.bold))))));
     }
     displays.add(Padding(

flutter/lib/mobile/widgets/custom_scale_widget.dart

@@ -1,71 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_hbb/models/model.dart';
-import 'package:flutter_hbb/common.dart';
-import 'package:flutter_hbb/common/widgets/custom_scale_base.dart';
-
-class MobileCustomScaleControls extends StatefulWidget {
-  final FFI ffi;
-  final ValueChanged<int>? onChanged;
-  const MobileCustomScaleControls({super.key, required this.ffi, this.onChanged});
-
-  @override
-  State<MobileCustomScaleControls> createState() => _MobileCustomScaleControlsState();
-}
-
-class _MobileCustomScaleControlsState extends CustomScaleControls<MobileCustomScaleControls> {
-  @override
-  FFI get ffi => widget.ffi;
-
-  @override
-  ValueChanged<int>? get onScaleChanged => widget.onChanged;
-
-  @override
-  Widget build(BuildContext context) {
-    // Smaller button size for mobile
-    const smallBtnConstraints = BoxConstraints(minWidth: 32, minHeight: 32);
-
-    final sliderControl = Slider(
-      value: scalePos,
-      min: 0.0,
-      max: 1.0,
-      divisions: (CustomScaleControls.maxPercent - CustomScaleControls.minPercent).round(),
-      label: '$scaleValue%',
-      onChanged: onSliderChanged,
-    );
-
-    return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 8.0),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Text(
-            '${translate("Scale custom")}: $scaleValue%',
-            style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w500),
-          ),
-          const SizedBox(height: 8),
-          Row(
-            children: [
-              IconButton(
-                iconSize: 20,
-                padding: const EdgeInsets.all(4),
-                constraints: smallBtnConstraints,
-                icon: const Icon(Icons.remove),
-                tooltip: translate('Decrease'),
-                onPressed: () => nudgeScale(-1),
-              ),
-              Expanded(child: sliderControl),
-              IconButton(
-                iconSize: 20,
-                padding: const EdgeInsets.all(4),
-                constraints: smallBtnConstraints,
-                icon: const Icon(Icons.add),
-                tooltip: translate('Increase'),
-                onPressed: () => nudgeScale(1),
-              ),
-            ],
-          ),
-        ],
-      ),
-    );
-  }
-}

flutter/lib/mobile/widgets/deploy_dialog.dart

@@ -1,114 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-
-import '../../common.dart';
-import '../../models/platform_model.dart';
-
-const _deployDialogTag = 'android-deploy-device';
-
-void showDeployPromptDialog() {
-  gFFI.dialogManager.dismissByTag(_deployDialogTag);
-  gFFI.dialogManager.show<bool>((setState, close, context) {
-    submit() => close(true);
-    return CustomAlertDialog(
-      title: Text(translate("Deploy")),
-      content: Text(translate("server_requires_deployment_tip")),
-      actions: [
-        dialogButton("Cancel", onPressed: close, isOutline: true),
-        dialogButton("OK", onPressed: submit),
-      ],
-      onSubmit: submit,
-      onCancel: close,
-    );
-  }, tag: _deployDialogTag).then((deploy) {
-    if (deploy == true) {
-      showDeployDialog();
-    }
-  });
-}
-
-void showDeployDialog() {
-  gFFI.dialogManager.dismissByTag(_deployDialogTag);
-  final tokenController = TextEditingController();
-  final idController = TextEditingController();
-  var errorText = "";
-  var isInProgress = false;
-  gFFI.dialogManager.show((setState, close, context) {
-    submit() async {
-      if (isInProgress) return;
-      final token = tokenController.text.trim();
-      if (token.isEmpty) {
-        setState(() {
-          errorText = translate("token is required!");
-        });
-        return;
-      }
-      setState(() {
-        errorText = "";
-        isInProgress = true;
-      });
-      String res;
-      try {
-        res = await bind.mainDeployDevice(
-            token: token, id: idController.text.trim());
-      } catch (e) {
-        setState(() {
-          errorText = translate(e.toString());
-          isInProgress = false;
-        });
-        return;
-      }
-      if (res.isEmpty) {
-        close();
-        await gFFI.serverModel.fetchID();
-        showToast(translate("Successful"));
-      } else {
-        setState(() {
-          errorText = translate(res.toString());
-          isInProgress = false;
-        });
-      }
-    }
-
-    return CustomAlertDialog(
-      title: Text(translate("Deploy")),
-      content: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          TextField(
-            controller: tokenController,
-            decoration: InputDecoration(labelText: translate("API Token")),
-            obscureText: true,
-            enableSuggestions: false,
-            autocorrect: false,
-            autofocus: true,
-          ).workaroundFreezeLinuxMint(),
-          TextField(
-            controller: idController,
-            decoration:
-                InputDecoration(labelText: translate("Custom ID (optional)")),
-          ).workaroundFreezeLinuxMint(),
-          if (errorText.isNotEmpty)
-            Align(
-              alignment: Alignment.centerLeft,
-              child: SelectableText(
-                errorText,
-                style: TextStyle(
-                  color: Theme.of(context).colorScheme.error,
-                  fontSize: 12,
-                ),
-              ).paddingOnly(top: 8),
-            ),
-          if (isInProgress) const LinearProgressIndicator().paddingOnly(top: 8),
-        ],
-      ),
-      actions: [
-        dialogButton("Cancel",
-            onPressed: isInProgress ? null : close, isOutline: true),
-        dialogButton("OK", onPressed: isInProgress ? null : submit),
-      ],
-      onSubmit: submit,
-      onCancel: isInProgress ? null : close,
-    );
-  }, tag: _deployDialogTag);
-}