Update es.rs (#9114)

New terms added

.cargo/config.toml

@@ -1,8 +1,14 @@
 [target.x86_64-pc-windows-msvc]
 rustflags = ["-Ctarget-feature=+crt-static"]
 [target.i686-pc-windows-msvc]
-rustflags = ["-Ctarget-feature=+crt-static"]
+rustflags = ["-C", "target-feature=+crt-static", "-C", "link-args=/NODEFAULTLIB:MSVCRT"]
 [target.'cfg(target_os="macos")']
 rustflags = [
     "-C", "link-args=-sectcreate __CGPreLoginApp __cgpreloginapp /dev/null",
 ]
+#[target.'cfg(target_os="linux")']
+# glibc-static required, this may fix https://github.com/rustdesk/rustdesk/issues/9103, but I do not want this big change
+# this is unlikely to help also, because the other so files still use libc dynamically
+#rustflags = [
+#    "-C", "link-args=-Wl,-Bstatic -lc -Wl,-Bdynamic"
+#]

.github/ISSUE_TEMPLATE/task.yaml

@@ -1,20 +0,0 @@
-name: 📝 Task
-description: Create a task for the team to work on, used internally only. We will delete tasks created by non-team members.
-title: "[Task]: "
-labels: [Task]
-body:
-- type: checkboxes
-  attributes:
-    label: Are you our team member?
-    description: If you are not our team member, please go to discussions.
-    options:
-    - label: Yes, I am?
-      required: true
-- type: textarea
-  attributes:
-    label: SubTasks 
-    placeholder: |
-      - Sub Task 1
-      - Sub Task 2
-  validations:
-    required: false

.github/workflows/bridge.yml

@@ -1,13 +1,14 @@
 # This yaml shares the build bridge steps with ci and nightly.
 name: Build flutter-rust-bridge
-# 2023-04-19 15:48:00+00:00
+# 2023-11-23 18:00:00+00:00
 
 on:
   workflow_call:
 
 env:
-  FLUTTER_VERSION: "3.10.6"
+  FLUTTER_VERSION: "3.16.9"
-  FLUTTER_RUST_BRIDGE_VERSION: "1.75.3"
+  FLUTTER_RUST_BRIDGE_VERSION: "1.80.1"
+  RUST_VERSION: "1.75" # https://github.com/rustdesk/rustdesk/discussions/7503
 
 jobs:
   generate_bridge:
@@ -23,21 +24,33 @@ jobs:
             }
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install prerequisites
         run: |
-          sudo apt install ca-certificates -y        
+          sudo apt-get install ca-certificates -y
-          sudo apt update -y
+          sudo apt-get update -y
-          sudo apt install -y g++ gcc git curl wget nasm yasm libgtk-3-dev clang cmake libclang-dev ninja-build llvm-dev libclang-10-dev llvm-10-dev pkg-config
+          sudo apt-get install -y \
+            clang \
+            cmake \
+            curl \
+            gcc \
+            git \
+            g++ \
+            libclang-10-dev \
+            libgtk-3-dev \
+            llvm-10-dev \
+            nasm \
+            ninja-build \
+            pkg-config \
+            wget
 
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@v1
         with:
-          toolchain: stable
+          toolchain: ${{ env.RUST_VERSION }}
-          target: ${{ matrix.job.target }}
+          targets: ${{ matrix.job.target }}
-          override: true
+          components: "rustfmt"
-          profile: minimal # minimal component installation (ie, no documentation)
 
       - uses: Swatinem/rust-cache@v2
         with:

.github/workflows/ci.yml

@@ -1,8 +1,12 @@
 name: CI
 
-# env:
+env:
 #   MIN_SUPPORTED_RUST_VERSION: "1.46.0"
 #   CICD_INTERMEDIATES_DIR: "_cicd-intermediates"
+  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
+  # vcpkg version: 2024.06.15
+  # for multiarch gcc compatibility
+  VCPKG_COMMIT_ID: "f7423ee180c4b7f40d43402c2feb3859161ef625"
 
 on:
   workflow_dispatch:
@@ -17,6 +21,9 @@ on:
       - ".github/**"
       - "docs/**"
       - "README.md"
+      - "res/**"
+      - "appimage/**"
+      - "flatpak/**"
 
 jobs:
   # ensure_cargo_fmt:
@@ -67,45 +74,75 @@ jobs:
           # - { target: aarch64-unknown-linux-gnu   , os: ubuntu-20.04, use-cross: true }
           # - { target: arm-unknown-linux-gnueabihf , os: ubuntu-20.04, use-cross: true }
           # - { target: arm-unknown-linux-musleabihf, os: ubuntu-20.04, use-cross: true }
-          # - { target: i686-pc-windows-msvc        , os: windows-2019                  }
+          # - { target: i686-pc-windows-msvc        , os: windows-2022                  }
           # - { target: i686-unknown-linux-gnu      , os: ubuntu-20.04, use-cross: true }
           # - { target: i686-unknown-linux-musl     , os: ubuntu-20.04, use-cross: true }
           # - { target: x86_64-apple-darwin         , os: macos-10.15                   }
-          # - { target: x86_64-pc-windows-gnu       , os: windows-2019                  }
+          # - { target: x86_64-pc-windows-gnu       , os: windows-2022                  }
-          # - { target: x86_64-pc-windows-msvc      , os: windows-2019                  }
+          # - { target: x86_64-pc-windows-msvc      , os: windows-2022                  }
           - { target: x86_64-unknown-linux-gnu    , os: ubuntu-20.04                  }
           # - { target: x86_64-unknown-linux-musl   , os: ubuntu-20.04, use-cross: true }
     steps:
+    - name: Export GitHub Actions cache environment variables
+      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@v3
+      uses: actions/checkout@v4
 
     - name: Install prerequisites
       shell: bash
       run: |
         case ${{ matrix.job.target }} in
-          x86_64-unknown-linux-gnu) sudo apt-get -y update ; 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 libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev;;
+          x86_64-unknown-linux-gnu)
+            sudo apt-get -y update
+            sudo apt-get install -y \
+               clang \
+               cmake \
+               curl \
+               gcc \
+               git \
+               g++ \
+               libpam0g-dev \
+               libasound2-dev \
+               libgstreamer1.0-dev \
+               libgstreamer-plugins-base1.0-dev \
+               libgtk-3-dev \
+               libpulse-dev \
+               libva-dev \
+               libvdpau-dev \
+               libxcb-randr0-dev \
+               libxcb-shape0-dev \
+               libxcb-xfixes0-dev \
+               libxdo-dev \
+               libxfixes-dev \
+               nasm \
+               wget
+            ;;
           # arm-unknown-linux-*) sudo apt-get -y update ; sudo apt-get -y install gcc-arm-linux-gnueabihf ;;
           # aarch64-unknown-linux-gnu) sudo apt-get -y update ; sudo apt-get -y install gcc-aarch64-linux-gnu ;;
         esac
 
-    - name: Restore from cache and install vcpkg
+    - name: Setup vcpkg with Github Actions binary cache
-      uses: lukka/run-vcpkg@v7
+      uses: lukka/run-vcpkg@v11
       with:
-        setupOnly: true
+        vcpkgDirectory: /opt/artifacts/vcpkg
-        vcpkgGitCommitId: '501db0f17ef6df184fcdbfbe0f87cde2313b6ab1' #2023.04.15
+        vcpkgGitCommitId: ${{ env.VCPKG_COMMIT_ID }}
 
     - name: Install vcpkg dependencies
       run: |
-        $VCPKG_ROOT/vcpkg install libvpx libyuv opus aom
+        $VCPKG_ROOT/vcpkg install --x-install-root="$VCPKG_ROOT/installed"
       shell: bash
 
     - name: Install Rust toolchain
-      uses: actions-rs/toolchain@v1
+      uses: dtolnay/rust-toolchain@v1
       with:
         toolchain: stable
-        target: ${{ matrix.job.target }}
+        targets: ${{ matrix.job.target }}
-        override: true
+        components: ''
-        profile: minimal # minimal component installation (ie, no documentation)
 
     - name: Show version information (Rust, cargo, GCC)
       shell: bash
@@ -117,7 +154,7 @@ jobs:
         cargo -V
         rustc -V
 
-    - uses: Swatinem/rust-cache@v1
+    - uses: Swatinem/rust-cache@v2
 
     - name: Build
       uses: actions-rs/cargo@v1
@@ -183,7 +220,9 @@ jobs:
             ;;
         esac;
 
-        echo ::set-output name=CARGO_TEST_OPTIONS::${CARGO_TEST_OPTIONS}  
+        #deprecated echo ::set-output name=CARGO_TEST_OPTIONS::${CARGO_TEST_OPTIONS}
+        echo "CARGO_TEST_OPTIONS=${CARGO_TEST_OPTIONS}" >> $GITHUB_ENV
+        echo "CARGO_TEST_OPTIONS=${CARGO_TEST_OPTIONS}" >> $GITHUB_OUTPUT
 
     - name: Run tests
       uses: actions-rs/cargo@v1

.github/workflows/clear-cache.yml

@@ -0,0 +1,37 @@
+name: Clear cache
+
+on:
+  workflow_dispatch:
+
+permissions:
+  actions: write
+
+jobs:
+  clear-cache:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clear cache
+        uses: actions/github-script@v7
+        with:
+          script: |
+            console.log("About to clear")
+            const caches = await github.rest.actions.getActionsCacheList({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+            })
+            for (const cache of caches.data.actions_caches) {
+              console.log(cache)
+              github.rest.actions.deleteActionsCacheById({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                cache_id: cache.id,
+              })
+            }
+            console.log("Clear completed")
+            
+      - name: Purge cache # Above seems not clear thouroughly, so add this to double clear
+        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)
+          max-age: 1 # in seconds

.github/workflows/fdroid.yml

@@ -0,0 +1,39 @@
+name: Fdroid version file generation
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+      - '[0-9]+.[0-9]+.[0-9]+'
+      - 'v[0-9]+.[0-9]+.[0-9]+-[0-9]+'
+      - '[0-9]+.[0-9]+.[0-9]+-[0-9]+'
+
+jobs:
+  # https://gitlab.com/fdroid/fdroiddata/-/blob/master/metadata/com.carriez.flutter_hbb.yml
+  # Finds latest release and transforms F-Droid version code from version as follows:
+  # X.Y.Z-A => X * 1e6 + Y * 1e4 + Z * 1e2 + A
+  update-fdroid-version-file:
+    name: Publish RustDesk version file for F-Droid updater
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate RustDesk version file
+        run: |
+          if [ "${GITHUB_REF_TYPE}" = "tag" ]; then
+            UPSTREAM_VERNAME="${GITHUB_REF##refs/tags/}"
+            UPSTREAM_VERNAME="${UPSTREAM_VERNAME##v}"
+          else
+            UPSTREAM_VERNAME="$(curl https://api.github.com/repos/rustdesk/rustdesk/releases/latest  | jq -r .tag_name | sed 's/^v//')"
+          fi
+          UPSTREAM_VERCODE="$(echo "$UPSTREAM_VERNAME" | tr '.' ' ' | tr '-' ' ' | while read -r MAJOR MINOR PATCH REV; do [ -z "$MAJOR" ] && MAJOR=0; [ -z "$MINOR" ] && MINOR=0; [ -z "$PATCH" ] && PATCH=0; [ -z "$REV" ] && REV=0; echo "$(( 1000000 * $MAJOR + 10000 * $MINOR + 100 * $PATCH + $REV ))"; done)"
+          echo "versionName=$UPSTREAM_VERNAME"  > rustdesk-version.txt
+          echo "versionCode=$UPSTREAM_VERCODE" >> rustdesk-version.txt
+        shell: bash
+
+      - name: Publish RustDesk version file
+        uses: softprops/action-gh-release@v1
+        with:
+          prerelease: true
+          tag_name: "fdroid-version"
+          files: |
+            ./rustdesk-version.txt

.github/workflows/flutter-ci.yml

@@ -13,10 +13,12 @@ on:
       - ".github/**"
       - "docs/**"
       - "README.md"
+      - "res/**"
+      - "appimage/**"
+      - "flatpak/**"
 
 jobs:
   run-ci:
     uses: ./.github/workflows/flutter-build.yml
     with:
       upload-artifact: false
-  

.github/workflows/flutter-tag.yml

@@ -15,4 +15,4 @@ jobs:
     secrets: inherit
     with:
       upload-artifact: true
-      upload-tag: "1.2.3" 
+      upload-tag: ${{ github.ref_name }}

.github/workflows/history.yml

@@ -1,82 +0,0 @@
-name: Flutter Windows History Build
-
-on: [workflow_dispatch]
-
-env:
-  LLVM_VERSION: "10.0"
-  FLUTTER_VERSION: "3.10.6"
-  TAG_NAME: "tmp"
-  FLUTTER_RUST_BRIDGE_VERSION: "1.75.3"
-  # vcpkg version: 2022.05.10
-  # for multiarch gcc compatibility
-  VCPKG_COMMIT_ID: "501db0f17ef6df184fcdbfbe0f87cde2313b6ab1"
-  VERSION: "1.2.3"
-
-jobs:
-  build-for-history-windows:
-    name: ${{ matrix.job.date }}
-    runs-on: ${{ matrix.job.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        job:
-          - { target: x86_64-pc-windows-msvc, os: windows-2019, arch: x86_64, date: 2023-08-04, ref: 72c198a1e94cc1e0242fce88f92b3f3caedcd0c3 }
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ matrix.job.ref }}
-
-      - name: Install LLVM and Clang
-        uses: KyleMayes/install-llvm-action@v1
-        with:
-          version: ${{ env.LLVM_VERSION }}
-
-      - name: Install flutter
-        uses: subosito/flutter-action@v2
-        with:
-          channel: "stable"
-          flutter-version: ${{ env.FLUTTER_VERSION }}
-          cache: true
-
-      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          target: ${{ matrix.job.target }}
-          override: true
-          components: rustfmt
-          profile: minimal # minimal component installation (ie, no documentation)
-
-      - name: Install flutter rust bridge deps
-        run: |
-          cargo install flutter_rust_bridge_codegen --version ${{ env.FLUTTER_RUST_BRIDGE_VERSION }} --features "uuid"
-          Push-Location flutter ; flutter pub get ; Pop-Location
-          ~/.cargo/bin/flutter_rust_bridge_codegen --rust-input ./src/flutter_ffi.rs --dart-output ./flutter/lib/generated_bridge.dart
-
-      - name: Install vcpkg dependencies
-        run: |
-          cd C:\
-          git clone https://github.com/Kingtous/rustdesk_thirdpary_lib --depth=1 
-          
-      - name: Build rustdesk
-        env:
-          VCPKG_ROOT: C:\rustdesk_thirdpary_lib\vcpkg
-        run: python3 .\build.py --portable --hwcodec --flutter --feature IddDriver
-
-      - name: Build self-extracted executable
-        shell: bash
-        run: |
-          pushd ./libs/portable
-          python3 ./generate.py -f ../../flutter/build/windows/runner/Release/ -o . -e ../../flutter/build/windows/runner/Release/rustdesk.exe
-          popd
-          mkdir -p ./SignOutput
-          mv ./target/release/rustdesk-portable-packer.exe ./SignOutput/rustdesk-${{ matrix.job.date }}-${{ matrix.job.target }}.exe
-          
-      - name: Publish Release
-        uses: softprops/action-gh-release@v1
-        with:
-          prerelease: true
-          tag_name: ${{ env.TAG_NAME }}
-          files: |
-            ./SignOutput/rustdesk-*.exe

.github/workflows/playground.yml

@@ -0,0 +1,416 @@
+name: playground
+
+on:
+  #schedule:
+    # schedule build every night
+  #  - cron: "0/6 * * * *"
+  workflow_dispatch:
+
+env:
+  RUST_VERSION: "1.75" # https://github.com/rustdesk/rustdesk/discussions/7503
+  CARGO_NDK_VERSION: "3.1.2"
+  LLVM_VERSION: "15.0.6"
+  FLUTTER_VERSION: "3.22.2"
+  FLUTTER_RUST_BRIDGE_VERSION: "1.80.1"
+  # for arm64 linux because official Dart SDK does not work
+  FLUTTER_ELINUX_VERSION: "3.16.9"
+  TAG_NAME: "nightly"
+  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
+  # vcpkg version: 2024.06.15
+  VCPKG_COMMIT_ID: "f7423ee180c4b7f40d43402c2feb3859161ef625"
+  VERSION: "1.3.0"
+  NDK_VERSION: "r26d"
+  #signing keys env variable checks
+  ANDROID_SIGNING_KEY: "${{ secrets.ANDROID_SIGNING_KEY }}"
+  MACOS_P12_BASE64: "${{ secrets.MACOS_P12_BASE64 }}"
+  # To make a custom build with your own servers set the below secret values
+  RS_PUB_KEY: "${{ secrets.RS_PUB_KEY }}"
+  RENDEZVOUS_SERVER: "${{ secrets.RENDEZVOUS_SERVER }}"
+  API_SERVER: "${{ secrets.API_SERVER }}"
+  UPLOAD_ARTIFACT: "${{ inputs.upload-artifact }}"
+  SIGN_BASE_URL: "${{ secrets.SIGN_BASE_URL }}"
+
+jobs:
+  build-for-macOS:
+    name: ${{ matrix.job.target }}
+    runs-on: ${{ matrix.job.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        job:
+          - {
+              target: x86_64-apple-darwin,
+              os: macos-13, #macos-latest or macos-14 use M1 now, https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#:~:text=14%20GB-,macos%2Dlatest%20or%20macos%2D14,-The%20macos%2Dlatestlabel
+              extra-build-args: "",
+              arch: x86_64,
+              flutter: "3.13.9",
+              ref: "f6509e3fd6917aa976bad2fc684182601ebf2434",
+              bridge: "1.80.1",
+              date: "20231219"
+            }
+          - {
+              target: x86_64-apple-darwin,
+              os: macos-13, #macos-latest or macos-14 use M1 now, https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#:~:text=14%20GB-,macos%2Dlatest%20or%20macos%2D14,-The%20macos%2Dlatestlabel
+              extra-build-args: "",
+              arch: x86_64,
+              flutter: "3.10.6",
+              ref: "f6509e3fd6917aa976bad2fc684182601ebf2434",
+              bridge: "1.80.1",
+              date: "20231219"
+            }
+          - {
+              target: x86_64-apple-darwin,
+              os: macos-13, #macos-latest or macos-14 use M1 now, https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#:~:text=14%20GB-,macos%2Dlatest%20or%20macos%2D14,-The%20macos%2Dlatestlabel
+              extra-build-args: "",
+              arch: x86_64,
+              flutter: "3.10.6",
+              ref: "85ddfc0739f052cab0029c46b899b959ee94eeb8",
+              bridge: "1.80.1",
+              date: "20231119"
+            }
+          - {
+              target: x86_64-apple-darwin,
+              os: macos-13, #macos-latest or macos-14 use M1 now, https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#:~:text=14%20GB-,macos%2Dlatest%20or%20macos%2D14,-The%20macos%2Dlatestlabel
+              extra-build-args: "",
+              arch: x86_64,
+              flutter: "3.13.9",
+              ref: "85ddfc0739f052cab0029c46b899b959ee94eeb8",
+              bridge: "1.80.1",
+              date: "20231119"
+            }
+    steps:
+      - name: Export GitHub Actions cache environment variables
+        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@v3
+        with:
+          ref: ${{ matrix.job.ref }}
+          
+      - name: Import the codesign cert
+        if: env.MACOS_P12_BASE64 != null
+        uses: apple-actions/import-codesign-certs@v1
+        with:
+          p12-file-base64: ${{ secrets.MACOS_P12_BASE64 }}
+          p12-password: ${{ secrets.MACOS_P12_PASSWORD }}
+          keychain: rustdesk
+
+      - name: Check sign and import sign key
+        if: env.MACOS_P12_BASE64 != null
+        run: |
+          security default-keychain -s rustdesk.keychain
+          security find-identity -v
+
+      - name: Import notarize key
+        if: env.MACOS_P12_BASE64 != null
+        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
+          fileDir: ${{ github.workspace }}
+          encodedString: ${{ secrets.MACOS_NOTARIZE_JSON }}
+
+      - name: Install rcodesign tool
+        if: env.MACOS_P12_BASE64 != null
+        shell: bash
+        run: |
+          pushd /tmp
+          wget https://github.com/indygreg/apple-platform-rs/releases/download/apple-codesign%2F0.22.0/apple-codesign-0.22.0-macos-universal.tar.gz
+          tar -zxvf apple-codesign-0.22.0-macos-universal.tar.gz
+          mv apple-codesign-0.22.0-macos-universal/rcodesign /usr/local/bin
+          popd
+
+      - name: Install build runtime
+        run: |
+          brew install llvm create-dmg nasm cmake gcc wget ninja pkg-config
+
+      - name: Install flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: "stable"
+          flutter-version: ${{ matrix.job.flutter }}
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@v1
+        with:
+          toolchain: ${{ env.RUST_VERSION }}
+          targets: ${{ matrix.job.target }}
+          components: "rustfmt"
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          prefix-key: ${{ matrix.job.os }}
+
+      - name: Install flutter rust bridge deps
+        shell: bash
+        run: |
+          sed -i '' 's/3.1.0/2.17.0/g' flutter/pubspec.yaml;
+          cargo install flutter_rust_bridge_codegen --version ${{ matrix.job.bridge }} --features "uuid"
+          # below works for mac to make buildable on 3.13.9
+          # pushd flutter/lib; find . -name "*.dart" | xargs -I{} sed -i '' 's/textScaler: TextScaler.linear(\(.*\)),/textScaleFactor: \1,/g' {}; 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 --c-output ./flutter/macos/Runner/bridge_generated.h
+
+      - name: Setup vcpkg with Github Actions binary cache
+        uses: lukka/run-vcpkg@v11
+        with:
+          vcpkgGitCommitId: ${{ env.VCPKG_COMMIT_ID }}
+
+      - name: Install vcpkg dependencies
+        run: |
+          $VCPKG_ROOT/vcpkg install --x-install-root="$VCPKG_ROOT/installed"
+          
+      - name: Restore from cache and install vcpkg
+        uses: lukka/run-vcpkg@v7
+        if: false
+        with:
+          setupOnly: true
+          vcpkgGitCommitId: ${{ env.VCPKG_COMMIT_ID }}
+
+      - name: Install vcpkg dependencies
+        if: false
+        run: |
+          $VCPKG_ROOT/vcpkg install libvpx libyuv opus aom
+
+      - name: Show version information (Rust, cargo, Clang)
+        shell: bash
+        run: |
+          clang --version || true
+          rustup -V
+          rustup toolchain list
+          rustup default
+          cargo -V
+          rustc -V
+
+      - name: Build rustdesk
+        run: |
+          ./build.py --flutter ${{ matrix.job.extra-build-args }}
+
+      - name: create unsigned dmg
+        run: |
+          CREATE_DMG="$(command -v create-dmg)"
+          CREATE_DMG="$(readlink -f "$CREATE_DMG")"
+          sed -i -e 's/MAXIMUM_UNMOUNTING_ATTEMPTS=3/MAXIMUM_UNMOUNTING_ATTEMPTS=7/' "$CREATE_DMG"
+          create-dmg --icon "RustDesk.app" 200 190 --hide-extension "RustDesk.app" --window-size 800 400 --app-drop-link 600 185 rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.dmg ./flutter/build/macos/Build/Products/Release/RustDesk.app
+
+      - name: Codesign app and create signed dmg
+        if: env.MACOS_P12_BASE64 != null
+        run: |
+          # Patch create-dmg to give more attempts to unmount image
+          CREATE_DMG="$(command -v create-dmg)"
+          CREATE_DMG="$(readlink -f "$CREATE_DMG")"
+          sed -i -e 's/MAXIMUM_UNMOUNTING_ATTEMPTS=3/MAXIMUM_UNMOUNTING_ATTEMPTS=7/' "$CREATE_DMG"
+          # Unlock keychain
+          security default-keychain -s rustdesk.keychain
+          security unlock-keychain -p ${{ secrets.MACOS_P12_PASSWORD }} rustdesk.keychain
+          # start sign the rustdesk.app and dmg
+          rm -rf *.dmg || true
+          codesign --force --options runtime -s ${{ secrets.MACOS_CODESIGN_IDENTITY }} --deep --strict ./flutter/build/macos/Build/Products/Release/RustDesk.app -vvv
+          create-dmg --icon "RustDesk.app" 200 190 --hide-extension "RustDesk.app" --window-size 800 400 --app-drop-link 600 185 rustdesk-${{ env.VERSION }}.dmg ./flutter/build/macos/Build/Products/Release/RustDesk.app
+          codesign --force --options runtime -s ${{ secrets.MACOS_CODESIGN_IDENTITY }} --deep --strict rustdesk-${{ env.VERSION }}.dmg -vvv
+          # notarize the rustdesk-${{ env.VERSION }}.dmg
+          rcodesign notary-submit --api-key-path ${{ github.workspace }}/rustdesk.json  --staple rustdesk-${{ env.VERSION }}.dmg
+
+      - name: Rename rustdesk
+        run: |
+          for name in rustdesk*??.dmg; do
+              mv "$name" "${name%%.dmg}-${{ matrix.job.arch }}-flutter${{ matrix.job.flutter }}-flutter${{ matrix.job.date }}.dmg"
+          done
+
+      - name: Publish DMG package
+        uses: softprops/action-gh-release@v1
+        with:
+          prerelease: true
+          tag_name: ${{ env.TAG_NAME }}
+          files: |
+            rustdesk*-${{ matrix.job.arch }}*.dmg
+
+
+  build-rustdesk-android:
+    if: false
+    name: build rustdesk android apk ${{ matrix.job.target }}
+    runs-on: ${{ matrix.job.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        job:
+          - {
+              arch: aarch64,
+              target: aarch64-linux-android,
+              os: ubuntu-20.04,
+              openssl-arch: android-arm64,
+              ref: master, # latest
+            }
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ matrix.job.ref }}
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+               clang \
+               cmake \
+               curl \
+               gcc-multilib \
+               git \
+               g++ \
+               g++-multilib \
+               libappindicator3-dev \
+               libasound2-dev \
+               libc6-dev \
+               libclang-10-dev \
+               libgstreamer1.0-dev \
+               libgstreamer-plugins-base1.0-dev \
+               libgtk-3-dev \
+               libpam0g-dev \
+               libpulse-dev \
+               libva-dev \
+               libvdpau-dev \
+               libxcb-randr0-dev \
+               libxcb-shape0-dev \
+               libxcb-xfixes0-dev \
+               libxdo-dev \
+               libxfixes-dev \
+               llvm-10-dev \
+               nasm \
+               yasm \
+               ninja-build \
+               openjdk-11-jdk-headless \
+               pkg-config \
+               tree \
+               wget
+
+      - name: Install flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: "stable"
+          flutter-version: ${{ env.FLUTTER_VERSION }}
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@v1
+        with:
+          toolchain: ${{ env.RUST_VERSION }}
+          components: "rustfmt"
+
+      - name: Install flutter rust bridge deps
+        run: |
+          git config --global core.longpaths true
+          cargo install flutter_rust_bridge_codegen --version ${{ env.FLUTTER_RUST_BRIDGE_VERSION }} --features "uuid"
+          sed -i 's/uni_links_desktop/#uni_links_desktop/g' flutter/pubspec.yaml
+          pushd flutter/lib;  find . | grep dart | xargs sed -i 's/textScaler: TextScaler.linear(\(.*\)),/textScaleFactor: \1,/g'; 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
+
+      - 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@v11
+        with:
+          vcpkgDirectory: /opt/artifacts/vcpkg
+          vcpkgGitCommitId: ${{ env.VCPKG_COMMIT_ID }}
+
+      - name: Install vcpkg dependencies
+        run: |
+          case ${{ matrix.job.target }} in
+            aarch64-linux-android)
+              ./flutter/build_android_deps.sh arm64-v8a
+            ;;
+            armv7-linux-androideabi)
+              ./flutter/build_android_deps.sh armeabi-v7a
+            ;;
+          esac
+        shell: bash
+
+      - name: Clone deps
+        shell: bash
+        run: |
+          pushd /opt
+          git clone https://github.com/rustdesk-org/rustdesk_thirdparty_lib.git --depth=1
+          ls -ls /opt/artifacts/vcpkg/installed/arm64-android/lib/
+          # cp -rf /opt/rustdesk_thirdparty_lib/vcpkg/* /opt/artifacts/vcpkg/
+          ls -ls /opt/artifacts/vcpkg/installed/arm64-android/lib/
+
+      - name: Build rustdesk lib
+        env:
+          ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
+          ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
+        run: |
+          rustup target add ${{ matrix.job.target }}
+          cargo install cargo-ndk --version ${{ env.CARGO_NDK_VERSION }}
+          case ${{ matrix.job.target }} in
+            aarch64-linux-android)
+              ./flutter/ndk_arm64.sh
+              mkdir -p ./flutter/android/app/src/main/jniLibs/arm64-v8a
+              cp ./target/${{ matrix.job.target }}/release/liblibrustdesk.so ./flutter/android/app/src/main/jniLibs/arm64-v8a/librustdesk.so
+            ;;
+            armv7-linux-androideabi)
+              ./flutter/ndk_arm.sh
+              mkdir -p ./flutter/android/app/src/main/jniLibs/armeabi-v7a
+              cp ./target/${{ matrix.job.target }}/release/liblibrustdesk.so ./flutter/android/app/src/main/jniLibs/armeabi-v7a/librustdesk.so
+            ;;
+          esac
+
+      - name: Build rustdesk
+        shell: bash
+        env:
+          JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+        run: |
+          export PATH=/usr/lib/jvm/java-11-openjdk-amd64/bin:$PATH
+          # temporary use debug sign config
+          sed -i "s/signingConfigs.release/signingConfigs.debug/g" ./flutter/android/app/build.gradle
+          case ${{ matrix.job.target }} in
+            aarch64-linux-android)
+              mkdir -p ./flutter/android/app/src/main/jniLibs/arm64-v8a
+              cp ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so ./flutter/android/app/src/main/jniLibs/arm64-v8a/
+              cp ./target/${{ matrix.job.target }}/release/liblibrustdesk.so ./flutter/android/app/src/main/jniLibs/arm64-v8a/librustdesk.so
+              # build flutter
+              pushd flutter
+              flutter build apk --release --target-platform android-arm64 --split-per-abi
+              mv build/app/outputs/flutter-apk/app-arm64-v8a-release.apk ../rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.apk
+            ;;
+            armv7-linux-androideabi)
+              mkdir -p ./flutter/android/app/src/main/jniLibs/armeabi-v7a
+              cp ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/libc++_shared.so ./flutter/android/app/src/main/jniLibs/armeabi-v7a/
+              cp ./target/${{ matrix.job.target }}/release/liblibrustdesk.so ./flutter/android/app/src/main/jniLibs/armeabi-v7a/librustdesk.so
+              # build flutter
+              pushd flutter
+              flutter build apk --release --target-platform android-arm --split-per-abi
+              mv build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk ../rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.apk
+            ;;
+          esac
+          popd
+          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@v1
+        name: Sign app APK
+        if: env.ANDROID_SIGNING_KEY != null
+        id: sign-rustdesk
+        with:
+          releaseDirectory: ./signed-apk
+          signingKeyBase64: ${{ secrets.ANDROID_SIGNING_KEY }}
+          alias: ${{ secrets.ANDROID_ALIAS }}
+          keyStorePassword: ${{ secrets.ANDROID_KEY_STORE_PASSWORD }}
+          keyPassword: ${{ secrets.ANDROID_KEY_PASSWORD }}
+        env:
+          # override default build-tools version (29.0.3) -- optional
+          BUILD_TOOLS_VERSION: "30.0.2"
+
+      - name: Publish signed apk package
+        uses: softprops/action-gh-release@v1
+        with:
+          prerelease: true
+          tag_name: ${{ env.TAG_NAME }}
+          files: |
+            ${{steps.sign-rustdesk.outputs.signedReleaseFile}}

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

@@ -0,0 +1,60 @@
+name: build RustDeskTempTopMostWindow
+
+on:
+  workflow_call:
+    inputs:
+        upload-artifact:
+          type: boolean
+          default: true
+        target:
+            description: 'Target'
+            required: true
+            type: string
+            default: 'windows-2022'
+        configuration:
+            description: 'Configuration'
+            required: true
+            type: string
+            default: 'Release'
+        platform:
+            description: 'Platform'
+            required: true
+            type: string
+            default: 'x64'
+        target_version:
+            description: 'TargetVersion'
+            required: true
+            type: string
+            default: 'Windows10'
+
+env:
+  project_path: WindowInjection/WindowInjection.vcxproj
+
+jobs:
+  build-RustDeskTempTopMostWindow:
+    runs-on: ${{ inputs.target }}
+    strategy:
+        fail-fast: false
+    env:
+      build_output_dir: RustDeskTempTopMostWindow/WindowInjection/${{ inputs.platform }}/${{ inputs.configuration }}
+    steps:
+      - name: Add MSBuild to PATH
+        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 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@master
+        if: ${{ inputs.upload-artifact }}
+        with:
+            name: topmostwindow-artifacts
+            path: |
+              ./${{ env.build_output_dir }}/WindowInjection.dll

.github/workflows/vcpkg-deps-linux.yml

@@ -1,92 +0,0 @@
-name: Build vcpkg dependencies for linux clients
-
-on: 
-  workflow_call:
-
-jobs:
-  build-vcpkg-deps-linux:
-    runs-on: ${{ matrix.job.os }}
-    strategy:
-      fail-fast: true
-      matrix:
-        job:
-          - { arch: armv7, os: ubuntu-20.04 }
-          - { arch: x86_64, os: ubuntu-20.04 }
-          - { arch: aarch64, os: ubuntu-20.04 }
-    steps:
-      - name: Create vcpkg artifacts folder
-        run: mkdir -p /opt/artifacts
-
-      - name: Cache Vcpkg
-        id: cache-vcpkg
-        uses: actions/cache@v3
-        with:
-          path: /opt/artifacts
-          key: vcpkg-${{ matrix.job.arch }}
-
-      - uses: rustdesk-org/run-on-arch-action@amd64-support
-        name: Run vcpkg install on ${{ matrix.job.arch }}
-        id: vcpkg
-        with:
-          arch: ${{ matrix.job.arch }}
-          distro: ubuntu18.04
-          githubToken: ${{ github.token }}
-          setup: |
-            ls -l "/opt/artifacts"
-          dockerRunArgs: |
-            --volume "/opt/artifacts:/artifacts"
-          shell: /bin/bash
-          install: |
-            apt update -y
-            case "${{ matrix.job.arch }}" in
-              x86_64)
-                apt update -y
-                apt install -y curl zip unzip tar git g++ gcc build-essential pkg-config wget nasm yasm ninja-build libjpeg8-dev libssl-dev
-                wget https://github.com/Kitware/CMake/releases/download/v3.27.5/cmake-3.27.5.tar.gz
-                apt remove -y --purge cmake
-                tar -zxvf cmake-3.27.5.tar.gz
-                cd cmake-3.27.5
-                ./bootstrap
-                make 
-                make install 
-                cd -
-                cmake --version
-                gcc -v
-                ;;
-              aarch64|armv7)
-                apt install -y curl zip unzip git
-            esac
-          run: |
-            # disable git safe.directory
-            git config --global --add safe.directory "*"
-            case "${{ matrix.job.arch }}" in
-              x86_64)
-                export VCPKG_FORCE_SYSTEM_BINARIES=1
-                pushd /artifacts
-                git clone https://github.com/microsoft/vcpkg.git || true
-                pushd vcpkg
-                git reset --hard ${{ env.VCPKG_COMMIT_ID }}
-                ./bootstrap-vcpkg.sh
-                ./vcpkg install libvpx libyuv opus aom
-                ;;
-              aarch64)
-                pushd /artifacts
-                rm -rf rustdesk_thirdparty_lib
-                git clone https://github.com/Kingtous/rustdesk_thirdparty_lib.git --depth=1
-                mkdir -p /artifacts/vcpkg/installed
-                mv ./rustdesk_thirdparty_lib/vcpkg/installed/arm64-linux /artifacts/vcpkg/installed/arm64-linux
-                ;;
-              armv7)
-                pushd /artifacts
-                rm -rf rustdesk_thirdparty_lib
-                git clone https://github.com/Kingtous/rustdesk_thirdparty_lib.git --depth=1
-                mkdir -p /artifacts/vcpkg/installed
-                mv ./rustdesk_thirdparty_lib/vcpkg/installed/arm-linux /artifacts/vcpkg/installed/arm-linux
-                ;;
-            esac
-      - name: Upload artifacts
-        uses: actions/upload-artifact@master
-        with:
-          name: vcpkg-artifact-${{ matrix.job.arch }}
-          path: |
-            /opt/artifacts/vcpkg/installed

.github/workflows/winget.yml

@@ -4,9 +4,9 @@ on:
     types: [released]
 jobs:
   publish:
-    runs-on: windows-latest # action can only be run on windows
+    runs-on: ubuntu-latest
     steps:
-      - uses: vedantmgoyal2009/winget-releaser@v1
+      - uses: vedantmgoyal9/winget-releaser@main
         with:
           identifier: RustDesk.RustDesk
           version: ${{ github.event.release.tag_name }}

.gitignore

@@ -50,3 +50,7 @@ lib/generated_bridge.dart
 .devcontainer/.*
 # build cache in examples
 examples/**/target/
+# ===
+vcpkg_installed
+flutter/lib/generated_plugin_registrant.dart
+libsciter.dylib

Cargo.toml

@@ -1,11 +1,12 @@
 [package]
 name = "rustdesk"
-version = "1.2.3"
+version = "1.3.0"
 authors = ["rustdesk <info@rustdesk.com>"]
 edition = "2021"
 build= "build.rs"
-description = "A remote control software."
+description = "RustDesk Remote Desktop"
 default-run = "rustdesk"
+rust-version = "1.75"
 
 [lib]
 name = "librustdesk"
@@ -18,25 +19,29 @@ path = "src/naming.rs"
 [features]
 inline = []
 cli = []
-flutter_texture_render = []
-appimage = []
-flatpak = []
 use_samplerate = ["samplerate"]
 use_rubato = ["rubato"]
 use_dasp = ["dasp"]
 flutter = ["flutter_rust_bridge"]
 default = ["use_dasp"]
 hwcodec = ["scrap/hwcodec"]
+vram = ["scrap/vram"]
 mediacodec = ["scrap/mediacodec"]
-linux_headless = ["pam" ]
-virtual_display_driver = ["virtual_display"]
 plugin_framework = []
 linux-pkg-config = ["magnum-opus/linux-pkg-config", "scrap/linux-pkg-config"]
+unix-file-copy-paste = [
+    "dep:x11-clipboard",
+    "dep:x11rb",
+    "dep:percent-encoding",
+    "dep:once_cell",
+    "clipboard/unix-file-copy-paste",
+]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-whoami = "1.4"
+async-trait = "0.1"
+whoami = "1.5.0"
 scrap = { path = "libs/scrap", features = ["wayland"] }
 hbb_common = { path = "libs/hbb_common" }
 serde_derive = "1.0"
@@ -47,33 +52,31 @@ cfg-if = "1.0"
 lazy_static = "1.4"
 sha2 = "0.10"
 repng = "0.2"
-parity-tokio-ipc = { git = "https://github.com/open-trade/parity-tokio-ipc" }
+parity-tokio-ipc = { git = "https://github.com/rustdesk-org/parity-tokio-ipc" }
-runas = "=1.0" # https://github.com/mitsuhiko/rust-runas/issues/13
+magnum-opus = { git = "https://github.com/rustdesk-org/magnum-opus" }
-magnum-opus = { git = "https://github.com/rustdesk/magnum-opus" }
 dasp = { version = "0.11", features = ["signal", "interpolate-linear", "interpolate"], optional = true }
 rubato = { version = "0.12", optional = true }
 samplerate = { version = "0.2", optional = true }
-async-trait = "0.1"
 uuid = { version = "1.3", features = ["v4"] }
 clap = "4.2"
 rpassword = "7.2"
-base64 = "0.21"
 num_cpus = "1.15"
 bytes = { version = "1.4", features = ["serde"] }
 default-net = "0.14"
 wol-rs = "1.0"
-flutter_rust_bridge = { version = "1.75", features = ["uuid"], optional = true}
+flutter_rust_bridge = { version = "=1.80", features = ["uuid"], optional = true}
 errno = "0.3"
-rdev = { git = "https://github.com/fufesou/rdev" }
+rdev = { git = "https://github.com/rustdesk-org/rdev" }
 url = { version = "2.3", features = ["serde"] }
 crossbeam-queue = "0.3"
 hex = "0.4"
-reqwest = { git = "https://github.com/rustdesk-org/reqwest", features = ["blocking", "json", "rustls-tls"], default-features=false }
 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"] }
 
 [target.'cfg(not(any(target_os = "android", target_os = "linux")))'.dependencies]
 cpal = "0.15"
@@ -86,18 +89,35 @@ sys-locale = "0.3"
 enigo = { path = "libs/enigo", features = [ "with_serde" ] }
 clipboard = { path = "libs/clipboard" }
 ctrlc = "3.2"
-arboard = "3.2"
+# arboard = { version = "3.4.0", features = ["wayland-data-control"] }
+arboard = { git = "https://github.com/rustdesk-org/arboard", features = ["wayland-data-control"] }
+clipboard-master = { git = "https://github.com/rustdesk-org/clipboard-master" }
+
 system_shutdown = "4.0"
+qrcode-generator = "4.1"
 
 [target.'cfg(target_os = "windows")'.dependencies]
-winapi = { version = "0.3", features = ["winuser", "wincrypt", "shellscalingapi"] }
+winapi = { version = "0.3", features = [
+    "winuser",
+    "wincrypt",
+    "shellscalingapi",
+    "pdh",
+    "synchapi",
+    "memoryapi",
+    "shellapi",
+    "devguid",
+    "setupapi",
+    "cguid",
+    "cfgmgr32",
+    "ioapiset",
+] }
 winreg = "0.11"
 windows-service = "0.6"
-virtual_display = { path = "libs/virtual_display", optional = true }
+virtual_display = { path = "libs/virtual_display" }
-impersonate_system = { git = "https://github.com/21pages/impersonate-system" }
+impersonate_system = { git = "https://github.com/rustdesk-org/impersonate-system" }
 shared_memory = "0.12"
-shutdown_hooks = "0.1"
 tauri-winrt-notification = "0.1.2"
+runas = "1.2"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 objc = "0.2"
@@ -106,51 +126,64 @@ dispatch = "0.2"
 core-foundation = "0.9"
 core-graphics = "0.22"
 include_dir = "0.7"
-dark-light = "1.0"
 fruitbasket = "0.10"
 objc_id = "0.1"
 
 [target.'cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))'.dependencies]
-tray-icon = { git = "https://github.com/rustdesk-org/tray-icon" }
+tray-icon = { git = "https://github.com/tauri-apps/tray-icon" }
 tao = { git = "https://github.com/rustdesk-org/tao", branch = "dev" }
 image = "0.24"
 
 [target.'cfg(any(target_os = "macos", target_os = "linux"))'.dependencies]
 keepawake = { git = "https://github.com/rustdesk-org/keepawake-rs" }
 
+[target.'cfg(any(target_os = "windows", target_os = "linux"))'.dependencies]
+wallpaper = { git = "https://github.com/rustdesk-org/wallpaper.rs" }
+
+[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]
 psimple = { package = "libpulse-simple-binding", version = "2.27" }
 pulse = { package = "libpulse-binding", version = "2.27" }
 rust-pulsectl = { git = "https://github.com/open-trade/pulsectl" }
 async-process = "1.7"
-mouce = { git="https://github.com/fufesou/mouce.git" }
+evdev = { git="https://github.com/rustdesk-org/evdev" }
-evdev = { git="https://github.com/fufesou/evdev" }
 dbus = "0.9"
 dbus-crossroads = "0.5"
-pam = { git="https://github.com/fufesou/pam", optional = true }
+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}
+once_cell = {version = "1.18", optional = true}
 
 [target.'cfg(target_os = "android")'.dependencies]
 android_logger = "0.13"
 jni = "0.21"
+android-wakelock = { git = "https://github.com/rustdesk-org/android-wakelock" }
 
 [workspace]
 members = ["libs/scrap", "libs/hbb_common", "libs/enigo", "libs/clipboard", "libs/virtual_display", "libs/virtual_display/dylib", "libs/portable"]
 exclude = ["vdi/host", "examples/custom_plugin"]
 
 [package.metadata.winres]
-LegalCopyright = "Copyright © 2023 Purslane, Inc."
+LegalCopyright = "Copyright © 2024 Purslane Ltd. All rights reserved."
-# this FileDescription overrides package.description
+ProductName = "RustDesk"
-FileDescription = "RustDesk"
+FileDescription = "RustDesk Remote Desktop"
+OriginalFilename = "rustdesk.exe"
 
 [target.'cfg(target_os="windows")'.build-dependencies]
 winres = "0.1"
-winapi = { version = "0.3", features = [ "winnt" ] }
+winapi = { version = "0.3", features = [ "winnt", "pdh", "synchapi" ] }
 
 [build-dependencies]
 cc = "1.0"
 hbb_common = { path = "libs/hbb_common" }
-flutter_rust_bridge_codegen = "1.75"
 os-version = "0.2"
 
 [dev-dependencies]
@@ -170,3 +203,7 @@ panic = 'abort'
 strip = true
 #opt-level = 'z' # only have smaller size after strip
 rpath = true
+
+[profile.dev]
+split-debuginfo = '...'  # Platform-specific.
+#strip = "debuginfo" 

Dockerfile

@@ -1,21 +1,55 @@
-FROM debian
+FROM debian:bullseye-slim
 
 WORKDIR /
-RUN apt update -y && apt install -y g++ gcc git curl nasm yasm libgtk-3-dev clang libxcb-randr0-dev libxdo-dev libxfixes-dev libxcb-shape0-dev libxcb-xfixes0-dev libasound2-dev libpulse-dev cmake unzip zip sudo libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev cmake ninja-build && rm -rf /var/lib/apt/lists/*
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt update -y && \
+    apt install --yes --no-install-recommends \
+        g++ \
+        gcc \
+        git \
+        curl \
+        nasm \
+        yasm \
+        libgtk-3-dev \
+        clang \
+        libxcb-randr0-dev \
+        libxdo-dev \
+        libxfixes-dev \
+        libxcb-shape0-dev \
+        libxcb-xfixes0-dev \
+        libasound2-dev \
+        libpam0g-dev \
+        libpulse-dev \
+        make \
+        cmake \
+        unzip \
+        zip \
+        sudo \
+        libgstreamer1.0-dev \
+        libgstreamer-plugins-base1.0-dev \
+        ca-certificates \
+        ninja-build && \
+        rm -rf /var/lib/apt/lists/*
 
-RUN git clone --branch 2023.04.15 --depth=1 https://github.com/microsoft/vcpkg
+RUN git clone --branch 2023.04.15 --depth=1 https://github.com/microsoft/vcpkg && \
-RUN /vcpkg/bootstrap-vcpkg.sh -disableMetrics
+    /vcpkg/bootstrap-vcpkg.sh -disableMetrics && \
-RUN /vcpkg/vcpkg --disable-metrics install libvpx libyuv opus aom
+    /vcpkg/vcpkg --disable-metrics install libvpx libyuv opus aom
+
+RUN groupadd -r user && \
+    useradd -r -g user user --home /home/user && \
+    mkdir -p /home/user/rustdesk && \
+    chown -R user: /home/user && \
+    echo "user ALL=(ALL) NOPASSWD:ALL" | sudo tee /etc/sudoers.d/user
 
-RUN groupadd -r user && useradd -r -g user user --home /home/user && mkdir -p /home/user && chown user /home/user && echo "user  ALL=(ALL) NOPASSWD:ALL" | sudo tee /etc/sudoers.d/user
 WORKDIR /home/user
 RUN curl -LO https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so
+
 USER user
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup.sh
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup.sh && \
-RUN chmod +x rustup.sh
+    chmod +x rustup.sh && \
-RUN ./rustup.sh -y
+    ./rustup.sh -y
 
 USER root
 ENV HOME=/home/user
-COPY ./entrypoint /
+COPY ./entrypoint.sh /
-ENTRYPOINT ["/entrypoint"]
+ENTRYPOINT ["/entrypoint.sh"]

README.md

@@ -13,8 +13,6 @@ Chat with us: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitt
 
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09)
 
-[![Open Bounties](https://img.shields.io/endpoint?url=https%3A%2F%2Fconsole.algora.io%2Fapi%2Fshields%2Frustdesk%2Fbounties%3Fstatus%3Dopen)](https://console.algora.io/org/rustdesk/bounties?status=open)
-
 Yet another remote desktop software, written in Rust. Works out of the box, no configuration required. You have full control of your data, with no concerns about security. You can use our rendezvous/relay server, [set up your own](https://rustdesk.com/server), or [write your own rendezvous/relay server](https://github.com/rustdesk/rustdesk-server-demo).
 
 ![image](https://user-images.githubusercontent.com/71636191/171661982-430285f0-2e12-4b1d-9957-4a58e375304d.png)
@@ -31,25 +29,9 @@ RustDesk welcomes contribution from everyone. See [CONTRIBUTING.md](docs/CONTRIB
     alt="Get it on F-Droid"
     height="80">](https://f-droid.org/en/packages/com.carriez.flutter_hbb)
 
-## Free Public Servers
-
-Below are the servers you are using for free, they may change over time. If you are not close to one of these, your network may be slow.
-| Location | Vendor | Specification |
-| --------- | ------------- | ------------------ |
-| Germany | [Hetzner](https://www.hetzner.com) | 2 vCPU / 4 GB RAM |
-| Ukraine (Kyiv) | [dc.volia](https://dc.volia.com) | 2 vCPU / 4 GB RAM |
-
-## Dev Container
-
-[![Open in Dev Containers](https://img.shields.io/static/v1?label=Dev%20Container&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/rustdesk/rustdesk)
-
-If you already have VS Code and Docker installed, you can click the badge above to get started. Clicking will cause VS Code to automatically install the Dev Containers extension if needed, clone the source code into a container volume, and spin up a dev container for use.
-
-Go through [DEVCONTAINER.md](docs/DEVCONTAINER.md) for more info.
-
 ## Dependencies
 
-Desktop versions use [Sciter](https://sciter.com/) or Flutter for GUI, this tutorial is for Sciter only.
+Desktop versions use Flutter or Sciter (deprecated) for GUI, this tutorial is for Sciter only, since it is easier and more friendly to start. Check out our [CI](https://github.com/rustdesk/rustdesk/blob/master/.github/workflows/flutter-build.yml) for building Flutter version.
 
 Please download Sciter dynamic library yourself.
 
@@ -77,18 +59,19 @@ Please download Sciter dynamic library yourself.
 ```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
+        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
+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
+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)
@@ -135,34 +118,6 @@ mv libsciter-gtk.so target/debug
 VCPKG_ROOT=$HOME/vcpkg cargo run
 ```
 
-### Change Wayland to X11 (Xorg)
-
-RustDesk does not support Wayland. Check [this](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/) to configuring Xorg as the default GNOME session.
-
-## Wayland support
-
-Wayland does not seem to provide any API for sending keypresses to other windows. Therefore, the RustDesk uses an API from a lower level, namely the `/dev/uinput` device (Linux kernel level).
-
-When Wayland is the controlled side, you have to start in the following way:
-```bash
-# Start uinput service
-$ sudo rustdesk --service
-$ rustdesk
-```
-**Notice**: Wayland screen recording uses different interfaces. RustDesk currently only supports org.freedesktop.portal.ScreenCast.
-```bash
-$ dbus-send --session --print-reply       \
-  --dest=org.freedesktop.portal.Desktop \
-  /org/freedesktop/portal/desktop       \
-  org.freedesktop.DBus.Properties.Get   \
-  string:org.freedesktop.portal.ScreenCast string:version
-# Not support
-Error org.freedesktop.DBus.Error.InvalidArgs: No such interface “org.freedesktop.portal.ScreenCast”
-# Support
-method return time=1662544486.931020 sender=:1.54 -> destination=:1.139 serial=257 reply_serial=2
-   variant       uint32 4
-```
-
 ## How to build with Docker
 
 Begin by cloning the repository and building the Docker container:
@@ -198,20 +153,21 @@ Please ensure that you are running these commands from the root of the RustDesk
 - **[libs/hbb_common](https://github.com/rustdesk/rustdesk/tree/master/libs/hbb_common)**: video codec, config, tcp/udp wrapper, protobuf, fs functions for file transfer, and some other utility functions
 - **[libs/scrap](https://github.com/rustdesk/rustdesk/tree/master/libs/scrap)**: screen capture
 - **[libs/enigo](https://github.com/rustdesk/rustdesk/tree/master/libs/enigo)**: platform specific keyboard/mouse control
-- **[src/ui](https://github.com/rustdesk/rustdesk/tree/master/src/ui)**: GUI
+- **[libs/clipboard](https://github.com/rustdesk/rustdesk/tree/master/libs/clipboard)**: file copy and paste implementation for Windows, Linux, macOS.
+- **[src/ui](https://github.com/rustdesk/rustdesk/tree/master/src/ui)**: obsolete Sciter UI (deprecated)
 - **[src/server](https://github.com/rustdesk/rustdesk/tree/master/src/server)**: audio/clipboard/input/video services, and network connections
 - **[src/client.rs](https://github.com/rustdesk/rustdesk/tree/master/src/client.rs)**: start a peer connection
 - **[src/rendezvous_mediator.rs](https://github.com/rustdesk/rustdesk/tree/master/src/rendezvous_mediator.rs)**: Communicate with [rustdesk-server](https://github.com/rustdesk/rustdesk-server), wait for remote direct (TCP hole punching) or relayed connection
 - **[src/platform](https://github.com/rustdesk/rustdesk/tree/master/src/platform)**: platform specific code
-- **[flutter](https://github.com/rustdesk/rustdesk/tree/master/flutter)**: Flutter code for mobile
+- **[flutter](https://github.com/rustdesk/rustdesk/tree/master/flutter)**: Flutter code for desktop and mobile
 - **[flutter/web/js](https://github.com/rustdesk/rustdesk/tree/master/flutter/web/js)**: JavaScript for Flutter web client
 
-## Snapshots
+## Screenshots
 
-![image](https://user-images.githubusercontent.com/71636191/113112362-ae4deb80-923b-11eb-957d-ff88daad4f06.png)
+![Connection Manager](https://github.com/rustdesk/rustdesk/assets/28412477/db82d4e7-c4bc-4823-8e6f-6af7eadf7651)
 
-![image](https://user-images.githubusercontent.com/71636191/113112619-f705a480-923b-11eb-911d-97e984ef52b6.png)
+![Connected to a Windows PC](https://github.com/rustdesk/rustdesk/assets/28412477/9baa91e9-3362-4d06-aa1a-7518edcbd7ea)
 
-![image](https://user-images.githubusercontent.com/71636191/113112857-3fbd5d80-923c-11eb-9836-768325faf906.png)
+![File Transfer](https://github.com/rustdesk/rustdesk/assets/28412477/39511ad3-aa9a-4f8c-8947-1cce286a46ad)
 
-![image](https://user-images.githubusercontent.com/71636191/135385039-38fdbd72-379a-422d-b97f-33df71fb1cec.png)
+![TCP Tunneling](https://github.com/rustdesk/rustdesk/assets/28412477/78e8708f-e87e-4570-8373-1360033ea6c5)

appimage/AppImageBuilder-aarch64.yml

@@ -2,7 +2,7 @@
 version: 1
 script:
  - rm -rf ./AppDir || true
- - bsdtar -zxvf ../rustdesk-1.2.3.deb
+ - bsdtar -zxvf rustdesk.deb
  - tar -xvf ./data.tar.xz
  - mkdir ./AppDir
  - mv ./usr ./AppDir/usr
@@ -18,7 +18,7 @@ AppDir:
     id: rustdesk
     name: rustdesk
     icon: rustdesk
-    version: 1.2.3
+    version: 1.3.0
     exec: usr/lib/rustdesk/rustdesk
     exec_args: $@
   apt:
@@ -26,18 +26,18 @@ AppDir:
     - arm64
     allow_unauthenticated: true
     sources:
-    - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe multiverse
+    - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe multiverse
       key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3b4fe6acc0b21f32'
-    - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe multiverse
+    - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe multiverse
       key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3b4fe6acc0b21f32'
-    - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted
+    - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted
         universe multiverse
       key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3b4fe6acc0b21f32'
-    - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted
+    - sourceline: deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted
         universe multiverse
       key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3b4fe6acc0b21f32'
     include:
-    - libc6
+    - libc6:arm64
     - libgtk-3-0
     - libxcb-randr0
     - libxdo3
@@ -51,9 +51,15 @@ AppDir:
     - libva-x11-2
     - libvdpau1
     - libgstreamer-plugins-base1.0-0
+    - gstreamer1.0-pipewire
+    - libwayland-client0
     - libwayland-cursor0
     - libwayland-egl1
     - libpulse0
+    - packagekit-gtk3-module
+    - libcanberra-gtk3-module
+    - libpam0g
+    - libdrm2
     exclude:
     - humanity-icon-theme
     - hicolor-icon-theme
@@ -69,8 +75,11 @@ AppDir:
     - usr/share/doc/*/TODO.*
   runtime:
     env:
-      GIO_MODULE_DIR: $APPDIR/usr/lib/x86_64-linux-gnu/gio/modules/
+      GIO_MODULE_DIR: /lib64/gio/modules:/usr/lib/aarch64-linux-gnu/gio/modules:$APPDIR/usr/lib/aarch64-linux-gnu/gio/modules
       GDK_BACKEND: x11
+      APPDIR_LIBRARY_PATH: /lib64:/usr/lib/aarch64-linux-gnu:$APPDIR/lib/aarch64-linux-gnu:$APPDIR/lib/aarch64-linux-gnu/security:$APPDIR/lib/systemd:$APPDIR/usr/lib/aarch64-linux-gnu:$APPDIR/usr/lib/aarch64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders:$APPDIR/usr/lib/aarch64-linux-gnu/gstreamer-1.0:$APPDIR/usr/lib/aarch64-linux-gnu/gtk-3.0/3.0.0/immodules:$APPDIR/usr/lib/aarch64-linux-gnu/gtk-3.0/3.0.0/printbackends:$APPDIR/usr/lib/aarch64-linux-gnu/krb5/plugins/preauth:$APPDIR/usr/lib/aarch64-linux-gnu/libcanberra-0.30:$APPDIR/usr/lib/aarch64-linux-gnu/pulseaudio:$APPDIR/usr/lib/aarch64-linux-gnu/sasl2:$APPDIR/usr/lib/aarch64-linux-gnu/vdpau:$APPDIR/usr/lib/rustdesk/lib:$APPDIR/lib/aarch64
+      GST_PLUGIN_PATH: /lib64/gstreamer-1.0:/usr/lib/aarch64-linux-gnu/gstreamer-1.0:$APPDIR/usr/lib/aarch64-linux-gnu/gstreamer-1.0
+      GST_PLUGIN_SYSTEM_PATH: /lib64/gstreamer-1.0:/usr/lib/aarch64-linux-gnu/gstreamer-1.0:$APPDIR/usr/lib/aarch64-linux-gnu/gstreamer-1.0
   test:
     fedora-30:
       image: appimagecrafters/tests-env:fedora-30

appimage/AppImageBuilder-x86_64.yml

@@ -2,7 +2,7 @@
 version: 1
 script:
  - rm -rf ./AppDir || true
- - bsdtar -zxvf ../rustdesk-1.2.3.deb
+ - bsdtar -zxvf rustdesk.deb
  - tar -xvf ./data.tar.xz
  - mkdir ./AppDir
  - mv ./usr ./AppDir/usr
@@ -18,7 +18,7 @@ AppDir:
     id: rustdesk
     name: rustdesk
     icon: rustdesk
-    version: 1.2.3
+    version: 1.3.0
     exec: usr/lib/rustdesk/rustdesk
     exec_args: $@
   apt:
@@ -26,19 +26,20 @@ AppDir:
     - amd64
     allow_unauthenticated: true
     sources:
-    - sourceline: deb http://archive.ubuntu.com/ubuntu/ bionic main restricted
+    - sourceline: deb http://archive.ubuntu.com/ubuntu/ focal main restricted
-    - sourceline: deb http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted
+    - sourceline: deb http://archive.ubuntu.com/ubuntu/ focal-updates main restricted
-    - sourceline: deb http://archive.ubuntu.com/ubuntu/ bionic universe
+    - sourceline: deb http://archive.ubuntu.com/ubuntu/ focal universe
-    - sourceline: deb http://archive.ubuntu.com/ubuntu/ bionic-updates universe
+    - sourceline: deb http://archive.ubuntu.com/ubuntu/ focal-updates universe
-    - sourceline: deb http://archive.ubuntu.com/ubuntu/ bionic multiverse
+    - sourceline: deb http://archive.ubuntu.com/ubuntu/ focal multiverse
-    - sourceline: deb http://archive.ubuntu.com/ubuntu/ bionic-updates multiverse
+    - sourceline: deb http://archive.ubuntu.com/ubuntu/ focal-updates multiverse
-    - sourceline: deb http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted
+    - sourceline: deb http://archive.ubuntu.com/ubuntu/ focal-backports main restricted
         universe multiverse
-    - sourceline: deb http://archive.ubuntu.com/ubuntu/ bionic-security main restricted
+    - sourceline: deb http://archive.ubuntu.com/ubuntu/ focal-security main restricted
         universe multiverse
-    - sourceline: deb http://ppa.launchpad.net/pipewire-debian/pipewire-upstream/ubuntu
-        bionic main
     include:
+    # https://github.com/rustdesk/rustdesk/issues/9103
+    # Because of APPDIR_LIBRARY_PATH, this libc6 is not used, use LD_PRELOAD: $APPDIR/usr/lib/x86_64-linux-gnu/libc.so.6 may help, If you have time, please have a try.
+    # We modify APPDIR_LIBRARY_PATH to use system lib first because gst crashed if not doing so, but you can try to change it.
     - libc6:amd64
     - libgtk-3-0
     - libxcb-randr0
@@ -54,9 +55,14 @@ AppDir:
     - libvdpau1
     - libgstreamer-plugins-base1.0-0
     - gstreamer1.0-pipewire
+    - libwayland-client0
     - libwayland-cursor0
     - libwayland-egl1
     - libpulse0
+    - packagekit-gtk3-module
+    - libcanberra-gtk3-module
+    - libpam0g
+    - libdrm2
     exclude:
     - humanity-icon-theme
     - hicolor-icon-theme
@@ -72,8 +78,11 @@ AppDir:
     - usr/share/doc/*/TODO.*
   runtime:
     env:
-      GIO_MODULE_DIR: $APPDIR/usr/lib/x86_64-linux-gnu/gio/modules/
+      GIO_MODULE_DIR: /lib64/gio/modules:/usr/lib/x86_64-linux-gnu/gio/modules:$APPDIR/usr/lib/x86_64-linux-gnu/gio/modules
       GDK_BACKEND: x11
+      APPDIR_LIBRARY_PATH: /lib64:/usr/lib/x86_64-linux-gnu:$APPDIR/lib/x86_64-linux-gnu:$APPDIR/lib/x86_64-linux-gnu/security:$APPDIR/lib/systemd:$APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders:$APPDIR/usr/lib/x86_64-linux-gnu/gstreamer-1.0:$APPDIR/usr/lib/x86_64-linux-gnu/gtk-3.0/3.0.0/immodules:$APPDIR/usr/lib/x86_64-linux-gnu/gtk-3.0/3.0.0/printbackends:$APPDIR/usr/lib/x86_64-linux-gnu/krb5/plugins/preauth:$APPDIR/usr/lib/x86_64-linux-gnu/libcanberra-0.30:$APPDIR/usr/lib/x86_64-linux-gnu/pulseaudio:$APPDIR/usr/lib/x86_64-linux-gnu/sasl2:$APPDIR/usr/lib/x86_64-linux-gnu/vdpau:$APPDIR/usr/lib/rustdesk/lib:$APPDIR/lib/x86_64
+      GST_PLUGIN_PATH: /lib64/gstreamer-1.0:/usr/lib/x86_64-linux-gnu/gstreamer-1.0:$APPDIR/usr/lib/x86_64-linux-gnu/gstreamer-1.0
+      GST_PLUGIN_SYSTEM_PATH: /lib64/gstreamer-1.0:/usr/lib/x86_64-linux-gnu/gstreamer-1.0:$APPDIR/usr/lib/x86_64-linux-gnu/gstreamer-1.0
   test:
     fedora-30:
       image: appimagecrafters/tests-env:fedora-30

build.py

@@ -16,7 +16,7 @@ osx = platform.platform().startswith(
 hbb_name = 'rustdesk' + ('.exe' if windows else '')
 exe_path = 'target/release/' + hbb_name
 if windows:
-    flutter_build_dir = 'build/windows/runner/Release/'
+    flutter_build_dir = 'build/windows/x64/runner/Release/'
 elif osx:
     flutter_build_dir = 'build/macos/Build/Products/Release/'
 else:
@@ -24,18 +24,26 @@ else:
 flutter_build_dir_2 = f'flutter/{flutter_build_dir}'
 skip_cargo = False
 
-def get_arch() -> str:
+
-    custom_arch = os.environ.get("ARCH")
+def get_deb_arch() -> str:
+    custom_arch = os.environ.get("DEB_ARCH")
     if custom_arch is None:
         return "amd64"
     return custom_arch
 
+def get_deb_extra_depends() -> str:
+    custom_arch = os.environ.get("DEB_ARCH")
+    if custom_arch == "armhf": # for arm32v7 libsciter-gtk.so
+        return ", libatomic1"
+    return ""
+
 def system2(cmd):
-    err = os.system(cmd)
+    exit_code = os.system(cmd)
-    if err != 0:
+    if exit_code != 0:
-        print(f"Error occurred when executing: {cmd}. Exiting.")
+        sys.stderr.write(f"Error occurred when executing: `{cmd}`. Exiting.\n")
         sys.exit(-1)
 
+
 def get_version():
     with open("Cargo.toml", encoding="utf-8") as fh:
         for line in fh:
@@ -45,21 +53,7 @@ def get_version():
 
 
 def parse_rc_features(feature):
-    available_features = {
+    available_features = {}
-        'IddDriver': {
-            'platform': ['windows'],
-            'zip_url': 'https://github.com/fufesou/RustDeskIddDriver/releases/download/v0.3/RustDeskIddDriver_x64.zip',
-            'checksum_url': 'https://github.com/fufesou/RustDeskIddDriver/releases/download/v0.3/checksum_md5',
-            'exclude': ['README.md', 'certmgr.exe', 'install_cert_runas_admin.bat', 'RustDeskIddApp.exe'],
-        },
-        'PrivacyMode': {
-            'platform': ['windows'],
-            'zip_url': 'https://github.com/fufesou/RustDeskTempTopMostWindow/releases/download/v0.1'
-                       '/TempTopMostWindow_x64_pic_en.zip',
-            'checksum_url': 'https://github.com/fufesou/RustDeskTempTopMostWindow/releases/download/v0.1/checksum_md5',
-            'include': ['WindowInjection.dll'],
-        }
-    }
     apply_features = {}
     if not feature:
         feature = []
@@ -83,8 +77,9 @@ def parse_rc_features(feature):
         return get_all_features()
     elif isinstance(feature, list):
         if windows:
-            # force add PrivacyMode
+            # download third party is deprecated, we use github ci instead.
-            feature.append('PrivacyMode')
+            # feature.append('PrivacyMode')
+            pass
         for feat in feature:
             if isinstance(feat, str) and feat.upper() == 'ALL':
                 return get_all_features()
@@ -109,7 +104,7 @@ def make_parser():
         nargs='+',
         default='',
         help='Integrate features, windows only.'
-             'Available: IddDriver, PrivacyMode. Special value is "ALL" and empty "". Default is empty.')
+             'Available: [Not used for now]. Special value is "ALL" and empty "". Default is empty.')
     parser.add_argument('--flutter', action='store_true',
                         help='Build flutter package', default=False)
     parser.add_argument(
@@ -118,26 +113,32 @@ def make_parser():
         help='Enable feature hwcodec' + (
             '' if windows or osx else ', need libva-dev, libvdpau-dev.')
     )
+    parser.add_argument(
+        '--vram',
+        action='store_true',
+        help='Enable feature vram, only available on windows now.'
+    )
     parser.add_argument(
         '--portable',
         action='store_true',
         help='Build windows portable'
     )
     parser.add_argument(
-        '--flatpak',
+        '--unix-file-copy-paste',
         action='store_true',
-        help='Build rustdesk libs with the flatpak feature enabled'
+        help='Build with unix file copy paste feature'
-    )
-    parser.add_argument(
-        '--appimage',
-        action='store_true',
-        help='Build rustdesk libs with the appimage feature enabled'
     )
     parser.add_argument(
         '--skip-cargo',
         action='store_true',
         help='Skip cargo build process, only flutter version + Linux supported currently'
     )
+    if windows:
+        parser.add_argument(
+            '--skip-portable-pack',
+            action='store_true',
+            help='Skip packing, only flutter version + Windows supported'
+        )
     parser.add_argument(
         "--package",
         type=str
@@ -172,8 +173,8 @@ def generate_build_script_for_docker():
             export VCPKG_ROOT=`pwd`/vcpkg
             git clone https://github.com/microsoft/vcpkg
             vcpkg/bootstrap-vcpkg.sh
-            vcpkg/vcpkg install libvpx libyuv opus
             popd
+            $VCPKG_ROOT/vcpkg install --x-install-root="$VCPKG_ROOT/installed"
             # build rustdesk
             ./build.py --flutter --hwcodec
         ''')
@@ -181,10 +182,14 @@ def generate_build_script_for_docker():
     system2("bash /tmp/build.sh")
 
 
+# Downloading third party resources is deprecated.
+# We can use this function in an offline build environment.
+# Even in an online environment, we recommend building third-party resources yourself.
 def download_extract_features(features, res_dir):
     import re
 
     proxy = ''
+
     def req(url):
         if not proxy:
             return url
@@ -196,9 +201,9 @@ def download_extract_features(features, res_dir):
 
     for (feat, feat_info) in features.items():
         includes = feat_info['include'] if 'include' in feat_info and feat_info['include'] else []
-        includes = [ re.compile(p) for p in includes ]
+        includes = [re.compile(p) for p in includes]
         excludes = feat_info['exclude'] if 'exclude' in feat_info and feat_info['exclude'] else []
-        excludes = [ re.compile(p) for p in excludes ]
+        excludes = [re.compile(p) for p in excludes]
 
         print(f'{feat} download begin')
         download_filename = feat_info['zip_url'].split('/')[-1]
@@ -261,17 +266,14 @@ def external_resources(flutter, args, res_dir):
 
 def get_features(args):
     features = ['inline'] if not args.flutter else []
-    if windows:
-        features.append('virtual_display_driver')
     if args.hwcodec:
         features.append('hwcodec')
+    if args.vram:
+        features.append('vram')
     if args.flutter:
         features.append('flutter')
-        features.append('flutter_texture_render')
+    if args.unix_file_copy_paste:
-    if args.flatpak:
+        features.append('unix-file-copy-paste')
-        features.append('flatpak')
-    if args.appimage:
-        features.append('appimage')
     print("features:", features)
     return features
 
@@ -285,10 +287,10 @@ Version: %s
 Architecture: %s
 Maintainer: rustdesk <info@rustdesk.com>
 Homepage: https://rustdesk.com
-Depends: libgtk-3-0, libxcb-randr0, libxdo3, libxfixes3, libxcb-shape0, libxcb-xfixes0, libasound2, libsystemd0, curl, libva-drm2, libva-x11-2, libvdpau1, libgstreamer-plugins-base1.0-0, libpam0g, libappindicator3-1, gstreamer1.0-pipewire
+Depends: libgtk-3-0, libxcb-randr0, libxdo3, libxfixes3, libxcb-shape0, libxcb-xfixes0, libasound2, libsystemd0, curl, libva-drm2, libva-x11-2, libvdpau1, libgstreamer-plugins-base1.0-0, libpam0g, libappindicator3-1, gstreamer1.0-pipewire%s
 Description: A remote control software.
 
-""" % (version, get_arch())
+""" % (version, get_deb_arch(), get_deb_extra_depends())
     file = open(control_file_path, "w")
     file.write(content)
     file.close()
@@ -350,6 +352,7 @@ def build_flutter_deb(version, features):
     os.rename('rustdesk.deb', '../rustdesk-%s.deb' % version)
     os.chdir("..")
 
+
 def build_deb_from_folder(version, binary_folder):
     os.chdir('flutter')
     system2('mkdir -p tmpdeb/usr/bin/')
@@ -388,18 +391,22 @@ def build_deb_from_folder(version, binary_folder):
     os.rename('rustdesk.deb', '../rustdesk-%s.deb' % version)
     os.chdir("..")
 
+
 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 --features {features} --lib --release')
+        system2(
+            f'MACOSX_DEPLOYMENT_TARGET=10.14 cargo build --features {features} --lib --release')
     # copy dylib
     system2(
         "cp target/release/liblibrustdesk.dylib target/release/librustdesk.dylib")
     os.chdir('flutter')
     system2('flutter build macos --release')
+    '''
     system2(
         "create-dmg --volname \"RustDesk Installer\" --window-pos 200 120 --window-size 800 400 --icon-size 100 --app-drop-link 600 185 --icon RustDesk.app 200 190 --hide-extension RustDesk.app rustdesk.dmg ./build/macos/Build/Products/Release/RustDesk.app")
     os.rename("rustdesk.dmg", f"../rustdesk-{version}.dmg")
+    '''
     os.chdir("..")
 
 
@@ -414,7 +421,7 @@ def build_flutter_arch_manjaro(version, features):
     system2('HBB=`pwd`/.. FLUTTER=1 makepkg -f')
 
 
-def build_flutter_windows(version, features):
+def build_flutter_windows(version, features, skip_portable_pack):
     if not skip_cargo:
         system2(f'cargo build --features {features} --lib --release')
         if not os.path.exists("target/release/librustdesk.dll"):
@@ -425,6 +432,8 @@ def build_flutter_windows(version, features):
     os.chdir('..')
     shutil.copy2('target/release/deps/dylib_virtual_display.dll',
                  flutter_build_dir_2)
+    if skip_portable_pack:
+        return
     os.chdir('libs/portable')
     system2('pip3 install -r requirements.txt')
     system2(
@@ -474,13 +483,14 @@ def main():
         os.chdir('../../..')
 
         if flutter:
-            build_flutter_windows(version, features)
+            build_flutter_windows(version, features, args.skip_portable_pack)
             return
         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')
         if pa:
+            # https://certera.com/kb/tutorial-guide-for-safenet-authentication-client-for-code-signing/
             system2(
                 f'signtool sign /a /v /p {pa} /debug /f .\\cert.pfx /t http://timestamp.digicert.com  '
                 'target\\release\\rustdesk.exe')
@@ -557,7 +567,8 @@ def main():
     codesign -s "Developer ID Application: {0}" --force --options runtime  ./target/release/bundle/osx/RustDesk.app/Contents/MacOS/*
     codesign -s "Developer ID Application: {0}" --force --options runtime  ./target/release/bundle/osx/RustDesk.app
     '''.format(pa))
-                system2('create-dmg "RustDesk %s.dmg" "target/release/bundle/osx/RustDesk.app"' % version)
+                system2(
+                    'create-dmg "RustDesk %s.dmg" "target/release/bundle/osx/RustDesk.app"' % version)
                 os.rename('RustDesk %s.dmg' %
                           version, 'rustdesk-%s.dmg' % version)
                 if pa:
@@ -577,7 +588,7 @@ def main():
                 else:
                     print('Not signed')
             else:
-                # buid deb package
+                # build deb package
                 system2(
                     'mv target/release/bundle/deb/rustdesk*.deb ./rustdesk.deb')
                 system2('dpkg-deb -R rustdesk.deb tmpdeb')

build.rs

@@ -1,9 +1,11 @@
 #[cfg(windows)]
 fn build_windows() {
     let file = "src/platform/windows.cc";
-    cc::Build::new().file(file).compile("windows");
+    let file2  = "src/platform/windows_delete_test_cert.cc";
+    cc::Build::new().file(file).file(file2).compile("windows");
     println!("cargo:rustc-link-lib=WtsApi32");
     println!("cargo:rerun-if-changed={}", file);
+    println!("cargo:rerun-if-changed={}", file2);
 }
 
 #[cfg(target_os = "macos")]
@@ -41,7 +43,7 @@ fn build_manifest() {
     }
 }
 
-fn install_oboe() {
+fn install_android_deps() {
     let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap();
     if target_os != "android" {
         return;
@@ -49,6 +51,8 @@ fn install_oboe() {
     let mut target_arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap();
     if target_arch == "x86_64" {
         target_arch = "x64".to_owned();
+    } else if target_arch == "x86" {
+        target_arch = "x86".to_owned();
     } else if target_arch == "aarch64" {
         target_arch = "arm64".to_owned();
     } else {
@@ -66,62 +70,16 @@ fn install_oboe() {
             path.join("lib").to_str().unwrap()
         )
     );
+    println!("cargo:rustc-link-lib=ndk_compat");
     println!("cargo:rustc-link-lib=oboe");
+    println!("cargo:rustc-link-lib=oboe_wrapper");
     println!("cargo:rustc-link-lib=c++");
     println!("cargo:rustc-link-lib=OpenSLES");
-    // I always got some strange link error with oboe, so as workaround, put oboe.cc into oboe src: src/common/AudioStreamBuilder.cpp
-    // also to avoid libc++_shared not found issue, cp ndk's libc++_shared.so to jniLibs, e.g.
-    // ./flutter_hbb/android/app/src/main/jniLibs/arm64-v8a/libc++_shared.so
-    // let include = path.join("include");
-    //cc::Build::new().file("oboe.cc").include(include).compile("oboe_wrapper");
-}
-
-#[cfg(feature = "flutter")]
-fn gen_flutter_rust_bridge() {
-    if !std::env::var("RUN_FFIGEN").is_ok() {
-        return;
-    }
-    use lib_flutter_rust_bridge_codegen::{
-        config_parse, frb_codegen, get_symbols_if_no_duplicates, RawOpts,
-    };
-    let llvm_path = match std::env::var("LLVM_HOME") {
-        Ok(path) => Some(vec![path]),
-        Err(_) => None,
-    };
-    // Tell Cargo that if the given file changes, to rerun this build script.
-    println!("cargo:rerun-if-changed=src/flutter_ffi.rs");
-    // Options for frb_codegen
-    let raw_opts = RawOpts {
-        // Path of input Rust code
-        rust_input: vec!["src/flutter_ffi.rs".to_string()],
-        // Path of output generated Dart code
-        dart_output: vec!["flutter/lib/generated_bridge.dart".to_string()],
-        // Path of output generated C header
-        c_output: Some(vec!["flutter/macos/Runner/bridge_generated.h".to_string()]),
-        /// Path to the installed LLVM
-        llvm_path,
-        // for other options use defaults
-        ..Default::default()
-    };
-    // get opts from raw opts
-    let configs = config_parse(raw_opts);
-    // generation of rust api for ffi
-    let all_symbols = get_symbols_if_no_duplicates(&configs).unwrap();
-    for config in configs.iter() {
-        frb_codegen(config, &all_symbols).unwrap();
-    }
 }
 
 fn main() {
     hbb_common::gen_version();
-    install_oboe();
+    install_android_deps();
-    // there is problem with cfg(target_os) in build.rs, so use our workaround
-    // let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap();
-    // if target_os == "android" || target_os == "ios" {
-    #[cfg(feature = "flutter")]
-    gen_flutter_rust_bridge();
-    //     return;
-    // }
     #[cfg(all(windows, feature = "inline"))]
     build_manifest();
     #[cfg(windows)]

docs/CODE_OF_CONDUCT-JP.md

@@ -0,0 +1,101 @@
+
+# コントリビューター規約 行動規範
+
+## 私たちの誓い
+
+私たちは、メンバー、貢献者、リーダーとして、年齢、体格、目に見える・見えない障害、
+民族性、性の特徴、性自認と表現、経験のレベル、教育、社会経済的地位、国籍、個人の外見、
+人種、宗教、性的自認と指向に関係なく、誰もがハラスメントのないコミュニティに参加できるようにすることを誓います。
+
+私たちは、開かれた、歓迎された、多様で、包容力のある、健全な地域社会に貢献するように行動し、交流することを誓います。
+
+## 私たちの基準
+
+地域社会にとって好ましい環境にコントリビュートする行動の例には、以下のようなものがある:
+
+* 他者への共感と優しさ
+* 異なる意見、視点、経験を尊重すること
+* 建設的なフィードバックを与え、潔く受け入れること
+* 私たちの過ちによって影響を受けた人々に責任を受け入れ、謝罪し、経験から学ぶこと
+* 私たち個人にとってだけでなく、地域社会全体にとって何が最善であるかに焦点を合わせること
+
+許されない行為の例:
+
+* 性的な言葉やイメージの使用、性的な注目や誘いかけ
+* 荒らし、侮辱的または軽蔑的なコメント、個人的または政治的な攻撃
+* 公的または私的な嫌がらせ
+* 明示的な許可なく、他人の住所や電子メールアドレスなどの個人情報を公開すること
+* 職業上不適切と見なされるその他の行為
+
+## 執行責任
+
+コミュニティリーダーは、許容される行動の基準を明確にし、実施する責任があり、
+不適切、脅迫的、攻撃的、または有害と判断される行動に対しては、適切かつ公正な是正措置をとります
+
+コミュニティリーダーは、本行動規範に沿わないコメント、コミット、コード、ウィキ編集、
+課題、その他の貢献を削除、編集、拒否する権利と責任を有し、適切な場合にはモデレーション決定の理由を伝えます。
+
+## スコープ
+
+この行動規範は、すべてのコミュニティスペースで適用され、また個人が公的なスペースでコミュニティを公式に代表している場合にも適用されます。
+当コミュニティを代表する例としては、公式 E メールアドレスの使用、公式ソーシャルメディアアカウントによる投稿、
+オンラインまたはオフラインのイベントでの任命された代表としての行動などが挙げられます。
+
+## 施行
+
+虐待、ハラスメント、その他容認できない行為があった場合は、[info@rustdesk.com](mailto:info@rustdesk.com) の
+執行担当コミュニティリーダーに報告することができる。
+すべての苦情は、迅速かつ公正に検討・調査されます。
+
+すべての地域社会の指導者は、いかなる事件の報告者のプライバシーと安全を尊重する義務がある。
+
+## 執行ガイドライン
+
+コミュニティリーダーは、本行動規範に違反すると判断した行為に対する結果を決定する際、
+以下の「コミュニティへの影響に関するガイドライン」に従います:
+
+### 1. 修正
+
+**コミュニティへの影響**: 不適切な言葉の使用、またはプロフェッショナルでない、あるいは地域社会で歓迎されないとみなされるその他の行動。
+
+**結果**: コミュニティリーダーからの私的な書面による警告。違反の性質と、
+なぜその行為が不適切であったのかについての説明を明確にする。公的な謝罪が要求される場合もある。
+
+### 2. 警告
+
+**コミュニティへの影響**: 単一の出来事または一連の行動による違反。
+
+**結果**: 行動を続けた場合の結果を伴う警告。一定期間、行動規範の実施者との勝手な交流を含め、
+関係者と交流しないこと。これには、ソーシャルメディアなどの外部チャンネルだけでなく、
+コミュニティスペースでの交流を避けることも含まれます。これらの条件に違反した場合、一時的または恒久的に追放される可能性があります。
+
+### 3. 一時的な禁止
+
+**コミュニティへの影響**: 継続的な不適切な行動を含む、コミュニティ基準に対する重大な違反。
+
+**結果**: 一定期間、地域社会とのあらゆる交流や公的なコミュニケーションを一時的に禁止すること。
+この期間中は、行動規範を執行する人々との未承諾の交流を含め、関係者との公私にわたる交流は許されない。
+これらの条件に違反した場合、永久禁止となる可能性があります。
+
+### 4. 永久禁止
+
+**コミュニティへの影響**: 継続的な不適切な行動、個人に対する嫌がらせ、
+または個人クラスに対する攻撃や中傷など、地域社会の基準に対する違反のパターンを示すこと。
+
+**結果**: コミュニティ内でのあらゆる公的交流の永久禁止。
+
+## 帰属
+
+この行動規範は、[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0] に掲載されている
+[コントリビューター規約][ホームページ]、バージョン 2.0 から引用したものです。
+
+コミュニティインパクトガイドラインは、[Mozilla's code of conduct enforcement ladder][Mozilla CoC] に触発されました。
+
+この行動規範に関するよくある質問については、[https://www.contributor-covenant.org/faq][FAQ] の FAQ をご覧ください。
+翻訳は [https://www.contributor-covenant.org/translations][翻訳] にあります。
+
+[ホームページ]: 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
+[翻訳]: https://www.contributor-covenant.org/translations

docs/CONTRIBUTING-JP.md

@@ -0,0 +1,41 @@
+# RustDesk へのコントリビュート
+
+RustDesk は皆さんからのコントリビュートを歓迎します。ご協力いただける方のガイドラインは
+以下の通りです:
+
+## コントリビューション
+
+RustDesk またはその依存関係へのコントリビュートは、GitHub のプルリクエストの形で行ってください。
+それぞれのプルリクエストは、コアコントリビューター（パッチの適用を許可されている人）によってレビューされ、
+メインツリーに適用されるか、必要な変更についてのフィードバックが与えられます。
+コアコントリビューターからのものであっても、すべてのコントリビューターはこのフォーマットに従うべきです。
+
+ある issue に取り組みたい場合は、GitHub の issue にコメントすることで、まずその対応を主張してください。
+これは、同じ issue に対するコントリビューターの重複作業を防ぐためです。
+
+## プルリクエストのチェックリスト
+
+- master ブランチからブランチし、必要であればプルリクエストを提出する前に現在の master ブランチにリベースしてください。
+  master と正しくマージできない場合、変更をリベースするよう求められる可能性があります。
+
+- コミットは、各コミットが独立して正しい（すなわち、各コミットがコンパイルされ、テストに合格する）ことを保証しながら、
+  可能な限り小さくすべきです。
+
+- コミットには、Developer Certificate of Origin (http://developercertificate.org) の sign-off を添えてください。
+  これは、あなた（および該当する場合はあなたの雇用主）が [プロジェクトのライセンス](../LICENCE) の条項に拘束されることに
+  同意していることを示すものです。git では、これは `git commit` の `-s` オプションを使います。
+
+- もしあなたのパッチがレビューされなかったり、特定の人にレビューしてもらう必要がある場合、
+  プルリクエストやコメントでレビューを依頼するレビュアーに@返信したり、[email](mailto:info@rustdesk.com) でレビューを依頼することができます。
+
+- 修正したバグや新機能に関連するテストを追加する。
+
+具体的なgitの手順については、[GitHub workflow 101](https://github.com/servo/servo/wiki/GitHub-workflow)を参照してください。
+
+## 行動規範
+
+https://github.com/rustdesk/rustdesk/blob/master/docs/CODE_OF_CONDUCT.md
+
+## コミュニケーション
+
+RustDesk のコントリビューターは、[Discord](https://discord.gg/nDceKgxnkV) を良く使っています。

docs/DEVCONTAINER-JP.md

@@ -0,0 +1,14 @@
+
+docker コンテナで devcontainer を起動すると、デバッグモードの linux バイナリが作成されます。
+
+現在 devcontainer では、Linux と android のビルドをデバッグモードとリリースモードの両方で提供しています。
+
+以下は、特定のビルドを作成するためにプロジェクトのルートから実行するコマンドの表になります。
+
+コマンド|ビルド タイプ|モード
+-|-|-|
+`.devcontainer/build.sh --debug linux`|Linux|debug
+`.devcontainer/build.sh --release linux`|Linux|release
+`.devcontainer/build.sh --debug android`|android-arm64|debug
+`.devcontainer/build.sh --release android`|android-arm64|release
+

docs/README-AR.md

@@ -27,14 +27,6 @@
 
 [**BINARY تنزيل**](https://github.com/rustdesk/rustdesk/releases)
 
-## خوادم مفتوحة ومجانية
-
-فيما يلي الخوادم التي تستخدمها مجانًا، وقد تتغير طوال الوقت. إذا لم تكن قريبًا من أحد هؤلاء، فقد تكون شبكتك بطيئة.
-| الموقع | المورد | المواصفات |
-| --------- | ------------- | ------------------ |
-| Germany | Hetzner | 2 vCPU / 4GB RAM |
-| Ukraine (Kyiv) | [dc.volia](https://dc.volia.com) | 2 vCPU / 4 GB RAM |
-
 ## التبعيات
 
  لواجهة المستخدم الرسومية [sciter](https://sciter.com/) نسخة سطح المكتب تستخدم
@@ -118,10 +110,6 @@ mv libsciter-gtk.so target/debug
 VCPKG_ROOT=$HOME/vcpkg cargo run
 ```
 
-###  X11 (Xorg) إلى Wayland تغيير
-
-افتراضية GNOME session  ك Xorg إتبع [هذه](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/) الخطوات لإعداد Wayland لا تدعم RustDesk
-
 ## Docker طريقة البناء باستخدام
 
 ابدأ باستنساخ المستودع وبناء الكونتاينر:

docs/README-CS.md

@@ -6,10 +6,10 @@
   <a href="#file-structure">Struktura</a> •
   <a href="#snapshot">Ukázky</a><br>
   [<a href="../README.md">English</a>] | [<a href="README-UA.md">Українська</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-GR.md">Ελληνικά</a>]<br>
-  <b>Potřebujeme Vaši pomoc s překláním textů tohoto ČTIMNE, <a href="https://github.com/rustdesk/rustdesk/tree/master/src/lang">uživatelského rozhraní aplikace RustDesk</a> a <a href="https://github.com/rustdesk/doc.rustdesk.com">dokumentace k ní</a> do vašeho jazyka</b>
+  <b>Potřebujeme Vaši pomoc s překladem tohoto README, <a href="https://github.com/rustdesk/rustdesk/tree/master/src/lang">uživatelského rozhraní aplikace RustDesk</a> a <a href="https://github.com/rustdesk/doc.rustdesk.com">dokumentace k ní</a> do vašeho jazyka</b>
 </p>
 
-Dopisujte si s námi: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk)
+Popovídejte si s námi: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk)
 
 
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09)
@@ -22,14 +22,6 @@ Projekt RustDesk vítá přiložení ruky k dílu od každého. Jak začít se d
 
 [**STAHOVÁNÍ ZKOMPILOVANÝCH APLIKACÍ**](https://github.com/rustdesk/rustdesk/releases)
 
-## Veřejné, zdarma službu nabízející servery
-
-Níže jsou uvedeny servery zdarma k vašemu použití (údaje se mohou v čase měnit). Pokud se nenacházíte v oblastech světa poblíž nich, spojení může být pomalé.
-| umístění | dodavatel | parametry |
-| --------- | ------------- | ------------------ |
-| Germany | Hetzner | 2 vCPU / 4GB RAM |
-| Ukraine (Kyiv) | [dc.volia](https://dc.volia.com) | 2 vCPU / 4 GB RAM |
-
 ## Softwarové součásti, na kterých závisí
 
 Varianta pro počítač používá pro grafické uživatelské rozhraní [sciter](https://sciter.com/) – stáhněte si potřebnou knihovnu.
@@ -44,7 +36,7 @@ Varianta pro mobilní platformy používá aplikační rámec (framework) Flutte
 
 - Připravte si vývojové prostředí pro jazyky Rust a C++
 
-- Nainstalujte [vcpkg](https://github.com/microsoft/vcpkg), a nastavte správně proměnnou prostsředí `VCPKG_ROOT`
+- Nainstalujte [vcpkg](https://github.com/microsoft/vcpkg), a správně nastavte proměnnou prostředí `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
@@ -111,10 +103,6 @@ mv libsciter-gtk.so target/debug
 VCPKG_ROOT=$HOME/vcpkg cargo run
 ```
 
-### Změna z Wayland na X11 (Xorg)
-
-RustDesk (zatím) nepodporuje zobrazovací server Wayland. Jak nastavit Xorg jako výchozí pro relace v prostředí GNOME naleznete [zde](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/).
-
 ## Jak sestavit prostřednictvím Docker kontejnerizace
 
 Začněte tím, že si naklonujete tento repozitář a sestavíte docker kontejner:
@@ -131,7 +119,7 @@ Poté pokaždé, když bude třeba aplikaci sestavit, spusťte následující p
 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
 ```
 
-Všimněte si, že prvotní sestavení může trvat déle (než se do mezipaměti uloží veškeré softwarové součásti, které jsou potřeba) – následná opakování už budou rychlejší. Dále, pokud potřebujete příkazu pro sestavení zadat nějaké argumenty, je možné je zapsat na konec příkazu na pozici `<OPTIONAL-ARGS>`. Například, pokud byste chtěli sestavit optimalizovaně pro vydání, spustili byste výše uvedený příkaz následovaný `--release`. Výsledný spustitelný soubor se objeví v cílové složce na vašem systému a bude ho možné spustit pomocí:
+Všimněte si, že prvotní sestavení může trvat déle (než se do mezipaměti uloží veškeré softwarové součásti, které jsou potřeba) – následná opakování už budou rychlejší. Pokud navíc potřebujete zadat různé argumenty příkazu pro sestavení, můžete tak učinit na konci příkazu v pozici `<OPTIONAL-ARGS>`. Například, pokud byste chtěli sestavit optimalizovanou verzi pro vydání, spustili byste výše uvedený příkaz následovaný `--release`. Výsledný spustitelný soubor se objeví v cílové složce na vašem systému a bude ho možné spustit pomocí:
 
 ```sh
 target/debug/rustdesk
@@ -143,7 +131,7 @@ Nebo, pokud spouštíte variantu pro vydání:
 target/release/rustdesk
 ```
 
-Zajistětě, abyste tyto příkazy spouštěli z kořene repozitáře s RustDesk, jinak aplikace nemusí být schopná nalézt potřebné prostředky (resources). Také si všimněte, že ostatní dílčí príkazy nástroje cargo, jako třeba `install` nebo `run` zatím nejsou prostřednictvím této metody podporovány, protože by vedly k instalaci či spuštění program uvnitř kontejneru namísto přímo v systému.
+Ujistěte se, že tyto příkazy spouštíte z kořenového adresáře RustDesk, jinak aplikace nemusí být schopná nalézt potřebné prostředky (resources). Také si všimněte, že ostatní dílčí príkazy nástroje cargo, jako třeba `install` nebo `run` zatím nejsou prostřednictvím této metody podporovány, protože by vedly k instalaci či spuštění program uvnitř kontejneru namísto přímo v systému.
 
 ## Struktura souborů
 

docs/README-DA.md

@@ -19,14 +19,6 @@ RustDesk hilser bidrag fra alle velkommen. Se [`docs/CONTRIBUTING.md`](docs/CONT
 
 [**PROGRAM DOWNLOAD**](https://github.com/rustdesk/rustdesk/releases)
 
-## Gratis offentlige servere
-
-Nedenfor er de servere, du bruger gratis, det kan ændre sig med tiden. Hvis du ikke er tæt på en af disse, kan dit netværk være langsomt.
-
-| Beliggenhed | Udbyder | Specifikation |
-| ---------- | ------------- | ------------------ |
-| Germany | Hetzner | 2 vCPU / 4GB RAM |
-
 ## Afhængigheder
 
 Desktopversioner bruger [sciter](https://sciter.com/) eller Flutter til GUI, denne vejledning er kun for Sciter.
@@ -108,33 +100,6 @@ mv libsciter-gtk.so target/debug
 cargo run
 ```
 
-### Skift Wayland til X11 (Xorg)
-
-RustDesk understøtter ikke Wayland. Tjek [dette](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/) for at konfigurere Xorg som standard GNOME-session.
-
-## Wayland-support
-
-Wayland ser ikke ud til at levere nogen API til at sende tastetryk til andre vinduer. Derfor bruger rustdesk et API fra et lavere niveau, nemlig `/dev/uinput`-enheden (Linux-kerneniveau).
-
-Når wayland er den kontrollerede side, skal du starte på følgende måde:
-```bash
-# Start uinput service
-$ sudo rustdesk --service
-$ rustdesk
-```
-**Bemærk**: Wayland-skærmoptagelse bruger forskellige grænseflader. RustDesk understøtter i øjeblikket kun org.freedesktop.portal.ScreenCast.
-```bash
-$ dbus-send --session --print-reply       \
-  --dest=org.freedesktop.portal.Desktop \
-  /org/freedesktop/portal/desktop       \
-  org.freedesktop.DBus.Properties.Get   \
-  string:org.freedesktop.portal.ScreenCast string:version
-# Not support
-Error org.freedesktop.DBus.Error.InvalidArgs: No such interface “org.freedesktop.portal.ScreenCast”
-# Support
-method return time=1662544486.931020 sender=:1.54 -> destination=:1.139 serial=257 reply_serial=2
-   variant       uint32 4
-```
 ## Sådan bygger du med Docker
 
 ```sh

docs/README-DE.md

@@ -29,22 +29,6 @@ RustDesk heißt jegliche Mitarbeit willkommen. Schauen Sie sich [CONTRIBUTING-DE
     alt="Get it on F-Droid"
     height="80">](https://f-droid.org/en/packages/com.carriez.flutter_hbb)
 
-## Freie öffentliche Server
-
-Nachfolgend sind die Server gelistet, die Sie kostenlos nutzen können. Es kann sein, dass sich diese Liste immer mal wieder ändert. Falls Sie nicht in der Nähe einer dieser Server sind, kann es sein, dass Ihre Verbindung langsam sein wird.
-| Standort | Anbieter | Spezifikation |
-| --------- | ------------- | ------------------ |
-| Deutschland | [Hetzner](https://www.hetzner.com/de/) | 2 vCPU / 4 GB RAM |
-| Ukraine (Kiew) | [dc.volia](https://dc.volia.com) | 2 vCPU / 4 GB RAM |
-
-## Dev-Container
-
-[![In Dev-Containern öffnen](https://img.shields.io/static/v1?label=Dev%20Container&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/rustdesk/rustdesk)
-
-Wenn Sie VS Code und Docker bereits installiert haben, können Sie auf das Abzeichen oben klicken, um loszulegen. Wenn Sie darauf klicken, wird VS Code automatisch die Dev-Container-Erweiterung installieren, den Quellcode in ein Container-Volume klonen und einen Dev-Container für die Verwendung aufsetzen.
-
-Weitere Informationen finden Sie in [DEVCONTAINER-DE.md](DEVCONTAINER-DE.md).
-
 ## Abhängigkeiten
 
 Desktop-Versionen verwenden [Sciter](https://sciter.com/) oder Flutter für die GUI, dieses Tutorial ist nur für Sciter.
@@ -133,34 +117,6 @@ mv libsciter-gtk.so target/debug
 VCPKG_ROOT=$HOME/vcpkg cargo run
 ```
 
-### Wayland zu X11 (Xorg) ändern
-
-RustDesk unterstützt Wayland nicht. Siehe [hier](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/), um Xorg als Standard-GNOME-Sitzung zu nutzen.
-
-## Wayland-Unterstützung
-
-Wayland scheint keine API für das Senden von Tastatureingaben an andere Fenster zu bieten. Daher verwendet RustDesk eine API von einer niedrigeren Ebene, nämlich dem Gerät `/dev/uinput` (Linux-Kernelebene).
-
-Wenn Wayland die kontrollierte Seite ist, müssen Sie wie folgt vorgehen:
-```bash
-# Dienst uinput starten
-$ sudo rustdesk --service
-$ rustdesk
-```
-**Hinweis**: Die Wayland-Bildschirmaufnahme verwendet verschiedene Schnittstellen. RustDesk unterstützt derzeit nur org.freedesktop.portal.ScreenCast.
-```bash
-$ dbus-send --session --print-reply       \
-  --dest=org.freedesktop.portal.Desktop \
-  /org/freedesktop/portal/desktop       \
-  org.freedesktop.DBus.Properties.Get   \
-  string:org.freedesktop.portal.ScreenCast string:version
-# Keine Unterstützung
-Error org.freedesktop.DBus.Error.InvalidArgs: No such interface “org.freedesktop.portal.ScreenCast”
-# Unterstützung
-method return time=1662544486.931020 sender=:1.54 -> destination=:1.139 serial=257 reply_serial=2
-   variant       uint32 4
-```
-
 ## Auf Docker kompilieren
 
 Beginnen Sie damit, das Repository zu klonen und den Docker-Container zu bauen:

docs/README-EO.md

@@ -19,14 +19,6 @@ RustDesk bonvenigas kontribuon de ĉiuj. Vidu [`docs/CONTRIBUTING.md`](CONTRIBUT
 
 [**BINARA ELŜUTO**](https://github.com/rustdesk/rustdesk/releases)
 
-## Senpagaj publikaj serviloj
-
-Malsupre estas la serviloj, kiuj vi uzas senpage, ĝi povas ŝanĝi laŭlonge de la tempo. Se vi ne estas proksima de unu de tiuj, via reto povas esti malrapida.
-| Situo | Vendanto | Detaloj |
-| --------- | ------------- | ------------------ |
-| Germany | Hetzner | 2 vCPU / 4GB RAM |
-| Ukraine (Kyiv) | [dc.volia](https://dc.volia.com) | 2 vCPU / 4GB RAM |
-
 ## Dependantaĵoj
 
 La labortabla versio uzas [sciter](https://sciter.com/) por la interfaco, bonvolu elŝuti la bibliotekon dinamikan sciter.
@@ -104,10 +96,6 @@ mv libsciter-gtk.so target/debug
 VCPKG_ROOT=$HOME/vcpkg cargo run
 ```
 
-### Ŝanĝi Wayland por X11 (Xorg)
-
-RustDesk ne subtenas Wayland. Kontrolu [tion](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/) por agordi Xorg kiel defaŭlta sesio GNOME.
-
 ## Kiel kompili kun Docker
 
 Komencu klonante la deponejon kaj kompilu la konteneron Docker:

docs/README-ES.md

@@ -25,15 +25,6 @@ RustDesk agradece la contribución de todo el mundo. Lee [`docs/CONTRIBUTING.md`
     alt="Get it on F-Droid"
     height="80">](https://f-droid.org/en/packages/com.carriez.flutter_hbb)
 
-## Servidores gratis de uso público
-
-A continuación se muestran los servidores gratuitos, pueden cambiar a medida que pasa el tiempo. Si no estás cerca de uno de ellos, tu conexión puede ser lenta.
-
-| Ubicación | Compañía | Especificación |
-| --------- | ------------- | ------------------ |
-| Germany | Hetzner | 2 vCPU / 4GB RAM |
-| Ukraine (Kyiv) | [dc.volia](https://dc.volia.com) | 2 vCPU / 4GB RAM |
-
 ## Dependencias
 
 La versión Desktop usa [Sciter](https://sciter.com/) o Flutter para el GUI, este tutorial es solo para Sciter.
@@ -113,34 +104,6 @@ mv libsciter-gtk.so target/debug
 cargo run
 ```
 
-### Cambia Wayland a X11 (Xorg)
-
-RustDesk no soporta Wayland. Lee [esto](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/) para configurar Xorg en la sesión por defecto de GNOME.
-
-## Soporte para Wayland
-
-Wayland no parece proporcionar ninguna API para enviar pulsaciones de teclas a otras ventanas. Por lo tanto, rustdesk usa una API de nivel bajo, a saber, el dispositivo `/dev/uinput` (a nivel del kernel de Linux).
-
-Cuando wayland esta del lado controlado, hay que iniciar de la siguiente manera:
-```bash
-# Empezar el servicio uinput
-$ sudo rustdesk --service
-$ rustdesk
-```
-**Aviso**: La grabación de pantalla de Wayland utiliza diferentes interfaces. RustDesk actualmente sólo soporta org.freedesktop.portal.ScreenCast
-```bash
-$ dbus-send --session --print-reply       \
-  --dest=org.freedesktop.portal.Desktop \
-  /org/freedesktop/portal/desktop       \
-  org.freedesktop.DBus.Properties.Get   \
-  string:org.freedesktop.portal.ScreenCast string:version
-# No soportado
-Error org.freedesktop.DBus.Error.InvalidArgs: No such interface “org.freedesktop.portal.ScreenCast”
-# Soportado
-method return time=1662544486.931020 sender=:1.54 -> destination=:1.139 serial=257 reply_serial=2
-   variant       uint32 4
-```
-
 ## Como compilar con Docker
 
 Empieza clonando el repositorio y compilando el contenedor de docker:

docs/README-FA.md

@@ -25,13 +25,6 @@
 
 [دریافت نرم‌افزار](https://github.com/rustdesk/rustdesk/releases)
 
-## سرورهای عمومی رایگان
-
-شما مي‌توانید از سرورهای زیر به رایگان استفاده کنید. این لیست ممکن است به مرور زمان تغییر می‌کند. اگر به این سرورها نزدیک نیستید، ممکن است اتصال شما کند باشد.
-| موقعیت | سرویس دهنده | مشخصات |
-| --------- | ------------- | ------------------ |
-| آلمان | Hetzner | 2 vCPU / 4GB RAM |
-
 ## وابستگی ها
 
 نسخه‌های رومیزی از [sciter](https://sciter.com/) برای رابط کاربری گرافیکی استفاده می‌کنند. خواهشمندیم کتابخانه‌ی پویای sciter را خودتان دانلود کنید از این منابع دریافت کنید.
@@ -112,10 +105,6 @@ mv libsciter-gtk.so target/debug
 VCPKG_ROOT=$HOME/vcpkg cargo run
 ```
 
-### تغییر Wayland به (X11 (Xorg
-
-راست‌دسک از Wayland پشتیبانی نمی کند. برای جایگزنی Xorg به عنوان پیش‌فرض GNOM، [اینجا](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/) را کلیک کنید.
-
 ## نحوه ساخت با داکر
 
 این مخزن Git را دریافت کنید و کانتینر را به روش زیر بسازید

docs/README-FI.md

@@ -19,14 +19,6 @@ RustDesk toivottaa avustukset tervetulleiksi kaikilta. Katso lisätietoja [`docs
 
 [**BINAARILATAUS**](https://github.com/rustdesk/rustdesk/releases)
 
-## Vapaita julkisia palvelimia
-
-Alla on palvelimia, joita voit käyttää ilmaiseksi, ne saattavat muuttua ajan mittaan. Jos et ole lähellä yhtä näistä, verkkosi voi olla hidas.
-| Sijainti | Myyjä | Määrittely |
-| --------- | ------------- | ------------------ |
-| Germany | Hetzner | 2 vCPU / 4GB RAM |
-| Ukraine (Kyiv) | [dc.volia](https://dc.volia.com) | 2 vCPU / 4GB RAM |
-
 ## Riippuvuudet
 
 Desktop-versiot käyttävät [sciter](https://sciter.com/) graafisena käyttöliittymänä, lataa sciter-dynaaminen kirjasto itsellesi.
@@ -104,10 +96,6 @@ mv libsciter-gtk.so target/debug
 VCPKG_ROOT=$HOME/vcpkg cargo run
 ```
 
-### Vaihda Wayland-ympäristö X11 (Xorg)-ympäristöön
-
-RustDesk ei tue Waylandia. Tarkista [tämä](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/) asettamalla Xorg oletus GNOME-istuntoon.
-
 ## Kuinka rakennetaan Dockerin kanssa
 
 Aloita kloonaamalla tietovarasto ja rakentamalla docker-säiliö:

docs/README-FR.md

@@ -19,14 +19,6 @@ RustDesk accueille les contributions de tout le monde. Voir [`docs/CONTRIBUTING.
 
 [**TÉLÉCHARGEMENT BINAIRE**](https://github.com/rustdesk/rustdesk/releases)
 
-## Serveurs publics libres
-
-Ci-dessous se trouvent les serveurs que vous utilisez gratuitement, cela peut changer au fil du temps. Si vous n'êtes pas proche de l'un d'entre eux, votre réseau peut être lent.
-
-| Location | Vendor | Specification |
-| --------- | ------------- | ------------------ |
-| Germany | Hetzner | 2 vCPU / 4GB RAM |
-
 ## Dépendances
 
 Les versions de bureau utilisent [sciter](https://sciter.com/) pour l'interface graphique, veuillez télécharger la bibliothèque dynamique sciter vous-même.
@@ -104,10 +96,6 @@ mv libsciter-gtk.so target/debug
 Exécution du cargo
 ```
 
-### Changer Wayland en X11 (Xorg)
-
-RustDesk ne supporte pas Wayland. Lisez [cela](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/) pour configurer Xorg comme la session GNOME par défaut.
-
 ## Comment construire avec Docker
 
 Commencez par cloner le dépôt et construire le conteneur Docker :

docs/README-GR.md

@@ -29,22 +29,6 @@
     alt="Get it on F-Droid"
     height="80">](https://f-droid.org/en/packages/com.carriez.flutter_hbb)
 
-## Δωρεάν δημόσιοι διακομιστές
-
-Παρακάτω είναι οι διακομιστές που χρησιμοποιούνται δωρεάν, ενδέχεται να αλλάξουν με την πάροδο του χρόνου. Εάν δεν είστε κοντά σε ένα από αυτούς, το δίκτυό σας ίσως να είναι αργό.
-| Περιοχή | Πάροχος | Προδιαγραφές |
-| --------- | ------------- | ------------------ |
-| Γερμανία | Hetzner | 2 vCPU / 4GB RAM |
-| Ουκρανία (Κίεβο) | [dc.volia](https://dc.volia.com) | 2 vCPU / 4GB RAM |
-
-## Dev Container
-
-[![Open in Dev Containers](https://img.shields.io/static/v1?label=Dev%20Container&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/rustdesk/rustdesk)
-
-Αν έχετε εγκατεστημένα το VS Code και το Docker, μπορείτε να ξεκινήσετε κάνοντας κλικ στην παραπάνω εικόνα. Αυτό θα έχει ως αποτέλεσμα, το VS Code να εγκαταστήσει αυτόματα την επέκταση Dev Containers, εάν χρειάζεται, θα κλωνοποιήσει τον πηγαίο κώδικα σε έναν νέο container και θα εκκινήσει ένα Dev Container για χρήση προγραμματισμού.
-
-Για περισσότερες πληροφορίες μεταβείτε στο [DEVCONTAINER.md](docs/DEVCONTAINER.md).
-
 ## Προαπαιτούμενα για build  
 
 Στις παραθυρικές εκδόσεις χρησιμοποιείται είτε το [sciter](https://sciter.com/) είτε το Flutter, τα παρακάτω βήματα είναι μόνο για το Sciter.
@@ -133,34 +117,6 @@ mv libsciter-gtk.so target/debug
 VCPKG_ROOT=$HOME/vcpkg cargo run
 ```
 
-### Αλλαγή του Wayland σε X11 (Xorg)
-
-Το RustDesk δεν υποστηρίζει το πρωτόκολλο Wayland. Διαβάστε [εδώ](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/) ώστε να ορίσετε το Xorg ως το προκαθορισμένο GNOME περιβάλλον.
-
-## Υποστήριξη Wayland
-
-Το Wayland προς το παρόν δεν διαθέτει κάποιο API το οποίο να στέλνει τα πατήματα πλήκτρων στα υπόλοιπα παράθυρα. Για τον λόγο αυτό, το Rustdesk χρησιμοποιεί ένα API από κατώτερο επίπεδο, όπως το `/dev/uinput` (Linux kernel level).
-
-Σε περίπτωση που το Wayland είναι η ελεγχόμενη πλευρά, θα πρέπει να ξεκινήσετε με τον παρακάτω τρόπο:
-```bash
-# Start uinput service
-$ sudo rustdesk --service
-$ rustdesk
-```
-**Σημείωση**: Η εγγραφή οθόνης του Wayland χρησιμοποιεί διαφορετικές διεπαφές. Το RustDesk προς το παρόν υποστηρίζει μόνο org.freedesktop.portal.ScreenCast.
-```bash
-$ dbus-send --session --print-reply       \
-  --dest=org.freedesktop.portal.Desktop \
-  /org/freedesktop/portal/desktop       \
-  org.freedesktop.DBus.Properties.Get   \
-  string:org.freedesktop.portal.ScreenCast string:version
-# Not support
-Error org.freedesktop.DBus.Error.InvalidArgs: No such interface “org.freedesktop.portal.ScreenCast”
-# Support
-method return time=1662544486.931020 sender=:1.54 -> destination=:1.139 serial=257 reply_serial=2
-   variant       uint32 4
-```
-
 ## Πως να κάνετε build στο Docker
 
 Ξεκινήστε κλωνοποιώντας το αποθετήριο και κάνοντας build το docker container:
@@ -189,7 +145,7 @@ target/debug/rustdesk
 target/release/rustdesk
 ```
 
-Βεβαιωθείτε ότι εκτελείτε αυτές τις εντολές από την αρχική διαδρομή του αποθετηρίου του Rustdesk, διαφορετικά η εφαρμογή ενδέχεται να μην είναι σε θέση να βρεί τους απαιτούμενους πόρους. Σημειώστε επίσης ότι άλλες υποεντολές, όπως το `install` ή το `run` δεν υποστηρίζονται επί του παρόντος μέσω αυτής της μεθόδου καθώς θα εγκαταστήσουν ή θα εκτελέσουν το πρόγραμμα εντός του container αντί του κεντρικού υπολογιστή.
+Βεβαιωθείτε ότι εκτελείτε αυτές τις εντολές από την αρχική διαδρομή του αποθετηρίου του RustDesk, διαφορετικά η εφαρμογή ενδέχεται να μην είναι σε θέση να βρεί τους απαιτούμενους πόρους. Σημειώστε επίσης ότι άλλες υποεντολές, όπως το `install` ή το `run` δεν υποστηρίζονται επί του παρόντος μέσω αυτής της μεθόδου καθώς θα εγκαταστήσουν ή θα εκτελέσουν το πρόγραμμα εντός του container αντί του κεντρικού υπολογιστή.
 
 ## Δομή φακέλων
 

docs/README-HU.md

@@ -27,14 +27,6 @@ A RustDesk szívesen fogad minden contributiont, támogatást mindenkitől. Lás
     alt="Get it on F-Droid"
     height="80">](https://f-droid.org/en/packages/com.carriez.flutter_hbb)
 
-## Ingyenes publikus szerverek
-
-Ezalatt az üzenet alatt találhatóak azok a publikus szerverek, amelyeket ingyen használhatsz. Ezek a szerverek változhatnak a jövőben, illetve a hálózatuk lehet hogy lassú lehet.
-| Hely | Host | Specifikáció |
-| --------- | ------------- | ------------------ |
-| Germany | Hetzner | 2 vCPU / 4GB RAM |
-| Ukraine (Kyiv) | [dc.volia](https://dc.volia.com) | 2 vCPU / 4GB RAM |
-
 ## Dependencies
 
 Az asztali verziók [sciter](https://sciter.com/)-t használnak a GUI-hoz, kérlek telepítsd a dynamikus könyvtárat magad.
@@ -116,10 +108,6 @@ mv libsciter-gtk.so target/debug
 VCPKG_ROOT=$HOME/vcpkg cargo run
 ```
 
-### Válts Wayland-ról X11-re (Xorg)
-
-A RustDesk nem támogatja a Waylendet. [Itt](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/) található egy tutorial amelynek segítségével beállíthatod a Xorg-ot mint alap GNOME session.
-
 ## Hogyan építs Dockerrel
 
 Kezdjünk a repo clónozásával, majd pedig a Docker container megépítésével:

docs/README-ID.md

@@ -31,20 +31,6 @@ RustDesk mengajak semua orang untuk ikut berkontribusi. Lihat [`docs/CONTRIBUTIN
     alt="Get it on F-Droid"
     height="80">](https://f-droid.org/en/packages/com.carriez.flutter_hbb)
 
-## Server Publik Gratis
-
-Di bawah ini merupakan server gratis yang bisa kamu gunakan, seiring dengan waktu mungkin akan terjadi perubahan spesifikasi pada setiap server yang ada. Jika lokasi kamu berada jauh dengan salah satu server yang tersedia, kemungkinan koneksi akan terasa lambat ketika melakukan proses remote.
-| Lokasi | Penyedia | Spesifikasi |
-| --------- | ------------- | ------------------ |
-| Jerman | [Hetzner](https://www.hetzner.com) | 2 vCPU / 4GB RAM |
-| Ukraina (Kyiv) | [dc.volia](https://dc.volia.com) | 2 vCPU / 4GB RAM |
-
-## Dev Container
-
-[![Open in Dev Containers](https://img.shields.io/static/v1?label=Dev%20Container&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/rustdesk/rustdesk)
-
-Apabila PC kamu sudah terinstal VS Code dan Docker, kamu bisa mengklik badge yang ada diatas untuk memulainya. Dengan mengklik badge tersebut secara otomatis akan menginstal ekstensi pada VS Code, lakukan kloning (clone) source code kedalam container volume, dan aktifkan dev container untuk menggunakannya.
-
 ## Dependensi
 
 Pada versi desktop, antarmuka pengguna (GUI) menggunakan [Sciter](https://sciter.com/) atau flutter
@@ -128,37 +114,6 @@ mv libsciter-gtk.so target/debug
 VCPKG_ROOT=$HOME/vcpkg cargo run
 ```
 
-### Mengubah Wayland ke X11 (Xorg)
-
-RustDesk tidak mendukung Wayland. Cek [ini](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/) untuk mengonfigurasi Xorg sebagai sesi standar di GNOME.
-
-## Kompatibilitas dengan Wayland
-
-Sepertinya Wayland tidak memiliki API untuk mengirimkan ketukan tombol ke jendela lain. Maka dari itu, RustDesk menggunakan API dari level yang lebih rendah, lebih tepatnya perangkat `/dev/uinput` (linux kernel level)
-
-Saat Wayland menjadi sisi yang dikendalikan atau sisi yang sedang diremote, kamu harus memulai dengan cara ini
-
-```bash
-# Start uinput service
-$ sudo rustdesk --service
-$ rustdesk
-```
-
-**Harap Diperhatikan**: Saat Perekaman layar menggunakan Wayland antarmuka (UI) yang ditampilkan akan berbeda. Untuk saat ini RustDesk hanya mendukung org.freedesktop.portal.ScreenCast.
-
-```bash
-$ dbus-send --session --print-reply       \
-  --dest=org.freedesktop.portal.Desktop \
-  /org/freedesktop/portal/desktop       \
-  org.freedesktop.DBus.Properties.Get   \
-  string:org.freedesktop.portal.ScreenCast string:version
-# Not support
-Error org.freedesktop.DBus.Error.InvalidArgs: No such interface “org.freedesktop.portal.ScreenCast”
-# Support
-method return time=1662544486.931020 sender=:1.54 -> destination=:1.139 serial=257 reply_serial=2
-   variant       uint32 4
-```
-
 ## Cara Build dengan Docker
 
 Mulailah dengan melakukan kloning (clone) repositori dan build dengan docker container:

docs/README-IT.md

@@ -4,8 +4,8 @@
   <a href="#passaggi-per-la-compilazione">Compilazione</a> •
   <a href="#come-compilare-con-docker">Docker</a> •
   <a href="#struttura-dei-file">Struttura</a> •
-  <a href="#screenshots">Schermate</a><br>
+  <a href="#schermate">Schermate</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-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-GR.md">Ελληνικά</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-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>]<br>
   <b>Abbiamo bisogno del tuo aiuto per tradurre questo file README e la <a href="https://github.com/rustdesk/rustdesk/tree/master/src/lang">UI RustDesk</a> nella tua lingua nativa</b>
 </p>
 
@@ -13,28 +13,29 @@ Chatta con noi su: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://
 
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09)
 
-Ancora un altro software per il controllo remoto del desktop, scritto in Rust. 
+[![Bounties aperti](https://img.shields.io/endpoint?url=https%3A%2F%2Fconsole.algora.io%2Fapi%2Fshields%2Frustdesk%2Fbounties%3Fstatus%3Dopen)](https://console.algora.io/org/rustdesk/bounties?status=open)
-Funziona immediatamente, nessuna configurazione richiesta. Hai il pieno controllo dei tuoi dati, senza preoccupazioni per la sicurezza. 
-Puoi usare il nostro server rendezvous/relay, [configurare il tuo server](https://rustdesk.com/server) o [realizzare il tuo server rendezvous/relay](https://github.com/rustdesk/rustdesk-server-demo).
 
-RustDesk accoglie il contributo di tutti. 
+Ancora un altro software per il controllo remoto del desktop, scritto in Rust. Funziona immediatamente, nessuna configurazione richiesta. Hai il pieno controllo dei tuoi dati, senza preoccupazioni per la sicurezza. Puoi usare il nostro server rendezvous/relay, [configurare il tuo server](https://rustdesk.com/server) o [realizzare il tuo server rendezvous/relay](https://github.com/rustdesk/rustdesk-server-demo).
-Per ulteriori informazioni su come iniziare a contribuire, vedi [`docs/CONTRIBUTING-IT.md`](CONTRIBUTING.md).
 
-[**DOWNLOAD PROGRAMMA**](https://github.com/rustdesk/rustdesk/releases)
+![image](https://user-images.githubusercontent.com/71636191/171661982-430285f0-2e12-4b1d-9957-4a58e375304d.png)
 
-## Server pubblici gratuiti
+RustDesk accoglie il contributo di tutti. Per ulteriori informazioni su come iniziare a contribuire, vedi [CONTRIBUTING.md](CONTRIBUTING-IT.md).
 
-Qui sotto trovi i server che possono essere usati gratuitamente, la lista potrebbe cambiare nel tempo. 
+[**FAQ**](https://github.com/rustdesk/rustdesk/wiki/FAQ)
-Se non sei vicino a uno di questi server, la connessione potrebbe essere lenta.
 
-| Posizione | Venditore | Specifiche |
+[**SCARICA PROGRAMMA**](https://github.com/rustdesk/rustdesk/releases)
-| --------- | ------------- | ------------------ |
+
-| Germania | Hetzner | 2 vCPU / 4GB RAM |
+[**SCARICA NIGHTLY**](https://github.com/rustdesk/rustdesk/releases/tag/nightly)
-| Ucraina (Kyev) | [dc.volia](https://dc.volia.com) | 2 vCPU / 4GB RAM |
+
+[<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)
 
 ## Dipendenze
 
-La versione Desktop usa per la GUI [sciter](https://sciter.com/), per favore scarica la libreria dinamica sciter.
+Le versioni desktop utilizzano Flutter o Sciter (deprecato) per l'interfaccia utente, questo tutorial è solo per Sciter, poiché è più facile per iniziare. Controlla il nostro [CI](https://github.com/rustdesk/rustdesk/blob/master/.github/workflows/flutter-build.yml) per la compilazione della versione Flutter.
+
+Scarica la libreria dinamica 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) |
@@ -51,12 +52,22 @@ La versione Desktop usa per la GUI [sciter](https://sciter.com/), per favore sca
 
 - Esegui `cargo run`
 
+## [Build](https://rustdesk.com/docs/en/dev/build/)
+
 ## Come compilare in Linux
 
 ### Ubuntu 18 (Debian 10)
 
 ```sh
-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
+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
+```
+
+### 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
 ```
 
 ### Fedora 28 (CentOS 8)
@@ -109,11 +120,6 @@ mv libsciter-gtk.so target/debug
 VCPKG_ROOT=$HOME/vcpkg cargo run
 ```
 
-### Cambiare Wayland in X11 (Xorg)
-
-RustDesk non supporta Wayland. 
-Controlla [qui](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/) per configurare Xorg come sessione predefinita di GNOME.
-
 ## Come compilare con Docker
 
 Clona il repository e compila i container docker:
@@ -130,10 +136,7 @@ Quindi, ogni volta che devi compilare l'applicazione, esegui il seguente comando
 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
 ```
 
-Tieni presente che la prima build potrebbe richiedere più tempo prima che le dipendenze vengano memorizzate nella cache, le build successive saranno più veloci. 
+Tieni presente che la prima build potrebbe richiedere più tempo prima che le dipendenze vengano memorizzate nella cache, le build successive saranno più veloci. Inoltre, se hai bisogno di specificare argomenti diversi per il comando build, puoi farlo alla fine del comando nella posizione `<OPTIONAL-ARGS>`. Ad esempio, se vuoi creare una versione di rilascio ottimizzata, esegui il comando precedentemente indicato seguito da `--release`. L'eseguibile generato sarà creato nella cartella destinazione del sistema e può essere eseguito con:
-Inoltre, se hai bisogno di specificare argomenti diversi per il comando build, puoi farlo alla fine del comando nella posizione `<OPTIONAL-ARGS>`. 
-Ad esempio, se vuoi creare una versione di rilascio ottimizzata, esegui il comando precedentemente indicato seguito da `--release`. 
-L'eseguibile generato sarà creato nella cartella destinazione del sistema e può essere eseguito con:
 
 ```sh
 target/debug/rustdesk
@@ -145,19 +148,21 @@ Oppure, se stai avviando un eseguibile di rilascio:
 target/release/rustdesk
 ```
 
-Assicurati di eseguire questi comandi dalla radice del repository RustDesk, altrimenti l'applicazione potrebbe non essere in grado di trovare le risorse richieste. 
+Assicurati di eseguire questi comandi dalla radice del repository RustDesk, altrimenti l'applicazione potrebbe non essere in grado di trovare le risorse richieste. Nota inoltre che altri sottocomandi cargo come `install` o `run` non sono attualmente supportati tramite questo metodo poiché installerebbero o eseguirebbero il programma all'interno del container anziché nell'host.
-Nota inoltre che altri sottocomandi cargo come `install` o `run` non sono attualmente supportati tramite questo metodo poiché installerebbero o eseguirebbero il programma all'interno del container anziché nell'host.
 
 ## Struttura dei file
 
 - **[libs/hbb_common](https://github.com/rustdesk/rustdesk/tree/master/libs/hbb_common)**: codec video, config, wrapper tcp/udp, protobuf, funzioni per il trasferimento file, e altre funzioni utili.
 - **[libs/scrap](https://github.com/rustdesk/rustdesk/tree/master/libs/scrap)**: cattura dello schermo
 - **[libs/enigo](https://github.com/rustdesk/rustdesk/tree/master/libs/enigo)**: controllo tastiera/mouse specifico della piattaforma
-- **[src/ui](https://github.com/rustdesk/rustdesk/tree/master/src/ui)**: GUI
+- **[libs/clipboard](https://github.com/rustdesk/rustdesk/tree/master/libs/clipboard)**: implementazione del copia e incolla dei file per Windows, Linux, macOS.
+- **[src/ui](https://github.com/rustdesk/rustdesk/tree/master/src/ui)**: Sciter UI obsoleto (deprecato)
 - **[src/server](https://github.com/rustdesk/rustdesk/tree/master/src/server)**: servizi audio/appunti/input/video e connessioni di rete
 - **[src/client.rs](https://github.com/rustdesk/rustdesk/tree/master/src/client.rs)**: avvio di una connessione peer
-- **[src/rendezvous_mediator.rs](https://github.com/rustdesk/rustdesk/tree/master/src/rendezvous_mediator.rs)**: Comunica con [rustdesk-server](https://github.com/rustdesk/rustdesk-server), attende la connessione remota diretta (TCP hole punching) oppure indiretta (relayed)
+- **[src/rendezvous_mediator.rs](https://github.com/rustdesk/rustdesk/tree/master/src/rendezvous_mediator.rs)**: comunica con [rustdesk-server](https://github.com/rustdesk/rustdesk-server), attende la connessione remota diretta (TCP hole punching) oppure indiretta (relayed)
 - **[src/platform](https://github.com/rustdesk/rustdesk/tree/master/src/platform)**: codice specifico della piattaforma
+- **[flutter](https://github.com/rustdesk/rustdesk/tree/master/flutter)**: codice Flutter per desktop e mobile
+- **[flutter/web/js](https://github.com/rustdesk/rustdesk/tree/master/flutter/web/js)**: JavaScript per client web Flutter
 
 ## Schermate
 

docs/README-JP.md

@@ -1,67 +1,73 @@
 <p align="center">
-  <img src="../res/logo-header.svg" alt="RustDesk - Your remote desktop"><br>
+  <img src="../res/logo-header.svg" alt="RustDesk - あなたのためのリモートデスクトップ"><br>
   <a href="#free-public-servers">Servers</a> •
   <a href="#raw-steps-to-build">Build</a> •
   <a href="#how-to-build-with-docker">Docker</a> •
   <a href="#file-structure">Structure</a> •
   <a href="#snapshot">Snapshot</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-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-GR.md">Ελληνικά</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>]<br>
-  <b>このREADMEをあなたの母国語に翻訳するために、あなたの助けが必要です。</b>
+  <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 Doc</a>の翻訳者を歓迎します！</b>
 </p>
 
-Chat with us: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk)
+私たちと話す: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk)
-
 
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09)
 
-Rustで書かれた、設定不要ですぐに使えるリモートデスクトップソフトウェアです。自分のデータを完全にコントロールでき、セキュリティの心配もありません。私たちのランデブー/リレーサーバを使うことも、[自分で設定する](https://rustdesk.com/server) ことも、 [自分でランデブー/リレーサーバを書くこともできます](https://github.com/rustdesk/rustdesk-server-demo)。
+Rustで書かれた、設定不要ですぐに使えるリモートデスクトップソフトウェアです。自分のデータを完全にコントロールでき、セキュリティの心配もありません。私たちのランデブー/リレーサーバを使うことも、[自分でサーバーをセットアップする](https://rustdesk.com/server) ことも、 [自分でランデブー/リレーサーバを作成する](https://github.com/rustdesk/rustdesk-server-demo)こともできます。
 
 ![image](https://user-images.githubusercontent.com/71636191/171661982-430285f0-2e12-4b1d-9957-4a58e375304d.png)
 
-RustDeskは誰からの貢献も歓迎します。 貢献するには [`docs/CONTRIBUTING.md`](CONTRIBUTING.md) を参照してください。
+RustDeskは皆さんの貢献を歓迎します。  
+貢献の方法については[CONTRIBUTING.md](docs/CONTRIBUTING.md)をご確認ください。
 
-[**RustDeskはどの様に動くのか?**](https://github.com/rustdesk/rustdesk/wiki/How-does-RustDesk-work%3F)
+[**よくある質問**](https://github.com/rustdesk/rustdesk/wiki/FAQ)
 
-[**BINARY DOWNLOAD**](https://github.com/rustdesk/rustdesk/releases)
+[**パッケージのダウンロード**](https://github.com/rustdesk/rustdesk/releases)
 
-## 無料のパブリックサーバー
+[**ナイトリービルド**](https://github.com/rustdesk/rustdesk/releases/tag/nightly)
 
-下記のサーバーは、無料で使用できますが、後々変更されることがあります。これらのサーバーから遠い場合、接続が遅い可能性があります。
+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-| Location | Vendor | Specification |
+    alt="F-Droidで入手する"
-| --------- | ------------- | ------------------ |
+    height="80">](https://f-droid.org/en/packages/com.carriez.flutter_hbb)
-| Germany | Hetzner | 2 vCPU / 4GB RAM |
 
 ## 依存関係
 
-デスクトップ版ではGUIに [sciter](https://sciter.com/) が使われています。 sciter dynamic library をダウンロードしてください。
+デスクトップ版ではGUIにFlutterまたはSciter(非推奨)を使用しますが、チュートリアルでは分かりやすく、簡単なSciterのみを対象に解説しています。Flutterでのビルド方法については[CI](https://github.com/rustdesk/rustdesk/blob/master/.github/workflows/flutter-build.yml)をご覧ください。
+
+Sciter dynamic libraryを事前にダウンロードしてください。
 
 [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)
-
-モバイル版はFlutterを利用します。デスクトップ版もSciterからFlutterへマイグレーション予定です。
 
 ## ビルド手順
 
-- Rust開発環境とC ++ビルド環境を準備します
+- Rust開発環境とC++ビルド環境を準備します。
 
-- [vcpkg](https://github.com/microsoft/vcpkg), をインストールし、 `VCPKG_ROOT` 環境変数を正しく設定します。
+- [vcpkg](https://github.com/microsoft/vcpkg)をインストールし、環境変数に`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
-
-- run `cargo run`
 
+  - 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
 
+- `cargo run`を実行します。
 
 ## [ビルド](https://rustdesk.com/docs/en/dev/build/)
 
-## Linuxでのビルド手順
+## Linuxでのビルド方法
 
 ### Ubuntu 18 (Debian 10)
 
 ```sh
-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
+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
+```
+
+### 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
 ```
 
 ### Fedora 28 (CentOS 8)
@@ -76,7 +82,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
 ```
 
-### Install vcpkg
+### vcpkgのインストール
 
 ```sh
 git clone https://github.com/microsoft/vcpkg
@@ -88,7 +94,7 @@ export VCPKG_ROOT=$HOME/vcpkg
 vcpkg/vcpkg install libvpx libyuv opus aom
 ```
 
-### Fix libvpx (For Fedora)
+### libvpxの修正 (Fedoraのみ)
 
 ```sh
 cd vcpkg/buildtrees/libvpx/src
@@ -114,14 +120,9 @@ mv libsciter-gtk.so target/debug
 VCPKG_ROOT=$HOME/vcpkg cargo run
 ```
 
-### Wayland の場合、X11（Xorg）に変更します
+## Dockerでのビルド方法
 
-RustDeskはWaylandをサポートしていません。
+リポジトリをクローンし、Dockerコンテナを構築します:
- [こちら](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/) を確認して、XorgをデフォルトのGNOMEセッションとして構成します。
-
-## Dockerでビルドする方法
-
-リポジトリのクローンを作成し、Dockerコンテナを構築することから始めます。
 
 ```sh
 git clone https://github.com/rustdesk/rustdesk
@@ -129,44 +130,50 @@ cd rustdesk
 docker build -t "rustdesk-builder" .
 ```
 
-その後、アプリケーションをビルドする必要があるたびに、以下のコマンドを実行します。
+以下のコマンドを実行します:
 
 ```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
 ```
+このコマンドはRustDeskをビルドする度に実行する必要があります。  
 
-なお、最初のビルドでは、依存関係がキャッシュされるまで時間がかかることがありますが、その後のビルドではより速くなります。さらに、ビルドコマンドに別の引数を指定する必要がある場合は、コマンドの最後にある `<OPTIONAL-ARGS>` の位置で指定することができます。例えば、最適化されたリリースバージョンをビルドしたい場合は、上記のコマンドの後に
+初回ビルドは時間がかかるかもしれませんが、2回目以降は依存関係がキャッシュされるため、ビルドにかかる時間が短くなります。  
-`--release` を実行します。できあがった実行ファイルは、システムのターゲット・フォルダに格納され、次のコマンドで実行できます。
+ビルドコマンドに追加の引数を指定する必要がある場合は、コマンドの最後(`<OPTIONAL-ARGS>`の位置)で指定することができます。例えば、最適化されたリリースバージョンをビルドしたい場合は、上記のコマンドの後に `--release` を追記し実行します。ビルドされた実行ファイルはあなたのシステムのターゲットフォルダに保存され、下記のコマンドで実行することができます。  
 
+デバッグビルドを起動する場合:
 ```sh
 target/debug/rustdesk
 ```
 
-あるいは、リリース用の実行ファイルを実行している場合:
+リリースビルドを起動する場合:
 
 ```sh
 target/release/rustdesk
 ```
 
-これらのコマンドをRustDeskリポジトリのルートから実行していることを確認してください。そうしないと、アプリケーションが必要なリソースを見つけられない可能性があります。また、 `install` や `run` などの他の cargo サブコマンドは、ホストではなくコンテナ内にプログラムをインストールまたは実行するため、現在この方法ではサポートされていないことに注意してください。
+コマンドをRustDeskリポジトリのルートから実行していることを確認してください。また、`install` や `run` などの他のcargoサブコマンドは、ホストではなくコンテナ内でプログラムをインストール、実行するため、現在の方法ではサポートされていません。
 
 ## ファイル構造
 
-- **[libs/hbb_common](https://github.com/rustdesk/rustdesk/tree/master/libs/hbb_common)**: ビデオコーデック、コンフィグ、tcp/udpラッパー、protobuf、ファイル転送用のfs関数、その他のユーティリティ関数
+- **[libs/hbb_common](https://github.com/rustdesk/rustdesk/tree/master/libs/hbb_common)**: ビデオコーデック、設定、tcp/udpラッパー、protobuf、ファイル転送に利用されるfs関数やその他のユーティリティ関数
 - **[libs/scrap](https://github.com/rustdesk/rustdesk/tree/master/libs/scrap)**: スクリーンキャプチャ
-- **[libs/enigo](https://github.com/rustdesk/rustdesk/tree/master/libs/enigo)**: プラットフォーム固有のキーボード/マウスコントロール
+- **[libs/enigo](https://github.com/rustdesk/rustdesk/tree/master/libs/enigo)**: プラットフォーム固有のキーボード/マウス操作
-- **[src/ui](https://github.com/rustdesk/rustdesk/tree/master/src/ui)**: GUI
+- **[libs/clipboard](https://github.com/rustdesk/rustdesk/tree/master/libs/clipboard)**: Windows、Linux、macOS向けのファイルのコピーと貼り付けの実装
-- **[src/server](https://github.com/rustdesk/rustdesk/tree/master/src/server)**: オーディオ/クリップボード/入力/ビデオサービス、ネットワーク接続
+- **[src/ui](https://github.com/rustdesk/rustdesk/tree/master/src/ui)**: 廃止された Sciter UI (非推奨)
+- **[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-server](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-server](https://github.com/rustdesk/rustdesk-server)と通信し、リモートの直接接続(TCPホールパンチング)や中継接続を担う。
 - **[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/js)**: Flutterウェブクライアント向けのJavaScript
 
-## スナップショット
+## スクリーンショット
 
-![image](https://user-images.githubusercontent.com/71636191/113112362-ae4deb80-923b-11eb-957d-ff88daad4f06.png)
+![Connection Manager](https://github.com/rustdesk/rustdesk/assets/28412477/db82d4e7-c4bc-4823-8e6f-6af7eadf7651)
 
-![image](https://user-images.githubusercontent.com/71636191/113112619-f705a480-923b-11eb-911d-97e984ef52b6.png)
+![Connected to a Windows PC](https://github.com/rustdesk/rustdesk/assets/28412477/9baa91e9-3362-4d06-aa1a-7518edcbd7ea)
 
-![image](https://user-images.githubusercontent.com/71636191/113112857-3fbd5d80-923c-11eb-9836-768325faf906.png)
+![File Transfer](https://github.com/rustdesk/rustdesk/assets/28412477/39511ad3-aa9a-4f8c-8947-1cce286a46ad)
 
-![image](https://user-images.githubusercontent.com/71636191/135385039-38fdbd72-379a-422d-b97f-33df71fb1cec.png)
+![TCP Tunneling](https://github.com/rustdesk/rustdesk/assets/28412477/78e8708f-e87e-4570-8373-1360033ea6c5)

docs/README-KR.md

@@ -24,13 +24,6 @@ RustDesk는 모든 기여를 환영합니다. 기여하고자 한다면 [`docs/C
 
 [**BINARY DOWNLOAD**](https://github.com/rustdesk/rustdesk/releases)
 
-## 무료 퍼블릭 서버
-
-표에 있는 서버는 무료로 사용할 수 있지만 추후 변경될 수도 있습니다. 이 서버에서 멀다면, 네트워크가 느려질 가능성도 있습니다.
-| Location | Vendor | Specification |
-| --------- | ------------- | ------------------ |
-| Germany | Hetzner | 2 vCPU / 4GB RAM |
-
 ## 의존관계
 
 데스크탑판에는 GUI에 [sciter](https://sciter.com/)가 사용되었습니다. sciter dynamic library 를 다운로드해주세요. 
@@ -112,10 +105,6 @@ mv libsciter-gtk.so target/debug
 VCPKG_ROOT=$HOME/vcpkg cargo run
 ```
 
-### Wayland 일 경우, X11(Xorg)로 변경
-
-RustDesk는 Wayland를 지원하지 않습니다. [링크](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/)를 확인해서 Xorg 기본값의 GNOME 세션을 구성합니다.
-
 ## Docker에 빌드하는 방법
 
 레포지토리를 클론하고, Docker 컨테이너 구성하는 것으로 시작합니다.

docs/README-ML.md

@@ -19,13 +19,6 @@
 
 [**BINARY DOWNLOAD**](https://github.com/rustdesk/rustdesk/releases)
 
-## സൗജന്യ പൊതു സെർവറുകൾ
-
-നിങ്ങൾ സൗജന്യമായി ഉപയോഗിക്കുന്ന സെർവറുകൾ ചുവടെയുണ്ട്, അത് സമയത്തിനനുസരിച്ച് മാറിയേക്കാം. നിങ്ങൾ ഇവയിലൊന്നിനോട് അടുത്തല്ലെങ്കിൽ, നിങ്ങളുടെ നെറ്റ്‌വർക്ക് സ്ലോ ആയേക്കാം.
-| സ്ഥാനം | കച്ചവടക്കാരൻ | വിവരണം |
-| --------- | ------------- | ------------------ |
-| Germany | Hetzner | 2 vCPU / 4GB RAM |
-
 ## ഡിപെൻഡൻസികൾ
 
 ഡെസ്‌ക്‌ടോപ്പ് പതിപ്പുകൾ GUI-യ്‌ക്കായി [sciter](https://sciter.com/) ഉപയോഗിക്കുന്നു, ദയവായി സ്‌സൈറ്റർ ഡൈനാമിക് ലൈബ്രറി സ്വയം ഡൗൺലോഡ് ചെയ്യുക.
@@ -103,10 +96,6 @@ mv libsciter-gtk.so target/debug
 VCPKG_ROOT=$HOME/vcpkg cargo run
 ```
 
-### വേലാൻഡ് X11 (Xorg) ആയി മാറ്റുക
-
-RustDesk Wayland-നെ പിന്തുണയ്ക്കുന്നില്ല. സ്ഥിരസ്ഥിതി ഗ്നോം സെഷനായി Xorg കോൺഫിഗർ ചെയ്യുന്നതിന് [ഇത്](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/) പരിശോധിക്കുക.
-
 ## ഡോക്കർ ഉപയോഗിച്ച് എങ്ങനെ നിർമ്മിക്കാം
 
  റെപ്പോസിറ്റോറി ക്ലോണുചെയ്‌ത് ഡോക്കർ കണ്ടെയ്‌നർ നിർമ്മിക്കുന്നതിലൂടെ ആരംഭിക്കുക:

docs/README-NL.md

@@ -27,22 +27,6 @@ RustDesk verwelkomt bijdragen van iedereen. Zie [`docs/CONTRIBUTING.md`](CONTRIB
     alt="Download het op F-Droid"
     height="80">](https://f-droid.org/en/packages/com.carriez.flutter_hbb)
 
-## Gratis openbare servers
-
-Hieronder staan de servers die u gratis gebruikt, ze kunnen in de loop van de tijd veranderen. Als u niet in de buurt van een van deze servers bevindt, kan uw vervinding langzamer zijn.
-| Locatie | Aanbieder | Specificaties |
-| --------- | ------------- | ------------------ |
-| Duitsland | Hetzner | 2 vCPU / 4GB RAM |
-| Oekraine (Kyiv) | [dc.volia](https://dc.volia.com) | 2 vCPU / 4GB RAM |
-
-## Dev Container
-
-[![Open in Dev Containers](https://img.shields.io/static/v1?label=Dev%20Container&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/rustdesk/rustdesk)
-
-Als u VS Code en Docker al hebt geinstalleerd, kunt u op de bovenstaande badge klikken om te beginnen. Door te klikken zal VS Code automatisch de Dev Containers-extensie installeren indien nodig, de broncode klonen naar een containervolume en een dev container opstarten voor gebruik.
-
-Bekijk [DEVCONTAINER.md](docs/DEVCONTAINER.md) voor meer informatie.
-
 ## Afhankelijkheden
 
 Desktop versies gebruiken [sciter](https://sciter.com/) of Flutter voor GUI, deze handleiding is alleen voor Sciter.
@@ -130,34 +114,6 @@ mv libsciter-gtk.so target/debug
 VCPKG_ROOT=$HOME/vcpkg cargo run
 ```
 
-### Wissel van Wayland naar X11 (Xorg)
-
-RustDesk ondersteunt Wayland niet. Lees [hier](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/) hoe je Xorg als standaardsessie kunt instellen voor GNOME.
-
-## Wayland support
-
-Wayland lijkt geen API te bieden voor het verzenden van toetsaanslagen naar andere vensters. Daarom gebruikt de rustdesk een API van een lager niveau, namelijk het `/dev/uinput` apparaat (Linux kernel niveau).
-
-Als wayland de gecontroleerde kant is, moet je op de volgende manier beginnen:
-```bash
-# Start uinput service
-$ sudo rustdesk --service
-$ rustdesk
-```
-**Let op**: Wayland schermopname gebruikt verschillende interfaces. RustDesk ondersteunt momenteel alleen org.freedesktop.portal.ScreenCast.
-```bash
-$ dbus-send --session --print-reply       \
-  --dest=org.freedesktop.portal.Desktop \
-  /org/freedesktop/portal/desktop       \
-  org.freedesktop.DBus.Properties.Get   \
-  string:org.freedesktop.portal.ScreenCast string:version
-# Not support
-Error org.freedesktop.DBus.Error.InvalidArgs: No such interface “org.freedesktop.portal.ScreenCast”
-# Support
-method return time=1662544486.931020 sender=:1.54 -> destination=:1.139 serial=257 reply_serial=2
-   variant       uint32 4
-```
-
 ## Bouwen met Docker
 
 Begin met het klonen van de repository en het bouwen van de docker container:

docs/README-PL.md

@@ -29,22 +29,6 @@ RustDesk zaprasza do współpracy każdego. Zobacz [`docs/CONTRIBUTING-PL.md`](C
     alt="Get it on F-Droid"
     height="80">](https://f-droid.org/en/packages/com.carriez.flutter_hbb)
 
-## Darmowe Serwery Publiczne
-
-Poniżej znajdują się serwery, z których można korzystać za darmo, może się to zmienić z upływem czasu. Jeśli nie znajdujesz się w pobliżu jednego z nich, Twoja prędkość połączenia może być niska.
-| Lokalizacja | Dostawca | Specyfikacja |
-| --------- | ------------- | ------------------ |
-| Niemcy | Hetzner | 2 vCPU / 4GB RAM |
-| Ukraina (Kijów) | [dc.volia](https://dc.volia.com) | 2 vCPU / 4GB RAM |
-
-## Konterner Programisty (Dev Container)
-
-[![Otwórz w Kontenerze programisty](https://img.shields.io/static/v1?label=Dev%20Container&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/rustdesk/rustdesk)
-
-Jeżeli masz zainstalowany VS Code i Docker, możesz kliknąć w powyższy link, aby rozpocząć. Kliknięcie spowoduje automatyczną instalację rozszrzenia Kontenera Programisty w VS Code (jeżeli wymagany), sklonuje kod źródłowy do kontenera, i przygotuje kontener do użycia.
-
-Więcej informacji w pliku [DEVCONTAINER-PL.md](docs/DEVCONTAINER-PL.md) for more info.
-
 ## Zależności
 
 Wersje desktopowe używają [sciter](https://sciter.com/) dla GUI, proszę pobrać samodzielnie bibliotekę sciter.
@@ -128,34 +112,6 @@ mv libsciter-gtk.so target/debug
 cargo run
 ```
 
-### Zmień Wayland na X11 (Xorg)
-
-RustDesk nie obsługuje Waylanda. Sprawdź [tutaj](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/), jak skonfigurować Xorg jako domyślną sesję GNOME.
-
-## Wspracie Wayland
-
-Wygląda na to, że Wayland nie wspiera żadnego API do wysyłania naciśnięć klawiszy do innych okien. Dlatego rustdesk używa API z niższego poziomu, urządzenia o nazwie `/dev/uinput` (poziom jądra Linux).
-
-Gdy po stronie kontrolowanej pracuje Wayland, musisz uruchomić program w następujący sposób:
-```bash
-# Start uinput service
-$ sudo rustdesk --service
-$ rustdesk
-```
-**Uwaga**: Nagrywanie ekranu Wayland wykorzystuje różne interfejsy. RustDesk obecnie obsługuje tylko org.freedesktop.portal.ScreenCast.
-```bash
-$ dbus-send --session --print-reply       \
-  --dest=org.freedesktop.portal.Desktop \
-  /org/freedesktop/portal/desktop       \
-  org.freedesktop.DBus.Properties.Get   \
-  string:org.freedesktop.portal.ScreenCast string:version
-# Not support
-Error org.freedesktop.DBus.Error.InvalidArgs: No such interface “org.freedesktop.portal.ScreenCast”
-# Support
-method return time=1662544486.931020 sender=:1.54 -> destination=:1.139 serial=257 reply_serial=2
-   variant       uint32 4
-```
-
 ## Jak kompilować za pomocą Dockera
 
 Rozpocznij od sklonowania repozytorium i stworzenia kontenera docker:

docs/README-PTBR.md

@@ -19,14 +19,6 @@ RustDesk acolhe contribuições de todos. Leia [`docs/CONTRIBUTING.md`](CONTRIBU
 
 [**DOWNLOAD DE BINÁRIOS**](https://github.com/rustdesk/rustdesk/releases)
 
-## Servidores Públicos Grátis
-
-Abaixo estão os servidores que você está utilizando de graça, ele pode mudar com o tempo. Se você não está próximo de algum deles, sua conexão pode ser lenta.
-
-| Localização | Fornecedor    | Especificações     |
-| ----------- | ------------- | ------------------ |
-| Germany | Hetzner | 2 vCPU / 4GB RAM |
-
 ## Dependências
 
 Versões de desktop utilizam [sciter](https://sciter.com/) para a GUI, por favor baixe a biblioteca dinâmica sciter por conta própria.
@@ -104,10 +96,6 @@ mv libsciter-gtk.so target/debug
 VCPKG_ROOT=$HOME/vcpkg cargo run
 ```
 
-### Mude Wayland para X11 (Xorg)
-
-RustDesk não suporta Wayland. Veja [esse link](https://docs.fedoraproject.org/pt_BR/quick-docs/configuring-xorg-as-default-gnome-session/) para configurar o Xorg como a sessão padrão do GNOME.
-
 ## Como compilar com Docker
 
 Comece clonando o repositório e montando o container docker:

docs/README-RU.md

@@ -28,13 +28,6 @@ RustDesk приветствует вклад каждого. Ознакомьт
 
 [<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)
 
-## Бесплатные общедоступные серверы
-
-Ниже приведены бесплатные публичные сервера, используемые по умолчанию. Имейте ввиду, они могут меняться со временем. Также стоит отметить, что скорость работы сети зависит от вашего местоположения и расстояния до серверов. Подключение происходит к ближайшему доступному.
-| Расположение | Поставщик | Технические характеристики |
-| --------- | ------------- | ------------------ |
-| Германия | Hetzner | 2 vCPU / 4GB RAM |
-
 ## Зависимости
 
 Настольные версии используют [sciter](https://sciter.com/) для графического интерфейса, загрузите динамическую библиотеку sciter самостоятельно.
@@ -114,10 +107,6 @@ mv libsciter-gtk.so target/debug
 VCPKG_ROOT=$HOME/vcpkg cargo run
 ```
 
-### Смените Wayland на X11 (Xorg)
-
-RustDesk не поддерживает Wayland. Смотрите [этот документ](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/) для настройки Xorg в качестве сеанса GNOME по умолчанию.
-
 ## Как собрать с помощью Docker
 
 Начните с клонирования репозитория и создания docker-контейнера:

docs/README-TR.md

@@ -30,23 +30,6 @@ RustDesk, herkesten katkıyı kabul eder. Başlamak için [CONTRIBUTING.md](docs
     alt="F-Droid'de Alın"
     height="80">](https://f-droid.org/en/packages/com.carriez.flutter_hbb)
 
-## Ücretsiz Genel Sunucular
-
-Aşağıda ücretsiz olarak kullandığınız sunucular listelenmiştir, zaman içinde değişebilirler. Eğer bunlardan birine yakın değilseniz, ağınız yavaş olabilir.
-| Konum | Sağlayıcı | Özellikler |
-| --------- | ------------- | ------------------ |
-| Almanya | [Hetzner](https://www.hetzner.com) | 2 vCPU / 4 GB RAM |
-| Almanya | [Codext](https://codext.de) | 4 vCPU / 8 GB RAM |
-| Ukrayna (Kiev) | [dc.volia](https://dc.volia.com) | 2 vCPU / 4 GB RAM |
-
-## Geliştirici Konteyneri
-
-[![Open in Dev Containers](https://img.shields.io/static/v1?label=Dev%20Container&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/rustdesk/rustdesk)
-
-Eğer zaten VS Code ve Docker kurulu ise yukarıdaki rozete tıklayarak başlayabilirsiniz. Tıklamak, VS Code'un gerektiğinde Dev Konteyner eklentisini otomatik olarak yüklemesine, kaynak kodunu bir konteyner hacmine klonlamasına ve kullanım için bir geliştirici konteyneri başlatmasına neden olur.
-
-Daha fazla bilgi için [DEVCONTAINER.md](docs/DEVCONTAINER-TR.md) belgesine bakabilirsiniz.
-
 ## Bağımlılıklar
 
 Masaüstü sürümleri GUI için
@@ -138,34 +121,6 @@ mv libsciter-gtk.so target/debug
 VCPKG_ROOT=$HOME/vcpkg cargo run
 ```
 
-### Wayland'ı X11 (Xorg) Olarak Değiştirme
-
-RustDesk, Wayland'ı desteklemez. Xorg'u GNOME oturumu olarak varsayılan olarak ayarlamak için [burayı](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/) kontrol edin.
-
-## Wayland Desteği
-
-Wayland'ın diğer pencerelere tuş vuruşu göndermek için herhangi bir API sağlamadığı görünmektedir. Bu nedenle, RustDesk daha düşük bir seviyeden, yani Linux çekirdek seviyesindeki `/dev/uinput` cihazının API'sini kullanır.
-
-Wayland tarafı kontrol edildiğinde, aşağıdaki şekilde başlatmanız gerekir:
-```bash
-# uinput servisini başlatın
-$ sudo rustdesk --service
-$ rustdesk
-```
-**Uyarı**: Wayland ekran kaydı farklı arayüzler kullanır. RustDesk şu anda yalnızca org.freedesktop.portal.ScreenCast'ı destekler.
-```bash
-$ dbus-send --session --print-reply       \
-  --dest=org.freedesktop.portal.Desktop \
-  /org/freedesktop/portal/desktop       \
-  org.freedesktop.DBus.Properties.Get   \
-  string:org.freedesktop.portal.ScreenCast string:version
-# Desteklenmez
-Error org.freedesktop.DBus.Error.InvalidArgs: No such interface “org.freedesktop.portal.ScreenCast”
-# Desteklenir
-method return time=1662544486.931020 sender=:1.54 -> destination=:1.139 serial=257 reply_serial=2
-   variant       uint32 4
-```
-
 ## Docker ile Derleme Nasıl Yapılır
 
 Öncelikle deposunu klonlayın ve Docker konteynerini oluşturun:

docs/README-UA.md

@@ -1,71 +1,59 @@
 <p align="center">
-  <img src="../res/logo-header.svg" alt="RustDesk - Ваш віддалений робочий стіл"><br>
+  <img src="../res/logo-header.svg" alt="RustDesk - Ваша віддалена стільниця"><br>
   <a href="#безкоштовні-загальнодоступні-сервери">Сервери</a> •
-  <a href="#первинні-кроки-для-складання">Складання</a> •
+  <a href="#кроки-для-збірки">Збирання</a> •
   <a href="#як-зібрати-за-допомогою-docker">Docker</a> •
   <a href="#структура-файлів">Структура</a> •
   <a href="#знімки">Знімки</a><br>
-  [<a href="../README.md">English</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-GR.md">Ελληνικά</a>]<br>
+  [<a href="../README.md">English</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>]<br>
-  <b>Нам потрібна ваша допомога для перекладу цього README і <a href="https://github.com/rustdesk/rustdesk/tree/master/src/rustdesk/tree/master/src/lang">RustDesk UI</a> на вашу рідну мову</B>
+  <b>Нам потрібна ваша допомога для перекладу цього README, <a href="https://github.com/rustdesk/rustdesk/tree/master/src/lang">інтерфейсу</a> та <a href="https://github.com/rustdesk/doc.rustdesk.com">документації</a> RustDesk на вашу рідну мову</B>
 </p>
 
 Спілкування з нами: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk)
 
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09)
 
-Ще одне програмне забезпечення для віддаленого робочого столу, написане на Rust. Працює з коробки, не потребує налаштування. Ви повністю контролюєте свої дані, не турбуючись про безпеку. Ви можете використовувати наш сервер ретрансляції, [налаштувати свій власний](https://rustdesk.com/server), або [написати свій власний сервер ретрансляції](https://github.com/rustdesk/rustdesk-server-demo).
+[![Open Bounties](https://img.shields.io/endpoint?url=https%3A%2F%2Fconsole.algora.io%2Fapi%2Fshields%2Frustdesk%2Fbounties%3Fstatus%3Dopen)](https://console.algora.io/org/rustdesk/bounties?status=open)
+
+Ще один застосунок для віддаленого керування стільницею, написаний на Rust. Працює з коробки, не потребує налаштування. Ви повністю контролюєте свої дані, не турбуючись про безпеку. Ви можете використовувати наш сервер ретрансляції, [налаштувати свій власний](https://rustdesk.com/server), або [написати свій власний сервер ретрансляції](https://github.com/rustdesk/rustdesk-server-demo).
 
 ![image](https://user-images.githubusercontent.com/71636191/171661982-430285f0-2e12-4b1d-9957-4a58e375304d.png)
 
-RustDesk вітає внесок кожного. Дивіться [`docs/CONTRIBUTING.md`](CONTRIBUTING.md) для допомоги на початку роботи.
+RustDesk вітає внесок кожного. Ознайомтеся з [CONTRIBUTING.md](docs/CONTRIBUTING.md), щоб отримати допомогу на початковому етапі.
 
-[**FAQ**](https://github.com/rustdesk/rustdesk/wiki/FAQ)
+[**ЧаПи**](https://github.com/rustdesk/rustdesk/wiki/FAQ)
 
-[**Як працює RustDesk?**](https://github.com/rustdesk/rustdesk/wiki/How-does-RustDesk-work%3F)
+[**ЗАВАНТАЖЕННЯ ЗАСТОСУНКУ**](https://github.com/rustdesk/rustdesk/releases)
 
-[**ЗАВАНТАЖИТИ ЗАСТОСУНОК**](https://github.com/rustdesk/rustdesk/releases)
+[**НІЧНІ ЗБІРКИ**](https://github.com/rustdesk/rustdesk/releases/tag/nightly)
 
 [<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)
 
-## Безкоштовні загальнодоступні сервери
-
-Нижче наведені сервери, для безкоштовного використання, вони можуть змінюватися з часом. Якщо ви не перебуваєте поруч з одним із них, ваша мережа може працювати повільно.
-| Місцезнаходження | Постачальник | Технічні характеристики |
-| --------- | ------------- | ------------------ |
-| Німеччина | Hetzner | 2 VCPU / 4GB RAM |
-| Україна (Київ) | [dc.volia](https://dc.volia.com) | 2 vCPU / 4GB RAM |
-
-## Dev Container
-
-[![Open in Dev Containers](https://img.shields.io/static/v1?label=Dev%20Container&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/rustdesk/rustdesk)
-
-Якщо у вас уже встановлено VS Code і Docker, ви можете натиснути значок вище, щоб почати. Клацання призведе до того, що VS Code автоматично встановить розширення Dev Containers, якщо це необхідно, клонує виcхідний код у том контейнера та розгорне контейнер dev для використання.
-
-Дивіться [DEVCONTAINER.md](docs/DEVCONTAINER.md) для додаткової інфо.
-
 ## Залежності
 
-Настільні версії використовують [sciter](https://sciter.com/) для графічного інтерфейсу, завантажте динамічну бібліотеку sciter самостійно.
+Стільничні версії використовують Flutter чи Sciter (застаріле) для графічного інтерфейсу. Ця інструкція лише для Sciter, оскільки він є більш простим та дружнім для початківців. Перегляньте [CI](https://github.com/rustdesk/rustdesk/blob/master/.github/workflows/flutter-build.yml) для збірки версії на Flutter.
+
+Будь ласка, завантажте динамічну бібліотеку 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)
+[macOS](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.osx/libsciter.dylib)
 
-Мобільні версії використовують Flutter. У майбутньому ми перенесемо настільну версію зі Sciter на Flutter.
+## Кроки для збірки
 
-## Первинні кроки для складання
+- Підготуйте середовище розробки Rust і середовище збирання C++.
-
-- Підготуйте середовище розробки Rust і середовище збірки C++.
 
 - Встановіть [vcpkg](https://github.com/microsoft/vcpkg), і правильно встановіть змінну `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/macOS: vcpkg install libvpx libyuv opus aom
 
 - Запустіть `cargo run`
 
+## [Збирання](https://rustdesk.com/docs/en/dev/build/)
+
 ## Як зібрати на Linux 
 
 ### Ubuntu 18 (Debian 10)
@@ -81,6 +69,7 @@ sudo apt install -y zip g++ gcc git curl wget nasm yasm libgtk-3-dev clang libxc
 ```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
 ```
+
 ### Fedora 28 (CentOS 8)
 
 ```sh
@@ -99,7 +88,7 @@ sudo pacman -Syu --needed unzip git cmake gcc curl wget yasm nasm zip make pkg-c
 git clone https://github.com/microsoft/vcpkg
 cd vcpkg
 git checkout 2023.04.15
-cd ...
+cd ..
 vcpkg/bootstrap-vcpkg.sh
 export VCPKG_ROOT=$HOME/vcpkg
 vcpkg/vcpkg install libvpx libyuv opus aom
@@ -118,7 +107,7 @@ cp libvpx.a $HOME/vcpkg/installed/x64-linux/lib/
 cd
 ```
 
-### Збірка
+### Збирання
 
 ```sh
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
@@ -131,10 +120,6 @@ mv libsciter-gtk.so target/debug
 VCPKG_ROOT=$HOME/vcpkg cargo run
 ```
 
-### Змініть Wayland на X11 (Xorg)
-
-RustDesk не підтримує Wayland. Дивіться [цей документ](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/) для налаштування Xorg як сеансу GNOME за замовчуванням.
-
 ## Як зібрати за допомогою Docker
 
 Почніть з клонування сховища та створення docker-контейнера:
@@ -145,7 +130,7 @@ cd rustdesk
 docker build -t "rustdesk-builder" .
 ```
 
-Потім кожного разу, коли вам потрібно зібрати додаток, запускайте таку команду:
+Надалі щоразу, коли вам буде потрібно зібрати застосунок, запускайте таку команду:
 
 ```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
@@ -170,6 +155,7 @@ target/release/rustdesk
 - **[libs/hbb_common](https://github.com/rustdesk/rustdesk/tree/master/libs/hbb_common)**: відеокодек, конфіг, обгортка tcp/udp, protobuf, функції fs для передавання файлів і деякі інші службові функції
 - **[libs/scrap](https://github.com/rustdesk/rustdesk/tree/master/libs/scrap)**: захоплення екрана
 - **[libs/enigo](https://github.com/rustdesk/rustdesk/tree/master/libs/enigo)**: специфічне для платформи керування клавіатурою/мишею
+- **[libs/clipboard](https://github.com/rustdesk/rustdesk/tree/master/libs/clipboard)**: реалізація копіювання та вставлення файлів для Windows, Linux, macOS.
 - **[src/ui](https://github.com/rustdesk/rustdesk/tree/master/src/ui)**: графічний інтерфейс користувача
 - **[src/server](https://github.com/rustdesk/rustdesk/tree/master/src/server)**: сервіси аудіо/буфера обміну/вводу/відео та мережевих підключень
 - **[src/client.rs](https://github.com/rustdesk/rustdesk/tree/master/src/client.rs)**: однорангове з'єднання

docs/README-VN.md

@@ -1,64 +1,55 @@
+
+
 <p align="center">
-  <img src="../res/logo-header.svg" alt="RustDesk - Phần mềm điểu khiển máy tính từ xa dành cho bạn"><br>
+  <img src="../res/logo-header.svg" alt="RustDesk - Your remote desktop"><br>
-  <a href="#free-public-servers">Máy chủ</a> •
+  <a href="#free-public-servers">Server</a> •
   <a href="#raw-steps-to-build">Build</a> •
   <a href="#how-to-build-with-docker">Docker</a> •
-  <a href="#file-structure">Cấu trúc tệp tin</a> •
+  <a href="#file-structure">Structure</a> •
   <a href="#snapshot">Snapshot</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-GR.md">Ελληνικά</a>]<br>
-  <b>Chúng tôi cần sự gíup đỡ của bạn để dịch trang README này, <a href="https://github.com/rustdesk/rustdesk/tree/master/src/lang">RustDesk UI</a> và <a href="https://github.com/rustdesk/doc.rustdesk.com">tài liệu</a> sang ngôn ngữ bản địa của bạn</b>
+  <b>Chúng tôi rất hoan nghênh sự hỗ trợ của bạn trong việc dịch trang README, trang giao diện người dùng của RustDesk - <a href="https://github.com/rustdesk/rustdesk/tree/master/src/lang">RustDesk UI</a> và trang tài liệu của RustDesk - <a href="https://github.com/rustdesk/doc.rustdesk.com">RustDesk Doc</a> sang Tiếng Việt</b>
 </p>
 
-Chat với chúng tôi qua: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk)
+Hãy trao đổi với chúng tôi qua: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk)
 
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09)
 
-Một phần mềm điểu khiển máy tính từ xa, đuợc lập trình bằng ngôn ngữ Rust. Hoạt động tức thì, không cần phải cài đặt. Bạn có toàn quyền điểu khiển với dữ liệu của bạn mà không cần phải lo lắng về sự bảo mật. Bạn có thể sử dụng máy chủ rendezvous/relay của chúng tôi, [tự cài đặt máy chủ](https://rustdesk.com/server), hay thậm chí [tự tạo máy chủ rendezvous/relay](https://github.com/rustdesk/rustdesk-server-demo).
+RustDesk là một phần mềm điểu khiển máy tính từ xa mã nguồn mở, được viết bằng Rust. Nó hoạt động ngay sau khi cài đặt, không yêu cầu cấu hình phức tạp. Bạn có toàn quyền kiểm soát với dữ liệu của mình mà không cần phải lo lắng về vấn đề bảo mật. Bạn có thể sử dụng máy chủ rendezvous/relay của chúng tôi hoặc [tự cài đặt máy chủ của riêng mình](https://rustdesk.com/server) hay thậm chí [tự tạo máy chủ rendezvous/relay cho riêng bạn](https://github.com/rustdesk/rustdesk-server-demo).
 
 ![image](https://user-images.githubusercontent.com/71636191/171661982-430285f0-2e12-4b1d-9957-4a58e375304d.png)
 
-Mọi người đều đuợc chào đón để đóng góp vào RustDesk. Để bắt đầu, hãy đọc [`docs/CONTRIBUTING.md`](CONTRIBUTING.md).
+**RustDesk** luôn hoan nghênh mọi đóng góp từ mọi người. Hãy xem tệp [`docs/CONTRIBUTING.md`](CONTRIBUTING.md) để bắt đầu. 
 
-[**RustDesk hoạt động như thế nào?**](https://github.com/rustdesk/rustdesk/wiki/How-does-RustDesk-work%3F)
+[**FAQ**](https://github.com/rustdesk/rustdesk/wiki/FAQ)
-
+[**BINARY DOWNLOAD**](https://github.com/rustdesk/rustdesk/releases)
-[**CÁC BẢN PHÂN PHÁT MÃ NHỊ PHÂN**](https://github.com/rustdesk/rustdesk/releases)
+[**NIGHTLY BUILD**](https://github.com/rustdesk/rustdesk/FAQreleases/tag/nightly)
 
 [<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)
 
-## Các Máy Chủ Công Khai Miễn Phí
-
-Dưới đây là những máy chủ mà bạn có thể sử dụng mà không mất phí, chú ý là máy chủ có thể thay đổi theo thời gian. Nếu địa điểm của bạn không gần một trong số những máy chủ này, thì kết nói có thể chậm.
-
-| Địa điểm | Nhà cung cấp | Cấu hình |
-| --------- | ------------- | ------------------ |
-| Germany | Hetzner | 2 vCPU / 4GB RAM |
-
 ## Dependencies
 
-Phiên bản cho máy tính sử dụng [sciter](https://sciter.com/) cho giao diện của phần mềm, vậy nên bạn cần tự tải về thư viện sciter.
+Phiên bản máy tính sử dụng __Flutter__ hoặc __Sciter__ (đã lỗi thời) cho giao diện người dùng (GUI). Hướng dẫn này chỉ áp dụng cho phiên bản Sciter, vì nó thân thiện và dễ bắt đầu hơn. Hãy kiểm tra [CI](https://github.com/rustdesk/rustdesk/blob/master/.github/workflows/flutter-build.yml) của chúng tôi để xây dựng phiên bản Flutter.
 
-[Windows](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.win/x64/sciter.dll) |
+Vui lòng tự tải thư viện `Sciter` về máy theo hướng dẫn cho từng hệ điều hành.
-[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)
 
-Phiên bản cho điện thoại sử dụng Flutter. Chúng tôi sẽ chuyển sang sử dụng Flutter thay cho Sciter cho phiên bản máy tính.
+[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)
 
-## Cách để build
+## Các bước build cơ bản
 
-- Chuẩn bị môi trường phát triển Rust và môi trường build C++
+- Chuẩn bị môi trường phát triển Rust và môi trường biên dịch C++
 
-- Tải và cài [vcpkg](https://github.com/microsoft/vcpkg), và đặt biến môi trường `VCPKG_ROOT` sao cho đúng.
+- Tải và cài đặt [`vcpkg`](https://github.com/microsoft/vcpkg), và thiết lập biến môi trường `VCPKG_ROOT`.
-
-  - Đối với Windows: vcpkg install libvpx:x64-windows-static libyuv:x64-windows-static opus:x64-windows-static aom:x64-windows-static
-  - Đối với 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`
 - Chạy lệnh `cargo run`
 
 ## [Build](https://rustdesk.com/docs/en/dev/build/)
 
-## Cách để build cho Linux
+## Cách build cho Linux
 
 ### Ubuntu 18 (Debian 10)
 
@@ -78,7 +69,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
 ```
 
-### Cách cài vcpkg
+### Cách cài đặt `vcpkg`
 
 ```sh
 git clone https://github.com/microsoft/vcpkg
@@ -90,7 +81,7 @@ export VCPKG_ROOT=$HOME/vcpkg
 vcpkg/vcpkg install libvpx libyuv opus aom
 ```
 
-### Cách sửa lỗi libvpx (Dành cho hệ điều hành Fedora)
+### Cách sửa lỗi `libvpx` (Dành cho hệ điều hành Fedora)
 
 ```sh
 cd vcpkg/buildtrees/libvpx/src
@@ -103,7 +94,7 @@ cp libvpx.a $HOME/vcpkg/installed/x64-linux/lib/
 cd
 ```
 
-### Cách build
+### Build
 
 ```sh
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
@@ -116,13 +107,9 @@ mv libsciter-gtk.so target/debug
 VCPKG_ROOT=$HOME/vcpkg cargo run
 ```
 
-### Chuyển từ Wayland sang X11 (Xorg)
+## Cách build bằng Docker
 
-RustDesk hiện không hỗ trợ Wayland. Hãy xem [đường linh ở đây](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/) cách để cài đặt Xorg làm session mặc định của GNOME.
+Bắt đầu bằng cách sao chép repo này về máy tính của bạn và tạo Docker container:
-
-## Cách để build sử dụng Docker
-
-Bắt đầu bằng cách sao chép repo này về máy tính và build cái Docker cointainer:
 
 ```sh
 git clone https://github.com/rustdesk/rustdesk
@@ -130,37 +117,37 @@ cd rustdesk
 docker build -t "rustdesk-builder" .
 ```
 
-Rồi mỗi khi bạn chạy ứng dụng, thì hãy chạy lệnh này:
+Sau đó, mỗi khi bạn chạy ứng dụng, thì hãy chạy dòng lệnh sau:
 
 ```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
 ```
 
-Chú ý: Lần build đầu tiên có thể sẽ mất lâu hơn truớc khi các dependecies đuợc lưu lại, những lần build sau sẽ nhanh hơn. Hơn nũa, nếu bạn cần cung cấp các cài đặt lệnh khác cho lệnh build, bạn có thể đặt những cài đặt lệnh này vào cuối lệnh ở phần `<OPTIONAL-ARGS>`. Ví dụ nếu bạn cần build phiên bản đuợc tối ưu hóa, bạn sẽ chạy lệnh trên cùng với cài đặt lệnh ‘--release’. Kết quả build sẽ được lưu trong thư mục target trên máy tính của bạn, và có thể chạy với lệnh:
+Lưu ý rằng **lần build đầu tiên có thể mất thời gian hơn trước khi các dependencies được lưu vào bộ nhớ cache**, nhưng các lần build sau sẽ nhanh hơn. Ngoài ra, nếu bạn cần chỉ định các đối số khác cho lệnh build, bạn có thể thêm chúng vào cuối lệnh ở phần `<OPTIONAL-ARGS>`. Ví dụ, nếu bạn muốn build phiên bản tối ưu hóa, bạn sẽ chạy lệnh trên với tùy chọn `--release`. Kết quả biên dịch sẽ được lưu trong thư mục target trên máy tính của bạn, và có thể chạy với lệnh:
 
 ```sh
 target/debug/rustdesk
 ```
 
-Nếu bạn đang chạy bản build đuợc tối ưu hóa, thì bạn có thể chạy với lệnh:
+Nếu bạn đang chạy bản build được tối ưu hóa, thì bạn có thể chạy với lệnh:
 
 ```sh
 target/release/rustdesk
 ```
 
-Hãy đảm bảo là bạn đang chạy những lệnh này từ thu mục rễ của repo RustDesk, vì nếu không thì ứng dụng có thể sẽ không tìm đuợc những tệp tài nguyên cần thiết. Cũng như nhớ rằng những lệnh con của cargo như `install` hoặc `run` hiện chưa được hỗ trợ bởi phương pháp này vì chúng sẽ cài đặt hoặc chạy ứng dụng trong container thay vì trên máy tính của bạn.
+Hãy đảm bảo rằng bạn đang chạy các lệnh này từ gốc của thư mục **RustDesk**, nếu không, ứng dụng có thể không thể tìm thấy các tệp tài nguyên cần thiết. Hãy lưu ý rằng các câu lệnh con khác của **cargo** như **install** hoặc **run** hiện không được hỗ trợ qua phương pháp này, vì chúng sẽ cài đặt hoặc chạy chương trình bên trong **container** thay vì trên máy tính của bạn.
 
 ## Cấu trúc tệp tin
 
 - **[libs/hbb_common](https://github.com/rustdesk/rustdesk/tree/master/libs/hbb_common)**: video codec, cấu hình, tcp/udp wrapper, protobuf, fs functions để truyền file, và một số hàm tiện ích khác
-- **[libs/scrap](https://github.com/rustdesk/rustdesk/tree/master/libs/scrap)**: để ghi lại màn hình
+- **[libs/scrap](https://github.com/rustdesk/rustdesk/tree/master/libs/scrap)**: ghi lại màn hình
-- **[libs/enigo](https://github.com/rustdesk/rustdesk/tree/master/libs/enigo)**: để điều khiển máy tính/con chuột trên những nền tảng khác nhau
+- **[libs/enigo](https://github.com/rustdesk/rustdesk/tree/master/libs/enigo)**: điều khiển máy tính/chuột trên các nền tảng khác nhau
 - **[src/ui](https://github.com/rustdesk/rustdesk/tree/master/src/ui)**: giao diện người dùng
 - **[src/server](https://github.com/rustdesk/rustdesk/tree/master/src/server)**: các dịch vụ âm thanh, clipboard, đầu vào, video và các kết nối mạng
-- **[src/client.rs](https://github.com/rustdesk/rustdesk/tree/master/src/client.rs)**: để bắt đầu kết nối với một peer
+- **[src/client.rs](https://github.com/rustdesk/rustdesk/tree/master/src/client.rs)**: bắt đầu kết nối với một peer
-- **[src/rendezvous_mediator.rs](https://github.com/rustdesk/rustdesk/tree/master/src/rendezvous_mediator.rs)**: Để liên lạc với [rustdesk-server](https://github.com/rustdesk/rustdesk-server), đợi cho kết nối trực tiếp (TCP hole punching) hoặc kết nối được relayed.
+- **[src/rendezvous_mediator.rs](https://github.com/rustdesk/rustdesk/tree/master/src/rendezvous_mediator.rs)**: giao tiếp với [rustdesk-server](https://github.com/rustdesk/rustdesk-server), đợi kết nối trực tiếp (TCP hole punching) hoặc kết nối được chuyển tiếp.
 - **[src/platform](https://github.com/rustdesk/rustdesk/tree/master/src/platform)**: mã nguồn riêng cho mỗi nền tảng
-- **[flutter](https://github.com/rustdesk/rustdesk/tree/master/flutter)**: Mã Flutter dành cho điện thoại
+- **[flutter](https://github.com/rustdesk/rustdesk/tree/master/flutter)**: Mã Flutter dành máy tính và điện thoại
 - **[flutter/web/js](https://github.com/rustdesk/rustdesk/tree/master/flutter/web/js)**: Mã JavaScript dành cho giao diện trên web bằng Flutter
 
 ## Snapshot

docs/README-ZH.md

@@ -18,7 +18,7 @@ Chat with us: [知乎](https://www.zhihu.com/people/rustdesk) | [Discord](https:
 
 ![image](https://user-images.githubusercontent.com/71636191/171661982-430285f0-2e12-4b1d-9957-4a58e375304d.png)
 
-RustDesk 期待各位的贡献. 如何参与开发? 详情请看 [CONTRIBUTING.md](docs/CONTRIBUTING.md).
+RustDesk 期待各位的贡献. 如何参与开发? 详情请看 [CONTRIBUTING.md](CONTRIBUTING.md).
 
 [**FAQ**](https://github.com/rustdesk/rustdesk/wiki/FAQ)
 
@@ -30,23 +30,6 @@ RustDesk 期待各位的贡献. 如何参与开发? 详情请看 [CONTRIBUTING.m
     alt="Get it on F-Droid"
     height="80">](https://f-droid.org/en/packages/com.carriez.flutter_hbb)
 
-## 免费的公共服务器
-
-以下是您可以使用的、免费的、会随时更新的公共服务器列表，在国内也许网速会很慢或者无法访问。
-
-| Location | Vendor | Specification |
-| --------- | ------------- | ------------------ |
-| Germany | [Hetzner](https://www.hetzner.com) | 2 vCPU / 4 GB RAM |
-| Ukraine (Kyiv) | [dc.volia](https://dc.volia.com) | 2 vCPU / 4 GB RAM |
-
-## Dev Container
-
-[![在 Dev Containers 中打开](https://img.shields.io/static/v1?label=Dev%20Container&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/rustdesk/rustdesk)
-
-如果你已经安装了 VS Code 和 Docker, 你可以点击上面的徽章开始使用. 点击后, VS Code 将自动安装 Dev Containers 扩展（如果需要），将源代码克隆到容器卷中, 并启动一个 Dev 容器供使用.
-
-Go through [DEVCONTAINER.md](docs/DEVCONTAINER.md) for more info.
-
 ## 依赖
 
 桌面版本界面使用[sciter](https://sciter.com/), 请自行下载。
@@ -134,39 +117,6 @@ mv libsciter-gtk.so target/debug
 VCPKG_ROOT=$HOME/vcpkg cargo run
 ```
 
-### 把 Wayland 修改成 X11 (Xorg)
-
-RustDesk 暂时不支持 Wayland，不过正在积极开发中。
-> [点我](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/)
-查看如何将 Xorg 设置成默认的 GNOME session.
-
-## Wayland 支持
-
-Wayland 似乎没有提供任何将按键发送到其他窗口的 API. 因此, RustDesk 使用较低级别的 API, 即 `/dev/uinput` devices (Linux kernal level).
-
-当 Wayland 是受控方时，您必须以下列方式开始操作:
-
-```bash
-# Start uinput service
-$ sudo rustdesk --service
-$ rustdesk
-```
-
-**Notice**: Wayland 屏幕录制使用不同的接口. RustDesk 目前只支持 org.freedesktop.portal.ScreenCast.
-
-```bash
-$ dbus-send --session --print-reply       \
-  --dest=org.freedesktop.portal.Desktop \
-  /org/freedesktop/portal/desktop       \
-  org.freedesktop.DBus.Properties.Get   \
-  string:org.freedesktop.portal.ScreenCast string:version
-# Not support
-Error org.freedesktop.DBus.Error.InvalidArgs: No such interface “org.freedesktop.portal.ScreenCast”
-# Support
-method return time=1662544486.931020 sender=:1.54 -> destination=:1.139 serial=257 reply_serial=2
-   variant       uint32 4
-```
-
 ## 使用 Docker 编译
 
 克隆版本库并构建 Docker 容器:

docs/SECURITY-JP.md

@@ -0,0 +1,9 @@
+# セキュリティポリシー
+
+## 脆弱性の報告
+
+私たちはプロジェクトのセキュリティを非常に重視しています。私たちは、すべてのユーザーが脆弱性を発見した場合、私たちに報告することを奨励しています。
+RustDesk プロジェクトにセキュリティの脆弱性を発見した場合は、info@rustdesk.com までメールで責任を持って報告してください。
+
+現時点では、バグ報奨金制度はありません。私たちは大きな問題を解決しようとしている小さなチームです。コミュニティ全体のために安全なアプリケーションを作り続けることができるよう、
+責任を持って脆弱性を報告してください。

flatpak/rustdesk.json

@@ -8,29 +8,43 @@
   "modules": [
     "shared-modules/libappindicator/libappindicator-gtk3-12.10.json",
     "xdotool.json",
+    {
+      "name": "pam",    
+      "buildsystem": "simple",
+      "build-commands": [
+          "./configure --disable-selinux --prefix=/app && make -j4 install"
+      ],
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://github.com/linux-pam/linux-pam/releases/download/v1.3.1/Linux-PAM-1.3.1.tar.xz",
+          "sha256": "eff47a4ecd833fbf18de9686632a70ee8d0794b79aecb217ebd0ce11db4cd0db"
+        }
+      ]
+    },
     {
       "name": "rustdesk",
       "buildsystem": "simple",
       "build-commands": [
-        "bsdtar -zxvf rustdesk-1.2.3.deb",
+        "bsdtar -zxvf rustdesk.deb",
         "tar -xvf ./data.tar.xz",
         "cp -r ./usr/*  /app/",
         "mkdir -p /app/bin && ln -s /app/lib/rustdesk/rustdesk /app/bin/rustdesk",
         "mv /app/share/applications/rustdesk.desktop /app/share/applications/com.rustdesk.RustDesk.desktop",
-        "sed -i '/^Icon=/ c\\Icon=com.rustdesk.RustDesk' /app/share/applications/com.rustdesk.RustDesk.desktop",
+        "mv /app/share/applications/rustdesk-link.desktop /app/share/applications/com.rustdesk.RustDesk-link.desktop",
-        "sed -i '/^Icon=/ c\\Icon=com.rustdesk.RustDesk' /app/share/applications/rustdesk-link.desktop",
+        "sed -i '/^Icon=/ c\\Icon=com.rustdesk.RustDesk' /app/share/applications/*.desktop",
         "mv /app/share/icons/hicolor/scalable/apps/rustdesk.svg /app/share/icons/hicolor/scalable/apps/com.rustdesk.RustDesk.svg",
-        "for size in 16 24 32 48 64 128 256 512; do\n rsvg-convert -w $size -h $size -f png -o $size.png logo.svg\n install -Dm644 $size.png /app/share/icons/hicolor/${size}x${size}/apps/com.rustdesk.RustDesk.png\n done"
+        "for size in 16 24 32 48 64 128 256 512; do\n rsvg-convert -w $size -h $size -f png -o $size.png scalable.svg\n install -Dm644 $size.png /app/share/icons/hicolor/${size}x${size}/apps/com.rustdesk.RustDesk.png\n done"
       ],
       "cleanup": ["/include", "/lib/pkgconfig", "/share/gtk-doc"],
       "sources": [
         {
           "type": "file",
-          "path": "../rustdesk-1.2.3.deb"
+          "path": "./rustdesk.deb"
         },
         {
           "type": "file",
-          "path": "../res/logo.svg"
+          "path": "../res/scalable.svg"
         }
       ]
     }

flutter/.gitignore

@@ -32,7 +32,6 @@
 /build/
 
 # Web related
-lib/generated_plugin_registrant.dart
 
 # Symbolication related
 app.*.symbols

flutter/README.md

@@ -13,4 +13,4 @@ A few resources to get you started if this is your first Flutter project:
 
 For help getting started with Flutter development, view the
 [online documentation](https://docs.flutter.dev/), which offers tutorials,
-samples, guidance on mobile development, and a full API reference.
+samples and guidance on mobile development, and a full API reference.

flutter/android/app/build.gradle

@@ -1,3 +1,8 @@
+import com.google.protobuf.gradle.*
+plugins {
+    id "com.google.protobuf" version "0.9.4"
+}
+
 def keystoreProperties = new Properties()
 def keystorePropertiesFile = rootProject.file('key.properties')
 if (keystorePropertiesFile.exists()) {
@@ -31,10 +36,33 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
+dependencies {
+    implementation 'com.google.protobuf:protobuf-javalite:3.20.1'
+}
+
+protobuf {
+    protoc {
+        artifact = 'com.google.protobuf:protoc:3.20.1'
+    }
+
+    generateProtoTasks {
+        all().configureEach { task ->
+            task.builtins {
+                java {
+                    option "lite"
+                }
+            }
+        }
+    }
+}
+
 android {
     compileSdkVersion 33
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
+
+        main.proto.srcDirs += '../../../libs/hbb_common/protos'
+        main.proto.includes += "message.proto"
     }
 
     compileOptions {
@@ -65,6 +93,7 @@ android {
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
             signingConfig signingConfigs.release
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules'
         }
     }
 }
@@ -75,8 +104,8 @@ flutter {
 
 dependencies {
     implementation "androidx.media:media:1.6.0"
-    implementation 'com.github.getActivity:XXPermissions:16.2'
+    implementation 'com.github.getActivity:XXPermissions:18.5'
     implementation("org.jetbrains.kotlin:kotlin-stdlib") { version { strictly("$kotlin_version") } }
+    implementation 'com.caverock:androidsvg-aar:1.4'
 }
 
-apply plugin: 'com.google.gms.google-services'

flutter/android/app/google-services.json

@@ -1,40 +0,0 @@
-{
-  "project_info": {
-    "project_number": "768133699366",
-    "firebase_url": "https://rustdesk.firebaseio.com",
-    "project_id": "rustdesk",
-    "storage_bucket": "rustdesk.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:768133699366:android:5fc9015370e344457993e7",
-        "android_client_info": {
-          "package_name": "com.carriez.flutter_hbb"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "768133699366-s9gdfsijefsd5g1nura4kmfne42lencn.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAPOsKcXjrAR-7Z148sYr_gdB_JQZkamTM"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "768133699366-s9gdfsijefsd5g1nura4kmfne42lencn.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}

flutter/android/app/proguard-rules

@@ -0,0 +1,4 @@
+# Keep class members from protobuf generated code.
+-keepclassmembers class * extends com.google.protobuf.GeneratedMessageLite {
+  <fields>;
+}

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

@@ -3,6 +3,7 @@
     package="com.carriez.flutter_hbb">
 
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -61,6 +62,14 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
+            <!-- Intent for deep linking-->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="rustdesk" />
+            </intent-filter>
         </activity>
 
         <activity
@@ -72,6 +81,11 @@
             android:name=".MainService"
             android:enabled="true"
             android:foregroundServiceType="mediaProjection" />
+
+        <service
+            android:name=".FloatingWindowService"
+            android:enabled="true" />
+
         <!--
  Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java

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

@@ -0,0 +1,193 @@
+package com.carriez.flutter_hbb
+
+import ffi.FFI
+
+import android.Manifest
+import android.content.Context
+import android.media.*
+import android.content.pm.PackageManager
+import android.media.projection.MediaProjection
+import androidx.annotation.RequiresApi
+import androidx.core.app.ActivityCompat
+import android.os.Build
+import android.util.Log
+import kotlin.concurrent.thread
+
+const val AUDIO_ENCODING = AudioFormat.ENCODING_PCM_FLOAT //  ENCODING_OPUS need API 30
+const val AUDIO_SAMPLE_RATE = 48000
+const val AUDIO_CHANNEL_MASK = AudioFormat.CHANNEL_IN_STEREO
+
+class AudioRecordHandle(private var context: Context, private var isVideoStart: ()->Boolean, private var isAudioStart: ()->Boolean) {
+    private val logTag = "LOG_AUDIO_RECORD_HANDLE"
+
+    private var audioRecorder: AudioRecord? = null
+    private var audioReader: AudioReader? = null
+    private var minBufferSize = 0
+    private var audioRecordStat = false
+    private var audioThread: Thread? = null
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    fun createAudioRecorder(inVoiceCall: Boolean, mediaProjection: MediaProjection?): Boolean {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+            return false
+        }
+        if (ActivityCompat.checkSelfPermission(
+            context,
+            Manifest.permission.RECORD_AUDIO
+        ) != PackageManager.PERMISSION_GRANTED
+        ) {
+            Log.d(logTag, "createAudioRecorder failed, no RECORD_AUDIO permission")
+            return false
+        }
+
+        var builder = AudioRecord.Builder()
+        .setAudioFormat(
+            AudioFormat.Builder()
+                .setEncoding(AUDIO_ENCODING)
+                .setSampleRate(AUDIO_SAMPLE_RATE)
+                .setChannelMask(AUDIO_CHANNEL_MASK).build()
+        );
+        if (inVoiceCall) {
+            builder.setAudioSource(MediaRecorder.AudioSource.VOICE_COMMUNICATION)
+        } else {
+            mediaProjection?.let {
+                var apcc = AudioPlaybackCaptureConfiguration.Builder(it)
+                .addMatchingUsage(AudioAttributes.USAGE_MEDIA)
+                .addMatchingUsage(AudioAttributes.USAGE_ALARM)
+                .addMatchingUsage(AudioAttributes.USAGE_GAME)
+                .addMatchingUsage(AudioAttributes.USAGE_UNKNOWN).build();
+                builder.setAudioPlaybackCaptureConfig(apcc);
+            } ?: let {
+                Log.d(logTag, "createAudioRecorder failed, mediaProjection null")
+                return false
+            }
+        }
+        audioRecorder = builder.build()
+        Log.d(logTag, "createAudioRecorder done,minBufferSize:$minBufferSize")
+        return true
+    }
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    private fun checkAudioReader() {
+        if (audioReader != null && minBufferSize != 0) {
+            return
+        }
+        // read f32 to byte , length * 4
+        minBufferSize = 2 * 4 * AudioRecord.getMinBufferSize(
+            AUDIO_SAMPLE_RATE,
+            AUDIO_CHANNEL_MASK,
+            AUDIO_ENCODING
+        )
+        if (minBufferSize == 0) {
+            Log.d(logTag, "get min buffer size fail!")
+            return
+        }
+        audioReader = AudioReader(minBufferSize, 4)
+        Log.d(logTag, "init audioData len:$minBufferSize")
+    }
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    fun startAudioRecorder() {
+        checkAudioReader()
+        if (audioReader != null && audioRecorder != null && minBufferSize != 0) {
+            try {
+                FFI.setFrameRawEnable("audio", true)
+                audioRecorder!!.startRecording()
+                audioRecordStat = true
+                audioThread = thread {
+                    while (audioRecordStat) {
+                        audioReader!!.readSync(audioRecorder!!)?.let {
+                            FFI.onAudioFrameUpdate(it)
+                        }
+                    }
+                    // let's release here rather than onDestroy to avoid threading issue
+                    audioRecorder?.release()
+                    audioRecorder = null
+                    minBufferSize = 0
+                    FFI.setFrameRawEnable("audio", false)
+                    Log.d(logTag, "Exit audio thread")
+                }
+            } catch (e: Exception) {
+                Log.d(logTag, "startAudioRecorder fail:$e")
+            }
+        } else {
+            Log.d(logTag, "startAudioRecorder fail")
+        }
+    }
+
+    fun onVoiceCallStarted(mediaProjection: MediaProjection?): Boolean {
+        if (!isSupportVoiceCall()) {
+            return false
+        }
+        // No need to check if video or audio is started here.
+        if (!switchToVoiceCall(mediaProjection)) {
+            return false
+        }
+        return true
+    }
+
+    fun onVoiceCallClosed(mediaProjection: MediaProjection?): Boolean {
+        // Return true if not supported, because is was not started.
+        if (!isSupportVoiceCall()) {
+            return true
+        }
+        if (isVideoStart()) {
+            switchOutVoiceCall(mediaProjection)
+        }
+        tryReleaseAudio()
+        return true
+    }
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    fun switchToVoiceCall(mediaProjection: MediaProjection?): Boolean {
+        audioRecorder?.let {
+            if (it.getAudioSource() == MediaRecorder.AudioSource.VOICE_COMMUNICATION) {
+                return true
+            }
+        }
+        audioRecordStat = false
+        audioThread?.join()
+        audioThread = null
+
+        if (!createAudioRecorder(true, mediaProjection)) {
+            Log.e(logTag, "createAudioRecorder fail")
+            return false
+        }
+        startAudioRecorder()
+        return true
+    }
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    fun switchOutVoiceCall(mediaProjection: MediaProjection?): Boolean {
+        audioRecorder?.let {
+            if (it.getAudioSource() != MediaRecorder.AudioSource.VOICE_COMMUNICATION) {
+                return true
+            }
+        }
+        audioRecordStat = false
+        audioThread?.join()
+
+        if (!createAudioRecorder(false, mediaProjection)) {
+            Log.e(logTag, "createAudioRecorder fail")
+            return false
+        }
+        startAudioRecorder()
+        return true
+    }
+
+    fun tryReleaseAudio() {
+        if (isAudioStart() || isVideoStart()) {
+            return
+        }
+        audioRecordStat = false
+        audioThread?.join()
+        audioThread = null
+    }
+
+    fun destroy() {
+        Log.d(logTag, "destroy audio record handle")
+
+        audioRecordStat = false
+        audioThread?.join()
+    }
+}

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

@@ -0,0 +1,378 @@
+package com.carriez.flutter_hbb
+
+import android.annotation.SuppressLint
+import android.app.PendingIntent
+import android.app.Service
+import android.content.Intent
+import android.content.res.Configuration
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.PixelFormat
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
+import android.os.Build
+import android.os.Handler
+import android.os.IBinder
+import android.os.Looper
+import android.util.Log
+import android.view.Gravity
+import android.view.MotionEvent
+import android.view.View
+import android.view.WindowManager
+import android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
+import android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+import android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
+import android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+import android.widget.ImageView
+import android.widget.PopupMenu
+import com.caverock.androidsvg.SVG
+import ffi.FFI
+import kotlin.math.abs
+
+class FloatingWindowService : Service(), View.OnTouchListener {
+
+    private lateinit var windowManager: WindowManager
+    private lateinit var layoutParams: WindowManager.LayoutParams
+    private lateinit var floatingView: ImageView
+    private lateinit var originalDrawable: Drawable
+    private lateinit var leftHalfDrawable: Drawable
+    private lateinit var rightHalfDrawable: Drawable
+
+    private var dragging = false
+    private var lastDownX = 0f
+    private var lastDownY = 0f
+    private var viewCreated = false;
+    private var keepScreenOn = KeepScreenOn.DURING_CONTROLLED
+
+    companion object {
+        private val logTag = "floatingService"
+        private var firstCreate = true
+        private var viewWidth = 120
+        private var viewHeight = 120
+        private const val MIN_VIEW_SIZE = 32 // size 0 does not help prevent the service from being killed
+        private const val MAX_VIEW_SIZE = 320
+        private var viewUntouchable = false
+        private var viewTransparency = 1f // 0 means invisible but can help prevent the service from being killed
+        private var customSvg = ""
+        private var lastLayoutX = 0
+        private var lastLayoutY = 0
+        private var lastOrientation = Configuration.ORIENTATION_UNDEFINED
+    }
+
+    override fun onBind(intent: Intent): IBinder? {
+        return null
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        windowManager = getSystemService(WINDOW_SERVICE) as WindowManager
+        try {
+            if (firstCreate) {
+                firstCreate = false
+                onFirstCreate(windowManager)
+            }
+            Log.d(logTag, "floating window size: $viewWidth x $viewHeight, transparency: $viewTransparency, lastLayoutX: $lastLayoutX, lastLayoutY: $lastLayoutY, customSvg: $customSvg")
+            createView(windowManager)
+            handler.postDelayed(runnable, 1000)
+            Log.d(logTag, "onCreate success")
+        } catch (e: Exception) {
+            Log.d(logTag, "onCreate failed: $e")
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        if (viewCreated) {
+            windowManager.removeView(floatingView)
+        }
+        handler.removeCallbacks(runnable)
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    private fun createView(windowManager: WindowManager) {
+        floatingView = ImageView(this)
+        viewCreated = true
+        originalDrawable = resources.getDrawable(R.drawable.floating_window, null)
+        if (customSvg.isNotEmpty()) {
+            try {
+                val svg = SVG.getFromString(customSvg)
+                Log.d(logTag, "custom svg info: ${svg.documentWidth} x ${svg.documentHeight}");
+                // This make the svg render clear
+               svg.documentWidth = viewWidth * 1f
+               svg.documentHeight = viewHeight * 1f
+                originalDrawable = svg.renderToPicture().let {
+                    BitmapDrawable(
+                        resources,
+                        Bitmap.createBitmap(it.width, it.height, Bitmap.Config.ARGB_8888)
+                            .also { bitmap ->
+                                it.draw(Canvas(bitmap))
+                            })
+                }
+                floatingView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+                Log.d(logTag, "custom svg loaded")
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+        val originalBitmap = Bitmap.createBitmap(
+            originalDrawable.intrinsicWidth,
+            originalDrawable.intrinsicHeight,
+            Bitmap.Config.ARGB_8888
+        )
+        val canvas = Canvas(originalBitmap)
+        originalDrawable.setBounds(
+            0,
+            0,
+            originalDrawable.intrinsicWidth,
+            originalDrawable.intrinsicHeight
+        )
+        originalDrawable.draw(canvas)
+        val leftHalfBitmap = Bitmap.createBitmap(
+            originalBitmap,
+            0,
+            0,
+            originalDrawable.intrinsicWidth / 2,
+            originalDrawable.intrinsicHeight
+        )
+        val rightHalfBitmap = Bitmap.createBitmap(
+            originalBitmap,
+            originalDrawable.intrinsicWidth / 2,
+            0,
+            originalDrawable.intrinsicWidth / 2,
+            originalDrawable.intrinsicHeight
+        )
+        leftHalfDrawable = BitmapDrawable(resources, leftHalfBitmap)
+        rightHalfDrawable = BitmapDrawable(resources, rightHalfBitmap)
+
+        floatingView.setImageDrawable(rightHalfDrawable)
+        floatingView.setOnTouchListener(this)
+        floatingView.alpha = viewTransparency * 1f
+
+        var flags = FLAG_LAYOUT_IN_SCREEN or FLAG_NOT_TOUCH_MODAL or FLAG_NOT_FOCUSABLE
+        if (viewUntouchable || viewTransparency == 0f) {
+            flags = flags or WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE
+        }
+        layoutParams = WindowManager.LayoutParams(
+            viewWidth / 2,
+            viewHeight,
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY else WindowManager.LayoutParams.TYPE_PHONE,
+            flags,
+            PixelFormat.TRANSLUCENT
+        )
+
+        layoutParams.gravity = Gravity.TOP or Gravity.START
+        layoutParams.x = lastLayoutX
+        layoutParams.y = lastLayoutY
+
+        val keepScreenOnOption = FFI.getLocalOption("keep-screen-on").lowercase()
+        keepScreenOn = when (keepScreenOnOption) {
+            "never" -> KeepScreenOn.NEVER
+            "service-on" -> KeepScreenOn.SERVICE_ON
+            else -> KeepScreenOn.DURING_CONTROLLED
+        }
+        Log.d(logTag, "keepScreenOn option: $keepScreenOnOption, value: $keepScreenOn")
+        updateKeepScreenOnLayoutParams()
+
+        windowManager.addView(floatingView, layoutParams)
+        moveToScreenSide()
+    }
+
+    private fun onFirstCreate(windowManager: WindowManager) {
+        val wh = getScreenSize(windowManager)
+        val w = wh.first
+        val h = wh.second
+        // size
+        FFI.getLocalOption("floating-window-size").let {
+            if (it.isNotEmpty()) {
+                try {
+                    val size = it.toInt()
+                    if (size in MIN_VIEW_SIZE..MAX_VIEW_SIZE && size <= w / 2 && size <= h / 2) {
+                        viewWidth = size
+                        viewHeight = size
+                    }
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
+            }
+        }
+        // untouchable
+        viewUntouchable = FFI.getLocalOption("floating-window-untouchable") == "Y"
+        // transparency
+        FFI.getLocalOption("floating-window-transparency").let {
+            if (it.isNotEmpty()) {
+                try {
+                    val transparency = it.toInt()
+                    if (transparency in 0..10) {
+                        viewTransparency = transparency * 1f / 10
+                    }
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
+            }
+        }
+        // custom svg
+        FFI.getLocalOption("floating-window-svg").let {
+            if (it.isNotEmpty()) {
+                customSvg = it
+            }
+        }
+        // position
+        lastLayoutX = 0
+        lastLayoutY = (wh.second - viewHeight) / 2
+        lastOrientation = resources.configuration.orientation
+    }
+
+
+
+    private fun performClick() {
+        showPopupMenu()
+    }
+
+    override fun onTouch(view: View?, event: MotionEvent?): Boolean {
+        when (event?.action) {
+            MotionEvent.ACTION_DOWN -> {
+                dragging = false
+                lastDownX = event.rawX
+                lastDownY = event.rawY
+            }
+            MotionEvent.ACTION_UP -> {
+                val clickDragTolerance = 10f
+                if (abs(event.rawX - lastDownX) < clickDragTolerance && abs(event.rawY - lastDownY) < clickDragTolerance) {
+                    performClick()
+                } else {
+                    moveToScreenSide()
+                }
+            }
+            MotionEvent.ACTION_MOVE -> {
+                val dx = event.rawX - lastDownX
+                val dy = event.rawY - lastDownY
+                // ignore too small fist start moving(some time is click)
+                if (!dragging && dx*dx+dy*dy < 25) {
+                    return false
+                }
+                dragging = true
+                layoutParams.x = event.rawX.toInt()
+                layoutParams.y = event.rawY.toInt()
+                layoutParams.width = viewWidth
+                floatingView.setImageDrawable(originalDrawable)
+                windowManager.updateViewLayout(view, layoutParams)
+                lastLayoutX = layoutParams.x
+                lastLayoutY = layoutParams.y
+            }
+        }
+        return false
+    }
+
+    private fun moveToScreenSide(center: Boolean = false) {
+        val windowManager = getSystemService(WINDOW_SERVICE) as WindowManager
+        val wh = getScreenSize(windowManager)
+        val w = wh.first
+        if (layoutParams.x < w / 2) {
+            layoutParams.x = 0
+            floatingView.setImageDrawable(rightHalfDrawable)
+        } else {
+            layoutParams.x = w - viewWidth / 2
+            floatingView.setImageDrawable(leftHalfDrawable)
+        }
+        if (center) {
+            layoutParams.y = (wh.second - viewHeight) / 2
+        }
+        layoutParams.width = viewWidth / 2
+        windowManager.updateViewLayout(floatingView, layoutParams)
+        lastLayoutX = layoutParams.x
+        lastLayoutY = layoutParams.y
+    }
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        if (newConfig.orientation != lastOrientation) {
+            lastOrientation = newConfig.orientation
+            val wh = getScreenSize(windowManager)
+            Log.d(logTag, "orientation: $lastOrientation, screen size: ${wh.first} x ${wh.second}")
+            val newW = wh.first
+            val newH = wh.second
+            if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE || newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
+                // Proportional change
+                layoutParams.x = (layoutParams.x.toFloat() / newH.toFloat() * newW.toFloat()).toInt()
+                layoutParams.y = (layoutParams.y.toFloat() / newW.toFloat() * newH.toFloat()).toInt()
+            }
+            moveToScreenSide()
+        }
+    }
+
+     private fun showPopupMenu() {
+         val popupMenu = PopupMenu(this, floatingView)
+         val idShowRustDesk = 0
+         popupMenu.menu.add(0, idShowRustDesk, 0, translate("Show RustDesk"))
+         val idStopService = 1
+         popupMenu.menu.add(0, idStopService, 0, translate("Stop service"))
+         popupMenu.setOnMenuItemClickListener { menuItem ->
+             when (menuItem.itemId) {
+                 idShowRustDesk -> {
+                     openMainActivity()
+                     true
+                 }
+                 idStopService -> {
+                     stopMainService()
+                     true
+                 }
+                 else -> false
+             }
+         }
+         popupMenu.setOnDismissListener {
+             moveToScreenSide()
+         }
+         popupMenu.show()
+     }
+
+
+    private fun openMainActivity() {
+        val intent = Intent(this, MainActivity::class.java)
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        val pendingIntent = PendingIntent.getActivity(
+            this, 0, intent,
+            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_ONE_SHOT
+        )
+        try {
+            pendingIntent.send()
+        } catch (e: PendingIntent.CanceledException) {
+            e.printStackTrace()
+        }
+    }
+
+    private fun stopMainService() {
+        MainActivity.flutterMethodChannel?.invokeMethod("stop_service", null)
+    }
+
+    enum class KeepScreenOn {
+        NEVER,
+        DURING_CONTROLLED,
+        SERVICE_ON,
+    }
+
+    private val handler = Handler(Looper.getMainLooper())
+    private val runnable = object : Runnable {
+        override fun run() {
+            if (updateKeepScreenOnLayoutParams()) {
+                windowManager.updateViewLayout(floatingView, layoutParams)
+            }
+            handler.postDelayed(this, 1000) // 1000 milliseconds = 1 second
+        }
+    }
+
+    private fun updateKeepScreenOnLayoutParams(): Boolean {
+        val oldOn = layoutParams.flags and FLAG_KEEP_SCREEN_ON != 0
+        val newOn = keepScreenOn == KeepScreenOn.SERVICE_ON ||  (keepScreenOn == KeepScreenOn.DURING_CONTROLLED  &&  MainService.isStart)
+        if (oldOn != newOn) {
+            Log.d(logTag, "change keep screen on to $newOn")
+            if (newOn) {
+                layoutParams.flags = layoutParams.flags or FLAG_KEEP_SCREEN_ON
+            } else {
+                layoutParams.flags = layoutParams.flags and FLAG_KEEP_SCREEN_ON.inv()
+            }
+            return true
+        }
+        return false
+    }
+}
+

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

@@ -10,12 +10,29 @@ import android.accessibilityservice.AccessibilityService
 import android.accessibilityservice.GestureDescription
 import android.graphics.Path
 import android.os.Build
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import android.util.Log
+import android.widget.EditText
 import android.view.accessibility.AccessibilityEvent
+import android.view.ViewGroup.LayoutParams
+import android.view.accessibility.AccessibilityNodeInfo
+import android.view.KeyEvent as KeyEventAndroid
+import android.graphics.Rect
+import android.media.AudioManager
+import android.accessibilityservice.AccessibilityServiceInfo
+import android.accessibilityservice.AccessibilityServiceInfo.FLAG_INPUT_METHOD_EDITOR
+import android.accessibilityservice.AccessibilityServiceInfo.FLAG_RETRIEVE_INTERACTIVE_WINDOWS
+import android.view.inputmethod.EditorInfo
 import androidx.annotation.RequiresApi
 import java.util.*
+import java.lang.Character
 import kotlin.math.abs
 import kotlin.math.max
+import hbb.MessageOuterClass.KeyEvent
+import hbb.MessageOuterClass.KeyboardMode
+import hbb.KeyEventConverter
 
 const val LIFT_DOWN = 9
 const val LIFT_MOVE = 8
@@ -58,6 +75,10 @@ class InputService : AccessibilityService() {
     private var isWheelActionsPolling = false
     private var isWaitingLongPress = false
 
+    private var fakeEditTextForTextStateCalculation: EditText? = null
+
+    private val volumeController: VolumeController by lazy { VolumeController(applicationContext.getSystemService(AUDIO_SERVICE) as AudioManager) }
+
     @RequiresApi(Build.VERSION_CODES.N)
     fun onMouseInput(mask: Int, _x: Int, _y: Int) {
         val x = max(0, _x)
@@ -252,9 +273,345 @@ class InputService : AccessibilityService() {
         }
     }
 
+    @RequiresApi(Build.VERSION_CODES.N)
+    fun onKeyEvent(data: ByteArray) {
+        val keyEvent = KeyEvent.parseFrom(data)
+        val keyboardMode = keyEvent.getMode()
+
+        var textToCommit: String? = null
+
+        if (keyboardMode == KeyboardMode.Legacy) {
+            if (keyEvent.hasChr() && keyEvent.getDown()) {
+                val chr = keyEvent.getChr()
+                if (chr != null) {
+                    textToCommit = String(Character.toChars(chr))
+                }
+            }
+        } else if (keyboardMode == KeyboardMode.Translate) {
+            if (keyEvent.hasSeq() && keyEvent.getDown()) {
+                val seq = keyEvent.getSeq()
+                if (seq != null) {
+                    textToCommit = seq
+                }
+            }
+        }
+
+        Log.d(logTag, "onKeyEvent $keyEvent textToCommit:$textToCommit")
+
+        var ke: KeyEventAndroid? = null
+        if (Build.VERSION.SDK_INT < 33 || textToCommit == null) {
+            ke = KeyEventConverter.toAndroidKeyEvent(keyEvent)
+        }
+        ke?.let { event ->
+            if (tryHandleVolumeKeyEvent(event)) {
+                return
+            } else if (tryHandlePowerKeyEvent(event)) {
+                return
+            }
+        }
+
+        if (Build.VERSION.SDK_INT >= 33) {
+            getInputMethod()?.let { inputMethod ->
+                inputMethod.getCurrentInputConnection()?.let { inputConnection ->
+                    if (textToCommit != null) {
+                        textToCommit?.let { text ->
+                            inputConnection.commitText(text, 1, null)
+                        }
+                    } else {
+                        ke?.let { event ->
+                            inputConnection.sendKeyEvent(event)
+                        }
+                    }
+                }
+            }
+        } else {
+            val handler = Handler(Looper.getMainLooper())
+            handler.post {
+                ke?.let { event ->
+                    val possibleNodes = possibleAccessibiltyNodes()
+                    Log.d(logTag, "possibleNodes:$possibleNodes")
+                    for (item in possibleNodes) {
+                        val success = trySendKeyEvent(event, item, textToCommit)
+                        if (success) {
+                            break
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private fun tryHandleVolumeKeyEvent(event: KeyEventAndroid): Boolean {
+        when (event.keyCode) {
+            KeyEventAndroid.KEYCODE_VOLUME_UP -> {
+                if (event.action == KeyEventAndroid.ACTION_DOWN) {
+                    volumeController.raiseVolume(null, true, AudioManager.STREAM_SYSTEM)
+                }
+                return true
+            }
+            KeyEventAndroid.KEYCODE_VOLUME_DOWN -> {
+                if (event.action == KeyEventAndroid.ACTION_DOWN) {
+                    volumeController.lowerVolume(null, true, AudioManager.STREAM_SYSTEM)
+                }
+                return true
+            }
+            KeyEventAndroid.KEYCODE_VOLUME_MUTE -> {
+                if (event.action == KeyEventAndroid.ACTION_DOWN) {
+                    volumeController.toggleMute(true, AudioManager.STREAM_SYSTEM)
+                }
+                return true
+            }
+            else -> {
+                return false
+            }
+        }
+    }
+
+    private fun tryHandlePowerKeyEvent(event: KeyEventAndroid): Boolean {
+        if (event.keyCode == KeyEventAndroid.KEYCODE_POWER) {
+            // Perform power dialog action when action is up
+            if (event.action == KeyEventAndroid.ACTION_UP) {
+                performGlobalAction(GLOBAL_ACTION_POWER_DIALOG);
+            }
+            return true
+        }
+        return false
+    }
+
+    private fun insertAccessibilityNode(list: LinkedList<AccessibilityNodeInfo>, node: AccessibilityNodeInfo) {
+        if (node == null) {
+            return
+        }
+        if (list.contains(node)) {
+            return
+        }
+        list.add(node)
+    }
+
+    private fun findChildNode(node: AccessibilityNodeInfo?): AccessibilityNodeInfo? {
+        if (node == null) {
+            return null
+        }
+        if (node.isEditable() && node.isFocusable()) {
+            return node
+        }
+        val childCount = node.getChildCount()
+        for (i in 0 until childCount) {
+            val child = node.getChild(i)
+            if (child != null) {
+                if (child.isEditable() && child.isFocusable()) {
+                    return child
+                }
+                if (Build.VERSION.SDK_INT < 33) {
+                    child.recycle()
+                }
+            }
+        }
+        for (i in 0 until childCount) {
+            val child = node.getChild(i)
+            if (child != null) {
+                val result = findChildNode(child)
+                if (Build.VERSION.SDK_INT < 33) {
+                    if (child != result) {
+                        child.recycle()
+                    }
+                }
+                if (result != null) {
+                    return result
+                }
+            }
+        }
+        return null
+    }
+
+    private fun possibleAccessibiltyNodes(): LinkedList<AccessibilityNodeInfo> {
+        val linkedList = LinkedList<AccessibilityNodeInfo>()
+        val latestList = LinkedList<AccessibilityNodeInfo>()
+
+        val focusInput = findFocus(AccessibilityNodeInfo.FOCUS_INPUT)
+        var focusAccessibilityInput = findFocus(AccessibilityNodeInfo.FOCUS_ACCESSIBILITY)
+
+        val rootInActiveWindow = getRootInActiveWindow()
+
+        Log.d(logTag, "focusInput:$focusInput focusAccessibilityInput:$focusAccessibilityInput rootInActiveWindow:$rootInActiveWindow")
+
+        if (focusInput != null) {
+            if (focusInput.isFocusable() && focusInput.isEditable()) {
+                insertAccessibilityNode(linkedList, focusInput)
+            } else {
+                insertAccessibilityNode(latestList, focusInput)
+            }
+        }
+
+        if (focusAccessibilityInput != null) {
+            if (focusAccessibilityInput.isFocusable() && focusAccessibilityInput.isEditable()) {
+                insertAccessibilityNode(linkedList, focusAccessibilityInput)
+            } else {
+                insertAccessibilityNode(latestList, focusAccessibilityInput)
+            }
+        }
+
+        val childFromFocusInput = findChildNode(focusInput)
+        Log.d(logTag, "childFromFocusInput:$childFromFocusInput")
+
+        if (childFromFocusInput != null) {
+            insertAccessibilityNode(linkedList, childFromFocusInput)
+        }
+
+        val childFromFocusAccessibilityInput = findChildNode(focusAccessibilityInput)
+        if (childFromFocusAccessibilityInput != null) {
+            insertAccessibilityNode(linkedList, childFromFocusAccessibilityInput)
+        }
+        Log.d(logTag, "childFromFocusAccessibilityInput:$childFromFocusAccessibilityInput")
+
+        if (rootInActiveWindow != null) {
+            insertAccessibilityNode(linkedList, rootInActiveWindow)
+        }
+
+        for (item in latestList) {
+            insertAccessibilityNode(linkedList, item)
+        }
+
+        return linkedList
+    }
+
+    private fun trySendKeyEvent(event: KeyEventAndroid, node: AccessibilityNodeInfo, textToCommit: String?): Boolean {
+        node.refresh()
+        this.fakeEditTextForTextStateCalculation?.setSelection(0,0)
+        this.fakeEditTextForTextStateCalculation?.setText(null)
+
+        val text = node.getText()
+        var isShowingHint = false
+        if (Build.VERSION.SDK_INT >= 26) {
+            isShowingHint = node.isShowingHintText()
+        }
+
+        var textSelectionStart = node.textSelectionStart
+        var textSelectionEnd = node.textSelectionEnd
+
+        if (text != null) {
+            if (textSelectionStart > text.length) {
+                textSelectionStart = text.length
+            }
+            if (textSelectionEnd > text.length) {
+                textSelectionEnd = text.length
+            }
+            if (textSelectionStart > textSelectionEnd) {
+                textSelectionStart = textSelectionEnd
+            }
+        }
+
+        var success = false
+
+        Log.d(logTag, "existing text:$text textToCommit:$textToCommit textSelectionStart:$textSelectionStart textSelectionEnd:$textSelectionEnd")
+
+        if (textToCommit != null) {
+            if ((textSelectionStart == -1) || (textSelectionEnd == -1)) {
+                val newText = textToCommit
+                this.fakeEditTextForTextStateCalculation?.setText(newText)
+                success = updateTextForAccessibilityNode(node)
+            } else if (text != null) {
+                this.fakeEditTextForTextStateCalculation?.setText(text)
+                this.fakeEditTextForTextStateCalculation?.setSelection(
+                    textSelectionStart,
+                    textSelectionEnd
+                )
+                this.fakeEditTextForTextStateCalculation?.text?.insert(textSelectionStart, textToCommit)
+                success = updateTextAndSelectionForAccessibiltyNode(node)
+            }
+        } else {
+            if (isShowingHint) {
+                this.fakeEditTextForTextStateCalculation?.setText(null)
+            } else {
+                this.fakeEditTextForTextStateCalculation?.setText(text)
+            }
+            if (textSelectionStart != -1 && textSelectionEnd != -1) {
+                Log.d(logTag, "setting selection $textSelectionStart $textSelectionEnd")
+                this.fakeEditTextForTextStateCalculation?.setSelection(
+                    textSelectionStart,
+                    textSelectionEnd
+                )
+            }
+
+            this.fakeEditTextForTextStateCalculation?.let {
+                // This is essiential to make sure layout object is created. OnKeyDown may not work if layout is not created.
+                val rect = Rect()
+                node.getBoundsInScreen(rect)
+
+                it.layout(rect.left, rect.top, rect.right, rect.bottom)
+                it.onPreDraw()
+                if (event.action == KeyEventAndroid.ACTION_DOWN) {
+                    val succ = it.onKeyDown(event.getKeyCode(), event)
+                    Log.d(logTag, "onKeyDown $succ")
+                } else if (event.action == KeyEventAndroid.ACTION_UP) {
+                    val success = it.onKeyUp(event.getKeyCode(), event)
+                    Log.d(logTag, "keyup $success")
+                } else {}
+            }
+
+            success = updateTextAndSelectionForAccessibiltyNode(node)
+        }
+        return success
+    }
+
+    fun updateTextForAccessibilityNode(node: AccessibilityNodeInfo): Boolean {
+        var success = false
+        this.fakeEditTextForTextStateCalculation?.text?.let {
+            val arguments = Bundle()
+            arguments.putCharSequence(
+                AccessibilityNodeInfo.ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE,
+                it.toString()
+            )
+            success = node.performAction(AccessibilityNodeInfo.ACTION_SET_TEXT, arguments)
+        }
+        return success
+    }
+
+    fun updateTextAndSelectionForAccessibiltyNode(node: AccessibilityNodeInfo): Boolean {
+        var success = updateTextForAccessibilityNode(node)
+
+        if (success) {
+            val selectionStart = this.fakeEditTextForTextStateCalculation?.selectionStart
+            val selectionEnd = this.fakeEditTextForTextStateCalculation?.selectionEnd
+
+            if (selectionStart != null && selectionEnd != null) {
+                val arguments = Bundle()
+                arguments.putInt(
+                    AccessibilityNodeInfo.ACTION_ARGUMENT_SELECTION_START_INT,
+                    selectionStart
+                )
+                arguments.putInt(
+                    AccessibilityNodeInfo.ACTION_ARGUMENT_SELECTION_END_INT,
+                    selectionEnd
+                )
+                success = node.performAction(AccessibilityNodeInfo.ACTION_SET_SELECTION, arguments)
+                Log.d(logTag, "Update selection to $selectionStart $selectionEnd success:$success")
+            }
+        }
+
+        return success
+    }
+
+
+    override fun onAccessibilityEvent(event: AccessibilityEvent) {
+    }
+
     override fun onServiceConnected() {
         super.onServiceConnected()
         ctx = this
+        val info = AccessibilityServiceInfo()
+        if (Build.VERSION.SDK_INT >= 33) {
+            info.flags = FLAG_INPUT_METHOD_EDITOR or FLAG_RETRIEVE_INTERACTIVE_WINDOWS
+        } else {
+            info.flags = FLAG_RETRIEVE_INTERACTIVE_WINDOWS
+        }
+        setServiceInfo(info)
+        fakeEditTextForTextStateCalculation = EditText(this)
+        // Size here doesn't matter, we won't show this view.
+        fakeEditTextForTextStateCalculation?.layoutParams = LayoutParams(100, 100)
+        fakeEditTextForTextStateCalculation?.onPreDraw()
+        val layout = fakeEditTextForTextStateCalculation?.getLayout()
+        Log.d(logTag, "fakeEditTextForTextStateCalculation layout:$layout")
         Log.d(logTag, "onServiceConnected!")
     }
 
@@ -263,7 +620,5 @@ class InputService : AccessibilityService() {
         super.onDestroy()
     }
 
-    override fun onAccessibilityEvent(event: AccessibilityEvent?) {}
-
     override fun onInterrupt() {}
 }

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

@@ -0,0 +1,124 @@
+package hbb;
+import android.view.KeyEvent
+import android.view.KeyCharacterMap
+import hbb.MessageOuterClass.KeyboardMode
+import hbb.MessageOuterClass.ControlKey
+
+object KeyEventConverter {
+    fun toAndroidKeyEvent(keyEventProto: hbb.MessageOuterClass.KeyEvent): KeyEvent {
+        var chrValue = 0
+        var modifiers = 0
+
+        val keyboardMode = keyEventProto.getMode()
+
+        if (keyEventProto.hasChr()) {
+            if (keyboardMode == KeyboardMode.Map || keyboardMode == KeyboardMode.Translate) {
+                chrValue = keyEventProto.getChr()
+            } else {
+                chrValue = convertUnicodeToKeyCode(keyEventProto.getChr() as Int)
+            }
+        } else if (keyEventProto.hasControlKey()) {
+            chrValue = convertControlKeyToKeyCode(keyEventProto.getControlKey())
+        }
+
+        var modifiersList = keyEventProto.getModifiersList()
+
+        if (modifiersList != null) {
+            for (modifier in keyEventProto.getModifiersList()) {
+                val modifierValue = convertModifier(modifier)
+                modifiers = modifiers or modifierValue
+            }
+        }
+
+        var action = 0
+        if (keyEventProto.getDown()) {
+            action = KeyEvent.ACTION_DOWN
+        } else {
+            action = KeyEvent.ACTION_UP
+        }
+
+        // FIXME: The last parameter is the repeat count, not modifiers ?
+        // https://developer.android.com/reference/android/view/KeyEvent#KeyEvent(long,%20long,%20int,%20int,%20int)
+        return KeyEvent(0, 0, action, chrValue, 0, modifiers)
+    }
+
+    private fun convertModifier(controlKey: hbb.MessageOuterClass.ControlKey): Int {
+        // Add logic to map ControlKey values to Android KeyEvent key codes.
+        // You'll need to provide the mapping for each key.
+        return when (controlKey) {
+            ControlKey.Alt -> KeyEvent.META_ALT_ON
+            ControlKey.Control -> KeyEvent.META_CTRL_ON
+            ControlKey.CapsLock -> KeyEvent.META_CAPS_LOCK_ON
+            ControlKey.Meta -> KeyEvent.META_META_ON
+            ControlKey.NumLock -> KeyEvent.META_NUM_LOCK_ON
+            ControlKey.RShift -> KeyEvent.META_SHIFT_RIGHT_ON
+            ControlKey.Shift -> KeyEvent.META_SHIFT_ON
+            ControlKey.RAlt -> KeyEvent.META_ALT_RIGHT_ON
+            ControlKey.RControl -> KeyEvent.META_CTRL_RIGHT_ON
+            else -> 0 // Default to unknown.
+        }
+    }
+
+    private val tag = "KeyEventConverter"
+
+    private fun convertUnicodeToKeyCode(unicode: Int): Int {
+        val charMap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD)
+        android.util.Log.d(tag, "unicode: $unicode")
+        val events = charMap.getEvents(charArrayOf(unicode.toChar()))
+        if (events != null && events.size > 0) {
+            android.util.Log.d(tag, "keycode ${events[0].keyCode}")
+            return events[0].keyCode
+        }
+        return 0
+    }
+
+    private fun convertControlKeyToKeyCode(controlKey: hbb.MessageOuterClass.ControlKey): Int {
+        // Add logic to map ControlKey values to Android KeyEvent key codes.
+        // You'll need to provide the mapping for each key.
+        return when (controlKey) {
+            ControlKey.Alt -> KeyEvent.KEYCODE_ALT_LEFT
+            ControlKey.Backspace -> KeyEvent.KEYCODE_DEL
+            ControlKey.Control -> KeyEvent.KEYCODE_CTRL_LEFT
+            ControlKey.CapsLock -> KeyEvent.KEYCODE_CAPS_LOCK
+            ControlKey.Meta -> KeyEvent.KEYCODE_META_LEFT
+            ControlKey.NumLock -> KeyEvent.KEYCODE_NUM_LOCK
+            ControlKey.RShift -> KeyEvent.KEYCODE_SHIFT_RIGHT
+            ControlKey.Shift -> KeyEvent.KEYCODE_SHIFT_LEFT
+            ControlKey.RAlt -> KeyEvent.KEYCODE_ALT_RIGHT
+            ControlKey.RControl -> KeyEvent.KEYCODE_CTRL_RIGHT
+            ControlKey.DownArrow -> KeyEvent.KEYCODE_DPAD_DOWN
+            ControlKey.LeftArrow -> KeyEvent.KEYCODE_DPAD_LEFT
+            ControlKey.RightArrow -> KeyEvent.KEYCODE_DPAD_RIGHT
+            ControlKey.UpArrow -> KeyEvent.KEYCODE_DPAD_UP
+            ControlKey.End -> KeyEvent.KEYCODE_MOVE_END
+            ControlKey.Home -> KeyEvent.KEYCODE_MOVE_HOME
+            ControlKey.PageUp -> KeyEvent.KEYCODE_PAGE_UP
+            ControlKey.PageDown -> KeyEvent.KEYCODE_PAGE_DOWN
+            ControlKey.Insert -> KeyEvent.KEYCODE_INSERT
+            ControlKey.Escape -> KeyEvent.KEYCODE_ESCAPE
+            ControlKey.F1 -> KeyEvent.KEYCODE_F1
+            ControlKey.F2 -> KeyEvent.KEYCODE_F2
+            ControlKey.F3 -> KeyEvent.KEYCODE_F3
+            ControlKey.F4 -> KeyEvent.KEYCODE_F4
+            ControlKey.F5 -> KeyEvent.KEYCODE_F5
+            ControlKey.F6 -> KeyEvent.KEYCODE_F6
+            ControlKey.F7 -> KeyEvent.KEYCODE_F7
+            ControlKey.F8 -> KeyEvent.KEYCODE_F8
+            ControlKey.F9 -> KeyEvent.KEYCODE_F9
+            ControlKey.F10 -> KeyEvent.KEYCODE_F10
+            ControlKey.F11 -> KeyEvent.KEYCODE_F11
+            ControlKey.F12 -> KeyEvent.KEYCODE_F12
+            ControlKey.Space -> KeyEvent.KEYCODE_SPACE
+            ControlKey.Tab -> KeyEvent.KEYCODE_TAB
+            ControlKey.Return -> KeyEvent.KEYCODE_ENTER
+            ControlKey.Delete -> KeyEvent.KEYCODE_FORWARD_DEL
+            ControlKey.Clear -> KeyEvent.KEYCODE_CLEAR
+            ControlKey.Pause -> KeyEvent.KEYCODE_BREAK
+            ControlKey.VolumeMute -> KeyEvent.KEYCODE_VOLUME_MUTE
+            ControlKey.VolumeUp -> KeyEvent.KEYCODE_VOLUME_UP
+            ControlKey.VolumeDown -> KeyEvent.KEYCODE_VOLUME_DOWN
+            ControlKey.Power -> KeyEvent.KEYCODE_POWER
+            else -> 0 // Default to unknown.
+        }
+    }
+}

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

@@ -7,6 +7,8 @@ package com.carriez.flutter_hbb
  * Inspired by [droidVNC-NG] https://github.com/bk138/droidVNC-NG
  */
 
+import ffi.FFI
+
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
@@ -15,10 +17,20 @@ import android.os.Build
 import android.os.IBinder
 import android.util.Log
 import android.view.WindowManager
+import android.media.MediaCodecInfo
+import android.media.MediaCodecInfo.CodecCapabilities.COLOR_FormatSurface
+import android.media.MediaCodecInfo.CodecCapabilities.COLOR_FormatYUV420SemiPlanar
+import android.media.MediaCodecList
+import android.media.MediaFormat
+import android.util.DisplayMetrics
+import androidx.annotation.RequiresApi
+import org.json.JSONArray
+import org.json.JSONObject
 import com.hjq.permissions.XXPermissions
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.MethodChannel
+import kotlin.concurrent.thread
 
 
 class MainActivity : FlutterActivity() {
@@ -30,6 +42,9 @@ class MainActivity : FlutterActivity() {
     private val logTag = "mMainActivity"
     private var mainService: MainService? = null
 
+    private var isAudioStart = false
+    private val audioRecordHandle = AudioRecordHandle(this, { false }, { isAudioStart })
+
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
         if (MainService.isReady) {
@@ -42,6 +57,7 @@ class MainActivity : FlutterActivity() {
             channelTag
         )
         initFlutterChannel(flutterMethodChannel!!)
+        thread { setCodecInfo() }
     }
 
     override fun onResume() {
@@ -217,10 +233,159 @@ class MainActivity : FlutterActivity() {
                         result.success(false)
                     }
                 }
+                GET_VALUE -> {
+                    if (call.arguments is String) {
+                        if (call.arguments == KEY_IS_SUPPORT_VOICE_CALL) {
+                            result.success(isSupportVoiceCall())
+                        } else {
+                            result.error("-1", "No such key", null)
+                        }
+                    } else {
+                        result.success(null)
+                    }
+                }
+                "on_voice_call_started" -> {
+                    onVoiceCallStarted()
+                }
+                "on_voice_call_closed" -> {
+                    onVoiceCallClosed()
+                }
                 else -> {
                     result.error("-1", "No such method", null)
                 }
             }
         }
     }
+
+    private fun setCodecInfo() {
+        val codecList = MediaCodecList(MediaCodecList.REGULAR_CODECS)
+        val codecs = codecList.codecInfos
+        val codecArray = JSONArray()
+
+        val windowManager = getSystemService(Context.WINDOW_SERVICE) as WindowManager
+        val wh = getScreenSize(windowManager)
+        var w = wh.first
+        var h = wh.second
+        val align = 64
+        w = (w + align - 1) / align * align
+        h = (h + align - 1) / align * align
+        codecs.forEach { codec ->
+            val codecObject = JSONObject()
+            codecObject.put("name", codec.name)
+            codecObject.put("is_encoder", codec.isEncoder)
+            var hw: Boolean? = null;
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                hw = codec.isHardwareAccelerated
+            } else {
+                // https://chromium.googlesource.com/external/webrtc/+/HEAD/sdk/android/src/java/org/webrtc/MediaCodecUtils.java#29
+                // https://chromium.googlesource.com/external/webrtc/+/master/sdk/android/api/org/webrtc/HardwareVideoEncoderFactory.java#229
+                if (listOf("OMX.google.", "OMX.SEC.", "c2.android").any { codec.name.startsWith(it, true) }) {
+                    hw = false
+                } else if (listOf("c2.qti", "OMX.qcom.video", "OMX.Exynos", "OMX.hisi", "OMX.MTK", "OMX.Intel", "OMX.Nvidia").any { codec.name.startsWith(it, true) }) {
+                    hw = true
+                }
+            }
+            if (hw != true) {
+                return@forEach
+            }
+            codecObject.put("hw", hw)
+            var mime_type = ""
+            codec.supportedTypes.forEach { type ->
+                if (listOf("video/avc", "video/hevc").contains(type)) { // "video/x-vnd.on2.vp8", "video/x-vnd.on2.vp9", "video/av01"
+                    mime_type = type;
+                }
+            }
+            if (mime_type.isNotEmpty()) {
+                codecObject.put("mime_type", mime_type)
+                val caps = codec.getCapabilitiesForType(mime_type)
+                if (codec.isEncoder) {
+                    // Encoder‘s max_height and max_width are interchangeable
+                    if (!caps.videoCapabilities.isSizeSupported(w,h) && !caps.videoCapabilities.isSizeSupported(h,w)) {
+                        return@forEach
+                    }
+                }
+                codecObject.put("min_width", caps.videoCapabilities.supportedWidths.lower)
+                codecObject.put("max_width", caps.videoCapabilities.supportedWidths.upper)
+                codecObject.put("min_height", caps.videoCapabilities.supportedHeights.lower)
+                codecObject.put("max_height", caps.videoCapabilities.supportedHeights.upper)
+                val surface = caps.colorFormats.contains(COLOR_FormatSurface);
+                codecObject.put("surface", surface)
+                val nv12 = caps.colorFormats.contains(COLOR_FormatYUV420SemiPlanar)
+                codecObject.put("nv12", nv12)
+                if (!(nv12 || surface)) {
+                    return@forEach
+                }
+                codecObject.put("min_bitrate", caps.videoCapabilities.bitrateRange.lower / 1000)
+                codecObject.put("max_bitrate", caps.videoCapabilities.bitrateRange.upper / 1000)
+                if (!codec.isEncoder) {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                        codecObject.put("low_latency", caps.isFeatureSupported(MediaCodecInfo.CodecCapabilities.FEATURE_LowLatency))
+                    }
+                }
+                if (!codec.isEncoder) {
+                    return@forEach
+                }
+                codecArray.put(codecObject)
+            }
+        }
+        val result = JSONObject()
+        result.put("version", Build.VERSION.SDK_INT)
+        result.put("w", w)
+        result.put("h", h)
+        result.put("codecs", codecArray)
+        FFI.setCodecInfo(result.toString())
+    }
+
+    private fun onVoiceCallStarted() {
+        var ok = false
+        mainService?.let {
+            ok = it.onVoiceCallStarted()
+        } ?: let {
+            isAudioStart = true
+            ok = audioRecordHandle.onVoiceCallStarted(null)
+        }
+        if (!ok) {
+            // Rarely happens, So we just add log and msgbox here.
+            Log.e(logTag, "onVoiceCallStarted fail")
+            flutterMethodChannel?.invokeMethod("msgbox", mapOf(
+                "type" to "custom-nook-nocancel-hasclose-error",
+                "title" to "Voice call",
+                "text" to "Failed to start voice call."))
+        } else {
+            Log.d(logTag, "onVoiceCallStarted success")
+        }
+    }
+
+    private fun onVoiceCallClosed() {
+        var ok = false
+        mainService?.let {
+            ok = it.onVoiceCallClosed()
+        } ?: let {
+            isAudioStart = false
+            ok = audioRecordHandle.onVoiceCallClosed(null)
+        }
+        if (!ok) {
+            // Rarely happens, So we just add log and msgbox here.
+            Log.e(logTag, "onVoiceCallClosed fail")
+            flutterMethodChannel?.invokeMethod("msgbox", mapOf(
+                "type" to "custom-nook-nocancel-hasclose-error",
+                "title" to "Voice call",
+                "text" to "Failed to stop voice call."))
+        } else {
+            Log.d(logTag, "onVoiceCallClosed success")
+        }
+    }
+
+    override fun onStop() {
+        super.onStop()
+        val disableFloatingWindow = FFI.getLocalOption("disable-floating-window") == "Y"
+        if (!disableFloatingWindow && MainService.isReady) {
+            startService(Intent(this, FloatingWindowService::class.java))
+        }
+    }
+
+    override fun onStart() {
+        super.onStart()
+        stopService(Intent(this, FloatingWindowService::class.java))
+    }
 }

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

@@ -1,5 +1,7 @@
 package com.carriez.flutter_hbb
 
+import ffi.FFI
+
 /**
  * Capture screen,get video and audio,send to rust.
  * Dispatch notifications
@@ -44,7 +46,6 @@ import java.nio.ByteBuffer
 import kotlin.math.max
 import kotlin.math.min
 
-
 const val DEFAULT_NOTIFY_TITLE = "RustDesk"
 const val DEFAULT_NOTIFY_TEXT = "Service is running"
 const val DEFAULT_NOTIFY_ID = 1
@@ -53,27 +54,19 @@ const val NOTIFY_ID_OFFSET = 100
 const val MIME_TYPE = MediaFormat.MIMETYPE_VIDEO_VP9
 
 // video const
+
 const val MAX_SCREEN_SIZE = 1200
 
 const val VIDEO_KEY_BIT_RATE = 1024_000
 const val VIDEO_KEY_FRAME_RATE = 30
 
-// audio const
-const val AUDIO_ENCODING = AudioFormat.ENCODING_PCM_FLOAT //  ENCODING_OPUS need API 30
-const val AUDIO_SAMPLE_RATE = 48000
-const val AUDIO_CHANNEL_MASK = AudioFormat.CHANNEL_IN_STEREO
-
 class MainService : Service() {
 
-    init {
-        System.loadLibrary("rustdesk")
-    }
-
     @Keep
     @RequiresApi(Build.VERSION_CODES.N)
-    fun rustPointerInput(kind: String, mask: Int, x: Int, y: Int) {
+    fun rustPointerInput(kind: Int, mask: Int, x: Int, y: Int) {
         // turn on screen with LIFT_DOWN when screen off
-        if (!powerManager.isInteractive && (kind == "touch" || mask == LIFT_DOWN)) {
+        if (!powerManager.isInteractive && (kind == 0 || mask == LIFT_DOWN)) {
             if (wakeLock.isHeld) {
                 Log.d(logTag, "Turn on Screen, WakeLock release")
                 wakeLock.release()
@@ -82,10 +75,10 @@ class MainService : Service() {
             wakeLock.acquire(5000)
         } else {
             when (kind) {
-                "touch" -> {
+                0 -> { // touch
                     InputService.ctx?.onTouchInput(mask, x, y)
                 }
-                "mouse" -> {
+                1 -> { // mouse
                     InputService.ctx?.onMouseInput(mask, x, y)
                 }
                 else -> {
@@ -94,6 +87,12 @@ class MainService : Service() {
         }
     }
 
+    @Keep
+    @RequiresApi(Build.VERSION_CODES.N)
+    fun rustKeyEventInput(input: ByteArray) {
+        InputService.ctx?.onKeyEvent(input)
+    }
+
     @Keep
     fun rustGetByName(name: String): String {
         return when (name) {
@@ -104,6 +103,9 @@ class MainService : Service() {
                     put("scale",SCREEN_INFO.scale)
                 }.toString()
             }
+            "is_start" -> {
+                isStart.toString()
+            }
             else -> ""
         }
     }
@@ -136,10 +138,51 @@ class MainService : Service() {
                     e.printStackTrace()
                 }
             }
+            "update_voice_call_state" -> {
+                try {
+                    val jsonObject = JSONObject(arg1)
+                    val id = jsonObject["id"] as Int
+                    val username = jsonObject["name"] as String
+                    val peerId = jsonObject["peer_id"] as String
+                    val inVoiceCall = jsonObject["in_voice_call"] as Boolean
+                    val incomingVoiceCall = jsonObject["incoming_voice_call"] as Boolean
+                    if (!inVoiceCall) {
+                        if (incomingVoiceCall) {
+                            voiceCallRequestNotification(id, "Voice Call Request", username, peerId)
+                        } else {
+                            if (!audioRecordHandle.switchOutVoiceCall(mediaProjection)) {
+                                Log.e(logTag, "switchOutVoiceCall fail")
+                                MainActivity.flutterMethodChannel?.invokeMethod("msgbox", mapOf(
+                                    "type" to "custom-nook-nocancel-hasclose-error",
+                                    "title" to "Voice call",
+                                    "text" to "Failed to switch out voice call."))
+                            }
+                        }
+                    } else {
+                        if (!audioRecordHandle.switchToVoiceCall(mediaProjection)) {
+                            Log.e(logTag, "switchToVoiceCall fail")
+                            MainActivity.flutterMethodChannel?.invokeMethod("msgbox", mapOf(
+                                "type" to "custom-nook-nocancel-hasclose-error",
+                                "title" to "Voice call",
+                                "text" to "Failed to switch to voice call."))
+                        }
+                    }
+                } catch (e: JSONException) {
+                    e.printStackTrace()
+                }
+            }
             "stop_capture" -> {
                 Log.d(logTag, "from rust:stop_capture")
                 stopCapture()
             }
+            "half_scale" -> {
+                val halfScale = arg1.toBoolean()
+                if (isHalfScale != halfScale) {
+                    isHalfScale = halfScale
+                    updateScreenInfo(resources.configuration.orientation)
+                }
+                
+            }
             else -> {
             }
         }
@@ -151,38 +194,23 @@ class MainService : Service() {
     private val powerManager: PowerManager by lazy { applicationContext.getSystemService(Context.POWER_SERVICE) as PowerManager }
     private val wakeLock: PowerManager.WakeLock by lazy { powerManager.newWakeLock(PowerManager.ACQUIRE_CAUSES_WAKEUP or PowerManager.SCREEN_BRIGHT_WAKE_LOCK, "rustdesk:wakelock")}
 
-    // jvm call rust
-    private external fun init(ctx: Context)
-
-    /// When app start on boot, app_dir will not be passed from flutter
-    /// so pass a app_dir here to rust server
-    private external fun startServer(app_dir: String)
-    private external fun startService()
-    private external fun onVideoFrameUpdate(buf: ByteBuffer)
-    private external fun onAudioFrameUpdate(buf: ByteBuffer)
-    private external fun translateLocale(localeName: String, input: String): String
-    private external fun refreshScreen()
-    private external fun setFrameRawEnable(name: String, value: Boolean)
-    // private external fun sendVp9(data: ByteArray)
-
-    private fun translate(input: String): String {
-        Log.d(logTag, "translate:$LOCAL_NAME")
-        return translateLocale(LOCAL_NAME, input)
-    }
-
     companion object {
         private var _isReady = false // media permission ready status
         private var _isStart = false // screen capture start status
+        private var _isAudioStart = false // audio capture start status
         val isReady: Boolean
             get() = _isReady
         val isStart: Boolean
             get() = _isStart
+        val isAudioStart: Boolean
+            get() = _isAudioStart
     }
 
     private val logTag = "LOG_SERVICE"
     private val useVP9 = false
     private val binder = LocalBinder()
 
+    private var reuseVirtualDisplay = Build.VERSION.SDK_INT > 33
 
     // video
     private var mediaProjection: MediaProjection? = null
@@ -193,10 +221,7 @@ class MainService : Service() {
     private var virtualDisplay: VirtualDisplay? = null
 
     // audio
-    private var audioRecorder: AudioRecord? = null
+    private val audioRecordHandle = AudioRecordHandle(this, { isStart }, { isAudioStart })
-    private var audioReader: AudioReader? = null
-    private var minBufferSize = 0
-    private var audioRecordStat = false
 
     // notification
     private lateinit var notificationManager: NotificationManager
@@ -205,7 +230,8 @@ class MainService : Service() {
 
     override fun onCreate() {
         super.onCreate()
-        Log.d(logTag,"MainService onCreate")
+        Log.d(logTag,"MainService onCreate, sdk int:${Build.VERSION.SDK_INT} reuseVirtualDisplay:$reuseVirtualDisplay")
+        FFI.init(this)
         HandlerThread("Service", Process.THREAD_PRIORITY_BACKGROUND).apply {
             start()
             serviceLooper = looper
@@ -217,16 +243,18 @@ class MainService : Service() {
         // keep the config dir same with flutter
         val prefs = applicationContext.getSharedPreferences(KEY_SHARED_PREFERENCES, FlutterActivity.MODE_PRIVATE)
         val configPath = prefs.getString(KEY_APP_DIR_CONFIG_PATH, "") ?: ""
-        startServer(configPath)
+        FFI.startServer(configPath, "")
 
         createForegroundNotification()
     }
 
     override fun onDestroy() {
         checkMediaPermission()
+        stopService(Intent(this, FloatingWindowService::class.java))
         super.onDestroy()
     }
 
+    private var isHalfScale: Boolean? = null;
     private fun updateScreenInfo(orientation: Int) {
         var w: Int
         var h: Int
@@ -259,7 +287,7 @@ class MainService : Service() {
         Log.d(logTag,"updateScreenInfo:w:$w,h:$h")
         var scale = 1
         if (w != 0 && h != 0) {
-            if (w > MAX_SCREEN_SIZE || h > MAX_SCREEN_SIZE) {
+            if (isHalfScale == true && (w > MAX_SCREEN_SIZE || h > MAX_SCREEN_SIZE)) {
                 scale = 2
                 w /= scale
                 h /= scale
@@ -272,7 +300,7 @@ class MainService : Service() {
                 SCREEN_INFO.dpi = dpi
                 if (isStart) {
                     stopCapture()
-                    refreshScreen()
+                    FFI.refreshScreen()
                     startCapture()
                 }
             }
@@ -300,7 +328,7 @@ class MainService : Service() {
             createForegroundNotification()
 
             if (intent.getBooleanExtra(EXT_INIT_FROM_BOOT, false)) {
-                startService()
+                FFI.startService()
             }
             Log.d(logTag, "service starting: ${startId}:${Thread.currentThread()}")
             val mediaProjectionManager =
@@ -310,7 +338,6 @@ class MainService : Service() {
                 mediaProjection =
                     mediaProjectionManager.getMediaProjection(Activity.RESULT_OK, it)
                 checkMediaPermission()
-                init(this)
                 _isReady = true
             } ?: let {
                 Log.d(logTag, "getParcelableExtra intent null, invoke requestMediaProjection")
@@ -349,12 +376,13 @@ class MainService : Service() {
                 ).apply {
                     setOnImageAvailableListener({ imageReader: ImageReader ->
                         try {
+                            // If not call acquireLatestImage, listener will not be called again
                             imageReader.acquireLatestImage().use { image ->
-                                if (image == null) return@setOnImageAvailableListener
+                                if (image == null || !isStart) return@setOnImageAvailableListener
                                 val planes = image.planes
                                 val buffer = planes[0].buffer
                                 buffer.rewind()
-                                onVideoFrameUpdate(buffer)
+                                FFI.onVideoFrameUpdate(buffer)
                             }
                         } catch (ignored: java.lang.Exception) {
                         }
@@ -365,6 +393,14 @@ class MainService : Service() {
         }
     }
 
+    fun onVoiceCallStarted(): Boolean {
+        return audioRecordHandle.onVoiceCallStarted(mediaProjection)
+    }
+
+    fun onVoiceCallClosed(): Boolean {
+        return audioRecordHandle.onVoiceCallClosed(mediaProjection)
+    }
+
     fun startCapture(): Boolean {
         if (isStart) {
             return true
@@ -373,6 +409,7 @@ class MainService : Service() {
             Log.w(logTag, "startCapture fail,mediaProjection is null")
             return false
         }
+        
         updateScreenInfo(resources.configuration.orientation)
         Log.d(logTag, "Start Capture")
         surface = createSurface()
@@ -384,51 +421,71 @@ class MainService : Service() {
         }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            startAudioRecorder()
+            if (!audioRecordHandle.createAudioRecorder(false, mediaProjection)) {
+                Log.d(logTag, "createAudioRecorder fail")
+            } else {
+                Log.d(logTag, "audio recorder start")
+                audioRecordHandle.startAudioRecorder()
+            }
         }
         checkMediaPermission()
         _isStart = true
-        setFrameRawEnable("video",true)
+        FFI.setFrameRawEnable("video",true)
-        setFrameRawEnable("audio",true)
         return true
     }
 
     @Synchronized
     fun stopCapture() {
         Log.d(logTag, "Stop Capture")
-        setFrameRawEnable("video",false)
+        FFI.setFrameRawEnable("video",false)
-        setFrameRawEnable("audio",false)
         _isStart = false
         // release video
-        virtualDisplay?.release()
+        if (reuseVirtualDisplay) {
-        surface?.release()
+            // The virtual display video projection can be paused by calling `setSurface(null)`.
+            // https://developer.android.com/reference/android/hardware/display/VirtualDisplay.Callback
+            // https://learn.microsoft.com/en-us/dotnet/api/android.hardware.display.virtualdisplay.callback.onpaused?view=net-android-34.0
+            virtualDisplay?.setSurface(null)
+        } else {
+            virtualDisplay?.release()
+        }
+        // suface needs to be release after `imageReader.close()` to imageReader access released surface
+        // https://github.com/rustdesk/rustdesk/issues/4118#issuecomment-1515666629
         imageReader?.close()
+        imageReader = null
         videoEncoder?.let {
             it.signalEndOfInputStream()
             it.stop()
             it.release()
         }
-        virtualDisplay = null
+        if (!reuseVirtualDisplay) {
+            virtualDisplay = null
+        }
         videoEncoder = null
+        // suface needs to be release after `imageReader.close()` to imageReader access released surface
+        // https://github.com/rustdesk/rustdesk/issues/4118#issuecomment-1515666629
+        surface?.release()
 
         // release audio
-        audioRecordStat = false
+        _isAudioStart = false
-        audioRecorder?.release()
+        audioRecordHandle.tryReleaseAudio()
-        audioRecorder = null
-        minBufferSize = 0
     }
 
     fun destroy() {
         Log.d(logTag, "destroy service")
         _isReady = false
+        _isAudioStart = false
 
         stopCapture()
-        imageReader?.close()
+
-        imageReader = null
+        if (reuseVirtualDisplay) {
+            virtualDisplay?.release()
+            virtualDisplay = null
+        }
 
         mediaProjection = null
         checkMediaPermission()
         stopForeground(true)
+        stopService(Intent(this, FloatingWindowService::class.java))
         stopSelf()
     }
 
@@ -454,11 +511,7 @@ class MainService : Service() {
             Log.d(logTag, "startRawVideoRecorder failed,surface is null")
             return
         }
-        virtualDisplay = mp.createVirtualDisplay(
+        createOrSetVirtualDisplay(mp, surface!!)
-            "RustDeskVD",
-            SCREEN_INFO.width, SCREEN_INFO.height, SCREEN_INFO.dpi, VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR,
-            surface, null, null
-        )
     }
 
     private fun startVP9VideoRecorder(mp: MediaProjection) {
@@ -470,11 +523,28 @@ class MainService : Service() {
             }
             it.setCallback(cb)
             it.start()
-            virtualDisplay = mp.createVirtualDisplay(
+            createOrSetVirtualDisplay(mp, surface!!)
-                "RustDeskVD",
+        }
-                SCREEN_INFO.width, SCREEN_INFO.height, SCREEN_INFO.dpi, VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR,
+    }
-                surface, null, null
+
-            )
+    // https://github.com/bk138/droidVNC-NG/blob/b79af62db5a1c08ed94e6a91464859ffed6f4e97/app/src/main/java/net/christianbeier/droidvnc_ng/MediaProjectionService.java#L250
+    // Reuse virtualDisplay if it exists, to avoid media projection confirmation dialog every connection.
+    private fun createOrSetVirtualDisplay(mp: MediaProjection, s: Surface) {
+        try {
+            virtualDisplay?.let {
+                it.resize(SCREEN_INFO.width, SCREEN_INFO.height, SCREEN_INFO.dpi)
+                it.setSurface(s)
+            } ?: let {
+                virtualDisplay = mp.createVirtualDisplay(
+                    "RustDeskVD",
+                    SCREEN_INFO.width, SCREEN_INFO.height, SCREEN_INFO.dpi, VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR,
+                    s, null, null
+                )
+            }
+        } catch (e: SecurityException) {
+            Log.w(logTag, "createOrSetVirtualDisplay: got SecurityException, re-requesting confirmation");
+            // This initiates a prompt dialog for the user to confirm screen projection.
+            requestMediaProjection()
         }
     }
 
@@ -502,7 +572,6 @@ class MainService : Service() {
         }
     }
 
-
     private fun createMediaCodec() {
         Log.d(logTag, "MediaFormat.MIMETYPE_VIDEO_VP9 :$MIME_TYPE")
         videoEncoder = MediaCodec.createEncoderByType(MIME_TYPE)
@@ -522,76 +591,6 @@ class MainService : Service() {
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.M)
-    private fun startAudioRecorder() {
-        checkAudioRecorder()
-        if (audioReader != null && audioRecorder != null && minBufferSize != 0) {
-            try {
-                audioRecorder!!.startRecording()
-                audioRecordStat = true
-                thread {
-                    while (audioRecordStat) {
-                        audioReader!!.readSync(audioRecorder!!)?.let {
-                            onAudioFrameUpdate(it)
-                        }
-                    }
-                    Log.d(logTag, "Exit audio thread")
-                }
-            } catch (e: Exception) {
-                Log.d(logTag, "startAudioRecorder fail:$e")
-            }
-        } else {
-            Log.d(logTag, "startAudioRecorder fail")
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    private fun checkAudioRecorder() {
-        if (audioRecorder != null && audioRecorder != null && minBufferSize != 0) {
-            return
-        }
-        // read f32 to byte , length * 4
-        minBufferSize = 2 * 4 * AudioRecord.getMinBufferSize(
-            AUDIO_SAMPLE_RATE,
-            AUDIO_CHANNEL_MASK,
-            AUDIO_ENCODING
-        )
-        if (minBufferSize == 0) {
-            Log.d(logTag, "get min buffer size fail!")
-            return
-        }
-        audioReader = AudioReader(minBufferSize, 4)
-        Log.d(logTag, "init audioData len:$minBufferSize")
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            mediaProjection?.let {
-                val apcc = AudioPlaybackCaptureConfiguration.Builder(it)
-                    .addMatchingUsage(AudioAttributes.USAGE_MEDIA)
-                    .addMatchingUsage(AudioAttributes.USAGE_ALARM)
-                    .addMatchingUsage(AudioAttributes.USAGE_GAME)
-                    .addMatchingUsage(AudioAttributes.USAGE_UNKNOWN).build()
-                if (ActivityCompat.checkSelfPermission(
-                        this,
-                        Manifest.permission.RECORD_AUDIO
-                    ) != PackageManager.PERMISSION_GRANTED
-                ) {
-                    return
-                }
-                audioRecorder = AudioRecord.Builder()
-                    .setAudioFormat(
-                        AudioFormat.Builder()
-                            .setEncoding(AUDIO_ENCODING)
-                            .setSampleRate(AUDIO_SAMPLE_RATE)
-                            .setChannelMask(AUDIO_CHANNEL_MASK).build()
-                    )
-                    .setAudioPlaybackCaptureConfig(apcc)
-                    .setBufferSizeInBytes(minBufferSize).build()
-                Log.d(logTag, "createAudioRecorder done,minBufferSize:$minBufferSize")
-                return
-            }
-        }
-        Log.d(logTag, "createAudioRecorder fail")
-    }
-
     private fun initNotification() {
         notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
         notificationChannel = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -676,6 +675,21 @@ class MainService : Service() {
         notificationManager.notify(getClientNotifyID(clientID), notification)
     }
 
+    private fun voiceCallRequestNotification(
+        clientID: Int,
+        type: String,
+        username: String,
+        peerId: String
+    ) {
+        val notification = notificationBuilder
+            .setOngoing(false)
+            .setPriority(NotificationCompat.PRIORITY_MAX)
+            .setContentTitle(translate("Do you accept?"))
+            .setContentText("$type:$username-$peerId")
+            .build()
+        notificationManager.notify(getClientNotifyID(clientID), notification)
+    }
+
     private fun getClientNotifyID(clientID: Int): Int {
         return clientID + NOTIFY_ID_OFFSET
     }

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

@@ -0,0 +1,78 @@
+package com.carriez.flutter_hbb
+
+// Inspired by https://github.com/yosemiteyss/flutter_volume_controller/blob/main/android/src/main/kotlin/com/yosemiteyss/flutter_volume_controller/VolumeController.kt
+
+import android.media.AudioManager
+import android.os.Build
+import android.util.Log
+
+class VolumeController(private val audioManager: AudioManager) {
+    private val logTag = "volume controller"
+
+    fun getVolume(streamType: Int): Double {
+        val current = audioManager.getStreamVolume(streamType)
+        val max = audioManager.getStreamMaxVolume(streamType)
+        return current.toDouble() / max
+    }
+
+    fun setVolume(volume: Double, showSystemUI: Boolean, streamType: Int) {
+        val max = audioManager.getStreamMaxVolume(streamType)
+        audioManager.setStreamVolume(
+            streamType,
+            (max * volume).toInt(),
+            if (showSystemUI) AudioManager.FLAG_SHOW_UI else 0
+        )
+    }
+
+    fun raiseVolume(step: Double?, showSystemUI: Boolean, streamType: Int) {
+        if (step == null) {
+            audioManager.adjustStreamVolume(
+                streamType,
+                AudioManager.ADJUST_RAISE,
+                if (showSystemUI) AudioManager.FLAG_SHOW_UI else 0
+            )
+        } else {
+            val target = getVolume(streamType) + step
+            setVolume(target, showSystemUI, streamType)
+        }
+    }
+
+    fun lowerVolume(step: Double?, showSystemUI: Boolean, streamType: Int) {
+        if (step == null) {
+            audioManager.adjustStreamVolume(
+                streamType,
+                AudioManager.ADJUST_LOWER,
+                if (showSystemUI) AudioManager.FLAG_SHOW_UI else 0
+            )
+        } else {
+            val target = getVolume(streamType) - step
+            setVolume(target, showSystemUI, streamType)
+        }
+    }
+
+    fun getMute(streamType: Int): Boolean {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            audioManager.isStreamMute(streamType)
+        } else {
+            audioManager.getStreamVolume(streamType) == 0
+        }
+    }
+
+    private fun setMute(isMuted: Boolean, showSystemUI: Boolean, streamType: Int) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            audioManager.adjustStreamVolume(
+                streamType,
+                if (isMuted) AudioManager.ADJUST_MUTE else AudioManager.ADJUST_UNMUTE,
+                if (showSystemUI) AudioManager.FLAG_SHOW_UI else 0
+            )
+        } else {
+            audioManager.setStreamMute(streamType, isMuted)
+        }
+    }
+
+    fun toggleMute(showSystemUI: Boolean, streamType: Int) {
+        val isMuted = getMute(streamType)
+        setMute(!isMuted, showSystemUI, streamType)
+    }
+}
+

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

@@ -15,10 +15,14 @@ import android.os.Looper
 import android.os.PowerManager
 import android.provider.Settings
 import android.provider.Settings.*
+import android.util.DisplayMetrics
+import android.util.Log
+import android.view.WindowManager
 import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat.getSystemService
 import com.hjq.permissions.Permission
 import com.hjq.permissions.XXPermissions
+import ffi.FFI
 import java.nio.ByteBuffer
 import java.util.*
 
@@ -43,6 +47,9 @@ const val START_ACTION = "start_action"
 const val GET_START_ON_BOOT_OPT = "get_start_on_boot_opt"
 const val SET_START_ON_BOOT_OPT = "set_start_on_boot_opt"
 const val SYNC_APP_DIR_CONFIG_PATH = "sync_app_dir"
+const val GET_VALUE = "get_value"
+
+const val KEY_IS_SUPPORT_VOICE_CALL = "KEY_IS_SUPPORT_VOICE_CALL"
 
 const val KEY_SHARED_PREFERENCES = "KEY_SHARED_PREFERENCES"
 const val KEY_START_ON_BOOT_OPT = "KEY_START_ON_BOOT_OPT"
@@ -56,6 +63,11 @@ data class Info(
     var width: Int, var height: Int, var scale: Int, var dpi: Int
 )
 
+fun isSupportVoiceCall(): Boolean {
+    // https://developer.android.com/reference/android/media/MediaRecorder.AudioSource#VOICE_COMMUNICATION
+    return Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
+}
+
 fun requestPermission(context: Context, type: String) {
     XXPermissions.with(context)
         .permission(type)
@@ -120,3 +132,26 @@ class AudioReader(val bufSize: Int, private val maxFrames: Int) {
         }
     }
 }
+
+
+fun getScreenSize(windowManager: WindowManager) : Pair<Int, Int>{
+    var w = 0
+    var h = 0
+    @Suppress("DEPRECATION")
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+        val m = windowManager.maximumWindowMetrics
+        w = m.bounds.width()
+        h = m.bounds.height()
+    } else {
+        val dm = DisplayMetrics()
+        windowManager.defaultDisplay.getRealMetrics(dm)
+        w = dm.widthPixels
+        h = dm.heightPixels
+    }
+    return Pair(w, h)
+}
+
+ fun translate(input: String): String {
+    Log.d("common", "translate:$LOCAL_NAME")
+    return FFI.translateLocale(LOCAL_NAME, input)
+}

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

@@ -0,0 +1,23 @@
+// ffi.kt
+
+package ffi
+
+import android.content.Context
+import java.nio.ByteBuffer
+
+object FFI {
+    init {
+        System.loadLibrary("rustdesk")
+    }
+
+    external fun init(ctx: Context)
+    external fun startServer(app_dir: String, custom_client_config: String)
+    external fun startService()
+    external fun onVideoFrameUpdate(buf: ByteBuffer)
+    external fun onAudioFrameUpdate(buf: ByteBuffer)
+    external fun translateLocale(localeName: String, input: String): String
+    external fun refreshScreen()
+    external fun setFrameRawEnable(name: String, value: Boolean)
+    external fun setCodecInfo(info: String)
+    external fun getLocalOption(key: String): String
+}

flutter/android/app/src/main/res/drawable/floating_window.xml

@@ -0,0 +1,7 @@
+<vector xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android" android:height="320dp" android:viewportHeight="32" android:viewportWidth="32" android:width="320dp">
+      
+    <path android:fillColor="#ffffff" android:pathData="M16,0L16,0A16,16 0,0 1,32 16L32,16A16,16 0,0 1,16 32L16,32A16,16 0,0 1,0 16L0,16A16,16 0,0 1,16 0z" android:strokeColor="#00000000" android:strokeWidth="1"/>
+      
+    <path android:fillColor="#1a1a1a" android:pathData="m23.89,10.135 l-1.807,1.795c-0.318,0.285 -0.472,0.744 -0.293,1.131 1.204,2.518 0.747,5.52 -1.228,7.494 -1.976,1.973 -4.981,2.429 -7.502,1.226 -0.371,-0.166 -0.807,-0.025 -1.093,0.265l-1.836,1.833c-0.216,0.211 -0.322,0.51 -0.288,0.809 0.034,0.3 0.206,0.567 0.463,0.723 4.326,2.618 9.882,1.951 13.463,-1.618 3.581,-3.568 4.264,-9.115 1.655,-13.443 -0.15,-0.263 -0.414,-0.442 -0.714,-0.484 -0.3,-0.043 -0.603,0.058 -0.819,0.269zM8.265,8.184c-3.599,3.554 -4.304,9.103 -1.709,13.441 0.15,0.264 0.413,0.443 0.714,0.485 0.3,0.042 0.603,-0.058 0.82,-0.27l1.797,-1.785c0.325,-0.285 0.484,-0.749 0.303,-1.141 -1.204,-2.518 -0.748,-5.52 1.228,-7.493 1.975,-1.973 4.981,-2.429 7.502,-1.227 0.367,0.165 0.797,0.028 1.084,-0.254l1.846,-1.844c0.216,-0.211 0.322,-0.509 0.288,-0.809 -0.035,-0.299 -0.206,-0.566 -0.463,-0.723 -4.334,-2.596 -9.881,-1.908 -13.448,1.668z" android:strokeWidth="0.987992"/>
+    
+</vector>

flutter/android/app/src/main/res/xml/accessibility_service_config.xml

@@ -1,5 +1,6 @@
 <accessibility-service xmlns:android="http://schemas.android.com/apk/res/android"
     android:accessibilityEventTypes="typeWindowsChanged"
+    android:canRetrieveWindowContent="true"
     android:accessibilityFlags="flagDefault"
     android:notificationTimeout="50"
     android:description="@string/accessibility_service_description"

flutter/android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.9.10'
     repositories {
         google()
         jcenter()

flutter/assets/voice_call.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="200" height="200" class="icon" viewBox="0 0 1024 1024"><path d="M608 160c141.16 0 256 114.84 256 256 0 17.67 14.33 32 32 32s32-14.33 32-32c0-85.48-33.29-165.83-93.73-226.27C773.83 129.29 693.47 96 608 96c-17.67 0-32 14.33-32 32s14.33 32 32 32zm-24 168c61.76 0 112 50.24 112 112 0 17.67 14.33 32 32 32s32-14.33 32-32c0-97.05-78.95-176-176-176-17.67 0-32 14.33-32 32s14.33 32 32 32z"/><path d="M808.3 561.21c-12.76-3.83-25.7-6.2-38.46-7.03-60.3-4.5-116.45 18.9-146.55 61.08-22.6 31.67-45.66 50.01-68.52 54.5-17.71 3.48-33.12-1.7-45.49-5.85-2.66-.9-5.18-1.74-7.68-2.49-93.84-28.17-156.49-108.42-155.9-199.7.16-24.14 16.38-45.98 42.34-56.99 43.75-18.56 77.35-54 92.17-97.22 7.02-20.48 9.65-41.57 7.8-62.68-2.66-31.78-15.1-61.85-35.96-86.96-21.1-25.39-49.51-44-82.16-53.8-4.07-1.22-8.22-2.31-12.35-3.23-30.63-6.87-62.7-4.49-92.73 6.88-29.24 11.07-54.56 29.86-73.23 54.33a476.073 476.073 0 0 0-36.42 55.34 477.675 477.675 0 0 0-17.24 33.81C109.84 312.17 95.73 376.76 96 443.15c.26 63.78 13.7 126.26 39.95 185.7 27.55 62.39 69.3 119.84 120.74 166.11 54.14 48.71 117.6 84.85 188.63 107.4C499.02 919.41 554.33 928 610.21 928c10.99 0 22.01-.33 33.03-1 17.64-1.07 31.08-16.23 30.01-33.87-1.07-17.64-16.22-31.08-33.87-30.01-59.19 3.57-117.96-3.75-174.69-21.76C342.78 802.66 244.31 715.78 194.5 603c-46.76-105.9-46.21-221.33 1.55-325.03 4.55-9.87 9.57-19.72 14.92-29.26 9.29-16.54 19.89-32.64 31.5-47.86 23.47-30.77 64.09-45.87 101.07-37.58 2.66.6 5.33 1.3 7.95 2.08 40.93 12.29 69.48 45.6 72.75 84.86 0 .05.01.1.01.15 1.07 12.15-.47 24.39-4.58 36.37-8.94 26.06-29.58 47.59-56.63 59.07-23.58 10.01-43.63 25.72-57.99 45.45-15.12 20.78-23.2 45-23.36 70.05-.37 57.15 19 114.29 54.53 160.91 36.46 47.83 87.28 82.58 146.96 100.49 1.5.45 3.44 1.1 5.69 1.86 29.79 10.01 108.9 36.59 186.49-72.13 16.95-23.75 52.2-37.26 89.81-34.42l.36.03c7.97.51 16.17 2.02 24.34 4.47 22.12 6.64 42.04 25.38 56.11 52.77 16.97 33.04 21.71 72.53 12.1 100.56l-.16.47c-5.54 16.05-17.78 29.48-34.47 37.8-15.82 7.89-22.24 27.1-14.36 42.92s27.1 22.24 42.92 14.36c31.78-15.85 55.36-42.19 66.41-74.2l.18-.53c15.23-44.4 9.22-102.11-15.68-150.61-22.07-43.02-55.68-73.15-94.62-84.84z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="200" height="200" class="icon" viewBox="-186 -186 1365 1365"><path d="M608 160c141.16 0 256 114.84 256 256 0 17.67 14.33 32 32 32s32-14.33 32-32c0-85.48-33.29-165.83-93.73-226.27C773.83 129.29 693.47 96 608 96c-17.67 0-32 14.33-32 32s14.33 32 32 32zm-24 168c61.76 0 112 50.24 112 112 0 17.67 14.33 32 32 32s32-14.33 32-32c0-97.05-78.95-176-176-176-17.67 0-32 14.33-32 32s14.33 32 32 32z"/><path d="M808.3 561.21c-12.76-3.83-25.7-6.2-38.46-7.03-60.3-4.5-116.45 18.9-146.55 61.08-22.6 31.67-45.66 50.01-68.52 54.5-17.71 3.48-33.12-1.7-45.49-5.85-2.66-.9-5.18-1.74-7.68-2.49-93.84-28.17-156.49-108.42-155.9-199.7.16-24.14 16.38-45.98 42.34-56.99 43.75-18.56 77.35-54 92.17-97.22 7.02-20.48 9.65-41.57 7.8-62.68-2.66-31.78-15.1-61.85-35.96-86.96-21.1-25.39-49.51-44-82.16-53.8-4.07-1.22-8.22-2.31-12.35-3.23-30.63-6.87-62.7-4.49-92.73 6.88-29.24 11.07-54.56 29.86-73.23 54.33a476.073 476.073 0 0 0-36.42 55.34 477.675 477.675 0 0 0-17.24 33.81C109.84 312.17 95.73 376.76 96 443.15c.26 63.78 13.7 126.26 39.95 185.7 27.55 62.39 69.3 119.84 120.74 166.11 54.14 48.71 117.6 84.85 188.63 107.4C499.02 919.41 554.33 928 610.21 928c10.99 0 22.01-.33 33.03-1 17.64-1.07 31.08-16.23 30.01-33.87-1.07-17.64-16.22-31.08-33.87-30.01-59.19 3.57-117.96-3.75-174.69-21.76C342.78 802.66 244.31 715.78 194.5 603c-46.76-105.9-46.21-221.33 1.55-325.03 4.55-9.87 9.57-19.72 14.92-29.26 9.29-16.54 19.89-32.64 31.5-47.86 23.47-30.77 64.09-45.87 101.07-37.58 2.66.6 5.33 1.3 7.95 2.08 40.93 12.29 69.48 45.6 72.75 84.86 0 .05.01.1.01.15 1.07 12.15-.47 24.39-4.58 36.37-8.94 26.06-29.58 47.59-56.63 59.07-23.58 10.01-43.63 25.72-57.99 45.45-15.12 20.78-23.2 45-23.36 70.05-.37 57.15 19 114.29 54.53 160.91 36.46 47.83 87.28 82.58 146.96 100.49 1.5.45 3.44 1.1 5.69 1.86 29.79 10.01 108.9 36.59 186.49-72.13 16.95-23.75 52.2-37.26 89.81-34.42l.36.03c7.97.51 16.17 2.02 24.34 4.47 22.12 6.64 42.04 25.38 56.11 52.77 16.97 33.04 21.71 72.53 12.1 100.56l-.16.47c-5.54 16.05-17.78 29.48-34.47 37.8-15.82 7.89-22.24 27.1-14.36 42.92s27.1 22.24 42.92 14.36c31.78-15.85 55.36-42.19 66.41-74.2l.18-.53c15.23-44.4 9.22-102.11-15.68-150.61-22.07-43.02-55.68-73.15-94.62-84.84z"/></svg>

flutter/build_android_deps.sh

@@ -1,13 +1,17 @@
 #!/bin/bash
 
-# Build libyuv / opus / libvpx / oboe for Android
+set -e -o pipefail
+
+ANDROID_ABI=$1
+
+# Build RustDesk dependencies for Android using vcpkg.json
 # Required:
 #   1. set VCPKG_ROOT / ANDROID_NDK path environment variables
 #   2. vcpkg initialized
-#   3. ndk, version: 22 (if ndk < 22 you need to change LD as `export LD=$TOOLCHAIN/bin/$NDK_LLVM_TARGET-ld`)
+#   3. ndk, version: r25c or newer
 
-if [ -z "$ANDROID_NDK" ]; then
+if [ -z "$ANDROID_NDK_HOME" ]; then
-  echo "Failed! Please set ANDROID_NDK"
+  echo "Failed! Please set ANDROID_NDK_HOME"
   exit 1
 fi
 
@@ -18,107 +22,66 @@ fi
 
 API_LEVEL="21"
 
+# Get directory of this script
+
+SCRIPTDIR="$(readlink -f "$0")"
+SCRIPTDIR="$(dirname "$SCRIPTDIR")"
+
+# Check if vcpkg.json is one level up - in root directory of RD
+
+if [ ! -f "$SCRIPTDIR/../vcpkg.json" ]; then
+  echo "Failed! Please check where vcpkg.json is!"
+  exit 1
+fi
+
 # NDK llvm toolchain
+
 HOST_TAG="linux-x86_64" # current platform, set as `ls $ANDROID_NDK/toolchains/llvm/prebuilt/`
 TOOLCHAIN=$ANDROID_NDK/toolchains/llvm/prebuilt/$HOST_TAG
 
 function build {
   ANDROID_ABI=$1
-  VCPKG_TARGET=$2
-  NDK_LLVM_TARGET=$3
-  LIBVPX_TARGET=$4
 
-  PREFIX=$VCPKG_ROOT/installed/$VCPKG_TARGET/
+  case "$ANDROID_ABI" in
+  arm64-v8a)
+     ABI=aarch64-linux-android$API_LEVEL
+     VCPKG_TARGET=arm64-android
+     ;;
+  armeabi-v7a)
+     ABI=armv7a-linux-androideabi$API_LEVEL
+     VCPKG_TARGET=arm-neon-android
+     ;;
+  x86_64)
+     ABI=x86_64-linux-android$API_LEVEL
+     VCPKG_TARGET=x64-android
+     ;;
+  x86)
+     ABI=i686-linux-android$API_LEVEL
+     VCPKG_TARGET=x86-android
+     ;;
+  *)
+     echo "ERROR: ANDROID_ABI must be one of: arm64-v8a, armeabi-v7a, x86_64, x86" >&2
+     return 1
+  esac
 
-  # 1
+  echo "*** [$ANDROID_ABI][Start] Build and install vcpkg dependencies"
-  echo "*** [$ANDROID_ABI][Start] Build opus / libyuv from vcpkg"
+  pushd "$SCRIPTDIR/.."
-  export ANDROID_NDK_HOME=$ANDROID_NDK
+  $VCPKG_ROOT/vcpkg install --triplet $VCPKG_TARGET --x-install-root="$VCPKG_ROOT/installed"
-  pushd $VCPKG_ROOT
-  $VCPKG_ROOT/vcpkg install opus --triplet $VCPKG_TARGET
-  $VCPKG_ROOT/vcpkg install libyuv --triplet $VCPKG_TARGET
   popd
-  echo "*** [$ANDROID_ABI][Finished] Build opus / libyuv from vcpkg"
+  echo "*** [$ANDROID_ABI][Finished] Build and install vcpkg dependencies"
 
-  # 2
+if [ -d "$VCPKG_ROOT/installed/arm-neon-android" ]; then
-  echo "*** [$ANDROID_ABI][Start] Build libvpx"
+  echo "*** [Start] Move arm-neon-android to arm-android"
-  pushd build/libvpx
-  export AR=$TOOLCHAIN/bin/${NDK_LLVM_TARGET}-ar
-  export AS=$TOOLCHAIN/bin/${NDK_LLVM_TARGET}-as
-  export LD=$TOOLCHAIN/bin/${NDK_LLVM_TARGET}-ld.gold  # if ndk < 22, use aarch64-linux-android-ld
-  export RANLIB=$TOOLCHAIN/bin/${NDK_LLVM_TARGET}-ranlib
-  export STRIP=$TOOLCHAIN/bin/${NDK_LLVM_TARGET}-strip
 
-  if [ $NDK_LLVM_TARGET == "arm-linux-androideabi" ]
+  mv "$VCPKG_ROOT/installed/arm-neon-android" "$VCPKG_ROOT/installed/arm-android"
-  then
-    export CC=$TOOLCHAIN/bin/armv7a-linux-androideabi${API_LEVEL}-clang
-    export CXX=$TOOLCHAIN/bin/armv7a-linux-androideabi${API_LEVEL}-clang++
-  else
-    export CC=$TOOLCHAIN/bin/${NDK_LLVM_TARGET}${API_LEVEL}-clang
-    export CXX=$TOOLCHAIN/bin/${NDK_LLVM_TARGET}${API_LEVEL}-clang++
-  fi
-  make clean
-  ./configure --target=$LIBVPX_TARGET \
-              --enable-pic
-              --disable-webm-io \
-              --disable-unit-tests \
-              --disable-examples \
-              --disable-libyuv \
-              --disable-postproc \
-              --disable-tools \
-              --disable-docs \
-              --prefix=$PREFIX
-  make -j5
-  make install
 
-  popd
+  echo "*** [Finished] Move arm-neon-android to arm-android"
-  echo "*** [$ANDROID_ABI][Finished] Build libvpx"
+fi
-
-  # 3
-  echo "*** [$ANDROID_ABI][Start] Build oboe"
-  pushd build/oboe
-  make clean
-  cmake -DBUILD_SHARED_LIBS=true \
-          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -DANDROID_TOOLCHAIN=clang \
-          -DANDROID_STL=c++_shared \
-          -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake \
-          -DCMAKE_INSTALL_PREFIX=$PREFIX \
-          -DANDROID_ABI=$ANDROID_ABI \
-          -DANDROID_PLATFORM=android-$API_LEVEL
-  make -j5
-  make install
-  mv $PREFIX/lib/$ANDROID_ABI/liboboe.a $PREFIX/lib/
-  popd
-  echo "*** [$ANDROID_ABI][Finished] Build oboe"
-
-  echo "*** [$ANDROID_ABI][All Finished]"
 }
 
-git clone -b v1.11.0 --depth=1 https://github.com/webmproject/libvpx.git build/libvpx
+if [ ! -z "$ANDROID_ABI" ]; then
-git clone -b 1.6.1 --depth=1 https://github.com/google/oboe build/oboe
+  build "$ANDROID_ABI"
-patch -N -d build/oboe -p1 < ../src/oboe.patch
+else
-
+  echo "Usage: build-android-deps.sh <ANDROID-ABI>" >&2
-# VCPKG_TARGET	        ANDROID_ABI
+  exit 1
-#   arm64-android	        arm64-v8a
+fi
-#   arm-android	          armeabi-v7a
-#   x64-android	          x86_64
-#   x86-android	          x86
-
-# NDK_LLVM_TARGET
-#   aarch64-linux-android
-#   arm-linux-androideabi
-#   x86_64-linux-android
-#   i686-linux-android
-
-# LIBVPX_TARGET :
-#   arm64-android-gcc
-#   armv7-android-gcc
-#   x86_64-android-gcc
-#   x86-android-gcc
-
-# args: ANDROID_ABI  VCPKG_TARGET  NDK_LLVM_TARGET  LIBVPX_TARGET
-build arm64-v8a arm64-android aarch64-linux-android arm64-android-gcc
-build armeabi-v7a arm-android arm-linux-androideabi armv7-android-gcc
-
-# rm -rf build/libvpx
-# rm -rf build/oboe

flutter/build_fdroid.sh

@@ -0,0 +1,563 @@
+#!/bin/bash
+
+set -x
+
+#
+# Script to build F-Droid release of RustDesk
+#
+# Copyright (C) 2024, The RustDesk Authors
+#               2024, Vasyl Gello <vasek.gello@gmail.com>
+#
+
+# The script is invoked by F-Droid builder system ste-by-step.
+#
+# It accepts the following arguments:
+#
+# - versionName from https://github.com/rustdesk/rustdesk/releases/download/fdroid-version/rustdesk-version.txt
+# - versionCode from https://github.com/rustdesk/rustdesk/releases/download/fdroid-version/rustdesk-version.txt
+# - 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
+#
+
+# Parse command-line arguments
+
+VERNAME="${1}"
+VERCODE="${2}"
+ANDROID_ABI="${3}"
+BUILDSTEP="${4}"
+
+if [ -z "${VERNAME}" ] || [ -z "${VERCODE}" ] || [ -z "${ANDROID_ABI}" ] ||
+	[ -z "${BUILDSTEP}" ]; then
+	echo "ERROR: Command-line arguments are all required to be non-empty!" >&2
+	exit 1
+fi
+
+# Set various architecture-specific identifiers
+
+case "${ANDROID_ABI}" in
+arm64-v8a)
+	FLUTTER_TARGET=android-arm64
+	NDK_TARGET=aarch64-linux-android
+	RUST_TARGET=aarch64-linux-android
+	RUSTDESK_FEATURES='flutter,hwcodec'
+	;;
+armeabi-v7a)
+	FLUTTER_TARGET=android-arm
+	NDK_TARGET=arm-linux-androideabi
+	RUST_TARGET=armv7-linux-androideabi
+	RUSTDESK_FEATURES='flutter,hwcodec'
+	;;
+x86_64)
+	FLUTTER_TARGET=android-x64
+	NDK_TARGET=x86_64-linux-android
+	RUST_TARGET=x86_64-linux-android
+	RUSTDESK_FEATURES='flutter'
+	;;
+x86)
+	FLUTTER_TARGET=android-x86
+	NDK_TARGET=i686-linux-android
+	RUST_TARGET=i686-linux-android
+	RUSTDESK_FEATURES='flutter'
+	;;
+*)
+	echo "ERROR: Unknown Android ABI '${ANDROID_ABI}'!" >&2
+	exit 1
+	;;
+esac
+
+# Check ANDROID_SDK_ROOT and sdkmanager present on PATH
+
+if [ ! -d "${ANDROID_SDK_ROOT}" ] || ! command -v sdkmanager 1>/dev/null; then
+	echo "ERROR: Can not find Android SDK!" >&2
+	exit 1
+fi
+
+# Export necessary variables
+
+export PATH="${PATH}:${HOME}/flutter/bin:${HOME}/depot_tools"
+
+export VCPKG_ROOT="${HOME}/vcpkg"
+
+# Now act depending on build step
+
+# NOTE: F-Droid maintainers require explicit declaration of dependencies
+# as root via `Builds.sudo` F-Droid metadata directive:
+# https://gitlab.com/fdroid/fdroiddata/-/merge_requests/15343#note_1988918695
+
+case "${BUILDSTEP}" in
+prebuild)
+	# prebuild: patch sources and do other stuff before the build
+
+	#
+	# Extract required versions for NDK, Rust, Flutter from
+	# '.github/workflows/flutter-build.yml'
+	#
+
+	CARGO_NDK_VERSION="$(yq -r \
+		.env.CARGO_NDK_VERSION \
+		.github/workflows/flutter-build.yml)"
+
+	FLUTTER_VERSION="$(yq -r \
+		.env.ANDROID_FLUTTER_VERSION \
+		.github/workflows/flutter-build.yml)"
+	if [ -z "${FLUTTER_VERSION}" ]; then
+		FLUTTER_VERSION="$(yq -r \
+			.env.FLUTTER_VERSION \
+			.github/workflows/flutter-build.yml)"
+	fi
+
+	FLUTTER_RUST_BRIDGE_VERSION="$(yq -r \
+		.env.FLUTTER_RUST_BRIDGE_VERSION \
+		.github/workflows/flutter-build.yml)"
+
+	NDK_VERSION="$(yq -r \
+		.env.NDK_VERSION \
+		.github/workflows/flutter-build.yml)"
+
+	RUST_VERSION="$(yq -r \
+		.env.RUST_VERSION \
+		.github/workflows/flutter-build.yml)"
+
+	VCPKG_COMMIT_ID="$(yq -r \
+		.env.VCPKG_COMMIT_ID \
+		.github/workflows/flutter-build.yml)"
+
+	if [ -z "${CARGO_NDK_VERSION}" ] || [ -z "${FLUTTER_VERSION}" ] ||
+		[ -z "${FLUTTER_RUST_BRIDGE_VERSION}" ] ||
+		[ -z "${NDK_VERSION}" ] || [ -z "${RUST_VERSION}" ] ||
+		[ -z "${VCPKG_COMMIT_ID}" ]; then
+		echo "ERROR: Can not identify all required versions!" >&2
+		exit 1
+	fi
+
+	# Map NDK version to revision
+
+	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
+		exit 1
+	fi
+
+	export ANDROID_NDK_HOME="${ANDROID_SDK_ROOT}/ndk/${NDK_VERSION}"
+	export ANDROID_NDK_ROOT="${ANDROID_SDK_ROOT}/ndk/${NDK_VERSION}"
+
+	#
+	# Install the components
+	#
+
+	set -e
+
+	# Install Android NDK
+
+	if [ ! -d "${ANDROID_NDK_ROOT}" ]; then
+		sdkmanager --install "ndk;${NDK_VERSION}"
+	fi
+
+	# Install Flutter
+
+	if [ ! -f "${HOME}/flutter/bin/flutter" ]; then
+		pushd "${HOME}"
+
+		git clone https://github.com/flutter/flutter
+
+		pushd flutter
+
+		git reset --hard "${FLUTTER_VERSION}"
+
+		flutter config --no-analytics
+
+		popd # flutter
+
+		popd # ${HOME}
+	fi
+
+	# Install Rust
+
+	if [ ! -f "${HOME}/rustup/rustup-init.sh" ]; then
+		pushd "${HOME}"
+
+		git clone --depth 1 https://github.com/rust-lang/rustup
+
+		popd # ${HOME}
+	fi
+
+	pushd "${HOME}/rustup"
+	bash rustup-init.sh -y \
+		--target "${RUST_TARGET}" \
+		--default-toolchain "${RUST_VERSION}"
+	popd
+
+	if ! command -v cargo 1>/dev/null 2>&1; then
+		. "${HOME}/.cargo/env"
+	fi
+
+	# Install cargo-ndk
+
+	cargo install \
+		cargo-ndk \
+		--version "${CARGO_NDK_VERSION}"
+
+	# Install rust bridge generator
+
+	cargo install cargo-expand
+	cargo install flutter_rust_bridge_codegen \
+		--version "${FLUTTER_RUST_BRIDGE_VERSION}" \
+		--features "uuid"
+
+	# Populate native vcpkg dependencies
+
+	if [ ! -d "${VCPKG_ROOT}" ]; then
+		pushd "${HOME}"
+
+		git clone \
+			https://github.com/Microsoft/vcpkg.git
+		git clone \
+			https://github.com/Microsoft/vcpkg-tool.git
+
+		pushd vcpkg-tool
+
+		mkdir build
+
+		pushd build
+
+		cmake \
+			-DCMAKE_BUILD_TYPE=Release \
+			-G 'Ninja' \
+			-DVCPKG_DEVELOPMENT_WARNINGS=OFF \
+			..
+
+		cmake --build .
+
+		popd # build
+
+		popd # vcpkg-tool
+
+		pushd vcpkg
+
+		git reset --hard "${VCPKG_COMMIT_ID}"
+
+		cp -a ../vcpkg-tool/build/vcpkg vcpkg
+
+		# disable telemetry
+
+		touch "vcpkg.disable-metrics"
+
+		popd # vcpkg
+
+		popd # ${HOME}
+	fi
+
+	# Install depot-tools for x86
+
+	if [ "${ANDROID_ABI}" = "x86" ]; then
+		if [ ! -d "${HOME}/depot_tools" ]; then
+			pushd "${HOME}"
+
+			git clone \
+				--depth 1 \
+				https://chromium.googlesource.com/chromium/tools/depot_tools.git
+
+			popd # ${HOME}
+		fi
+	fi
+
+	# Patch the RustDesk sources
+
+	git apply res/fdroid/patches/*.patch
+
+	sed \
+		-i \
+		-e '/gms/d' \
+		flutter/android/build.gradle \
+		flutter/android/app/build.gradle
+
+	sed \
+		-i \
+		-e '/firebase_analytics/d' \
+		flutter/pubspec.yaml
+
+	sed \
+		-i \
+		-e '/  firebase/,/    version/d' \
+		flutter/pubspec.lock
+
+	sed \
+		-i \
+		-e '/firebase/Id' \
+		flutter/lib/main.dart
+
+	if [ "${FLUTTER_VERSION}" = "3.13.9" ]; then
+		# Fix for android 3.13.9
+		# https://github.com/rustdesk/rustdesk/blob/285e974d1a52c891d5fcc28e963d724e085558bc/.github/workflows/flutter-build.yml#L862
+
+		sed \
+			-i \
+			-e 's/uni_links_desktop/#uni_links_desktop/g' \
+			flutter/pubspec.yaml
+
+		set --
+
+		while read -r _1; do
+			set -- "$@" "${_1}"
+		done 0<<.a
+$(find flutter/lib/ -type f -name "*dart*")
+.a
+
+		sed \
+			-i \
+			-e 's/textScaler: TextScaler.linear(\(.*\)),/textScaleFactor: \1,/g' \
+			"$@"
+
+		set --
+	fi
+
+	sed -i "s/FLUTTER_VERSION_PLACEHOLDER/${FLUTTER_VERSION}/" flutter-sdk/.gclient
+
+	;;
+build)
+	# build: perform actual build of APK file
+
+	set -e
+
+	#
+	# Extract required versions for NDK, Rust, Flutter from
+	# '.github/workflows/flutter-build.yml'
+	#
+
+	FLUTTER_VERSION="$(yq -r \
+		.env.ANDROID_FLUTTER_VERSION \
+		.github/workflows/flutter-build.yml)"
+	if [ -z "${FLUTTER_VERSION}" ]; then
+		FLUTTER_VERSION="$(yq -r \
+			.env.FLUTTER_VERSION \
+			.github/workflows/flutter-build.yml)"
+	fi
+
+	NDK_VERSION="$(yq -r \
+		.env.NDK_VERSION \
+		.github/workflows/flutter-build.yml)"
+
+	# Map NDK version to revision
+
+	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
+		exit 1
+	fi
+
+	export ANDROID_NDK_HOME="${ANDROID_SDK_ROOT}/ndk/${NDK_VERSION}"
+	export ANDROID_NDK_ROOT="${ANDROID_SDK_ROOT}/ndk/${NDK_VERSION}"
+
+	if ! command -v cargo 1>/dev/null 2>&1; then
+		. "${HOME}/.cargo/env"
+	fi
+
+	# Download Flutter dependencies
+
+	pushd flutter
+
+	flutter packages pub get
+
+	popd # flutter
+
+	# Generate FFI bindings
+
+	flutter_rust_bridge_codegen \
+		--rust-input ./src/flutter_ffi.rs \
+		--dart-output ./flutter/lib/generated_bridge.dart
+
+	# Build host android deps
+
+	bash flutter/build_android_deps.sh "${ANDROID_ABI}"
+
+	# Build rustdesk lib
+
+	cargo ndk \
+		--platform 21 \
+		--target "${RUST_TARGET}" \
+		--bindgen \
+		build \
+		--release \
+		--features "${RUSTDESK_FEATURES}"
+
+	mkdir -p "flutter/android/app/src/main/jniLibs/${ANDROID_ABI}"
+
+	cp "target/${RUST_TARGET}/release/liblibrustdesk.so" \
+		"flutter/android/app/src/main/jniLibs/${ANDROID_ABI}/librustdesk.so"
+
+	cp "${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/${NDK_TARGET}/libc++_shared.so" \
+		"flutter/android/app/src/main/jniLibs/${ANDROID_ABI}/"
+
+	"${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip" \
+		"flutter/android/app/src/main/jniLibs/${ANDROID_ABI}"/*
+
+	# Build flutter-jit-release for x86
+
+	if [ "${ANDROID_ABI}" = "x86" ]; then
+		pushd flutter-sdk
+
+		echo "## Sync flutter engine sources"
+		echo "### We need fakeroot because chromium base image is unpacked with weird uid/gid ownership"
+
+		sed -i "s/FLUTTER_VERSION_PLACEHOLDER/${FLUTTER_VERSION}/" .gclient
+
+		export FAKEROOTDONTTRYCHOWN=1
+
+		fakeroot gclient sync
+
+		unset FAKEROOTDONTTRYCHOWN
+
+		pushd src
+
+		echo "## Patch away Google Play dependencies"
+
+		rm \
+			flutter/shell/platform/android/io/flutter/app/FlutterPlayStoreSplitApplication.java \
+			flutter/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManager.java flutter/shell/platform/android/io/flutter/embedding/android/FlutterPlayStoreSplitApplication.java
+
+		sed \
+			-i \
+			-e '/PlayStore/d' \
+			flutter/tools/android_lint/project.xml \
+			flutter/shell/platform/android/BUILD.gn
+
+		sed \
+			-i \
+			-e '/com.google.android.play/d' \
+			flutter/tools/androidx/files.json
+
+		echo "## Configure android engine build"
+
+		flutter/tools/gn \
+			--android --android-cpu x86 --runtime-mode=jit_release \
+			--no-goma --no-enable-unittests
+
+		echo "## Perform android engine build"
+
+		ninja -C out/android_jit_release_x86
+
+		echo "## Configure host engine build"
+
+		flutter/tools/gn \
+			--android-cpu x86 --runtime-mode=jit_release \
+			--no-goma --no-enable-unittests
+
+		echo "## Perform android engine build"
+
+		ninja -C out/host_jit_release_x86
+
+		echo "## Rename host engine"
+
+		mv out/host_jit_release_x86 out/host_jit_release
+
+		echo "## Mimic jit_release engine to debug to use with flutter build apk"
+
+		pushd out/android_jit_release_x86
+
+		sed \
+			-e 's/jit_release/debug/' \
+			flutter_embedding_jit_release.maven-metadata.xml \
+			1>flutter_embedding_debug.maven-metadata.xml
+
+		sed \
+			-e 's/jit_release/debug/' \
+			flutter_embedding_jit_release.pom \
+			1>flutter_embedding_debug.pom
+
+		sed \
+			-e 's/jit_release/debug/' \
+			x86_jit_release.maven-metadata.xml \
+			1>x86_debug.maven-metadata.xml
+
+		sed \
+			-e 's/jit_release/debug/' \
+			x86_jit_release.pom \
+			1>x86_debug.pom
+
+		cp -a \
+			flutter_embedding_jit_release-sources.jar \
+			flutter_embedding_debug-sources.jar
+
+		cp -a \
+			flutter_embedding_jit_release.jar \
+			flutter_embedding_debug.jar
+
+		cp -a \
+			x86_jit_release.jar \
+			x86_debug.jar
+
+		popd # out/android_jit_release_x86
+
+		popd # src
+
+		popd # flutter-sdk
+
+		echo "# Clean up intermediate engine files and show free space"
+
+		rm -rf \
+			flutter-sdk/src/out/android_jit_release_x86/obj \
+			flutter-sdk/src/out/host_jit_release/obj
+
+		mv flutter-sdk/src/out flutter-out
+
+		rm -rf flutter-sdk
+
+		mkdir -p flutter-sdk/src/
+
+		mv flutter-out flutter-sdk/src/out
+	fi
+
+	# Build the apk
+
+	pushd flutter
+
+	if [ "${ANDROID_ABI}" = "x86" ]; then
+		flutter build apk \
+			--local-engine-src-path="$(readlink -mf "../flutter-sdk/src")" \
+			--local-engine=android_jit_release_x86 \
+			--debug \
+			--build-number="${VERCODE}" \
+			--build-name="${VERNAME}" \
+			--target-platform "${FLUTTER_TARGET}"
+	else
+		flutter build apk \
+			--release \
+			--build-number="${VERCODE}" \
+			--build-name="${VERNAME}" \
+			--target-platform "${FLUTTER_TARGET}"
+	fi
+
+	popd # flutter
+
+	rm -rf flutter-sdk
+
+	# Special step for fdroiddata CI builds to remove .gitconfig
+
+	rm -f /home/vagrant/.gitconfig
+
+	;;
+*)
+	echo "ERROR: Unknown build step '${BUILDSTEP}'!" >&2
+	exit 1
+	;;
+esac
+
+# Report success
+
+echo "All done!"

flutter/ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>12.0</string>
 </dict>
 </plist>

flutter/ios/Podfile

@@ -1,10 +1,10 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '11.0'
+# platform :ios, '12.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
 
-platform :ios, '11.0'
+platform :ios, '12.0'
 
 project 'Runner', {
   'Debug' => :debug,

flutter/ios/Podfile.lock

@@ -38,9 +38,6 @@ PODS:
   - Flutter (1.0.0)
   - flutter_keyboard_visibility (0.0.1):
     - Flutter
-  - FMDB (2.7.5):
-    - FMDB/standard (= 2.7.5)
-  - FMDB/standard (2.7.5)
   - image_picker_ios (0.0.1):
     - Flutter
   - MTBBarcodeScanner (5.0.11)
@@ -52,12 +49,12 @@ PODS:
   - qr_code_scanner (0.2.0):
     - Flutter
     - MTBBarcodeScanner
-  - SDWebImage (5.15.5):
+  - SDWebImage (5.18.11):
-    - SDWebImage/Core (= 5.15.5)
+    - SDWebImage/Core (= 5.18.11)
-  - SDWebImage/Core (5.15.5)
+  - SDWebImage/Core (5.18.11)
-  - sqflite (0.0.2):
+  - sqflite (0.0.3):
     - Flutter
-    - FMDB (>= 2.7.5)
+    - FlutterMacOS
   - SwiftyGif (5.4.4)
   - uni_links (0.0.1):
     - Flutter
@@ -65,7 +62,8 @@ PODS:
     - Flutter
   - video_player_avfoundation (0.0.1):
     - Flutter
-  - wakelock (0.0.1):
+    - FlutterMacOS
+  - wakelock_plus (0.0.1):
     - Flutter
 
 DEPENDENCIES:
@@ -77,17 +75,16 @@ DEPENDENCIES:
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`)
-  - sqflite (from `.symlinks/plugins/sqflite/ios`)
+  - sqflite (from `.symlinks/plugins/sqflite/darwin`)
   - uni_links (from `.symlinks/plugins/uni_links/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
-  - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`)
+  - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
-  - wakelock (from `.symlinks/plugins/wakelock/ios`)
+  - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
 
 SPEC REPOS:
   trunk:
     - DKImagePickerController
     - DKPhotoGallery
-    - FMDB
     - MTBBarcodeScanner
     - SDWebImage
     - SwiftyGif
@@ -110,37 +107,36 @@ EXTERNAL SOURCES:
   qr_code_scanner:
     :path: ".symlinks/plugins/qr_code_scanner/ios"
   sqflite:
-    :path: ".symlinks/plugins/sqflite/ios"
+    :path: ".symlinks/plugins/sqflite/darwin"
   uni_links:
     :path: ".symlinks/plugins/uni_links/ios"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
   video_player_avfoundation:
-    :path: ".symlinks/plugins/video_player_avfoundation/ios"
+    :path: ".symlinks/plugins/video_player_avfoundation/darwin"
-  wakelock:
+  wakelock_plus:
-    :path: ".symlinks/plugins/wakelock/ios"
+    :path: ".symlinks/plugins/wakelock_plus/ios"
 
 SPEC CHECKSUMS:
-  device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
+  device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
   DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
   DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
   file_picker: ce3938a0df3cc1ef404671531facef740d03f920
-  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
-  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
+  image_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425
-  image_picker_ios: b786a5dcf033a8336a657191401bfdf12017dabb
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
-  package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
+  package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
-  path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852
+  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
   qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
-  SDWebImage: fd7e1a22f00303e058058278639bf6196ee431fe
+  SDWebImage: a3ba0b8faac7228c3c8eadd1a55c9c9fe5e16457
-  sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
+  sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
   SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
   uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
-  url_launcher_ios: ae1517e5e344f5544fb090b079e11f399dfbe4d2
+  url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
-  video_player_avfoundation: e489aac24ef5cf7af82702979ed16f2a5ef84cff
+  video_player_avfoundation: 02011213dab73ae3687df27ce441fbbcc82b5579
-  wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
+  wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
 
-PODFILE CHECKSUM: 2aff76ba0ac13439479560d1d03e9b4479f5c9e1
+PODFILE CHECKSUM: d4cb12ad5d3bdb3352770b1d3db237584e155156
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.15.2

flutter/ios/Runner.xcodeproj/project.pbxproj

@@ -159,7 +159,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -347,7 +347,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -394,8 +394,6 @@
 					"-framework",
 					"\"DKPhotoGallery\"",
 					"-framework",
-					"\"FMDB\"",
-					"-framework",
 					"\"Foundation\"",
 					"-framework",
 					"\"ImageIO\"",
@@ -434,7 +432,7 @@
 					"-framework",
 					"\"video_player_avfoundation\"",
 					"-framework",
-					"\"wakelock\"",
+					"\"wakelock_plus\"",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.carriez.flutterHbb;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -493,7 +491,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -543,7 +541,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -592,8 +590,6 @@
 					"-framework",
 					"\"DKPhotoGallery\"",
 					"-framework",
-					"\"FMDB\"",
-					"-framework",
 					"\"Foundation\"",
 					"-framework",
 					"\"ImageIO\"",
@@ -632,7 +628,7 @@
 					"-framework",
 					"\"video_player_avfoundation\"",
 					"-framework",
-					"\"wakelock\"",
+					"\"wakelock_plus\"",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.carriez.flutterHbb;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -682,8 +678,6 @@
 					"-framework",
 					"\"DKPhotoGallery\"",
 					"-framework",
-					"\"FMDB\"",
-					"-framework",
 					"\"Foundation\"",
 					"-framework",
 					"\"ImageIO\"",
@@ -722,7 +716,7 @@
 					"-framework",
 					"\"video_player_avfoundation\"",
 					"-framework",
-					"\"wakelock\"",
+					"\"wakelock_plus\"",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.carriez.flutterHbb;
 				PRODUCT_NAME = "$(TARGET_NAME)";

flutter/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

flutter/ios/Runner/AppDelegate.swift

@@ -14,6 +14,6 @@ import Flutter
     
   public func dummyMethodToEnforceBundling() {
       dummy_method_to_enforce_bundling();
-    session_get_rgba(nil);
+    session_get_rgba(nil, 0);
   }
 }

flutter/ios/Runner/Info.plist

@@ -24,6 +24,21 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLIconFile</key>
+			<string></string>
+			<key>CFBundleURLName</key>
+			<string>com.carriez.rustdesk</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>rustdesk</string>
+			</array>
+		</dict>
+	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>

flutter/ios/Runner/Runner.entitlements

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>aps-environment</key>
+	<string>development</string>
 	<key>com.apple.developer.networking.wifi-info</key>
 	<true/>
 </dict>

flutter/ios_arm64.sh

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

flutter/lib/common/hbbs/hbbs.dart

@@ -1,5 +1,6 @@
 import 'dart:convert';
 import 'package:flutter/material.dart';
+import 'package:flutter_hbb/common.dart';
 import 'package:flutter_hbb/consts.dart';
 
 import 'package:flutter_hbb/models/peer_model.dart';
@@ -11,9 +12,11 @@ class HttpType {
   static const kAuthReqTypeMobile = "mobile";
   static const kAuthReqTypeSMSCode = "sms_code";
   static const kAuthReqTypeEmailCode = "email_code";
+  static const kAuthReqTypeTfaCode = "tfa_code";
 
   static const kAuthResTypeToken = "access_token";
   static const kAuthResTypeEmailCheck = "email_check";
+  static const kAuthResTypeTfaCheck = "tfa_check";
 }
 
 enum UserStatus { kDisabled, kNormal, kUnverified }
@@ -118,6 +121,8 @@ class LoginRequest {
   bool? autoLogin;
   String? type;
   String? verificationCode;
+  String? tfaCode;
+  String? secret;
 
   LoginRequest(
       {this.username,
@@ -126,7 +131,9 @@ class LoginRequest {
       this.uuid,
       this.autoLogin,
       this.type,
-      this.verificationCode});
+      this.verificationCode,
+      this.tfaCode,
+      this.secret});
 
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = <String, dynamic>{};
@@ -139,6 +146,8 @@ class LoginRequest {
     if (verificationCode != null) {
       data['verificationCode'] = verificationCode;
     }
+    if (tfaCode != null) data['tfaCode'] = tfaCode;
+    if (secret != null) data['secret'] = secret;
 
     Map<String, dynamic> deviceInfo = {};
     try {
@@ -154,13 +163,18 @@ class LoginRequest {
 class LoginResponse {
   String? access_token;
   String? type;
+  String? tfa_type;
+  String? secret;
   UserPayload? user;
 
-  LoginResponse({this.access_token, this.type, this.user});
+  LoginResponse(
+      {this.access_token, this.type, this.tfa_type, this.secret, this.user});
 
   LoginResponse.fromJson(Map<String, dynamic> json) {
     access_token = json['access_token'];
     type = json['type'];
+    tfa_type = json['tfa_type'];
+    secret = json['secret'];
     user = json['user'] != null ? UserPayload.fromJson(json['user']) : null;
   }
 }
@@ -175,3 +189,79 @@ class RequestException implements Exception {
     return "RequestException, statusCode: $statusCode, error: $cause";
   }
 }
+
+enum ShareRule {
+  read(1),
+  readWrite(2),
+  fullControl(3);
+
+  const ShareRule(this.value);
+  final int value;
+
+  static String desc(int v) {
+    if (v == ShareRule.read.value) {
+      return translate('Read-only');
+    }
+    if (v == ShareRule.readWrite.value) {
+      return translate('Read/Write');
+    }
+    if (v == ShareRule.fullControl.value) {
+      return translate('Full Control');
+    }
+    return v.toString();
+  }
+
+  static String shortDesc(int v) {
+    if (v == ShareRule.read.value) {
+      return 'R';
+    }
+    if (v == ShareRule.readWrite.value) {
+      return 'RW';
+    }
+    if (v == ShareRule.fullControl.value) {
+      return 'F';
+    }
+    return v.toString();
+  }
+
+  static ShareRule? fromValue(int v) {
+    if (v == ShareRule.read.value) {
+      return ShareRule.read;
+    }
+    if (v == ShareRule.readWrite.value) {
+      return ShareRule.readWrite;
+    }
+    if (v == ShareRule.fullControl.value) {
+      return ShareRule.fullControl;
+    }
+    return null;
+  }
+}
+
+class AbProfile {
+  String guid;
+  String name;
+  String owner;
+  String? note;
+  int rule;
+
+  AbProfile(this.guid, this.name, this.owner, this.note, this.rule);
+
+  AbProfile.fromJson(Map<String, dynamic> json)
+      : guid = json['guid'] ?? '',
+        name = json['name'] ?? '',
+        owner = json['owner'] ?? '',
+        note = json['note'] ?? '',
+        rule = json['rule'] ?? 0;
+}
+
+class AbTag {
+  String name;
+  int color;
+
+  AbTag(this.name, this.color);
+
+  AbTag.fromJson(Map<String, dynamic> json)
+      : name = json['name'] ?? '',
+        color = json['color'] ?? '';
+}

flutter/lib/common/shared_state.dart

@@ -1,3 +1,4 @@
+import 'package:flutter_hbb/common.dart';
 import 'package:get/get.dart';
 
 import '../consts.dart';
@@ -9,22 +10,22 @@ class PrivacyModeState {
 
   static void init(String id) {
     final key = tag(id);
-    if (!Get.isRegistered(tag: key)) {
+    if (!Get.isRegistered<RxString>(tag: key)) {
-      final RxBool state = false.obs;
+      final RxString state = ''.obs;
-      Get.put(state, tag: key);
+      Get.put<RxString>(state, tag: key);
     }
   }
 
   static void delete(String id) {
     final key = tag(id);
-    if (Get.isRegistered(tag: key)) {
+    if (Get.isRegistered<RxString>(tag: key)) {
-      Get.delete(tag: key);
+      Get.delete<RxString>(tag: key);
     } else {
-      Get.find<RxBool>(tag: key).value = false;
+      Get.find<RxString>(tag: key).value = '';
     }
   }
 
-  static RxBool find(String id) => Get.find<RxBool>(tag: tag(id));
+  static RxString find(String id) => Get.find<RxString>(tag: tag(id));
 }
 
 class BlockInputState {
@@ -32,9 +33,9 @@ class BlockInputState {
 
   static void init(String id) {
     final key = tag(id);
-    if (!Get.isRegistered(tag: key)) {
+    if (!Get.isRegistered<RxBool>(tag: key)) {
       final RxBool state = false.obs;
-      Get.put(state, tag: key);
+      Get.put<RxBool>(state, tag: key);
     } else {
       Get.find<RxBool>(tag: key).value = false;
     }
@@ -42,8 +43,8 @@ class BlockInputState {
 
   static void delete(String id) {
     final key = tag(id);
-    if (Get.isRegistered(tag: key)) {
+    if (Get.isRegistered<RxBool>(tag: key)) {
-      Get.delete(tag: key);
+      Get.delete<RxBool>(tag: key);
     }
   }
 
@@ -55,9 +56,9 @@ class CurrentDisplayState {
 
   static void init(String id) {
     final key = tag(id);
-    if (!Get.isRegistered(tag: key)) {
+    if (!Get.isRegistered<RxInt>(tag: key)) {
       final RxInt state = RxInt(0);
-      Get.put(state, tag: key);
+      Get.put<RxInt>(state, tag: key);
     } else {
       Get.find<RxInt>(tag: key).value = 0;
     }
@@ -65,8 +66,8 @@ class CurrentDisplayState {
 
   static void delete(String id) {
     final key = tag(id);
-    if (Get.isRegistered(tag: key)) {
+    if (Get.isRegistered<RxInt>(tag: key)) {
-      Get.delete(tag: key);
+      Get.delete<RxInt>(tag: key);
     }
   }
 
@@ -104,16 +105,16 @@ class ConnectionTypeState {
 
   static void init(String id) {
     final key = tag(id);
-    if (!Get.isRegistered(tag: key)) {
+    if (!Get.isRegistered<ConnectionType>(tag: key)) {
       final ConnectionType collectionType = ConnectionType();
-      Get.put(collectionType, tag: key);
+      Get.put<ConnectionType>(collectionType, tag: key);
     }
   }
 
   static void delete(String id) {
     final key = tag(id);
-    if (Get.isRegistered(tag: key)) {
+    if (Get.isRegistered<ConnectionType>(tag: key)) {
-      Get.delete(tag: key);
+      Get.delete<ConnectionType>(tag: key);
     }
   }
 
@@ -126,9 +127,9 @@ class FingerprintState {
 
   static void init(String id) {
     final key = tag(id);
-    if (!Get.isRegistered(tag: key)) {
+    if (!Get.isRegistered<RxString>(tag: key)) {
       final RxString state = ''.obs;
-      Get.put(state, tag: key);
+      Get.put<RxString>(state, tag: key);
     } else {
       Get.find<RxString>(tag: key).value = '';
     }
@@ -136,8 +137,8 @@ class FingerprintState {
 
   static void delete(String id) {
     final key = tag(id);
-    if (Get.isRegistered(tag: key)) {
+    if (Get.isRegistered<RxString>(tag: key)) {
-      Get.delete(tag: key);
+      Get.delete<RxString>(tag: key);
     }
   }
 
@@ -149,9 +150,9 @@ class ShowRemoteCursorState {
 
   static void init(String id) {
     final key = tag(id);
-    if (!Get.isRegistered(tag: key)) {
+    if (!Get.isRegistered<RxBool>(tag: key)) {
       final RxBool state = false.obs;
-      Get.put(state, tag: key);
+      Get.put<RxBool>(state, tag: key);
     } else {
       Get.find<RxBool>(tag: key).value = false;
     }
@@ -159,8 +160,31 @@ class ShowRemoteCursorState {
 
   static void delete(String id) {
     final key = tag(id);
-    if (Get.isRegistered(tag: key)) {
+    if (Get.isRegistered<RxBool>(tag: key)) {
-      Get.delete(tag: key);
+      Get.delete<RxBool>(tag: key);
+    }
+  }
+
+  static RxBool find(String id) => Get.find<RxBool>(tag: tag(id));
+}
+
+class ShowRemoteCursorLockState {
+  static String tag(String id) => 'show_remote_cursor_lock_$id';
+
+  static void init(String id) {
+    final key = tag(id);
+    if (!Get.isRegistered<RxBool>(tag: key)) {
+      final RxBool state = false.obs;
+      Get.put<RxBool>(state, tag: key);
+    } else {
+      Get.find<RxBool>(tag: key).value = false;
+    }
+  }
+
+  static void delete(String id) {
+    final key = tag(id);
+    if (Get.isRegistered<RxBool>(tag: key)) {
+      Get.delete<RxBool>(tag: key);
     }
   }
 
@@ -172,10 +196,10 @@ class KeyboardEnabledState {
 
   static void init(String id) {
     final key = tag(id);
-    if (!Get.isRegistered(tag: key)) {
+    if (!Get.isRegistered<RxBool>(tag: key)) {
       // Server side, default true
       final RxBool state = true.obs;
-      Get.put(state, tag: key);
+      Get.put<RxBool>(state, tag: key);
     } else {
       Get.find<RxBool>(tag: key).value = true;
     }
@@ -183,8 +207,8 @@ class KeyboardEnabledState {
 
   static void delete(String id) {
     final key = tag(id);
-    if (Get.isRegistered(tag: key)) {
+    if (Get.isRegistered<RxBool>(tag: key)) {
-      Get.delete(tag: key);
+      Get.delete<RxBool>(tag: key);
     }
   }
 
@@ -196,9 +220,9 @@ class RemoteCursorMovedState {
 
   static void init(String id) {
     final key = tag(id);
-    if (!Get.isRegistered(tag: key)) {
+    if (!Get.isRegistered<RxBool>(tag: key)) {
       final RxBool state = false.obs;
-      Get.put(state, tag: key);
+      Get.put<RxBool>(state, tag: key);
     } else {
       Get.find<RxBool>(tag: key).value = false;
     }
@@ -206,8 +230,8 @@ class RemoteCursorMovedState {
 
   static void delete(String id) {
     final key = tag(id);
-    if (Get.isRegistered(tag: key)) {
+    if (Get.isRegistered<RxBool>(tag: key)) {
-      Get.delete(tag: key);
+      Get.delete<RxBool>(tag: key);
     }
   }
 
@@ -219,9 +243,9 @@ class RemoteCountState {
 
   static void init() {
     final key = tag();
-    if (!Get.isRegistered(tag: key)) {
+    if (!Get.isRegistered<RxInt>(tag: key)) {
       final RxInt state = 1.obs;
-      Get.put(state, tag: key);
+      Get.put<RxInt>(state, tag: key);
     } else {
       Get.find<RxInt>(tag: key).value = 1;
     }
@@ -229,8 +253,8 @@ class RemoteCountState {
 
   static void delete() {
     final key = tag();
-    if (Get.isRegistered(tag: key)) {
+    if (Get.isRegistered<RxInt>(tag: key)) {
-      Get.delete(tag: key);
+      Get.delete<RxInt>(tag: key);
     }
   }
 
@@ -242,9 +266,9 @@ class PeerBoolOption {
 
   static void init(String id, String opt, bool Function() init_getter) {
     final key = tag(id, opt);
-    if (!Get.isRegistered(tag: key)) {
+    if (!Get.isRegistered<RxBool>(tag: key)) {
       final RxBool value = RxBool(init_getter());
-      Get.put(value, tag: key);
+      Get.put<RxBool>(value, tag: key);
     } else {
       Get.find<RxBool>(tag: key).value = init_getter();
     }
@@ -252,8 +276,8 @@ class PeerBoolOption {
 
   static void delete(String id, String opt) {
     final key = tag(id, opt);
-    if (Get.isRegistered(tag: key)) {
+    if (Get.isRegistered<RxBool>(tag: key)) {
-      Get.delete(tag: key);
+      Get.delete<RxBool>(tag: key);
     }
   }
 
@@ -266,9 +290,9 @@ class PeerStringOption {
 
   static void init(String id, String opt, String Function() init_getter) {
     final key = tag(id, opt);
-    if (!Get.isRegistered(tag: key)) {
+    if (!Get.isRegistered<RxString>(tag: key)) {
       final RxString value = RxString(init_getter());
-      Get.put(value, tag: key);
+      Get.put<RxString>(value, tag: key);
     } else {
       Get.find<RxString>(tag: key).value = init_getter();
     }
@@ -276,8 +300,8 @@ class PeerStringOption {
 
   static void delete(String id, String opt) {
     final key = tag(id, opt);
-    if (Get.isRegistered(tag: key)) {
+    if (Get.isRegistered<RxString>(tag: key)) {
-      Get.delete(tag: key);
+      Get.delete<RxString>(tag: key);
     }
   }
 
@@ -290,9 +314,9 @@ class UnreadChatCountState {
 
   static void init(String id) {
     final key = tag(id);
-    if (!Get.isRegistered(tag: key)) {
+    if (!Get.isRegistered<RxInt>(tag: key)) {
       final RxInt state = RxInt(0);
-      Get.put(state, tag: key);
+      Get.put<RxInt>(state, tag: key);
     } else {
       Get.find<RxInt>(tag: key).value = 0;
     }
@@ -300,8 +324,8 @@ class UnreadChatCountState {
 
   static void delete(String id) {
     final key = tag(id);
-    if (Get.isRegistered(tag: key)) {
+    if (Get.isRegistered<RxInt>(tag: key)) {
-      Get.delete(tag: key);
+      Get.delete<RxInt>(tag: key);
     }
   }
 
@@ -314,10 +338,12 @@ initSharedStates(String id) {
   CurrentDisplayState.init(id);
   KeyboardEnabledState.init(id);
   ShowRemoteCursorState.init(id);
+  ShowRemoteCursorLockState.init(id);
   RemoteCursorMovedState.init(id);
   FingerprintState.init(id);
-  PeerBoolOption.init(id, 'zoom-cursor', () => false);
+  PeerBoolOption.init(id, kOptionZoomCursor, () => false);
   UnreadChatCountState.init(id);
+  if (isMobile) ConnectionTypeState.init(id); // desktop in other places
 }
 
 removeSharedStates(String id) {
@@ -325,9 +351,11 @@ removeSharedStates(String id) {
   BlockInputState.delete(id);
   CurrentDisplayState.delete(id);
   ShowRemoteCursorState.delete(id);
+  ShowRemoteCursorLockState.delete(id);
   KeyboardEnabledState.delete(id);
   RemoteCursorMovedState.delete(id);
   FingerprintState.delete(id);
-  PeerBoolOption.delete(id, 'zoom-cursor');
+  PeerBoolOption.delete(id, kOptionZoomCursor);
   UnreadChatCountState.delete(id);
+  if (isMobile) ConnectionTypeState.delete(id);
 }

flutter/lib/common/widgets/address_book.dart

@@ -1,13 +1,17 @@
 import 'dart:math';
 
+import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:dynamic_layouts/dynamic_layouts.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hbb/common/formatter/id_formatter.dart';
+import 'package:flutter_hbb/common/hbbs/hbbs.dart';
 import 'package:flutter_hbb/common/widgets/peer_card.dart';
 import 'package:flutter_hbb/common/widgets/peers_view.dart';
+import 'package:flutter_hbb/consts.dart';
 import 'package:flutter_hbb/desktop/widgets/popup_menu.dart';
 import 'package:flutter_hbb/models/ab_model.dart';
 import 'package:flutter_hbb/models/platform_model.dart';
+import 'package:url_launcher/url_launcher_string.dart';
 import '../../desktop/widgets/material_mod_popup_menu.dart' as mod_menu;
 import 'package:get/get.dart';
 import 'package:flex_color_picker/flex_color_picker.dart';
@@ -31,39 +35,33 @@ class AddressBook extends StatefulWidget {
 class _AddressBookState extends State<AddressBook> {
   var menuPos = RelativeRect.fill;
 
-  @override
-  void initState() {
-    super.initState();
-  }
-
   @override
   Widget build(BuildContext context) => Obx(() {
         if (!gFFI.userModel.isLogin) {
           return Center(
               child: ElevatedButton(
                   onPressed: loginDialog, child: Text(translate("Login"))));
+        } else if (gFFI.userModel.networkError.isNotEmpty) {
+          return netWorkErrorWidget();
         } else {
-          if (gFFI.abModel.abLoading.value && gFFI.abModel.emtpy) {
-            return const Center(
-              child: CircularProgressIndicator(),
-            );
-          }
           return Column(
             children: [
               // NOT use Offstage to wrap LinearProgressIndicator
-              if (gFFI.abModel.retrying.value) LinearProgressIndicator(),
+              if (gFFI.abModel.currentAbLoading.value &&
+                  gFFI.abModel.currentAbEmpty)
+                const LinearProgressIndicator(),
               buildErrorBanner(context,
-                  loading: gFFI.abModel.abLoading,
+                  loading: gFFI.abModel.currentAbLoading,
-                  err: gFFI.abModel.pullError,
+                  err: gFFI.abModel.currentAbPullError,
                   retry: null,
-                  close: () => gFFI.abModel.pullError.value = ''),
+                  close: () => gFFI.abModel.currentAbPullError.value = ''),
               buildErrorBanner(context,
-                  loading: gFFI.abModel.abLoading,
+                  loading: gFFI.abModel.currentAbLoading,
-                  err: gFFI.abModel.pushError,
+                  err: gFFI.abModel.currentAbPushError,
-                  retry: () => gFFI.abModel.pushAb(isRetry: true),
+                  retry: null, // remove retry
-                  close: () => gFFI.abModel.pushError.value = ''),
+                  close: () => gFFI.abModel.currentAbPushError.value = ''),
               Expanded(
-                  child: isDesktop
+                  child: (isDesktop || isWebDesktop)
                       ? _buildAddressBookDesktop()
                       : _buildAddressBookMobile())
             ],
@@ -82,19 +80,23 @@ class _AddressBookState extends State<AddressBook> {
                   border: Border.all(
                       color: Theme.of(context).colorScheme.background)),
               child: Container(
-                width: 150,
+                width: 200,
                 height: double.infinity,
-                padding: const EdgeInsets.all(8.0),
                 child: Column(
                   children: [
-                    _buildTagHeader().marginOnly(left: 8.0, right: 0),
+                    _buildAbDropdown(),
+                    _buildTagHeader().marginOnly(
+                        left: 8.0,
+                        right: gFFI.abModel.legacyMode.value ? 8.0 : 0,
+                        top: gFFI.abModel.legacyMode.value ? 8.0 : 0),
                     Expanded(
                       child: Container(
                         width: double.infinity,
                         height: double.infinity,
                         child: _buildTags(),
                       ),
-                    )
+                    ),
+                    _buildAbPermission(),
                   ],
                 ),
               ),
@@ -105,6 +107,7 @@ class _AddressBookState extends State<AddressBook> {
   }
 
   Widget _buildAddressBookMobile() {
+    const padding = 8.0;
     return Column(
       children: [
         Offstage(
@@ -115,10 +118,12 @@ class _AddressBookState extends State<AddressBook> {
                   border: Border.all(
                       color: Theme.of(context).colorScheme.background)),
               child: Container(
-                padding: const EdgeInsets.all(8.0),
+                padding:
+                    const EdgeInsets.fromLTRB(padding, 0, padding, padding),
                 child: Column(
                   mainAxisSize: MainAxisSize.min,
                   children: [
+                    _buildAbDropdown(),
                     _buildTagHeader().marginOnly(left: 8.0, right: 0),
                     Container(
                       width: double.infinity,
@@ -133,6 +138,162 @@ class _AddressBookState extends State<AddressBook> {
     );
   }
 
+  Widget _buildAbPermission() {
+    icon(IconData data, String tooltip) {
+      return Tooltip(
+          message: translate(tooltip),
+          waitDuration: Duration.zero,
+          child: Icon(data, size: 12.0).marginSymmetric(horizontal: 2.0));
+    }
+
+    return Obx(() {
+      if (gFFI.abModel.legacyMode.value) return Offstage();
+      if (gFFI.abModel.current.isPersonal()) {
+        return Row(
+          mainAxisAlignment: MainAxisAlignment.end,
+          children: [
+            icon(Icons.cloud_off, "Personal"),
+          ],
+        );
+      } else {
+        List<Widget> children = [];
+        final rule = gFFI.abModel.current.sharedProfile()?.rule;
+        if (rule == ShareRule.read.value) {
+          children.add(
+              icon(Icons.visibility, ShareRule.desc(ShareRule.read.value)));
+        } else if (rule == ShareRule.readWrite.value) {
+          children
+              .add(icon(Icons.edit, ShareRule.desc(ShareRule.readWrite.value)));
+        } else if (rule == ShareRule.fullControl.value) {
+          children.add(icon(
+              Icons.security, ShareRule.desc(ShareRule.fullControl.value)));
+        }
+        final owner = gFFI.abModel.current.sharedProfile()?.owner;
+        if (owner != null) {
+          children.add(icon(Icons.person, "${translate("Owner")}: $owner"));
+        }
+        return Row(
+          mainAxisAlignment: MainAxisAlignment.end,
+          children: children,
+        );
+      }
+    });
+  }
+
+  Widget _buildAbDropdown() {
+    if (gFFI.abModel.legacyMode.value) {
+      return Offstage();
+    }
+    final names = gFFI.abModel.addressBookNames();
+    if (!names.contains(gFFI.abModel.currentName.value)) {
+      return Offstage();
+    }
+    // order: personal, divider, character order
+    // https://pub.dev/packages/dropdown_button2#3-dropdownbutton2-with-items-of-different-heights-like-dividers
+    final personalAddressBookName = gFFI.abModel.personalAddressBookName();
+    bool contains = names.remove(personalAddressBookName);
+    names.sort((a, b) => a.toLowerCase().compareTo(b.toLowerCase()));
+    if (contains) {
+      names.insert(0, personalAddressBookName);
+    }
+
+    Row buildItem(String e, {bool button = false}) {
+      return Row(
+        children: [
+          Expanded(
+            child: Tooltip(
+                waitDuration: Duration(milliseconds: 500),
+                message: gFFI.abModel.translatedName(e),
+                child: Text(
+                  gFFI.abModel.translatedName(e),
+                  style: button ? null : TextStyle(fontSize: 14.0),
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                  textAlign: button ? TextAlign.center : null,
+                )),
+          ),
+        ],
+      );
+    }
+
+    final items = names
+        .map((e) => DropdownMenuItem(value: e, child: buildItem(e)))
+        .toList();
+    var menuItemStyleData = MenuItemStyleData(height: 36);
+    if (contains && items.length > 1) {
+      items.insert(1, DropdownMenuItem(enabled: false, child: Divider()));
+      List<double> customHeights = List.filled(items.length, 36);
+      customHeights[1] = 4;
+      menuItemStyleData = MenuItemStyleData(customHeights: customHeights);
+    }
+    final TextEditingController textEditingController = TextEditingController();
+
+    final isOptFixed = isOptionFixed(kOptionCurrentAbName);
+    return DropdownButton2<String>(
+      value: gFFI.abModel.currentName.value,
+      onChanged: isOptFixed
+          ? null
+          : (value) {
+              if (value != null) {
+                gFFI.abModel.setCurrentName(value);
+                bind.setLocalFlutterOption(k: kOptionCurrentAbName, v: value);
+              }
+            },
+      customButton: Container(
+        height: isDesktop ? 48 : 40,
+        child: Row(children: [
+          Expanded(
+              child: buildItem(gFFI.abModel.currentName.value, button: true)),
+          Icon(Icons.arrow_drop_down),
+        ]),
+      ),
+      underline: Container(
+        height: 0.7,
+        color: Theme.of(context).dividerColor.withOpacity(0.1),
+      ),
+      menuItemStyleData: menuItemStyleData,
+      items: items,
+      isExpanded: true,
+      isDense: true,
+      dropdownSearchData: DropdownSearchData(
+        searchController: textEditingController,
+        searchInnerWidgetHeight: 50,
+        searchInnerWidget: Container(
+          height: 50,
+          padding: const EdgeInsets.only(
+            top: 8,
+            bottom: 4,
+            right: 8,
+            left: 8,
+          ),
+          child: TextFormField(
+            expands: true,
+            maxLines: null,
+            controller: textEditingController,
+            decoration: InputDecoration(
+              isDense: true,
+              contentPadding: const EdgeInsets.symmetric(
+                horizontal: 10,
+                vertical: 8,
+              ),
+              hintText: translate('Search'),
+              hintStyle: const TextStyle(fontSize: 12),
+              border: OutlineInputBorder(
+                borderRadius: BorderRadius.circular(8),
+              ),
+            ),
+          ),
+        ),
+        searchMatchFn: (item, searchValue) {
+          return item.value
+              .toString()
+              .toLowerCase()
+              .contains(searchValue.toLowerCase());
+        },
+      ),
+    );
+  }
+
   Widget _buildTagHeader() {
     return Row(
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -154,11 +315,12 @@ class _AddressBookState extends State<AddressBook> {
     return Obx(() {
       final List tags;
       if (gFFI.abModel.sortTags.value) {
-        tags = gFFI.abModel.tags.toList();
+        tags = gFFI.abModel.currentAbTags.toList();
         tags.sort();
       } else {
-        tags = gFFI.abModel.tags;
+        tags = gFFI.abModel.currentAbTags;
       }
+      final editPermission = gFFI.abModel.current.canWrite();
       tagBuilder(String e) {
         return AddressBookTag(
             name: e,
@@ -169,7 +331,8 @@ class _AddressBookState extends State<AddressBook> {
               } else {
                 gFFI.abModel.selectedTags.add(e);
               }
-            });
+            },
+            showActionMenu: editPermission);
       }
 
       final gridView = DynamicGridView.builder(
@@ -181,7 +344,7 @@ class _AddressBookState extends State<AddressBook> {
             return tagBuilder(e);
           });
       final maxHeight = max(MediaQuery.of(context).size.height / 6, 100.0);
-      return isDesktop
+      return (isDesktop || isWebDesktop)
           ? gridView
           : LimitedBox(maxHeight: maxHeight, child: gridView);
     });
@@ -193,13 +356,14 @@ class _AddressBookState extends State<AddressBook> {
           alignment: Alignment.topLeft,
           child: AddressBookPeersView(
             menuPadding: widget.menuPadding,
-            initPeers: gFFI.abModel.peers,
+            getInitPeers: () => gFFI.abModel.currentAbPeers,
           )),
     );
   }
 
   @protected
   MenuEntryBase<String> syncMenuItem() {
+    final isOptFixed = isOptionFixed(syncAbOption);
     return MenuEntrySwitch<String>(
       switchType: SwitchType.scheckbox,
       text: translate('Sync with recent sessions'),
@@ -207,14 +371,16 @@ class _AddressBookState extends State<AddressBook> {
         return shouldSyncAb();
       },
       setter: (bool v) async {
-        bind.mainSetLocalOption(key: syncAbOption, value: v ? 'Y' : '');
+        gFFI.abModel.setShouldAsync(v);
       },
       dismissOnClicked: true,
+      enabled: (!isOptFixed).obs,
     );
   }
 
   @protected
   MenuEntryBase<String> sortMenuItem() {
+    final isOptFixed = isOptionFixed(sortAbTagsOption);
     return MenuEntrySwitch<String>(
       switchType: SwitchType.scheckbox,
       text: translate('Sort tags'),
@@ -222,15 +388,18 @@ class _AddressBookState extends State<AddressBook> {
         return shouldSortTags();
       },
       setter: (bool v) async {
-        bind.mainSetLocalOption(key: sortAbTagsOption, value: v ? 'Y' : '');
+        bind.mainSetLocalOption(
+            key: sortAbTagsOption, value: v ? 'Y' : defaultOptionNo);
         gFFI.abModel.sortTags.value = v;
       },
       dismissOnClicked: true,
+      enabled: (!isOptFixed).obs,
     );
   }
 
   @protected
   MenuEntryBase<String> filterMenuItem() {
+    final isOptFixed = isOptionFixed(filterAbTagOption);
     return MenuEntrySwitch<String>(
       switchType: SwitchType.scheckbox,
       text: translate('Filter by intersection'),
@@ -238,21 +407,34 @@ class _AddressBookState extends State<AddressBook> {
         return filterAbTagByIntersection();
       },
       setter: (bool v) async {
-        bind.mainSetLocalOption(key: filterAbTagOption, value: v ? 'Y' : '');
+        bind.mainSetLocalOption(
+            key: filterAbTagOption, value: v ? 'Y' : defaultOptionNo);
         gFFI.abModel.filterByIntersection.value = v;
       },
       dismissOnClicked: true,
+      enabled: (!isOptFixed).obs,
     );
   }
 
   void _showMenu(RelativeRect pos) {
+    final canWrite = gFFI.abModel.current.canWrite();
     final items = [
-      getEntry(translate("Add ID"), abAddId),
+      if (canWrite) getEntry(translate("Add ID"), addIdToCurrentAb),
-      getEntry(translate("Add Tag"), abAddTag),
+      if (canWrite) getEntry(translate("Add Tag"), abAddTag),
       getEntry(translate("Unselect all tags"), gFFI.abModel.unsetSelectedTags),
-      sortMenuItem(),
+      if (gFFI.abModel.legacyMode.value)
-      syncMenuItem(),
+        sortMenuItem(), // It's already sorted after pulling down
+      if (canWrite) syncMenuItem(),
       filterMenuItem(),
+      if (!gFFI.abModel.legacyMode.value && canWrite)
+        MenuEntryDivider<String>(),
+      if (!gFFI.abModel.legacyMode.value && canWrite)
+        getEntry(translate("ab_web_console_tip"), () async {
+          final url = await bind.mainGetApiServer();
+          if (await canLaunchUrlString(url)) {
+            launchUrlString(url);
+          }
+        }),
     ];
 
     mod_menu.showMenu(
@@ -271,17 +453,20 @@ class _AddressBookState extends State<AddressBook> {
     );
   }
 
-  void abAddId() async {
+  void addIdToCurrentAb() async {
-    if (gFFI.abModel.isFull(true)) {
+    if (gFFI.abModel.isCurrentAbFull(true)) {
       return;
     }
     var isInProgress = false;
+    var passwordVisible = false;
     IDTextEditingController idController = IDTextEditingController(text: '');
     TextEditingController aliasController = TextEditingController(text: '');
-    final tags = List.of(gFFI.abModel.tags);
+    TextEditingController passwordController = TextEditingController(text: '');
+    final tags = List.of(gFFI.abModel.currentAbTags);
     var selectedTag = List<dynamic>.empty(growable: true).obs;
     final style = TextStyle(fontSize: 14.0);
     String? errorMsg;
+    final isCurrentAbShared = !gFFI.abModel.current.isPersonal();
 
     gFFI.dialogManager.show((setState, close, context) {
       submit() async {
@@ -293,22 +478,50 @@ class _AddressBookState extends State<AddressBook> {
         if (id.isEmpty) {
           // pass
         } else {
-          if (gFFI.abModel.idContainBy(id)) {
+          if (gFFI.abModel.idContainByCurrent(id)) {
             setState(() {
               isInProgress = false;
               errorMsg = translate('ID already exists');
             });
             return;
           }
-          gFFI.abModel.addId(id, aliasController.text.trim(), selectedTag);
+          var password = '';
-          gFFI.abModel.pushAb();
+          if (isCurrentAbShared) {
-          this.setState(() {});
+            password = passwordController.text;
+          }
+          String? errMsg2 = await gFFI.abModel.addIdToCurrent(
+              id, aliasController.text.trim(), password, selectedTag);
+          if (errMsg2 != null) {
+            setState(() {
+              isInProgress = false;
+              errorMsg = errMsg2;
+            });
+            return;
+          }
           // final currentPeers
         }
         close();
       }
 
       double marginBottom = 4;
+
+      row({required Widget lable, required Widget input}) {
+        return Row(
+          children: [
+            !isMobile
+                ? ConstrainedBox(
+                    constraints: const BoxConstraints(minWidth: 100),
+                    child: lable.marginOnly(right: 10))
+                : SizedBox.shrink(),
+            Expanded(
+              child: ConstrainedBox(
+                  constraints: const BoxConstraints(minWidth: 200),
+                  child: input),
+            ),
+          ],
+        ).marginOnly(bottom: !isMobile ? 8 : 0);
+      }
+
       return CustomAlertDialog(
         title: Text(translate("Add ID")),
         content: Column(
@@ -316,66 +529,103 @@ class _AddressBookState extends State<AddressBook> {
           children: [
             Column(
               children: [
-                Align(
+                row(
-                  alignment: Alignment.centerLeft,
+                    lable: Row(
-                  child: Row(
+                      children: [
-                    children: [
+                        Text(
-                      Text(
+                          '*',
-                        '*',
+                          style: TextStyle(color: Colors.red, fontSize: 14),
-                        style: TextStyle(color: Colors.red, fontSize: 14),
+                        ),
-                      ),
+                        Text(
-                      Text(
+                          'ID',
-                        'ID',
+                          style: style,
-                        style: style,
+                        ),
-                      ),
+                      ],
-                    ],
+                    ),
-                  ),
+                    input: TextField(
-                ).marginOnly(bottom: marginBottom),
+                      controller: idController,
-                TextField(
+                      inputFormatters: [IDTextInputFormatter()],
-                  controller: idController,
+                      decoration: InputDecoration(
-                  inputFormatters: [IDTextInputFormatter()],
+                          labelText: !isMobile ? null : translate('ID'),
-                  decoration: InputDecoration(errorText: errorMsg),
+                          errorText: errorMsg,
-                ),
+                          errorMaxLines: 5),
-                Align(
+                    )),
-                  alignment: Alignment.centerLeft,
+                row(
-                  child: Text(
+                  lable: Text(
                     translate('Alias'),
                     style: style,
                   ),
-                ).marginOnly(top: 8, bottom: marginBottom),
+                  input: TextField(
-                TextField(
+                      controller: aliasController,
-                  controller: aliasController,
+                      decoration: InputDecoration(
+                        labelText: !isMobile ? null : translate('Alias'),
+                      )),
                 ),
-                Align(
+                if (isCurrentAbShared)
-                  alignment: Alignment.centerLeft,
+                  row(
-                  child: Text(
+                      lable: Text(
-                    translate('Tags'),
+                        translate('Password'),
-                    style: style,
+                        style: style,
-                  ),
+                      ),
-                ).marginOnly(top: 8, bottom: marginBottom),
+                      input: TextField(
-                Align(
+                        controller: passwordController,
-                  alignment: Alignment.centerLeft,
+                        obscureText: !passwordVisible,
-                  child: Wrap(
+                        decoration: InputDecoration(
-                    children: tags
+                          labelText: !isMobile ? null : translate('Password'),
-                        .map((e) => AddressBookTag(
+                          suffixIcon: IconButton(
-                            name: e,
+                            icon: Icon(
-                            tags: selectedTag,
+                                passwordVisible
-                            onTap: () {
+                                    ? Icons.visibility
-                              if (selectedTag.contains(e)) {
+                                    : Icons.visibility_off,
-                                selectedTag.remove(e);
+                                color: MyTheme.lightTheme.primaryColor),
-                              } else {
+                            onPressed: () {
-                                selectedTag.add(e);
+                              setState(() {
-                              }
+                                passwordVisible = !passwordVisible;
+                              });
                             },
-                            showActionMenu: false))
+                          ),
-                        .toList(growable: false),
+                        ),
+                      )),
+                if (gFFI.abModel.currentAbTags.isNotEmpty)
+                  Align(
+                    alignment: Alignment.centerLeft,
+                    child: Text(
+                      translate('Tags'),
+                      style: style,
+                    ),
+                  ).marginOnly(top: 8, bottom: marginBottom),
+                if (gFFI.abModel.currentAbTags.isNotEmpty)
+                  Align(
+                    alignment: Alignment.centerLeft,
+                    child: Wrap(
+                      children: tags
+                          .map((e) => AddressBookTag(
+                              name: e,
+                              tags: selectedTag,
+                              onTap: () {
+                                if (selectedTag.contains(e)) {
+                                  selectedTag.remove(e);
+                                } else {
+                                  selectedTag.add(e);
+                                }
+                              },
+                              showActionMenu: false))
+                          .toList(growable: false),
+                    ),
                   ),
-                ),
               ],
             ),
             const SizedBox(
               height: 4.0,
             ),
+            if (!gFFI.abModel.current.isPersonal())
+              Row(children: [
+                Icon(Icons.info, color: Colors.amber).marginOnly(right: 4),
+                Text(
+                  translate('share_warning_tip'),
+                  style: TextStyle(fontSize: 12),
+                )
+              ]).marginSymmetric(vertical: 10),
             // NOT use Offstage to wrap LinearProgressIndicator
             if (isInProgress) const LinearProgressIndicator(),
           ],
@@ -407,10 +657,7 @@ class _AddressBookState extends State<AddressBook> {
         } else {
           final tags = field.trim().split(RegExp(r"[\s,;\n]+"));
           field = tags.join(',');
-          for (final tag in tags) {
+          gFFI.abModel.addTags(tags);
-            gFFI.abModel.addTag(tag);
-          }
-          gFFI.abModel.pushAb();
           // final currentPeers
         }
         close();
@@ -491,7 +738,7 @@ class AddressBookTag extends StatelessWidget {
       child: Obx(() => Container(
             decoration: BoxDecoration(
                 color: tags.contains(name)
-                    ? gFFI.abModel.getTagColor(name)
+                    ? gFFI.abModel.getCurrentAbTagColor(name)
                     : Theme.of(context).colorScheme.background,
                 borderRadius: BorderRadius.circular(4)),
             margin: const EdgeInsets.symmetric(horizontal: 4.0, vertical: 4.0),
@@ -506,7 +753,7 @@ class AddressBookTag extends StatelessWidget {
                         shape: BoxShape.circle,
                         color: tags.contains(name)
                             ? Colors.white
-                            : gFFI.abModel.getTagColor(name)),
+                            : gFFI.abModel.getCurrentAbTagColor(name)),
                   ).marginOnly(right: radius / 2),
                   Expanded(
                     child: Text(name,
@@ -530,7 +777,8 @@ class AddressBookTag extends StatelessWidget {
               if (newName == null || newName.isEmpty) {
                 return translate('Can not be empty');
               }
-              if (newName != name && gFFI.abModel.tags.contains(newName)) {
+              if (newName != name &&
+                  gFFI.abModel.currentAbTags.contains(newName)) {
                 return translate('Already exists');
               }
               return null;
@@ -538,7 +786,6 @@ class AddressBookTag extends StatelessWidget {
             onSubmit: (String newName) {
               if (name != newName) {
                 gFFI.abModel.renameTag(name, newName);
-                gFFI.abModel.pushAb();
               }
               Future.delayed(Duration.zero, () => Get.back());
             },
@@ -548,7 +795,7 @@ class AddressBookTag extends StatelessWidget {
       }),
       getEntry(translate(translate('Change Color')), () async {
         final model = gFFI.abModel;
-        Color oldColor = model.getTagColor(name);
+        Color oldColor = model.getCurrentAbTagColor(name);
         Color newColor = await showColorPickerDialog(
           context,
           oldColor,
@@ -567,12 +814,10 @@ class AddressBookTag extends StatelessWidget {
         );
         if (oldColor != newColor) {
           model.setTagColor(name, newColor);
-          model.pushAb();
         }
       }),
       getEntry(translate("Delete"), () {
         gFFI.abModel.deleteTag(name);
-        gFFI.abModel.pushAb();
         Future.delayed(Duration.zero, () => Get.back());
       }),
     ];

flutter/lib/common/widgets/audio_input.dart

@@ -0,0 +1,81 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_hbb/common.dart';
+import 'package:flutter_hbb/models/platform_model.dart';
+
+const _kWindowsSystemSound = 'System Sound';
+
+typedef AudioINputSetDevice = void Function(String device);
+typedef AudioInputBuilder = Widget Function(
+    List<String> devices, String currentDevice, AudioINputSetDevice setDevice);
+
+class AudioInput extends StatelessWidget {
+  final AudioInputBuilder builder;
+  final bool isCm;
+  final bool isVoiceCall;
+
+  const AudioInput(
+      {Key? key,
+      required this.builder,
+      required this.isCm,
+      required this.isVoiceCall})
+      : super(key: key);
+
+  static String getDefault() {
+    if (isWindows) return translate('System Sound');
+    return '';
+  }
+
+  static Future<String> getAudioInput(bool isCm, bool isVoiceCall) {
+    if (isVoiceCall) {
+      return bind.getVoiceCallInputDevice(isCm: isCm);
+    } else {
+      return bind.mainGetOption(key: 'audio-input');
+    }
+  }
+
+  static Future<String> getValue(bool isCm, bool isVoiceCall) async {
+    String device = await getAudioInput(isCm, isVoiceCall);
+    if (device.isNotEmpty) {
+      return device;
+    } else {
+      return getDefault();
+    }
+  }
+
+  static Future<void> setDevice(
+      String device, bool isCm, bool isVoiceCall) async {
+    if (device == getDefault()) device = '';
+    if (isVoiceCall) {
+      await bind.setVoiceCallInputDevice(isCm: isCm, device: device);
+    } else {
+      await bind.mainSetOption(key: 'audio-input', value: device);
+    }
+  }
+
+  static Future<Map<String, Object>> getDevicesInfo(
+      bool isCm, bool isVoiceCall) async {
+    List<String> devices = (await bind.mainGetSoundInputs()).toList();
+    if (isWindows) {
+      devices.insert(0, translate(_kWindowsSystemSound));
+    }
+    String current = await getValue(isCm, isVoiceCall);
+    return {'devices': devices, 'current': current};
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return futureBuilder(
+      future: getDevicesInfo(isCm, isVoiceCall),
+      hasData: (data) {
+        String currentDevice = data['current'];
+        List<String> devices = data['devices'] as List<String>;
+        if (devices.isEmpty) {
+          return const Offstage();
+        }
+        return builder(devices, currentDevice, (devices) {
+          setDevice(devices, isCm, isVoiceCall);
+        });
+      },
+    );
+  }
+}

flutter/lib/common/widgets/autocomplete.dart

@@ -0,0 +1,210 @@
+import 'dart:convert';
+import 'package:flutter/material.dart';
+import 'package:flutter_hbb/common/formatter/id_formatter.dart';
+import '../../../models/platform_model.dart';
+import 'package:flutter_hbb/models/peer_model.dart';
+import 'package:flutter_hbb/common.dart';
+import 'package:flutter_hbb/common/widgets/peer_card.dart';
+
+Future<List<Peer>> getAllPeers() async {
+  Map<String, dynamic> recentPeers = jsonDecode(bind.mainLoadRecentPeersSync());
+  Map<String, dynamic> lanPeers = jsonDecode(bind.mainLoadLanPeersSync());
+  Map<String, dynamic> combinedPeers = {};
+
+  void mergePeers(Map<String, dynamic> peers) {
+    if (peers.containsKey("peers")) {
+      dynamic peerData = peers["peers"];
+
+      if (peerData is String) {
+        try {
+          peerData = jsonDecode(peerData);
+        } catch (e) {
+          print("Error decoding peers: $e");
+          return;
+        }
+      }
+
+      if (peerData is List) {
+        for (var peer in peerData) {
+          if (peer is Map && peer.containsKey("id")) {
+            String id = peer["id"];
+            if (!combinedPeers.containsKey(id)) {
+              combinedPeers[id] = peer;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  mergePeers(recentPeers);
+  mergePeers(lanPeers);
+  for (var p in gFFI.abModel.allPeers()) {
+    if (!combinedPeers.containsKey(p.id)) {
+      combinedPeers[p.id] = p.toJson();
+    }
+  }
+  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));
+  }
+  return parsedPeers;
+}
+
+class AutocompletePeerTile extends StatefulWidget {
+  final VoidCallback onSelect;
+  final Peer peer;
+
+  const AutocompletePeerTile({
+    Key? key,
+    required this.onSelect,
+    required this.peer,
+  }) : super(key: key);
+
+  @override
+  AutocompletePeerTileState createState() => AutocompletePeerTileState();
+}
+
+class AutocompletePeerTileState extends State<AutocompletePeerTile> {
+  List _frontN<T>(List list, int n) {
+    if (list.length <= n) {
+      return list;
+    } else {
+      return list.sublist(0, n);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final double tileRadius = 5;
+    final name =
+        '${widget.peer.username}${widget.peer.username.isNotEmpty && widget.peer.hostname.isNotEmpty ? '@' : ''}${widget.peer.hostname}';
+    final greyStyle = TextStyle(
+        fontSize: 11,
+        color: Theme.of(context).textTheme.titleLarge?.color?.withOpacity(0.6));
+    final child = GestureDetector(
+        onTap: () => widget.onSelect(),
+        child: Padding(
+            padding: EdgeInsets.only(left: 5, right: 5),
+            child: Container(
+                height: 42,
+                margin: EdgeInsets.only(bottom: 5),
+                child: Row(
+                  mainAxisSize: MainAxisSize.max,
+                  children: [
+                    Container(
+                        decoration: BoxDecoration(
+                          color: str2color(
+                              '${widget.peer.id}${widget.peer.platform}', 0x7f),
+                          borderRadius: BorderRadius.only(
+                            topLeft: Radius.circular(tileRadius),
+                            bottomLeft: Radius.circular(tileRadius),
+                          ),
+                        ),
+                        alignment: Alignment.center,
+                        width: 42,
+                        height: null,
+                        child: Padding(
+                            padding: EdgeInsets.all(6),
+                            child: getPlatformImage(widget.peer.platform,
+                                size: 30))),
+                    Expanded(
+                      child: Container(
+                          padding: EdgeInsets.only(left: 10),
+                          decoration: BoxDecoration(
+                            color: Theme.of(context).colorScheme.background,
+                            borderRadius: BorderRadius.only(
+                              topRight: Radius.circular(tileRadius),
+                              bottomRight: Radius.circular(tileRadius),
+                            ),
+                          ),
+                          child: Row(
+                            children: [
+                              Expanded(
+                                  child: Container(
+                                      margin: EdgeInsets.only(top: 2),
+                                      child: Container(
+                                          margin: EdgeInsets.only(top: 2),
+                                          child: Column(
+                                            children: [
+                                              Container(
+                                                  margin:
+                                                      EdgeInsets.only(top: 2),
+                                                  child: Row(children: [
+                                                    getOnline(
+                                                        8, widget.peer.online),
+                                                    Expanded(
+                                                        child: Text(
+                                                      widget.peer.alias.isEmpty
+                                                          ? formatID(
+                                                              widget.peer.id)
+                                                          : widget.peer.alias,
+                                                      overflow:
+                                                          TextOverflow.ellipsis,
+                                                      style: Theme.of(context)
+                                                          .textTheme
+                                                          .titleSmall,
+                                                    )),
+                                                    widget.peer.alias.isNotEmpty
+                                                        ? Padding(
+                                                            padding:
+                                                                const EdgeInsets
+                                                                    .only(
+                                                                    left: 5,
+                                                                    right: 5),
+                                                            child: Text(
+                                                              "(${widget.peer.id})",
+                                                              style: greyStyle,
+                                                              overflow:
+                                                                  TextOverflow
+                                                                      .ellipsis,
+                                                            ))
+                                                        : Container(),
+                                                  ])),
+                                              Align(
+                                                alignment: Alignment.centerLeft,
+                                                child: Text(
+                                                  name,
+                                                  style: greyStyle,
+                                                  textAlign: TextAlign.start,
+                                                  overflow:
+                                                      TextOverflow.ellipsis,
+                                                ),
+                                              ),
+                                            ],
+                                          )))),
+                            ],
+                          )),
+                    )
+                  ],
+                ))));
+    final colors = _frontN(widget.peer.tags, 25)
+        .map((e) => gFFI.abModel.getCurrentAbTagColor(e))
+        .toList();
+    return Tooltip(
+      message: isMobile
+          ? ''
+          : widget.peer.tags.isNotEmpty
+              ? '${translate('Tags')}: ${widget.peer.tags.join(', ')}'
+              : '',
+      child: Stack(children: [
+        child,
+        if (colors.isNotEmpty)
+          Positioned(
+            top: 5,
+            right: 10,
+            child: CustomPaint(
+              painter: TagPainter(radius: 3, colors: colors),
+            ),
+          )
+      ]),
+    );
+  }
+}

flutter/lib/common/widgets/gestures.dart

@@ -112,6 +112,8 @@ class CustomTouchGestureRecognizer extends ScaleGestureRecognizer {
     };
   }
 
+  // FIXME: This debounce logic is not working properly.
+  // If we move our finger very fast, we won't be able to detect the "oneFingerPan" event sometimes.
   void onOneFingerStartDebounce(ScaleUpdateDetails d) {
     start(ScaleUpdateDetails d) {
       _currentState = GestureState.oneFingerPan;

flutter/lib/common/widgets/login.dart

@@ -142,11 +142,6 @@ class _WidgetOPState extends State<WidgetOP> {
   String _failedMsg = '';
   String _url = '';
 
-  @override
-  void initState() {
-    super.initState();
-  }
-
   @override
   void dispose() {
     super.dispose();
@@ -357,6 +352,7 @@ class LoginWidgetUserPass extends StatelessWidget {
             PasswordWidget(
               controller: pass,
               autoFocus: false,
+              reRequestFocus: true,
               errorText: passMsg,
             ),
             // NOT use Offstage to wrap LinearProgressIndicator
@@ -389,8 +385,7 @@ class LoginWidgetUserPass extends StatelessWidget {
 
 const kAuthReqTypeOidc = 'oidc/';
 
-/// common login dialog for desktop
+// call this directly
-/// call this directly
 Future<bool?> loginDialog() async {
   var username =
       TextEditingController(text: UserModel.getLocalUserInfo()?['name'] ?? '');
@@ -426,6 +421,55 @@ Future<bool?> loginDialog() async {
       close(false);
     }
 
+    handleLoginResponse(LoginResponse resp, bool storeIfAccessToken,
+        void Function([dynamic])? close) async {
+      switch (resp.type) {
+        case HttpType.kAuthResTypeToken:
+          if (resp.access_token != null) {
+            if (storeIfAccessToken) {
+              await bind.mainSetLocalOption(
+                  key: 'access_token', value: resp.access_token!);
+              await bind.mainSetLocalOption(
+                  key: 'user_info', value: jsonEncode(resp.user ?? {}));
+            }
+            if (close != null) {
+              close(true);
+            }
+            return;
+          }
+          break;
+        case HttpType.kAuthResTypeEmailCheck:
+          bool? isEmailVerification;
+          if (resp.tfa_type == null ||
+              resp.tfa_type == HttpType.kAuthResTypeEmailCheck) {
+            isEmailVerification = true;
+          } else if (resp.tfa_type == HttpType.kAuthResTypeTfaCheck) {
+            isEmailVerification = false;
+          } else {
+            passwordMsg = "Failed, bad tfa type from server";
+          }
+          if (isEmailVerification != null) {
+            if (isMobile) {
+              if (close != null) close(null);
+              verificationCodeDialog(
+                  resp.user, resp.secret, isEmailVerification);
+            } else {
+              setState(() => isInProgress = false);
+              final res = await verificationCodeDialog(
+                  resp.user, resp.secret, isEmailVerification);
+              if (res == true) {
+                if (close != null) close(false);
+                return;
+              }
+            }
+          }
+          break;
+        default:
+          passwordMsg = "Failed, bad response from server";
+          break;
+      }
+    }
+
     onLogin() async {
       // validate
       if (username.text.isEmpty) {
@@ -446,35 +490,7 @@ Future<bool?> loginDialog() async {
             uuid: await bind.mainGetUuid(),
             autoLogin: true,
             type: HttpType.kAuthReqTypeAccount));
-
+        await handleLoginResponse(resp, true, close);
-        switch (resp.type) {
-          case HttpType.kAuthResTypeToken:
-            if (resp.access_token != null) {
-              await bind.mainSetLocalOption(
-                  key: 'access_token', value: resp.access_token!);
-              await bind.mainSetLocalOption(
-                  key: 'user_info', value: jsonEncode(resp.user ?? {}));
-              close(true);
-              return;
-            }
-            break;
-          case HttpType.kAuthResTypeEmailCheck:
-            if (isMobile) {
-              close(true);
-              verificationCodeDialog(resp.user);
-            } else {
-              setState(() => isInProgress = false);
-              final res = await verificationCodeDialog(resp.user);
-              if (res == true) {
-                close(true);
-                return;
-              }
-            }
-            break;
-          default:
-            passwordMsg = "Failed, bad response from server";
-            break;
-        }
       } on RequestException catch (err) {
         passwordMsg = translate(err.cause);
       } catch (err) {
@@ -505,15 +521,21 @@ Future<bool?> loginDialog() async {
                       .map((e) => ConfigOP(op: e['name'], icon: e['icon']))
                       .toList(),
                   curOP: curOP,
-                  cbLogin: (Map<String, dynamic> authBody) {
+                  cbLogin: (Map<String, dynamic> authBody) async {
+                    LoginResponse? resp;
                     try {
                       // access_token is already stored in the rust side.
-                      gFFI.userModel.getLoginResponseFromAuthBody(authBody);
+                      resp =
+                          gFFI.userModel.getLoginResponseFromAuthBody(authBody);
                     } catch (e) {
                       debugPrint(
                           'Failed to parse oidc login body: "$authBody"');
                     }
                     close(true);
+
+                    if (resp != null) {
+                      handleLoginResponse(resp, false, null);
+                    }
                   },
                 ),
               ],
@@ -572,6 +594,7 @@ Future<bool?> loginDialog() async {
         ],
       ),
       onCancel: onDialogCancel,
+      onSubmit: onLogin,
     );
   });
 
@@ -582,37 +605,23 @@ Future<bool?> loginDialog() async {
   return res;
 }
 
-Future<bool?> verificationCodeDialog(UserPayload? user) async {
+Future<bool?> verificationCodeDialog(
+    UserPayload? user, String? secret, bool isEmailVerification) async {
   var autoLogin = true;
   var isInProgress = false;
   String? errorText;
 
   final code = TextEditingController();
-  final focusNode = FocusNode()..requestFocus();
-  Timer(Duration(milliseconds: 100), () => focusNode..requestFocus());
 
   final res = await gFFI.dialogManager.show<bool>((setState, close, context) {
-    bool validate() {
-      return code.text.length >= 6;
-    }
-
-    code.addListener(() {
-      if (errorText != null) {
-        setState(() => errorText = null);
-      }
-    });
-
     void onVerify() async {
-      if (!validate()) {
-        setState(
-            () => errorText = translate('Too short, at least 6 characters.'));
-        return;
-      }
       setState(() => isInProgress = true);
 
       try {
         final resp = await gFFI.userModel.login(LoginRequest(
             verificationCode: code.text,
+            tfaCode: isEmailVerification ? null : code.text,
+            secret: secret,
             username: user?.name,
             id: await bind.mainGetMyId(),
             uuid: await bind.mainGetUuid(),
@@ -641,27 +650,37 @@ Future<bool?> verificationCodeDialog(UserPayload? user) async {
       setState(() => isInProgress = false);
     }
 
+    final codeField = isEmailVerification
+        ? DialogEmailCodeField(
+            controller: code,
+            errorText: errorText,
+            readyCallback: onVerify,
+            onChanged: () => errorText = null,
+          )
+        : Dialog2FaField(
+            controller: code,
+            errorText: errorText,
+            readyCallback: onVerify,
+            onChanged: () => errorText = null,
+          );
+
+    getOnSubmit() => codeField.isReady ? onVerify : null;
+
     return CustomAlertDialog(
         title: Text(translate("Verification code")),
         contentBoxConstraints: BoxConstraints(maxWidth: 300),
         content: Column(
           children: [
             Offstage(
-                offstage: user?.email == null,
+                offstage: !isEmailVerification || user?.email == null,
                 child: TextField(
                   decoration: InputDecoration(
                       labelText: "Email", prefixIcon: Icon(Icons.email)),
                   readOnly: true,
                   controller: TextEditingController(text: user?.email),
                 )),
-            const SizedBox(height: 8),
+            isEmailVerification ? const SizedBox(height: 8) : const Offstage(),
-            DialogTextField(
+            codeField,
-              title: '${translate("Verification code")}:',
-              controller: code,
-              errorText: errorText,
-              focusNode: focusNode,
-              helperText: translate('verification_tip'),
-            ),
             /*
             CheckboxListTile(
               contentPadding: const EdgeInsets.all(0),
@@ -682,12 +701,17 @@ Future<bool?> verificationCodeDialog(UserPayload? user) async {
           ],
         ),
         onCancel: close,
-        onSubmit: onVerify,
+        onSubmit: getOnSubmit(),
         actions: [
           dialogButton("Cancel", onPressed: close, isOutline: true),
-          dialogButton("Verify", onPressed: onVerify),
+          dialogButton("Verify", onPressed: getOnSubmit()),
         ]);
   });
+  // For verification code, desktop update other models in login dialog, mobile need to close login dialog first,
+  // otherwise the soft keyboard will jump out on each key press, so mobile update in verification code dialog.
+  if (isMobile && res == true) {
+    await UserModel.updateOtherModels();
+  }
 
   return res;
 }

flutter/lib/common/widgets/my_group.dart

@@ -23,11 +23,6 @@ class _MyGroupState extends State<MyGroup> {
   RxString get searchUserText => gFFI.groupModel.searchUserText;
   static TextEditingController searchUserController = TextEditingController();
 
-  @override
-  void initState() {
-    super.initState();
-  }
-
   @override
   Widget build(BuildContext context) {
     return Obx(() {
@@ -35,6 +30,8 @@ class _MyGroupState extends State<MyGroup> {
         return Center(
             child: ElevatedButton(
                 onPressed: loginDialog, child: Text(translate("Login"))));
+      } else if (gFFI.userModel.networkError.isNotEmpty) {
+        return netWorkErrorWidget();
       } else if (gFFI.groupModel.groupLoading.value && gFFI.groupModel.emtpy) {
         return const Center(
           child: CircularProgressIndicator(),
@@ -47,7 +44,10 @@ class _MyGroupState extends State<MyGroup> {
               err: gFFI.groupModel.groupLoadError,
               retry: null,
               close: () => gFFI.groupModel.groupLoadError.value = ''),
-          Expanded(child: isDesktop ? _buildDesktop() : _buildMobile())
+          Expanded(
+              child: (isDesktop || isWebDesktop)
+                  ? _buildDesktop()
+                  : _buildMobile())
         ],
       );
     });
@@ -83,7 +83,7 @@ class _MyGroupState extends State<MyGroup> {
               alignment: Alignment.topLeft,
               child: MyGroupPeerView(
                   menuPadding: widget.menuPadding,
-                  initPeers: gFFI.groupModel.peers)),
+                  getInitPeers: () => gFFI.groupModel.peers)),
         )
       ],
     );
@@ -115,7 +115,7 @@ class _MyGroupState extends State<MyGroup> {
               alignment: Alignment.topLeft,
               child: MyGroupPeerView(
                   menuPadding: widget.menuPadding,
-                  initPeers: gFFI.groupModel.peers)),
+                  getInitPeers: () => gFFI.groupModel.peers)),
         )
       ],
     );
@@ -164,7 +164,7 @@ class _MyGroupState extends State<MyGroup> {
           itemCount: items.length,
           itemBuilder: (context, index) => _buildUserItem(items[index]));
       var maxHeight = max(MediaQuery.of(context).size.height / 6, 100.0);
-      return isDesktop
+      return (isDesktop || isWebDesktop)
           ? listView
           : LimitedBox(maxHeight: maxHeight, child: listView);
     });

flutter/lib/common/widgets/overlay.dart

@@ -1,6 +1,8 @@
 import 'package:auto_size_text/auto_size_text.dart';
+import 'package:debounce_throttle/debounce_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hbb/common.dart';
+import 'package:flutter_hbb/models/platform_model.dart';
 import 'package:get/get.dart';
 import 'package:provider/provider.dart';
 
@@ -26,46 +28,48 @@ class DraggableChatWindow extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    if (draggablePositions.chatWindow.isInvalid()) {
+      draggablePositions.chatWindow.update(position);
+    }
     return isIOS
-    ? IOSDraggable (
+        ? IOSDraggable(
-      position: position,
+            position: draggablePositions.chatWindow,
-      chatModel: chatModel,
+            chatModel: chatModel,
-      width: width,
+            width: width,
-      height: height,
+            height: height,
-      builder: (context) {
+            builder: (context) {
-    return Column(
+              return Column(
-      children: [
+                children: [
-        _buildMobileAppBar(context),
+                  _buildMobileAppBar(context),
-        Expanded(
+                  Expanded(
-          child: ChatPage(chatModel: chatModel),
+                    child: ChatPage(chatModel: chatModel),
-              ),
-            ],
-          );
-        },
-      )
-    : Draggable(
-        checkKeyboard: true,
-        position: position,
-        width: width,
-        height: height,
-        chatModel: chatModel,
-        builder: (context, onPanUpdate) {
-          final child = 
-              Scaffold(
-                  resizeToAvoidBottomInset: false,
-                  appBar: CustomAppBar(
-                    onPanUpdate: onPanUpdate,
-                    appBar: isDesktop
-                        ? _buildDesktopAppBar(context)
-                        : _buildMobileAppBar(context),
                   ),
-                  body: ChatPage(chatModel: chatModel),
+                ],
-                );
+              );
-          return Container(
+            },
-              decoration:
+          )
-                  BoxDecoration(border: Border.all(color: MyTheme.border)),
+        : Draggable(
-              child: child);
+            checkKeyboard: true,
-        });
+            position: draggablePositions.chatWindow,
+            width: width,
+            height: height,
+            chatModel: chatModel,
+            builder: (context, onPanUpdate) {
+              final child = Scaffold(
+                resizeToAvoidBottomInset: false,
+                appBar: CustomAppBar(
+                  onPanUpdate: onPanUpdate,
+                  appBar: (isDesktop || isWebDesktop)
+                      ? _buildDesktopAppBar(context)
+                      : _buildMobileAppBar(context),
+                ),
+                body: ChatPage(chatModel: chatModel),
+              );
+              return Container(
+                  decoration:
+                      BoxDecoration(border: Border.all(color: MyTheme.border)),
+                  child: child);
+            });
   }
 
   Widget _buildMobileAppBar(BuildContext context) {
@@ -167,15 +171,17 @@ class CustomAppBar extends StatelessWidget implements PreferredSizeWidget {
 /// floating buttons of back/home/recent actions for android
 class DraggableMobileActions extends StatelessWidget {
   DraggableMobileActions(
-      {this.position = Offset.zero,
+      {this.onBackPressed,
-      this.onBackPressed,
       this.onRecentPressed,
       this.onHomePressed,
       this.onHidePressed,
+      required this.position,
       required this.width,
-      required this.height});
+      required this.height,
+      required this.scale});
 
-  final Offset position;
+  final double scale;
+  final DraggableKeyPosition position;
   final double width;
   final double height;
   final VoidCallback? onBackPressed;
@@ -187,8 +193,8 @@ class DraggableMobileActions extends StatelessWidget {
   Widget build(BuildContext context) {
     return Draggable(
         position: position,
-        width: width,
+        width: scale * width,
-        height: height,
+        height: scale * height,
         builder: (_, onPanUpdate) {
           return GestureDetector(
               onPanUpdate: onPanUpdate,
@@ -198,7 +204,8 @@ class DraggableMobileActions extends StatelessWidget {
                   child: Container(
                     decoration: BoxDecoration(
                         color: MyTheme.accent.withOpacity(0.4),
-                        borderRadius: BorderRadius.all(Radius.circular(15))),
+                        borderRadius:
+                            BorderRadius.all(Radius.circular(15 * scale))),
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceAround,
                       children: [
@@ -206,17 +213,20 @@ class DraggableMobileActions extends StatelessWidget {
                             color: Colors.white,
                             onPressed: onBackPressed,
                             splashRadius: kDesktopIconButtonSplashRadius,
-                            icon: const Icon(Icons.arrow_back)),
+                            icon: const Icon(Icons.arrow_back),
+                            iconSize: 24 * scale),
                         IconButton(
                             color: Colors.white,
                             onPressed: onHomePressed,
                             splashRadius: kDesktopIconButtonSplashRadius,
-                            icon: const Icon(Icons.home)),
+                            icon: const Icon(Icons.home),
+                            iconSize: 24 * scale),
                         IconButton(
                             color: Colors.white,
                             onPressed: onRecentPressed,
                             splashRadius: kDesktopIconButtonSplashRadius,
-                            icon: const Icon(Icons.more_horiz)),
+                            icon: const Icon(Icons.more_horiz),
+                            iconSize: 24 * scale),
                         const VerticalDivider(
                           width: 0,
                           thickness: 2,
@@ -227,7 +237,8 @@ class DraggableMobileActions extends StatelessWidget {
                             color: Colors.white,
                             onPressed: onHidePressed,
                             splashRadius: kDesktopIconButtonSplashRadius,
-                            icon: const Icon(Icons.keyboard_arrow_down)),
+                            icon: const Icon(Icons.keyboard_arrow_down),
+                            iconSize: 24 * scale),
                       ],
                     ),
                   )));
@@ -235,12 +246,98 @@ class DraggableMobileActions extends StatelessWidget {
   }
 }
 
+class DraggableKeyPosition {
+  final String key;
+  Offset _pos;
+  late Debouncer<int> _debouncerStore;
+  DraggableKeyPosition(this.key)
+      : _pos = DraggablePositions.kInvalidDraggablePosition;
+
+  get pos => _pos;
+
+  _loadPosition(String k) {
+    final value = bind.getLocalFlutterOption(k: k);
+    if (value.isNotEmpty) {
+      final parts = value.split(',');
+      if (parts.length == 2) {
+        return Offset(double.parse(parts[0]), double.parse(parts[1]));
+      }
+    }
+    return DraggablePositions.kInvalidDraggablePosition;
+  }
+
+  load() {
+    _pos = _loadPosition(key);
+    _debouncerStore = Debouncer<int>(const Duration(milliseconds: 500),
+        onChanged: (v) => _store(), initialValue: 0);
+  }
+
+  update(Offset pos) {
+    _pos = pos;
+    _triggerStore();
+  }
+
+  // Adjust position to keep it in the screen
+  // Only used for desktop and web desktop
+  tryAdjust(double w, double h, double scale) {
+    final size = MediaQuery.of(Get.context!).size;
+    w = w * scale;
+    h = h * scale;
+    double x = _pos.dx;
+    double y = _pos.dy;
+    if (x + w > size.width) {
+      x = size.width - w;
+    }
+    final tabBarHeight = isDesktop ? kDesktopRemoteTabBarHeight : 0;
+    if (y + h > (size.height - tabBarHeight)) {
+      y = size.height - tabBarHeight - h;
+    }
+    if (x < 0) {
+      x = 0;
+    }
+    if (y < 0) {
+      y = 0;
+    }
+    if (x != _pos.dx || y != _pos.dy) {
+      update(Offset(x, y));
+    }
+  }
+
+  isInvalid() {
+    return _pos == DraggablePositions.kInvalidDraggablePosition;
+  }
+
+  _triggerStore() => _debouncerStore.value = _debouncerStore.value + 1;
+  _store() {
+    bind.setLocalFlutterOption(k: key, v: '${_pos.dx},${_pos.dy}');
+  }
+}
+
+class DraggablePositions {
+  static const kChatWindow = 'draggablePositionChat';
+  static const kMobileActions = 'draggablePositionMobile';
+  static const kIOSDraggable = 'draggablePositionIOS';
+
+  static const kInvalidDraggablePosition = Offset(-999999, -999999);
+  final chatWindow = DraggableKeyPosition(kChatWindow);
+  final mobileActions = DraggableKeyPosition(kMobileActions);
+  final iOSDraggable = DraggableKeyPosition(kIOSDraggable);
+
+  load() {
+    chatWindow.load();
+    mobileActions.load();
+    iOSDraggable.load();
+  }
+}
+
+DraggablePositions draggablePositions = DraggablePositions();
+
 class Draggable extends StatefulWidget {
-  const Draggable(
+  Draggable(
       {Key? key,
       this.checkKeyboard = false,
       this.checkScreenSize = false,
-      this.position = Offset.zero,
+      required this.position,
       required this.width,
       required this.height,
       this.chatModel,
@@ -249,55 +346,53 @@ class Draggable extends StatefulWidget {
 
   final bool checkKeyboard;
   final bool checkScreenSize;
-  final Offset position;
+  final DraggableKeyPosition position;
   final double width;
   final double height;
   final ChatModel? chatModel;
   final Widget Function(BuildContext, GestureDragUpdateCallback) builder;
 
   @override
-  State<StatefulWidget> createState() => _DraggableState();
+  State<StatefulWidget> createState() => _DraggableState(chatModel);
 }
 
 class _DraggableState extends State<Draggable> {
-  late Offset _position;
   late ChatModel? _chatModel;
   bool _keyboardVisible = false;
   double _saveHeight = 0;
   double _lastBottomHeight = 0;
 
-  @override
+  _DraggableState(ChatModel? chatModel) {
-  void initState() {
+    _chatModel = chatModel;
-    super.initState();
-    _position = widget.position;
-    _chatModel = widget.chatModel;
   }
 
+  get position => widget.position.pos;
+
   void onPanUpdate(DragUpdateDetails d) {
     final offset = d.delta;
     final size = MediaQuery.of(context).size;
     double x = 0;
     double y = 0;
 
-    if (_position.dx + offset.dx + widget.width > size.width) {
+    if (position.dx + offset.dx + widget.width > size.width) {
       x = size.width - widget.width;
-    } else if (_position.dx + offset.dx < 0) {
+    } else if (position.dx + offset.dx < 0) {
       x = 0;
     } else {
-      x = _position.dx + offset.dx;
+      x = position.dx + offset.dx;
     }
 
-    if (_position.dy + offset.dy + widget.height > size.height) {
+    if (position.dy + offset.dy + widget.height > size.height) {
       y = size.height - widget.height;
-    } else if (_position.dy + offset.dy < 0) {
+    } else if (position.dy + offset.dy < 0) {
       y = 0;
     } else {
-      y = _position.dy + offset.dy;
+      y = position.dy + offset.dy;
     }
     setState(() {
-      _position = Offset(x, y);
+      widget.position.update(Offset(x, y));
     });
-    _chatModel?.setChatWindowPosition(_position);
+    _chatModel?.setChatWindowPosition(position);
   }
 
   checkScreenSize() {}
@@ -308,13 +403,13 @@ class _DraggableState extends State<Draggable> {
 
     // save
     if (!_keyboardVisible && currentVisible) {
-      _saveHeight = _position.dy;
+      _saveHeight = position.dy;
     }
 
     // reset
     if (_lastBottomHeight > 0 && bottomHeight == 0) {
       setState(() {
-        _position = Offset(_position.dx, _saveHeight);
+        widget.position.update(Offset(position.dx, _saveHeight));
       });
     }
 
@@ -322,10 +417,10 @@ class _DraggableState extends State<Draggable> {
     if (_keyboardVisible && currentVisible) {
       final sumHeight = bottomHeight + widget.height;
       final contextHeight = MediaQuery.of(context).size.height;
-      if (sumHeight + _position.dy > contextHeight) {
+      if (sumHeight + position.dy > contextHeight) {
         final y = contextHeight - sumHeight;
         setState(() {
-          _position = Offset(_position.dx, y);
+          widget.position.update(Offset(position.dx, y));
         });
       }
     }
@@ -344,8 +439,8 @@ class _DraggableState extends State<Draggable> {
     }
     return Stack(children: [
       Positioned(
-          top: _position.dy,
+          top: position.dy,
-          left: _position.dx,
+          left: position.dx,
           width: widget.width,
           height: widget.height,
           child: widget.builder(context, onPanUpdate))
@@ -354,27 +449,27 @@ class _DraggableState extends State<Draggable> {
 }
 
 class IOSDraggable extends StatefulWidget {
-  const IOSDraggable({
+  const IOSDraggable(
-    Key? key,
+      {Key? key,
-    this.position = Offset.zero,
+      this.chatModel,
-    this.chatModel,
+      required this.position,
-    required this.width,
+      required this.width,
-    required this.height,
+      required this.height,
-    required this.builder})
+      required this.builder})
-    : super(key: key);
+      : super(key: key);
 
-  final Offset position;
+  final DraggableKeyPosition position;
   final ChatModel? chatModel;
   final double width;
   final double height;
   final Widget Function(BuildContext) builder;
 
   @override
-  _IOSDraggableState createState() => _IOSDraggableState();
+  IOSDraggableState createState() =>
+      IOSDraggableState(chatModel, width, height);
 }
 
-class _IOSDraggableState extends State<IOSDraggable> {
+class IOSDraggableState extends State<IOSDraggable> {
-  late Offset _position;
   late ChatModel? _chatModel;
   late double _width;
   late double _height;
@@ -382,28 +477,27 @@ class _IOSDraggableState extends State<IOSDraggable> {
   double _saveHeight = 0;
   double _lastBottomHeight = 0;
 
-  @override
+  IOSDraggableState(ChatModel? chatModel, double w, double h) {
-  void initState() {
+    _chatModel = chatModel;
-    super.initState();
+    _width = w;
-    _position = widget.position;
+    _height = h;
-    _chatModel = widget.chatModel;
-    _width = widget.width;
-    _height = widget.height;
   }
 
+  DraggableKeyPosition get position => widget.position;
+
   checkKeyboard() {
     final bottomHeight = MediaQuery.of(context).viewInsets.bottom;
     final currentVisible = bottomHeight != 0;
 
     // save
     if (!_keyboardVisible && currentVisible) {
-      _saveHeight = _position.dy;
+      _saveHeight = position.pos.dy;
     }
 
     // reset
     if (_lastBottomHeight > 0 && bottomHeight == 0) {
       setState(() {
-        _position = Offset(_position.dx, _saveHeight);
+        position.update(Offset(position.pos.dx, _saveHeight));
       });
     }
 
@@ -411,10 +505,10 @@ class _IOSDraggableState extends State<IOSDraggable> {
     if (_keyboardVisible && currentVisible) {
       final sumHeight = bottomHeight + _height;
       final contextHeight = MediaQuery.of(context).size.height;
-      if (sumHeight + _position.dy > contextHeight) {
+      if (sumHeight + position.pos.dy > contextHeight) {
         final y = contextHeight - sumHeight;
         setState(() {
-          _position = Offset(_position.dx, y);
+          position.update(Offset(position.pos.dx, y));
         });
       }
     }
@@ -423,28 +517,28 @@ class _IOSDraggableState extends State<IOSDraggable> {
     _lastBottomHeight = bottomHeight;
   }
 
-@override
+  @override
   Widget build(BuildContext context) {
     checkKeyboard();
     return Stack(
       children: [
         Positioned(
-          left: _position.dx,
+          left: position.pos.dx,
-          top: _position.dy,
+          top: position.pos.dy,
           child: GestureDetector(
             onPanUpdate: (details) {
               setState(() {
-                _position += details.delta;
+                position.update(position.pos + details.delta);
               });
-              _chatModel?.setChatWindowPosition(_position);
+              _chatModel?.setChatWindowPosition(position.pos);
             },
             child: Material(
-              child:
+              child: Container(
-            Container(
+                width: _width,
-              width: _width,
+                height: _height,
-              height: _height,
+                decoration:
-              decoration: BoxDecoration(border: Border.all(color: MyTheme.border)),
+                    BoxDecoration(border: Border.all(color: MyTheme.border)),
-              child: widget.builder(context),
+                child: widget.builder(context),
               ),
             ),
           ),
@@ -492,13 +586,16 @@ class QualityMonitor extends StatelessWidget {
                     children: [
                       _row("Speed", qualityMonitorModel.data.speed ?? '-'),
                       _row("FPS", qualityMonitorModel.data.fps ?? '-'),
+                      // let delay be 0 if fps is 0
                       _row(
-                          "Delay", "${qualityMonitorModel.data.delay ?? '-'}ms",
+                          "Delay",
+                          "${qualityMonitorModel.data.delay == null ? '-' : (qualityMonitorModel.data.fps ?? "").replaceAll(' ', '').replaceAll('0', '').isEmpty ? 0 : qualityMonitorModel.data.delay}ms",
                           rightColor: Colors.green),
                       _row("Target Bitrate",
                           "${qualityMonitorModel.data.targetBitrate ?? '-'}kb"),
                       _row(
                           "Codec", qualityMonitorModel.data.codecFormat ?? '-'),
+                      _row("Chroma", qualityMonitorModel.data.chroma ?? '-'),
                     ],
                   ),
                 )

flutter/lib/common/widgets/peer_card.dart

@@ -1,5 +1,4 @@
-import 'dart:io';
+import 'package:bot_toast/bot_toast.dart';
-
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hbb/common/widgets/dialog.dart';
@@ -19,10 +18,12 @@ import 'dart:math' as math;
 typedef PopupMenuEntryBuilder = Future<List<mod_menu.PopupMenuEntry<String>>>
     Function(BuildContext);
 
-enum PeerUiType { grid, list }
+enum PeerUiType { grid, tile, list }
 
 final peerCardUiType = PeerUiType.grid.obs;
 
+bool? hideUsernameOnCard;
+
 class _PeerCard extends StatefulWidget {
   final Peer peer;
   final PeerTabIndex tab;
@@ -52,7 +53,7 @@ class _PeerCardState extends State<_PeerCard>
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    if (isDesktop) {
+    if (isDesktop || isWebDesktop) {
       return _buildDesktop();
     } else {
       return _buildMobile();
@@ -70,12 +71,12 @@ class _PeerCardState extends State<_PeerCard>
               peerTabModel.select(peer);
             } else {
               if (!isWebDesktop) {
-                connectInPeerTab(context, peer.id, widget.tab);
+                connectInPeerTab(context, peer, widget.tab);
               }
             }
           },
           onDoubleTap: isWebDesktop
-              ? () => connectInPeerTab(context, peer.id, widget.tab)
+              ? () => connectInPeerTab(context, peer, widget.tab)
               : null,
           onLongPress: () {
             peerTabModel.select(peer);
@@ -131,8 +132,11 @@ class _PeerCardState extends State<_PeerCard>
 
   Widget _buildPeerTile(
       BuildContext context, Peer peer, Rx<BoxDecoration?>? deco) {
-    final name =
+    hideUsernameOnCard ??=
-        '${peer.username}${peer.username.isNotEmpty && peer.hostname.isNotEmpty ? '@' : ''}${peer.hostname}';
+        bind.mainGetBuildinOption(key: kHideUsernameOnCard) == 'Y';
+    final name = hideUsernameOnCard == true
+        ? peer.hostname
+        : '${peer.username}${peer.username.isNotEmpty && peer.hostname.isNotEmpty ? '@' : ''}${peer.hostname}';
     final greyStyle = TextStyle(
         fontSize: 11,
         color: Theme.of(context).textTheme.titleLarge?.color?.withOpacity(0.6));
@@ -140,21 +144,30 @@ class _PeerCardState extends State<_PeerCard>
       mainAxisSize: MainAxisSize.max,
       children: [
         Container(
-          decoration: BoxDecoration(
+            decoration: BoxDecoration(
-            color: str2color('${peer.id}${peer.platform}', 0x7f),
+              color: str2color('${peer.id}${peer.platform}', 0x7f),
-            borderRadius: isMobile
+              borderRadius: isMobile
-                ? BorderRadius.circular(_tileRadius)
+                  ? BorderRadius.circular(_tileRadius)
-                : BorderRadius.only(
+                  : BorderRadius.only(
-                    topLeft: Radius.circular(_tileRadius),
+                      topLeft: Radius.circular(_tileRadius),
-                    bottomLeft: Radius.circular(_tileRadius),
+                      bottomLeft: Radius.circular(_tileRadius),
+                    ),
+            ),
+            alignment: Alignment.center,
+            width: isMobile ? 50 : 42,
+            height: isMobile ? 50 : null,
+            child: Stack(
+              children: [
+                getPlatformImage(peer.platform, size: isMobile ? 38 : 30)
+                    .paddingAll(6),
+                if (_shouldBuildPasswordIcon(peer))
+                  Positioned(
+                    top: 1,
+                    left: 1,
+                    child: Icon(Icons.key, size: 6, color: Colors.white),
                   ),
-          ),
+              ],
-          alignment: Alignment.center,
+            )),
-          width: isMobile ? 50 : 42,
-          height: isMobile ? 50 : null,
-          child: getPlatformImage(peer.platform, size: isMobile ? 38 : 30)
-              .paddingAll(6),
-        ),
         Expanded(
           child: Container(
             decoration: BoxDecoration(
@@ -199,8 +212,9 @@ class _PeerCardState extends State<_PeerCard>
         )
       ],
     );
-    final colors =
+    final colors = _frontN(peer.tags, 25)
-        _frontN(peer.tags, 25).map((e) => gFFI.abModel.getTagColor(e)).toList();
+        .map((e) => gFFI.abModel.getCurrentAbTagColor(e))
+        .toList();
     return Tooltip(
       message: isMobile
           ? ''
@@ -230,8 +244,11 @@ class _PeerCardState extends State<_PeerCard>
 
   Widget _buildPeerCard(
       BuildContext context, Peer peer, Rx<BoxDecoration?> deco) {
-    final name =
+    hideUsernameOnCard ??=
-        '${peer.username}${peer.username.isNotEmpty && peer.hostname.isNotEmpty ? '@' : ''}${peer.hostname}';
+        bind.mainGetBuildinOption(key: kHideUsernameOnCard) == 'Y';
+    final name = hideUsernameOnCard == true
+        ? peer.hostname
+        : '${peer.username}${peer.username.isNotEmpty && peer.hostname.isNotEmpty ? '@' : ''}${peer.hostname}';
     final child = Card(
       color: Colors.transparent,
       elevation: 0,
@@ -310,14 +327,21 @@ class _PeerCardState extends State<_PeerCard>
       ),
     );
 
-    final colors =
+    final colors = _frontN(peer.tags, 25)
-        _frontN(peer.tags, 25).map((e) => gFFI.abModel.getTagColor(e)).toList();
+        .map((e) => gFFI.abModel.getCurrentAbTagColor(e))
+        .toList();
     return Tooltip(
       message: peer.tags.isNotEmpty
           ? '${translate('Tags')}: ${peer.tags.join(', ')}'
           : '',
       child: Stack(children: [
         child,
+        if (_shouldBuildPasswordIcon(peer))
+          Positioned(
+            top: 4,
+            left: 12,
+            child: Icon(Icons.key, size: 12, color: Colors.white),
+          ),
         if (colors.isNotEmpty)
           Positioned(
             top: 4,
@@ -401,6 +425,12 @@ class _PeerCardState extends State<_PeerCard>
       onPointerUp: (_) => _showPeerMenu(peer.id),
       child: build_more(context));
 
+  bool _shouldBuildPasswordIcon(Peer peer) {
+    if (gFFI.peerTabModel.currentTab != PeerTabIndex.ab.index) return false;
+    if (gFFI.abModel.current.isPersonal()) return false;
+    return peer.password.isNotEmpty;
+  }
+
   /// Show the peer menu and handle user's choice.
   /// User might remove the peer or send a file to the peer.
   void _showPeerMenu(String id) async {
@@ -431,7 +461,7 @@ abstract class BasePeerCard extends StatelessWidget {
       peer: peer,
       tab: tab,
       connect: (BuildContext context, String id) =>
-          connectInPeerTab(context, id, tab),
+          connectInPeerTab(context, peer, tab),
       popupMenuEntryBuilder: _buildPopupMenuEntry,
     );
   }
@@ -453,7 +483,6 @@ abstract class BasePeerCard extends StatelessWidget {
 
   MenuEntryBase<String> _connectCommonAction(
     BuildContext context,
-    String id,
     String title, {
     bool isFileTransfer = false,
     bool isTcpTunneling = false,
@@ -467,7 +496,7 @@ abstract class BasePeerCard extends StatelessWidget {
       proc: () {
         connectInPeerTab(
           context,
-          peer.id,
+          peer,
           tab,
           isFileTransfer: isFileTransfer,
           isTcpTunneling: isTcpTunneling,
@@ -480,10 +509,9 @@ abstract class BasePeerCard extends StatelessWidget {
   }
 
   @protected
-  MenuEntryBase<String> _connectAction(BuildContext context, Peer peer) {
+  MenuEntryBase<String> _connectAction(BuildContext context) {
     return _connectCommonAction(
       context,
-      peer.id,
       (peer.alias.isEmpty
           ? translate('Connect')
           : '${translate('Connect')} ${peer.id}'),
@@ -491,21 +519,19 @@ abstract class BasePeerCard extends StatelessWidget {
   }
 
   @protected
-  MenuEntryBase<String> _transferFileAction(BuildContext context, String id) {
+  MenuEntryBase<String> _transferFileAction(BuildContext context) {
     return _connectCommonAction(
       context,
-      id,
+      translate('Transfer file'),
-      translate('Transfer File'),
       isFileTransfer: true,
     );
   }
 
   @protected
-  MenuEntryBase<String> _tcpTunnelingAction(BuildContext context, String id) {
+  MenuEntryBase<String> _tcpTunnelingAction(BuildContext context) {
     return _connectCommonAction(
       context,
-      id,
+      translate('TCP tunneling'),
-      translate('TCP Tunneling'),
       isTcpTunneling: true,
     );
   }
@@ -541,7 +567,7 @@ abstract class BasePeerCard extends StatelessWidget {
             ],
           )),
       proc: () {
-        connectInPeerTab(context, id, tab, isRDP: true);
+        connectInPeerTab(context, peer, tab, isRDP: true);
       },
       padding: menuPadding,
       dismissOnClicked: true,
@@ -568,7 +594,7 @@ abstract class BasePeerCard extends StatelessWidget {
   MenuEntryBase<String> _createShortCutAction(String id) {
     return MenuEntryButton<String>(
       childBuilder: (TextStyle? style) => Text(
-        translate('Create Desktop Shortcut'),
+        translate('Create desktop shortcut'),
         style: style,
       ),
       proc: () {
@@ -600,8 +626,9 @@ abstract class BasePeerCard extends StatelessWidget {
       await _openNewConnInAction(id, 'Open in New Tab', kOptionOpenInTabs);
 
   _openInWindowsAction(String id) async => await _openNewConnInAction(
-      id, 'Open in New Window', kOptionOpenInWindows);
+      id, 'Open in new window', kOptionOpenInWindows);
 
+  // ignore: unused_element
   _openNewConnInOptAction(String id) async =>
       mainGetLocalBoolOptionSync(kOptionOpenNewConnInTabs)
           ? await _openInWindowsAction(id)
@@ -609,8 +636,8 @@ abstract class BasePeerCard extends StatelessWidget {
 
   @protected
   Future<bool> _isForceAlwaysRelay(String id) async {
-    return (await bind.mainGetPeerOption(id: id, key: kOptionForceAlwaysRelay))
+    return option2bool(kOptionForceAlwaysRelay,
-        .isNotEmpty;
+        (await bind.mainGetPeerOption(id: id, key: kOptionForceAlwaysRelay)));
   }
 
   @protected
@@ -647,9 +674,8 @@ abstract class BasePeerCard extends StatelessWidget {
             onSubmit: (String newName) async {
               if (newName != oldName) {
                 if (tab == PeerTabIndex.ab) {
-                  gFFI.abModel.changeAlias(id: id, alias: newName);
+                  await gFFI.abModel.changeAlias(id: id, alias: newName);
                   await bind.mainSetPeerAlias(id: id, alias: newName);
-                  gFFI.abModel.pushAb();
                 } else {
                   await bind.mainSetPeerAlias(id: id, alias: newName);
                   showToast(translate('Successful'));
@@ -701,11 +727,7 @@ abstract class BasePeerCard extends StatelessWidget {
               await bind.mainLoadLanPeers();
               break;
             case PeerTabIndex.ab:
-              gFFI.abModel.deletePeer(id);
+              await gFFI.abModel.deletePeers([id]);
-              final future = gFFI.abModel.pushAb();
-              if (await bind.mainPeerExists(id: peer.id)) {
-                gFFI.abModel.reSyncToast(future);
-              }
               break;
             case PeerTabIndex.group:
               break;
@@ -715,7 +737,7 @@ abstract class BasePeerCard extends StatelessWidget {
           }
         }
 
-        deletePeerConfirmDialog(onSubmit,
+        deleteConfirmDialog(onSubmit,
             '${translate('Delete')} "${peer.alias.isEmpty ? formatID(peer.id) : peer.alias}"?');
       },
       padding: menuPadding,
@@ -731,14 +753,16 @@ abstract class BasePeerCard extends StatelessWidget {
         style: style,
       ),
       proc: () async {
-        bool result = gFFI.abModel.changePassword(id, '');
+        bool succ = await gFFI.abModel.changePersonalHashPassword(id, '');
         await bind.mainForgetPassword(id: id);
-        bool toast = false;
+        if (succ) {
-        if (result) {
+          showToast(translate('Successful'));
-          toast = tab == PeerTabIndex.ab;
+        } else {
-          gFFI.abModel.pushAb(toastIfFail: toast, toastIfSucc: toast);
+          if (tab.index == PeerTabIndex.ab.index) {
+            BotToast.showText(
+                contentColor: Colors.red, text: translate("Failed"));
+          }
         }
-        if (!toast) showToast(translate('Successful'));
       },
       padding: menuPadding,
       dismissOnClicked: true,
@@ -818,18 +842,12 @@ abstract class BasePeerCard extends StatelessWidget {
   MenuEntryBase<String> _addToAb(Peer peer) {
     return MenuEntryButton<String>(
       childBuilder: (TextStyle? style) => Text(
-        translate('Add to Address Book'),
+        translate('Add to address book'),
         style: style,
       ),
       proc: () {
         () async {
-          if (gFFI.abModel.isFull(true)) {
+          addPeersToAbDialog([Peer.copy(peer)]);
-            return;
-          }
-          if (!gFFI.abModel.idContainBy(peer.id)) {
-            gFFI.abModel.addPeer(peer);
-            gFFI.abModel.pushAb();
-          }
         }();
       },
       padding: menuPadding,
@@ -857,25 +875,29 @@ class RecentPeerCard extends BasePeerCard {
   Future<List<MenuEntryBase<String>>> _buildMenuItems(
       BuildContext context) async {
     final List<MenuEntryBase<String>> menuItems = [
-      _connectAction(context, peer),
+      _connectAction(context),
-      _transferFileAction(context, peer.id),
+      if (!isWeb) _transferFileAction(context),
     ];
 
     final List favs = (await bind.mainGetFav()).toList();
 
     if (isDesktop && peer.platform != kPeerPlatformAndroid) {
-      menuItems.add(_tcpTunnelingAction(context, peer.id));
+      menuItems.add(_tcpTunnelingAction(context));
     }
     // menuItems.add(await _openNewConnInOptAction(peer.id));
-    menuItems.add(await _forceAlwaysRelayAction(peer.id));
+    if (!isWeb) {
-    if (Platform.isWindows && peer.platform == kPeerPlatformWindows) {
+      menuItems.add(await _forceAlwaysRelayAction(peer.id));
+    }
+    if (isWindows && peer.platform == kPeerPlatformWindows) {
       menuItems.add(_rdpAction(context, peer.id));
     }
-    if (Platform.isWindows) {
+    if (isWindows) {
       menuItems.add(_createShortCutAction(peer.id));
     }
     menuItems.add(MenuEntryDivider());
-    menuItems.add(_renameAction(peer.id));
+    if (isMobile || isDesktop || isWebDesktop) {
+      menuItems.add(_renameAction(peer.id));
+    }
     if (await bind.mainPeerHasPassword(id: peer.id)) {
       menuItems.add(_unrememberPasswordAction(peer.id));
     }
@@ -887,9 +909,7 @@ class RecentPeerCard extends BasePeerCard {
     }
 
     if (gFFI.userModel.userName.isNotEmpty) {
-      if (!gFFI.abModel.idContainBy(peer.id)) {
+      menuItems.add(_addToAb(peer));
-        menuItems.add(_addToAb(peer));
-      }
     }
 
     menuItems.add(MenuEntryDivider());
@@ -914,22 +934,26 @@ class FavoritePeerCard extends BasePeerCard {
   Future<List<MenuEntryBase<String>>> _buildMenuItems(
       BuildContext context) async {
     final List<MenuEntryBase<String>> menuItems = [
-      _connectAction(context, peer),
+      _connectAction(context),
-      _transferFileAction(context, peer.id),
+      if (!isWeb) _transferFileAction(context),
     ];
     if (isDesktop && peer.platform != kPeerPlatformAndroid) {
-      menuItems.add(_tcpTunnelingAction(context, peer.id));
+      menuItems.add(_tcpTunnelingAction(context));
     }
     // menuItems.add(await _openNewConnInOptAction(peer.id));
-    menuItems.add(await _forceAlwaysRelayAction(peer.id));
+    if (!isWeb) {
-    if (Platform.isWindows && peer.platform == kPeerPlatformWindows) {
+      menuItems.add(await _forceAlwaysRelayAction(peer.id));
+    }
+    if (isWindows && peer.platform == kPeerPlatformWindows) {
       menuItems.add(_rdpAction(context, peer.id));
     }
-    if (Platform.isWindows) {
+    if (isWindows) {
       menuItems.add(_createShortCutAction(peer.id));
     }
     menuItems.add(MenuEntryDivider());
-    menuItems.add(_renameAction(peer.id));
+    if (isMobile || isDesktop || isWebDesktop) {
+      menuItems.add(_renameAction(peer.id));
+    }
     if (await bind.mainPeerHasPassword(id: peer.id)) {
       menuItems.add(_unrememberPasswordAction(peer.id));
     }
@@ -938,9 +962,7 @@ class FavoritePeerCard extends BasePeerCard {
     }));
 
     if (gFFI.userModel.userName.isNotEmpty) {
-      if (!gFFI.abModel.idContainBy(peer.id)) {
+      menuItems.add(_addToAb(peer));
-        menuItems.add(_addToAb(peer));
-      }
     }
 
     menuItems.add(MenuEntryDivider());
@@ -965,22 +987,24 @@ class DiscoveredPeerCard extends BasePeerCard {
   Future<List<MenuEntryBase<String>>> _buildMenuItems(
       BuildContext context) async {
     final List<MenuEntryBase<String>> menuItems = [
-      _connectAction(context, peer),
+      _connectAction(context),
-      _transferFileAction(context, peer.id),
+      if (!isWeb) _transferFileAction(context),
     ];
 
     final List favs = (await bind.mainGetFav()).toList();
 
     if (isDesktop && peer.platform != kPeerPlatformAndroid) {
-      menuItems.add(_tcpTunnelingAction(context, peer.id));
+      menuItems.add(_tcpTunnelingAction(context));
     }
     // menuItems.add(await _openNewConnInOptAction(peer.id));
-    menuItems.add(await _forceAlwaysRelayAction(peer.id));
+    if (!isWeb) {
-    if (Platform.isWindows && peer.platform == kPeerPlatformWindows) {
+      menuItems.add(await _forceAlwaysRelayAction(peer.id));
+    }
+    if (isWindows && peer.platform == kPeerPlatformWindows) {
       menuItems.add(_rdpAction(context, peer.id));
     }
     menuItems.add(_wolAction(peer.id));
-    if (Platform.isWindows) {
+    if (isWindows) {
       menuItems.add(_createShortCutAction(peer.id));
     }
 
@@ -991,9 +1015,7 @@ class DiscoveredPeerCard extends BasePeerCard {
     }
 
     if (gFFI.userModel.userName.isNotEmpty) {
-      if (!gFFI.abModel.idContainBy(peer.id)) {
+      menuItems.add(_addToAb(peer));
-        menuItems.add(_addToAb(peer));
-      }
     }
 
     menuItems.add(MenuEntryDivider());
@@ -1018,37 +1040,55 @@ class AddressBookPeerCard extends BasePeerCard {
   Future<List<MenuEntryBase<String>>> _buildMenuItems(
       BuildContext context) async {
     final List<MenuEntryBase<String>> menuItems = [
-      _connectAction(context, peer),
+      _connectAction(context),
-      _transferFileAction(context, peer.id),
+      if (!isWeb) _transferFileAction(context),
     ];
     if (isDesktop && peer.platform != kPeerPlatformAndroid) {
-      menuItems.add(_tcpTunnelingAction(context, peer.id));
+      menuItems.add(_tcpTunnelingAction(context));
     }
     // menuItems.add(await _openNewConnInOptAction(peer.id));
-    menuItems.add(await _forceAlwaysRelayAction(peer.id));
+    // menuItems.add(await _forceAlwaysRelayAction(peer.id));
-    if (Platform.isWindows && peer.platform == kPeerPlatformWindows) {
+    if (isWindows && peer.platform == kPeerPlatformWindows) {
       menuItems.add(_rdpAction(context, peer.id));
     }
-    if (Platform.isWindows) {
+    if (isWindows) {
       menuItems.add(_createShortCutAction(peer.id));
     }
-    menuItems.add(MenuEntryDivider());
+    if (gFFI.abModel.current.canWrite()) {
-    menuItems.add(_renameAction(peer.id));
+      menuItems.add(MenuEntryDivider());
-    if (peer.hash.isNotEmpty) {
+      if (isMobile || isDesktop || isWebDesktop) {
-      menuItems.add(_unrememberPasswordAction(peer.id));
+        menuItems.add(_renameAction(peer.id));
+      }
+      if (gFFI.abModel.current.isPersonal() && peer.hash.isNotEmpty) {
+        menuItems.add(_unrememberPasswordAction(peer.id));
+      }
+      if (!gFFI.abModel.current.isPersonal()) {
+        menuItems.add(_changeSharedAbPassword());
+      }
+      if (gFFI.abModel.currentAbTags.isNotEmpty) {
+        menuItems.add(_editTagAction(peer.id));
+      }
     }
-    if (gFFI.abModel.tags.isNotEmpty) {
+    final addressbooks = gFFI.abModel.addressBooksCanWrite();
-      menuItems.add(_editTagAction(peer.id));
+    if (gFFI.peerTabModel.currentTab == PeerTabIndex.ab.index) {
+      addressbooks.remove(gFFI.abModel.currentName.value);
+    }
+    if (addressbooks.isNotEmpty) {
+      menuItems.add(_addToAb(peer));
+    }
+    menuItems.add(_existIn());
+    if (gFFI.abModel.current.canWrite()) {
+      menuItems.add(MenuEntryDivider());
+      menuItems.add(_removeAction(peer.id));
     }
-
-    menuItems.add(MenuEntryDivider());
-    menuItems.add(_removeAction(peer.id));
     return menuItems;
   }
 
+  // address book does not need to update
   @protected
   @override
-  void _update() => gFFI.abModel.pullAb(quiet: true);
+  void _update() =>
+      {}; //gFFI.abModel.pullAb(force: ForcePullAb.current, quiet: true);
 
   @protected
   MenuEntryBase<String> _editTagAction(String id) {
@@ -1059,8 +1099,7 @@ class AddressBookPeerCard extends BasePeerCard {
       ),
       proc: () {
         editAbTagDialog(gFFI.abModel.getPeerTags(id), (selectedTag) async {
-          gFFI.abModel.changeTagForPeer(id, selectedTag);
+          await gFFI.abModel.changeTagForPeers([id], selectedTag);
-          gFFI.abModel.pushAb();
         });
       },
       padding: super.menuPadding,
@@ -1072,6 +1111,53 @@ class AddressBookPeerCard extends BasePeerCard {
   @override
   Future<String> _getAlias(String id) async =>
       gFFI.abModel.find(id)?.alias ?? '';
+
+  MenuEntryBase<String> _changeSharedAbPassword() {
+    return MenuEntryButton<String>(
+      childBuilder: (TextStyle? style) => Text(
+        translate(
+            peer.password.isEmpty ? 'Set shared password' : 'Change Password'),
+        style: style,
+      ),
+      proc: () {
+        setSharedAbPasswordDialog(gFFI.abModel.currentName.value, peer);
+      },
+      padding: super.menuPadding,
+      dismissOnClicked: true,
+    );
+  }
+
+  MenuEntryBase<String> _existIn() {
+    final names = gFFI.abModel.idExistIn(peer.id);
+    final text = names.join(', ');
+    return MenuEntryButton<String>(
+      childBuilder: (TextStyle? style) => Text(
+        translate('Exist in'),
+        style: style,
+      ),
+      proc: () {
+        gFFI.dialogManager.show((setState, close, context) {
+          return CustomAlertDialog(
+            title: Text(translate('Exist in')),
+            content: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [Text(text)]),
+            actions: [
+              dialogButton(
+                "OK",
+                icon: Icon(Icons.done_rounded),
+                onPressed: close,
+              ),
+            ],
+            onSubmit: close,
+            onCancel: close,
+          );
+        });
+      },
+      padding: super.menuPadding,
+      dismissOnClicked: true,
+    );
+  }
 }
 
 class MyGroupPeerCard extends BasePeerCard {
@@ -1086,18 +1172,18 @@ class MyGroupPeerCard extends BasePeerCard {
   Future<List<MenuEntryBase<String>>> _buildMenuItems(
       BuildContext context) async {
     final List<MenuEntryBase<String>> menuItems = [
-      _connectAction(context, peer),
+      _connectAction(context),
-      _transferFileAction(context, peer.id),
+      if (!isWeb) _transferFileAction(context),
     ];
     if (isDesktop && peer.platform != kPeerPlatformAndroid) {
-      menuItems.add(_tcpTunnelingAction(context, peer.id));
+      menuItems.add(_tcpTunnelingAction(context));
     }
     // menuItems.add(await _openNewConnInOptAction(peer.id));
     // menuItems.add(await _forceAlwaysRelayAction(peer.id));
-    if (Platform.isWindows && peer.platform == kPeerPlatformWindows) {
+    if (isWindows && peer.platform == kPeerPlatformWindows) {
       menuItems.add(_rdpAction(context, peer.id));
     }
-    if (Platform.isWindows) {
+    if (isWindows) {
       menuItems.add(_createShortCutAction(peer.id));
     }
     // menuItems.add(MenuEntryDivider());
@@ -1106,9 +1192,7 @@ class MyGroupPeerCard extends BasePeerCard {
     //   menuItems.add(_unrememberPasswordAction(peer.id));
     // }
     if (gFFI.userModel.userName.isNotEmpty) {
-      if (!gFFI.abModel.idContainBy(peer.id)) {
+      menuItems.add(_addToAb(peer));
-        menuItems.add(_addToAb(peer));
-      }
     }
     return menuItems;
   }
@@ -1175,7 +1259,7 @@ void _rdpDialog(String id) async {
             ).marginOnly(bottom: isDesktop ? 8 : 0),
             Row(
               children: [
-                isDesktop
+                (isDesktop || isWebDesktop)
                     ? ConstrainedBox(
                         constraints: const BoxConstraints(minWidth: 140),
                         child: Text(
@@ -1186,15 +1270,17 @@ void _rdpDialog(String id) async {
                 Expanded(
                   child: TextField(
                     decoration: InputDecoration(
-                        labelText: isDesktop ? null : translate('Username')),
+                        labelText: (isDesktop || isWebDesktop)
+                            ? null
+                            : translate('Username')),
                     controller: userController,
                   ),
                 ),
               ],
-            ).marginOnly(bottom: isDesktop ? 8 : 0),
+            ).marginOnly(bottom: (isDesktop || isWebDesktop) ? 8 : 0),
             Row(
               children: [
-                isDesktop
+                (isDesktop || isWebDesktop)
                     ? ConstrainedBox(
                         constraints: const BoxConstraints(minWidth: 140),
                         child: Text(
@@ -1206,7 +1292,9 @@ void _rdpDialog(String id) async {
                   child: Obx(() => TextField(
                         obscureText: secure.value,
                         decoration: InputDecoration(
-                            labelText: isDesktop ? null : translate('Password'),
+                            labelText: (isDesktop || isWebDesktop)
+                                ? null
+                                : translate('Password'),
                             suffixIcon: IconButton(
                                 onPressed: () => secure.value = !secure.value,
                                 icon: Icon(secure.value
@@ -1304,24 +1392,32 @@ class TagPainter extends CustomPainter {
   }
 }
 
-void connectInPeerTab(BuildContext context, String id, PeerTabIndex tab,
+void connectInPeerTab(BuildContext context, Peer peer, PeerTabIndex tab,
     {bool isFileTransfer = false,
     bool isTcpTunneling = false,
     bool isRDP = false}) async {
+  var password = '';
+  bool isSharedPassword = false;
   if (tab == PeerTabIndex.ab) {
     // If recent peer's alias is empty, set it to ab's alias
     // Because the platform is not set, it may not take effect, but it is more important not to display if the connection is not successful
-    Peer? p = gFFI.abModel.find(id);
+    if (peer.alias.isNotEmpty &&
-    if (p != null &&
+        (await bind.mainGetPeerOption(id: peer.id, key: "alias")).isEmpty) {
-        p.alias.isNotEmpty &&
-        (await bind.mainGetPeerOption(id: id, key: "alias")).isEmpty) {
       await bind.mainSetPeerAlias(
-        id: id,
+        id: peer.id,
-        alias: p.alias,
+        alias: peer.alias,
       );
     }
+    if (!gFFI.abModel.current.isPersonal()) {
+      if (peer.password.isNotEmpty) {
+        password = peer.password;
+        isSharedPassword = true;
+      }
+    }
   }
-  connect(context, id,
+  connect(context, peer.id,
+      password: password,
+      isSharedPassword: isSharedPassword,
       isFileTransfer: isFileTransfer,
       isTcpTunneling: isTcpTunneling,
       isRDP: isRDP);

flutter/lib/common/widgets/peer_tab_page.dart

@@ -13,6 +13,7 @@ import 'package:flutter_hbb/desktop/widgets/material_mod_popup_menu.dart'
     as mod_menu;
 import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
 import 'package:flutter_hbb/models/ab_model.dart';
+import 'package:flutter_hbb/models/peer_model.dart';
 
 import 'package:flutter_hbb/models/peer_tab_model.dart';
 import 'package:flutter_svg/flutter_svg.dart';
@@ -36,7 +37,7 @@ class _TabEntry {
 }
 
 EdgeInsets? _menuPadding() {
-  return isDesktop ? kDesktopMenuPadding : null;
+  return (isDesktop || isWebDesktop) ? kDesktopMenuPadding : null;
 }
 
 class _PeerTabPageState extends State<PeerTabPage>
@@ -61,7 +62,9 @@ class _PeerTabPageState extends State<PeerTabPage>
         AddressBook(
           menuPadding: _menuPadding(),
         ),
-        ({dynamic hint}) => gFFI.abModel.pullAb(force: hint == null)),
+        ({dynamic hint}) => gFFI.abModel.pullAb(
+            force: hint == null ? ForcePullAb.listAndCurrent : null,
+            quiet: false)),
     _TabEntry(
       MyGroup(
         menuPadding: _menuPadding(),
@@ -71,21 +74,30 @@ class _PeerTabPageState extends State<PeerTabPage>
   ];
   RelativeRect? mobileTabContextMenuPos;
 
-  @override
+  final isOptVisiableFixed = isOptionFixed(kOptionPeerTabVisible);
-  void initState() {
+
-    final uiType = bind.getLocalFlutterOption(k: 'peer-card-ui-type');
+  _PeerTabPageState() {
+    _loadLocalOptions();
+  }
+
+  void _loadLocalOptions() {
+    final uiType = bind.getLocalFlutterOption(k: kOptionPeerCardUiType);
     if (uiType != '') {
-      peerCardUiType.value = int.parse(uiType) == PeerUiType.list.index
+      peerCardUiType.value = int.parse(uiType) == 0
-          ? PeerUiType.list
+          ? PeerUiType.grid
-          : PeerUiType.grid;
+          : int.parse(uiType) == 1
+              ? PeerUiType.tile
+              : PeerUiType.list;
     }
     hideAbTagsPanel.value =
-        bind.mainGetLocalOption(key: "hideAbTagsPanel").isNotEmpty;
+        bind.mainGetLocalOption(key: kOptionHideAbTagsPanel) == 'Y';
-    super.initState();
   }
 
   Future<void> handleTabSelection(int tabIndex) async {
     if (tabIndex < entries.length) {
+      if (tabIndex != gFFI.peerTabModel.currentTab) {
+        gFFI.peerTabModel.setCurrentTabCachedPeers([]);
+      }
       gFFI.peerTabModel.setCurrentTab(tabIndex);
       entries[tabIndex].load(hint: false);
     }
@@ -105,7 +117,9 @@ class _PeerTabPageState extends State<PeerTabPage>
         SizedBox(
           height: 32,
           child: Container(
-            padding: isDesktop ? null : EdgeInsets.symmetric(horizontal: 2),
+            padding: (isDesktop || isWebDesktop)
+                ? null
+                : EdgeInsets.symmetric(horizontal: 2),
             child: selectionWrap(Row(
               crossAxisAlignment: CrossAxisAlignment.center,
               children: [
@@ -119,7 +133,7 @@ class _PeerTabPageState extends State<PeerTabPage>
               ],
             )),
           ),
-        ).paddingOnly(right: isDesktop ? 12 : 0),
+        ).paddingOnly(right: (isDesktop || isWebDesktop) ? 12 : 0),
         _createPeersView(),
       ],
     );
@@ -127,11 +141,13 @@ class _PeerTabPageState extends State<PeerTabPage>
 
   Widget _createSwitchBar(BuildContext context) {
     final model = Provider.of<PeerTabModel>(context);
-
+    var counter = -1;
-    return ListView(
+    return ReorderableListView(
+        buildDefaultDragHandles: false,
+        onReorder: model.reorder,
         scrollDirection: Axis.horizontal,
         physics: NeverScrollableScrollPhysics(),
-        children: model.visibleIndexs.map((t) {
+        children: model.visibleEnabledOrderedIndexs.map((t) {
           final selected = model.currentTab == t;
           final color = selected
               ? MyTheme.tabbar(context).selectedTextColor
@@ -145,48 +161,56 @@ class _PeerTabPageState extends State<PeerTabPage>
               border: Border(
             bottom: BorderSide(width: 2, color: color!),
           ));
-          return Obx(() => InkWell(
+          counter += 1;
-                child: Container(
+          return ReorderableDragStartListener(
-                  decoration: (hover.value
+              key: ValueKey(t),
-                      ? (selected ? decoBorder : deco)
+              index: counter,
-                      : (selected ? decoBorder : null)),
+              child: Obx(() => Tooltip(
-                  child: Tooltip(
                     preferBelow: false,
                     message: model.tabTooltip(t),
                     onTriggered: isMobile ? mobileShowTabVisibilityMenu : null,
-                    child: Icon(model.tabIcon(t), color: color),
+                    child: InkWell(
-                  ).paddingSymmetric(horizontal: 4),
+                      child: Container(
-                ).paddingSymmetric(horizontal: 4),
+                        decoration: (hover.value
-                onTap: () async {
+                            ? (selected ? decoBorder : deco)
-                  await handleTabSelection(t);
+                            : (selected ? decoBorder : null)),
-                  await bind.setLocalFlutterOption(
+                        child: Icon(model.tabIcon(t), color: color)
-                      k: 'peer-tab-index', v: t.toString());
+                            .paddingSymmetric(horizontal: 4),
-                },
+                      ).paddingSymmetric(horizontal: 4),
-                onHover: (value) => hover.value = value,
+                      onTap: isOptionFixed(kOptionPeerTabIndex)
-              ));
+                          ? null
+                          : () async {
+                              await handleTabSelection(t);
+                              await bind.setLocalFlutterOption(
+                                  k: kOptionPeerTabIndex, v: t.toString());
+                            },
+                      onHover: (value) => hover.value = value,
+                    ),
+                  )));
         }).toList());
   }
 
   Widget _createPeersView() {
     final model = Provider.of<PeerTabModel>(context);
     Widget child;
-    if (model.visibleIndexs.isEmpty) {
+    if (model.visibleEnabledOrderedIndexs.isEmpty) {
       child = visibleContextMenuListener(Row(
         children: [Expanded(child: InkWell())],
       ));
     } else {
-      if (model.visibleIndexs.contains(model.currentTab)) {
+      if (model.visibleEnabledOrderedIndexs.contains(model.currentTab)) {
         child = entries[model.currentTab].widget;
       } else {
         debugPrint("should not happen! currentTab not in visibleIndexs");
         Future.delayed(Duration.zero, () {
-          model.setCurrentTab(model.indexs[0]);
+          model.setCurrentTab(model.visibleEnabledOrderedIndexs[0]);
         });
         child = entries[0].widget;
       }
     }
     return Expanded(
-        child: child.marginSymmetric(vertical: isDesktop ? 12.0 : 6.0));
+        child: child.marginSymmetric(
+            vertical: (isDesktop || isWebDesktop) ? 12.0 : 6.0));
   }
 
   Widget _createRefresh(
@@ -195,55 +219,35 @@ class _PeerTabPageState extends State<PeerTabPage>
     final textColor = Theme.of(context).textTheme.titleLarge?.color;
     return Offstage(
       offstage: model.currentTab != index.index,
-      child: RefreshWidget(
+      child: Tooltip(
-          onPressed: () {
+        message: translate('Refresh'),
-            if (gFFI.peerTabModel.currentTab < entries.length) {
+        child: RefreshWidget(
-              entries[gFFI.peerTabModel.currentTab].load();
+            onPressed: () {
-            }
+              if (gFFI.peerTabModel.currentTab < entries.length) {
-          },
+                entries[gFFI.peerTabModel.currentTab].load();
-          spinning: loading,
+              }
-          child: RotatedBox(
+            },
-              quarterTurns: 2,
+            spinning: loading,
-              child: Tooltip(
+            child: RotatedBox(
-                  message: translate('Refresh'),
+                quarterTurns: 2,
-                  child: Icon(
+                child: Icon(
-                    Icons.refresh,
+                  Icons.refresh,
-                    size: 18,
+                  size: 18,
-                    color: textColor,
+                  color: textColor,
-                  )))),
+                ))),
+      ),
     );
   }
 
   Widget _createPeerViewTypeSwitch(BuildContext context) {
-    final textColor = Theme.of(context).textTheme.titleLarge?.color;
+    return PeerViewDropdown();
-    final types = [PeerUiType.grid, PeerUiType.list];
-
-    return Obx(() => _hoverAction(
-        context: context,
-        onTap: () async {
-          final type = types
-              .elementAt(peerCardUiType.value == types.elementAt(0) ? 1 : 0);
-          await bind.setLocalFlutterOption(
-              k: 'peer-card-ui-type', v: type.index.toString());
-          peerCardUiType.value = type;
-        },
-        child: Tooltip(
-            message: peerCardUiType.value == PeerUiType.grid
-                ? translate('List View')
-                : translate('Grid View'),
-            child: Icon(
-              peerCardUiType.value == PeerUiType.grid
-                  ? Icons.view_list_rounded
-                  : Icons.grid_view_rounded,
-              size: 18,
-              color: textColor,
-            ))));
   }
 
   Widget _createMultiSelection() {
     final textColor = Theme.of(context).textTheme.titleLarge?.color;
     final model = Provider.of<PeerTabModel>(context);
     return _hoverAction(
+      toolTip: translate('Select'),
       context: context,
       onTap: () {
         model.setMultiSelectionMode(true);
@@ -251,34 +255,38 @@ class _PeerTabPageState extends State<PeerTabPage>
           Navigator.pop(context);
         }
       },
-      child: Tooltip(
+      child: SvgPicture.asset(
-          message: translate('Select'),
+        "assets/checkbox-outline.svg",
-          child: SvgPicture.asset(
+        width: 18,
-            "assets/checkbox-outline.svg",
+        height: 18,
-            width: 18,
+        colorFilter: svgColor(textColor),
-            height: 18,
+      ),
-            color: textColor,
-          )),
     );
   }
 
   void mobileShowTabVisibilityMenu() {
     final model = gFFI.peerTabModel;
     final items = List<PopupMenuItem>.empty(growable: true);
-    for (int i = 0; i < model.tabNames.length; i++) {
+    for (int i = 0; i < PeerTabModel.maxTabCount; i++) {
+      if (!model.isEnabled[i]) continue;
       items.add(PopupMenuItem(
         height: kMinInteractiveDimension * 0.8,
-        onTap: () => model.setTabVisible(i, !model.isVisible[i]),
+        onTap: isOptVisiableFixed
+            ? null
+            : () => model.setTabVisible(i, !model.isVisibleEnabled[i]),
+        enabled: !isOptVisiableFixed,
         child: Row(
           children: [
             Checkbox(
-                value: model.isVisible[i],
+                value: model.isVisibleEnabled[i],
-                onChanged: (_) {
+                onChanged: isOptVisiableFixed
-                  model.setTabVisible(i, !model.isVisible[i]);
+                    ? null
-                  if (Navigator.canPop(context)) {
+                    : (_) {
-                    Navigator.pop(context);
+                        model.setTabVisible(i, !model.isVisibleEnabled[i]);
-                  }
+                        if (Navigator.canPop(context)) {
-                }),
+                          Navigator.pop(context);
+                        }
+                      }),
             Expanded(child: Text(model.tabTooltip(i))),
           ],
         ),
@@ -324,18 +332,21 @@ class _PeerTabPageState extends State<PeerTabPage>
 
   Widget visibleContextMenu(CancelFunc cancelFunc) {
     final model = Provider.of<PeerTabModel>(context);
-    final menu = List<MenuEntrySwitch>.empty(growable: true);
+    final menu = List<MenuEntrySwitchSync>.empty(growable: true);
-    for (int i = 0; i < model.tabNames.length; i++) {
+    for (int i = 0; i < model.orders.length; i++) {
-      menu.add(MenuEntrySwitch(
+      int tabIndex = model.orders[i];
+      if (tabIndex < 0 || tabIndex >= PeerTabModel.maxTabCount) continue;
+      if (!model.isEnabled[tabIndex]) continue;
+      menu.add(MenuEntrySwitchSync(
           switchType: SwitchType.scheckbox,
-          text: model.tabTooltip(i),
+          text: model.tabTooltip(tabIndex),
-          getter: () async {
+          currentValue: model.isVisibleEnabled[tabIndex],
-            return model.isVisible[i];
-          },
           setter: (show) async {
-            model.setTabVisible(i, show);
+            model.setTabVisible(tabIndex, show);
-            cancelFunc();
+            // Do not hide the current menu (checkbox)
-          }));
+            // cancelFunc();
+          },
+          enabled: (!isOptVisiableFixed).obs));
     }
     return mod_menu.PopupMenu(
         items: menu
@@ -353,15 +364,26 @@ class _PeerTabPageState extends State<PeerTabPage>
   Widget createMultiSelectionBar() {
     final model = Provider.of<PeerTabModel>(context);
     return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
       children: [
-        deleteSelection(),
+        Offstage(
-        addSelectionToFav(),
+          offstage: model.selectedPeers.isEmpty,
-        addSelectionToAb(),
+          child: Row(
-        editSelectionTags(),
+            children: [
-        Expanded(child: Container()),
+              deleteSelection(),
-        selectionCount(model.selectedPeers.length),
+              addSelectionToFav(),
-        selectAll(),
+              addSelectionToAb(),
-        closeSelection(),
+              editSelectionTags(),
+            ],
+          ),
+        ),
+        Row(
+          children: [
+            selectionCount(model.selectedPeers.length),
+            selectAll(),
+            closeSelection(),
+          ],
+        )
       ],
     );
   }
@@ -373,14 +395,15 @@ class _PeerTabPageState extends State<PeerTabPage>
     }
     return _hoverAction(
         context: context,
+        toolTip: translate('Delete'),
         onTap: () {
           onSubmit() async {
             final peers = model.selectedPeers;
             switch (model.currentTab) {
               case 0:
-                peers.map((p) async {
+                for (var p in peers) {
                   await bind.mainRemovePeer(id: p.id);
-                }).toList();
+                }
                 await bind.mainLoadRecentPeers();
                 break;
               case 1:
@@ -392,27 +415,13 @@ class _PeerTabPageState extends State<PeerTabPage>
                 await bind.mainLoadFavPeers();
                 break;
               case 2:
-                peers.map((p) async {
+                for (var p in peers) {
                   await bind.mainRemoveDiscovered(id: p.id);
-                }).toList();
+                }
                 await bind.mainLoadLanPeers();
                 break;
               case 3:
-                {
+                await gFFI.abModel.deletePeers(peers.map((p) => p.id).toList());
-                  bool hasSynced = false;
-                  if (shouldSyncAb()) {
-                    for (var p in peers) {
-                      if (await bind.mainPeerExists(id: p.id)) {
-                        hasSynced = true;
-                      }
-                    }
-                  }
-                  gFFI.abModel.deletePeers(peers.map((p) => p.id).toList());
-                  final future = gFFI.abModel.pushAb();
-                  if (hasSynced) {
-                    gFFI.abModel.reSyncToast(future);
-                  }
-                }
                 break;
               default:
                 break;
@@ -421,11 +430,9 @@ class _PeerTabPageState extends State<PeerTabPage>
             if (model.currentTab != 3) showToast(translate('Successful'));
           }
 
-          deletePeerConfirmDialog(onSubmit, translate('Delete'));
+          deleteConfirmDialog(onSubmit, translate('Delete'));
         },
-        child: Tooltip(
+        child: Icon(Icons.delete, color: Colors.red));
-            message: translate('Delete'),
-            child: Icon(Icons.delete, color: Colors.red)));
   }
 
   Widget addSelectionToFav() {
@@ -435,6 +442,7 @@ class _PeerTabPageState extends State<PeerTabPage>
           model.currentTab != PeerTabIndex.recent.index, // show based on recent
       child: _hoverAction(
         context: context,
+        toolTip: translate('Add to Favorites'),
         onTap: () async {
           final peers = model.selectedPeers;
           final favs = (await bind.mainGetFav()).toList();
@@ -447,37 +455,28 @@ class _PeerTabPageState extends State<PeerTabPage>
           model.setMultiSelectionMode(false);
           showToast(translate('Successful'));
         },
-        child: Tooltip(
+        child: Icon(PeerTabModel.icons[PeerTabIndex.fav.index]),
-            message: translate('Add to Favorites'),
-            child: Icon(model.icons[PeerTabIndex.fav.index])),
       ).marginOnly(left: isMobile ? 11 : 6),
     );
   }
 
   Widget addSelectionToAb() {
     final model = Provider.of<PeerTabModel>(context);
+    final addressbooks = gFFI.abModel.addressBooksCanWrite();
+    if (model.currentTab == PeerTabIndex.ab.index) {
+      addressbooks.remove(gFFI.abModel.currentName.value);
+    }
     return Offstage(
-      offstage:
+      offstage: !gFFI.userModel.isLogin || addressbooks.isEmpty,
-          !gFFI.userModel.isLogin || model.currentTab == PeerTabIndex.ab.index,
       child: _hoverAction(
         context: context,
+        toolTip: translate('Add to address book'),
         onTap: () {
-          if (gFFI.abModel.isFull(true)) {
+          final peers = model.selectedPeers.map((e) => Peer.copy(e)).toList();
-            return;
+          addPeersToAbDialog(peers);
-          }
-          final peers = model.selectedPeers;
-          gFFI.abModel.addPeers(peers);
-          final future = gFFI.abModel.pushAb();
           model.setMultiSelectionMode(false);
-          Future.delayed(Duration.zero, () async {
-            await future;
-            await Future.delayed(Duration(seconds: 2)); // toast
-            gFFI.abModel.isFull(true);
-          });
         },
-        child: Tooltip(
+        child: Icon(PeerTabModel.icons[PeerTabIndex.ab.index]),
-            message: translate('Add to Address Book'),
-            child: Icon(model.icons[PeerTabIndex.ab.index])),
       ).marginOnly(left: isMobile ? 11 : 6),
     );
   }
@@ -487,21 +486,20 @@ class _PeerTabPageState extends State<PeerTabPage>
     return Offstage(
       offstage: !gFFI.userModel.isLogin ||
           model.currentTab != PeerTabIndex.ab.index ||
-          gFFI.abModel.tags.isEmpty,
+          gFFI.abModel.currentAbTags.isEmpty,
       child: _hoverAction(
               context: context,
+              toolTip: translate('Edit Tag'),
               onTap: () {
                 editAbTagDialog(List.empty(), (selectedTags) async {
                   final peers = model.selectedPeers;
-                  gFFI.abModel.changeTagForPeers(
+                  await gFFI.abModel.changeTagForPeers(
                       peers.map((p) => p.id).toList(), selectedTags);
-                  gFFI.abModel.pushAb();
                   model.setMultiSelectionMode(false);
                   showToast(translate('Successful'));
                 });
               },
-              child: Tooltip(
+              child: Icon(Icons.tag))
-                  message: translate('Edit Tag'), child: Icon(Icons.tag)))
           .marginOnly(left: isMobile ? 11 : 6),
     );
   }
@@ -520,11 +518,11 @@ class _PeerTabPageState extends State<PeerTabPage>
           model.selectedPeers.length >= model.currentTabCachedPeers.length,
       child: _hoverAction(
         context: context,
+        toolTip: translate('Select All'),
         onTap: () {
           model.selectAll();
         },
-        child: Tooltip(
+        child: Icon(Icons.select_all),
-            message: translate('Select All'), child: Icon(Icons.select_all)),
       ).marginOnly(left: 6),
     );
   }
@@ -533,27 +531,27 @@ class _PeerTabPageState extends State<PeerTabPage>
     final model = Provider.of<PeerTabModel>(context);
     return _hoverAction(
             context: context,
+            toolTip: translate('Close'),
             onTap: () {
               model.setMultiSelectionMode(false);
             },
-            child:
+            child: Icon(Icons.clear))
-                Tooltip(message: translate('Close'), child: Icon(Icons.clear)))
         .marginOnly(left: 6);
   }
 
   Widget _toggleTags() {
     return _hoverAction(
         context: context,
+        toolTip: translate('Toggle Tags'),
         hoverableWhenfalse: hideAbTagsPanel,
-        child: Tooltip(
+        child: Icon(
-            message: translate('Toggle Tags'),
+          Icons.tag_rounded,
-            child: Icon(
+          size: 18,
-              Icons.tag_rounded,
+        ),
-              size: 18,
-            )),
         onTap: () async {
           await bind.mainSetLocalOption(
-              key: "hideAbTagsPanel", value: hideAbTagsPanel.value ? "" : "Y");
+              key: kOptionHideAbTagsPanel,
+              value: hideAbTagsPanel.value ? defaultOptionNo : "Y");
           hideAbTagsPanel.value = !hideAbTagsPanel.value;
         });
   }
@@ -562,7 +560,8 @@ class _PeerTabPageState extends State<PeerTabPage>
     final model = Provider.of<PeerTabModel>(context);
     return [
       const PeerSearchBar().marginOnly(right: isMobile ? 0 : 13),
-      _createRefresh(index: PeerTabIndex.ab, loading: gFFI.abModel.abLoading),
+      _createRefresh(
+          index: PeerTabIndex.ab, loading: gFFI.abModel.currentAbLoading),
       _createRefresh(
           index: PeerTabIndex.group, loading: gFFI.groupModel.groupLoading),
       Offstage(
@@ -586,7 +585,7 @@ class _PeerTabPageState extends State<PeerTabPage>
     final screenWidth = MediaQuery.of(context).size.width;
     final leftIconSize = Theme.of(context).iconTheme.size ?? 24;
     final leftActionsSize =
-        (leftIconSize + (4 + 4) * 2) * model.visibleIndexs.length;
+        (leftIconSize + (4 + 4) * 2) * model.visibleEnabledOrderedIndexs.length;
     final availableWidth = screenWidth - 10 * 2 - leftActionsSize - 2 * 2;
     final searchWidth = 120;
     final otherActionWidth = 18 + 10;
@@ -599,14 +598,13 @@ class _PeerTabPageState extends State<PeerTabPage>
             (BuildContext context, Future<void> Function() showMenu) {
           return _hoverAction(
             context: context,
-            child: Tooltip(
+            toolTip: translate('More'),
-                message: translate('More'),
+            child: SvgPicture.asset(
-                child: SvgPicture.asset(
+              "assets/chevron_up_chevron_down.svg",
-                  "assets/chevron_up_chevron_down.svg",
+              width: 18,
-                  width: 18,
+              height: 18,
-                  height: 18,
+              colorFilter: svgColor(textColor),
-                  color: textColor,
+            ),
-                )),
             onTap: showMenu,
           );
         },
@@ -630,7 +628,8 @@ class _PeerTabPageState extends State<PeerTabPage>
     List<Widget> actions = [
       const PeerSearchBar(),
       if (model.currentTab == PeerTabIndex.ab.index)
-        _createRefresh(index: PeerTabIndex.ab, loading: gFFI.abModel.abLoading),
+        _createRefresh(
+            index: PeerTabIndex.ab, loading: gFFI.abModel.currentAbLoading),
       if (model.currentTab == PeerTabIndex.group.index)
         _createRefresh(
             index: PeerTabIndex.group, loading: gFFI.groupModel.groupLoading),
@@ -644,8 +643,6 @@ class _PeerTabPageState extends State<PeerTabPage>
         searchWidth -
         (actions.length == 2 ? otherActionWidth : 0);
     final availablePositions = rightWidth ~/ otherActionWidth;
-    debugPrint(
-        "dynamic action count:${dynamicActions.length}, available positions: $availablePositions");
 
     if (availablePositions < dynamicActions.length &&
         dynamicActions.length > 1) {
@@ -682,18 +679,17 @@ class _PeerSearchBarState extends State<PeerSearchBar> {
         ? _buildSearchBar()
         : _hoverAction(
             context: context,
+            toolTip: translate('Search'),
             padding: const EdgeInsets.only(right: 2),
             onTap: () {
               setState(() {
                 drawer = true;
               });
             },
-            child: Tooltip(
+            child: Icon(
-                message: translate('Search'),
+              Icons.search_rounded,
-                child: Icon(
+              color: Theme.of(context).hintColor,
-                  Icons.search_rounded,
+            ));
-                  color: Theme.of(context).hintColor,
-                )));
   }
 
   Widget _buildSearchBar() {
@@ -777,6 +773,99 @@ class _PeerSearchBarState extends State<PeerSearchBar> {
   }
 }
 
+class PeerViewDropdown extends StatefulWidget {
+  const PeerViewDropdown({super.key});
+
+  @override
+  State<PeerViewDropdown> createState() => _PeerViewDropdownState();
+}
+
+class _PeerViewDropdownState extends State<PeerViewDropdown> {
+  @override
+  Widget build(BuildContext context) {
+    final List<PeerUiType> types = [
+      PeerUiType.grid,
+      PeerUiType.tile,
+      PeerUiType.list
+    ];
+    final style = TextStyle(
+        color: Theme.of(context).textTheme.titleLarge?.color,
+        fontSize: MenuConfig.fontSize,
+        fontWeight: FontWeight.normal);
+    List<PopupMenuEntry> items = List.empty(growable: true);
+    items.add(PopupMenuItem(
+        height: 36,
+        enabled: false,
+        child: Text(translate("Change view"), style: style)));
+    for (var e in PeerUiType.values) {
+      items.add(PopupMenuItem(
+          height: 36,
+          child: Obx(() => Center(
+                child: SizedBox(
+                  height: 36,
+                  child: getRadio<PeerUiType>(
+                      Tooltip(
+                          message: translate(types.indexOf(e) == 0
+                              ? 'Big tiles'
+                              : types.indexOf(e) == 1
+                                  ? 'Small tiles'
+                                  : 'List'),
+                          child: Icon(
+                            e == PeerUiType.grid
+                                ? Icons.grid_view_rounded
+                                : e == PeerUiType.list
+                                    ? Icons.view_list_rounded
+                                    : Icons.view_agenda_rounded,
+                            size: 18,
+                          )),
+                      e,
+                      peerCardUiType.value,
+                      dense: true,
+                      isOptionFixed(kOptionPeerCardUiType)
+                          ? null
+                          : (PeerUiType? v) async {
+                              if (v != null) {
+                                peerCardUiType.value = v;
+                                setState(() {});
+                                await bind.setLocalFlutterOption(
+                                  k: kOptionPeerCardUiType,
+                                  v: peerCardUiType.value.index.toString(),
+                                );
+                                if (Navigator.canPop(context)) {
+                                  Navigator.pop(context);
+                                }
+                              }
+                            }),
+                ),
+              ))));
+    }
+
+    var menuPos = RelativeRect.fromLTRB(0, 0, 0, 0);
+    return _hoverAction(
+        context: context,
+        toolTip: translate('Change view'),
+        child: Icon(
+          peerCardUiType.value == PeerUiType.grid
+              ? Icons.grid_view_rounded
+              : peerCardUiType.value == PeerUiType.list
+                  ? Icons.view_list_rounded
+                  : Icons.view_agenda_rounded,
+          size: 18,
+        ),
+        onTapDown: (details) {
+          final x = details.globalPosition.dx;
+          final y = details.globalPosition.dy;
+          menuPos = RelativeRect.fromLTRB(x, y, x, y);
+        },
+        onTap: () => showMenu(
+              context: context,
+              position: menuPos,
+              items: items,
+              elevation: 8,
+            ));
+  }
+}
+
 class PeerSortDropdown extends StatefulWidget {
   const PeerSortDropdown({super.key});
 
@@ -785,16 +874,18 @@ class PeerSortDropdown extends StatefulWidget {
 }
 
 class _PeerSortDropdownState extends State<PeerSortDropdown> {
-  @override
+  _PeerSortDropdownState() {
-  void initState() {
     if (!PeerSortType.values.contains(peerSort.value)) {
-      peerSort.value = PeerSortType.remoteId;
+      _loadLocalOptions();
-      bind.setLocalFlutterOption(
-        k: "peer-sorting",
-        v: peerSort.value,
-      );
     }
-    super.initState();
+  }
+
+  void _loadLocalOptions() {
+    peerSort.value = PeerSortType.remoteId;
+    bind.setLocalFlutterOption(
+      k: kOptionPeerSorting,
+      v: peerSort.value,
+    );
   }
 
   @override
@@ -820,7 +911,7 @@ class _PeerSortDropdownState extends State<PeerSortDropdown> {
                     if (v != null) {
                       peerSort.value = v;
                       await bind.setLocalFlutterOption(
-                        k: "peer-sorting",
+                        k: kOptionPeerSorting,
                         v: peerSort.value,
                       );
                     }
@@ -832,12 +923,11 @@ class _PeerSortDropdownState extends State<PeerSortDropdown> {
     var menuPos = RelativeRect.fromLTRB(0, 0, 0, 0);
     return _hoverAction(
       context: context,
-      child: Tooltip(
+      toolTip: translate('Sort by'),
-          message: translate('Sort by'),
+      child: Icon(
-          child: Icon(
+        Icons.sort_rounded,
-            Icons.sort_rounded,
+        size: 18,
-            size: 18,
+      ),
-          )),
       onTapDown: (details) {
         final x = details.globalPosition.dx;
         final y = details.globalPosition.dy;
@@ -919,6 +1009,7 @@ Widget _hoverAction(
     {required BuildContext context,
     required Widget child,
     required Function() onTap,
+    required String toolTip,
     GestureTapDownCallback? onTapDown,
     RxBool? hoverableWhenfalse,
     EdgeInsetsGeometry padding = const EdgeInsets.all(4.0)}) {
@@ -927,16 +1018,19 @@ Widget _hoverAction(
     color: Theme.of(context).colorScheme.background,
     borderRadius: BorderRadius.circular(6),
   );
-  return Obx(
+  return Tooltip(
-    () => Container(
+    message: toolTip,
-        margin: EdgeInsets.symmetric(horizontal: 1),
+    child: Obx(
-        decoration:
+      () => Container(
-            (hover.value || hoverableWhenfalse?.value == false) ? deco : null,
+          margin: EdgeInsets.symmetric(horizontal: 1),
-        child: InkWell(
+          decoration:
-            onHover: (value) => hover.value = value,
+              (hover.value || hoverableWhenfalse?.value == false) ? deco : null,
-            onTap: onTap,
+          child: InkWell(
-            onTapDown: onTapDown,
+              onHover: (value) => hover.value = value,
-            child: Container(padding: padding, child: child))),
+              onTap: onTap,
+              onTapDown: onTapDown,
+              child: Container(padding: padding, child: child))),
+    ),
   );
 }
 

flutter/lib/common/widgets/peers_view.dart

@@ -4,6 +4,7 @@ import 'dart:collection';
 import 'package:dynamic_layouts/dynamic_layouts.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_hbb/consts.dart';
 import 'package:flutter_hbb/desktop/widgets/scroll_wrapper.dart';
 import 'package:get/get.dart';
 import 'package:provider/provider.dart';
@@ -44,10 +45,14 @@ class LoadEvent {
 final peerSearchText = "".obs;
 
 /// for peer sort, global obs value
-final peerSort = bind.getLocalFlutterOption(k: 'peer-sorting').obs;
+RxString? _peerSort;
+RxString get peerSort {
+  _peerSort ??= bind.getLocalFlutterOption(k: kOptionPeerSorting).obs;
+  return _peerSort!;
+}
 
 // list for listener
-final obslist = [peerSearchText, peerSort].obs;
+RxList<RxString> get obslist => [peerSearchText, peerSort].obs;
 
 final peerSearchTextController =
     TextEditingController(text: peerSearchText.value);
@@ -69,7 +74,8 @@ class _PeersView extends StatefulWidget {
 }
 
 /// State for the peer widget.
-class _PeersViewState extends State<_PeersView> with WindowListener {
+class _PeersViewState extends State<_PeersView>
+    with WindowListener, WidgetsBindingObserver {
   static const int _maxQueryCount = 3;
   final HashMap<String, String> _emptyMessages = HashMap.from({
     LoadEvent.recent: 'empty_recent_tip',
@@ -77,24 +83,14 @@ class _PeersViewState extends State<_PeersView> with WindowListener {
     LoadEvent.lan: 'empty_lan_tip',
     LoadEvent.addressBook: 'empty_address_book_tip',
   });
-  final space = isDesktop ? 12.0 : 8.0;
+  final space = (isDesktop || isWebDesktop) ? 12.0 : 8.0;
   final _curPeers = <String>{};
   var _lastChangeTime = DateTime.now();
   var _lastQueryPeers = <String>{};
-  var _lastQueryTime = DateTime.now().subtract(const Duration(hours: 1));
+  var _lastQueryTime = DateTime.now();
   var _queryCount = 0;
   var _exit = false;
-
+  bool _isActive = true;
-  late final mobileWidth = () {
-    const minWidth = 320.0;
-    final windowWidth = MediaQuery.of(context).size.width;
-    var width = windowWidth - 2 * space;
-    if (windowWidth > minWidth + 2 * space) {
-      final n = (windowWidth / (minWidth + 2 * space)).floor();
-      width = windowWidth / n - 2 * space;
-    }
-    return width;
-  }();
 
   final _scrollController = ScrollController();
 
@@ -105,12 +101,14 @@ class _PeersViewState extends State<_PeersView> with WindowListener {
   @override
   void initState() {
     windowManager.addListener(this);
+    WidgetsBinding.instance.addObserver(this);
     super.initState();
   }
 
   @override
   void dispose() {
     windowManager.removeListener(this);
+    WidgetsBinding.instance.removeObserver(this);
     _exit = true;
     super.dispose();
   }
@@ -125,6 +123,20 @@ class _PeersViewState extends State<_PeersView> with WindowListener {
     _queryCount = _maxQueryCount;
   }
 
+  // This function is required for mobile.
+  // `onWindowFocus` works fine for desktop.
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    super.didChangeAppLifecycleState(state);
+    if (isDesktop) return;
+    if (state == AppLifecycleState.resumed) {
+      _isActive = true;
+      _queryCount = 0;
+    } else if (state == AppLifecycleState.inactive) {
+      _isActive = false;
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return ChangeNotifierProvider<Peers>(
@@ -188,41 +200,60 @@ class _PeersViewState extends State<_PeersView> with WindowListener {
                 onVisibilityChanged: onVisibilityChanged,
                 child: widget.peerCardBuilder(peer),
               );
-              return isDesktop
+              // `Provider.of<PeerTabModel>(context)` will causes infinete loop.
-                  ? Obx(
+              // Because `gFFI.peerTabModel.setCurrentTabCachedPeers(peers)` will trigger `notifyListeners()`.
-                      () => SizedBox(
+              //
-                        width: 220,
+              // No need to listen the currentTab change event.
-                        height:
+              // Because the currentTab change event will trigger the peers change event,
-                            peerCardUiType.value == PeerUiType.grid ? 140 : 42,
+              // and the peers change event will trigger _buildPeersView().
-                        child: visibilityChild,
+              return (isDesktop || isWebDesktop)
-                      ),
+                  ? Obx(() => peerCardUiType.value == PeerUiType.list
-                    )
+                      ? Container(height: 45, child: visibilityChild)
-                  : SizedBox(width: mobileWidth, child: visibilityChild);
+                      : peerCardUiType.value == PeerUiType.grid
+                          ? SizedBox(
+                              width: 220, height: 140, child: visibilityChild)
+                          : SizedBox(
+                              width: 220, height: 42, child: visibilityChild))
+                  : Container(child: visibilityChild);
             }
 
             final Widget child;
             if (isMobile) {
-              child = DynamicGridView.builder(
+              child = ListView.builder(
-                gridDelegate: SliverGridDelegateWithWrapping(
-                    mainAxisSpacing: space / 2, crossAxisSpacing: space),
                 itemCount: peers.length,
                 itemBuilder: (BuildContext context, int index) {
-                  return buildOnePeer(peers[index]);
+                  return buildOnePeer(peers[index]).marginOnly(
+                      top: index == 0 ? 0 : space / 2, bottom: space / 2);
                 },
               );
             } else {
-              child = DesktopScrollWrapper(
+              child = Obx(() => peerCardUiType.value == PeerUiType.list
-                scrollController: _scrollController,
+                  ? DesktopScrollWrapper(
-                child: DynamicGridView.builder(
+                      scrollController: _scrollController,
-                    controller: _scrollController,
+                      child: ListView.builder(
-                    physics: DraggableNeverScrollableScrollPhysics(),
+                          controller: _scrollController,
-                    gridDelegate: SliverGridDelegateWithWrapping(
+                          physics: DraggableNeverScrollableScrollPhysics(),
-                        mainAxisSpacing: space / 2, crossAxisSpacing: space),
+                          itemCount: peers.length,
-                    itemCount: peers.length,
+                          itemBuilder: (BuildContext context, int index) {
-                    itemBuilder: (BuildContext context, int index) {
+                            return buildOnePeer(peers[index]).marginOnly(
-                      return buildOnePeer(peers[index]);
+                                right: space,
-                    }),
+                                top: index == 0 ? 0 : space / 2,
-              );
+                                bottom: space / 2);
+                          }),
+                    )
+                  : DesktopScrollWrapper(
+                      scrollController: _scrollController,
+                      child: DynamicGridView.builder(
+                          controller: _scrollController,
+                          physics: DraggableNeverScrollableScrollPhysics(),
+                          gridDelegate: SliverGridDelegateWithWrapping(
+                              mainAxisSpacing: space / 2,
+                              crossAxisSpacing: space),
+                          itemCount: peers.length,
+                          itemBuilder: (BuildContext context, int index) {
+                            return buildOnePeer(peers[index]);
+                          }),
+                    ));
             }
 
             if (updateEvent == UpdateEvent.load) {
@@ -244,10 +275,14 @@ class _PeersViewState extends State<_PeersView> with WindowListener {
     return body;
   }
 
-  final _queryInterval = const Duration(seconds: 20);
+  var _queryInterval = const Duration(seconds: 20);
 
   void _startCheckOnlines() {
     () async {
+      final p = await bind.mainIsUsingPublicServer();
+      if (!p) {
+        _queryInterval = const Duration(seconds: 6);
+      }
       while (!_exit) {
         final now = DateTime.now();
         if (!setEquals(_curPeers, _lastQueryPeers)) {
@@ -255,11 +290,10 @@ class _PeersViewState extends State<_PeersView> with WindowListener {
             _queryOnlines(false);
           }
         } else {
-          if (_queryCount < _maxQueryCount) {
+          if (_isActive && (_queryCount < _maxQueryCount || !p)) {
             if (now.difference(_lastQueryTime) >= _queryInterval) {
               if (_curPeers.isNotEmpty) {
-                platformFFI.ffiBind
+                bind.queryOnlines(ids: _curPeers.toList(growable: false));
-                    .queryOnlines(ids: _curPeers.toList(growable: false));
                 _lastQueryTime = DateTime.now();
                 _queryCount += 1;
               }
@@ -273,15 +307,15 @@ class _PeersViewState extends State<_PeersView> with WindowListener {
 
   _queryOnlines(bool isLoadEvent) {
     if (_curPeers.isNotEmpty) {
-      platformFFI.ffiBind.queryOnlines(ids: _curPeers.toList(growable: false));
+      bind.queryOnlines(ids: _curPeers.toList(growable: false));
-      _lastQueryPeers = {..._curPeers};
-      if (isLoadEvent) {
-        _lastChangeTime = DateTime.now();
-      } else {
-        _lastQueryTime = DateTime.now().subtract(_queryInterval);
-      }
       _queryCount = 0;
     }
+    _lastQueryPeers = {..._curPeers};
+    if (isLoadEvent) {
+      _lastChangeTime = DateTime.now();
+    } else {
+      _lastQueryTime = DateTime.now().subtract(_queryInterval);
+    }
   }
 
   Future<List<Peer>>? matchPeers(
@@ -294,7 +328,7 @@ class _PeersViewState extends State<_PeersView> with WindowListener {
     if (!PeerSortType.values.contains(sortedBy)) {
       sortedBy = PeerSortType.remoteId;
       bind.setLocalFlutterOption(
-        k: "peer-sorting",
+        k: kOptionPeerSorting,
         v: sortedBy,
       );
     }
@@ -341,7 +375,7 @@ abstract class BasePeersView extends StatelessWidget {
   final String loadEvent;
   final PeerFilter? peerFilter;
   final PeerCardBuilder peerCardBuilder;
-  final RxList<Peer>? initPeers;
+  final GetInitPeers? getInitPeers;
 
   const BasePeersView({
     Key? key,
@@ -349,13 +383,14 @@ abstract class BasePeersView extends StatelessWidget {
     required this.loadEvent,
     this.peerFilter,
     required this.peerCardBuilder,
-    required this.initPeers,
+    required this.getInitPeers,
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     return _PeersView(
-        peers: Peers(name: name, loadEvent: loadEvent, initPeers: initPeers),
+        peers:
+            Peers(name: name, loadEvent: loadEvent, getInitPeers: getInitPeers),
         peerFilter: peerFilter,
         peerCardBuilder: peerCardBuilder);
   }
@@ -372,7 +407,7 @@ class RecentPeersView extends BasePeersView {
             peer: peer,
             menuPadding: menuPadding,
           ),
-          initPeers: null,
+          getInitPeers: null,
         );
 
   @override
@@ -394,7 +429,7 @@ class FavoritePeersView extends BasePeersView {
             peer: peer,
             menuPadding: menuPadding,
           ),
-          initPeers: null,
+          getInitPeers: null,
         );
 
   @override
@@ -416,7 +451,7 @@ class DiscoveredPeersView extends BasePeersView {
             peer: peer,
             menuPadding: menuPadding,
           ),
-          initPeers: null,
+          getInitPeers: null,
         );
 
   @override
@@ -432,7 +467,7 @@ class AddressBookPeersView extends BasePeersView {
       {Key? key,
       EdgeInsets? menuPadding,
       ScrollController? scrollController,
-      required RxList<Peer> initPeers})
+      required GetInitPeers getInitPeers})
       : super(
           key: key,
           name: 'address book peer',
@@ -443,7 +478,7 @@ class AddressBookPeersView extends BasePeersView {
             peer: peer,
             menuPadding: menuPadding,
           ),
-          initPeers: initPeers,
+          getInitPeers: getInitPeers,
         );
 
   static bool _hitTag(List<dynamic> selectedTags, List<dynamic> idents) {
@@ -473,7 +508,7 @@ class MyGroupPeerView extends BasePeersView {
       {Key? key,
       EdgeInsets? menuPadding,
       ScrollController? scrollController,
-      required RxList<Peer> initPeers})
+      required GetInitPeers getInitPeers})
       : super(
           key: key,
           name: 'group peer',
@@ -483,7 +518,7 @@ class MyGroupPeerView extends BasePeersView {
             peer: peer,
             menuPadding: menuPadding,
           ),
-          initPeers: initPeers,
+          getInitPeers: getInitPeers,
         );
 
   static bool filter(Peer peer) {

flutter/lib/common/widgets/remote_input.dart

@@ -34,7 +34,8 @@ class RawKeyFocusScope extends StatelessWidget {
             canRequestFocus: true,
             focusNode: focusNode,
             onFocusChange: onFocusChange,
-            onKey: inputModel.handleRawKeyEvent,
+            onKey: (FocusNode data, RawKeyEvent e) =>
+                inputModel.handleRawKeyEvent(e),
             child: child));
   }
 }
@@ -68,6 +69,8 @@ class RawTouchGestureDetectorRegion extends StatefulWidget {
 class _RawTouchGestureDetectorRegionState
     extends State<RawTouchGestureDetectorRegion> {
   Offset _cacheLongPressPosition = Offset(0, 0);
+  // Timestamp of the last long press event.
+  int _cacheLongPressPositionTs = 0;
   double _mouseScrollIntegral = 0; // mouse scroll speed controller
   double _scale = 1;
 
@@ -76,7 +79,7 @@ class _RawTouchGestureDetectorRegionState
   FFI get ffi => widget.ffi;
   FfiModel get ffiModel => widget.ffiModel;
   InputModel get inputModel => widget.inputModel;
-  bool get handleTouch => isDesktop || ffiModel.touchMode;
+  bool get handleTouch => (isDesktop || isWebDesktop) || ffiModel.touchMode;
   SessionID get sessionId => ffi.sessionId;
 
   @override
@@ -94,8 +97,9 @@ class _RawTouchGestureDetectorRegionState
     }
     if (handleTouch) {
       // Desktop or mobile "Touch mode"
-      ffi.cursorModel.move(d.localPosition.dx, d.localPosition.dy);
+      if (ffi.cursorModel.move(d.localPosition.dx, d.localPosition.dy)) {
-      inputModel.tapDown(MouseButtons.left);
+        inputModel.tapDown(MouseButtons.left);
+      }
     }
   }
 
@@ -104,8 +108,9 @@ class _RawTouchGestureDetectorRegionState
       return;
     }
     if (handleTouch) {
-      ffi.cursorModel.move(d.localPosition.dx, d.localPosition.dy);
+      if (ffi.cursorModel.move(d.localPosition.dx, d.localPosition.dy)) {
-      inputModel.tapUp(MouseButtons.left);
+        inputModel.tapUp(MouseButtons.left);
+      }
     }
   }
 
@@ -133,6 +138,9 @@ class _RawTouchGestureDetectorRegionState
     if (lastDeviceKind != PointerDeviceKind.touch) {
       return;
     }
+    if (ffiModel.touchMode && ffi.cursorModel.lastIsBlocked) {
+      return;
+    }
     inputModel.tap(MouseButtons.left);
     inputModel.tap(MouseButtons.left);
   }
@@ -145,6 +153,7 @@ class _RawTouchGestureDetectorRegionState
     if (handleTouch) {
       ffi.cursorModel.move(d.localPosition.dx, d.localPosition.dy);
       _cacheLongPressPosition = d.localPosition;
+      _cacheLongPressPositionTs = DateTime.now().millisecondsSinceEpoch;
     }
   }
 
@@ -182,7 +191,7 @@ class _RawTouchGestureDetectorRegionState
     if (lastDeviceKind != PointerDeviceKind.touch) {
       return;
     }
-    if (isDesktop || !ffiModel.touchMode) {
+    if ((isDesktop || isWebDesktop) || !ffiModel.touchMode) {
       inputModel.tap(MouseButtons.right);
     }
   }
@@ -202,7 +211,7 @@ class _RawTouchGestureDetectorRegionState
       return;
     }
     if (!handleTouch) {
-      ffi.cursorModel.updatePan(d.delta.dx, d.delta.dy, handleTouch);
+      ffi.cursorModel.updatePan(d.delta, d.localPosition, handleTouch);
     }
   }
 
@@ -221,6 +230,22 @@ class _RawTouchGestureDetectorRegionState
       return;
     }
     if (handleTouch) {
+      if (ffi.cursorModel.shouldBlock(d.localPosition.dx, d.localPosition.dy)) {
+        return;
+      }
+      if (isDesktop) {
+        ffi.cursorModel.trySetRemoteWindowCoords();
+      }
+      // Workaround for the issue that the first pan event is sent a long time after the start event.
+      // If the time interval between the start event and the first pan event is less than 500ms,
+      // we consider to use the long press position as the start position.
+      //
+      // TODO: We should find a better way to send the first pan event as soon as possible.
+      if (DateTime.now().millisecondsSinceEpoch - _cacheLongPressPositionTs <
+          500) {
+        ffi.cursorModel
+            .move(_cacheLongPressPosition.dx, _cacheLongPressPosition.dy);
+      }
       inputModel.sendMouse('down', MouseButtons.left);
       ffi.cursorModel.move(d.localPosition.dx, d.localPosition.dy);
     } else {
@@ -240,13 +265,19 @@ class _RawTouchGestureDetectorRegionState
     if (lastDeviceKind != PointerDeviceKind.touch) {
       return;
     }
-    ffi.cursorModel.updatePan(d.delta.dx, d.delta.dy, handleTouch);
+    if (ffi.cursorModel.shouldBlock(d.localPosition.dx, d.localPosition.dy)) {
+      return;
+    }
+    ffi.cursorModel.updatePan(d.delta, d.localPosition, handleTouch);
   }
 
   onOneFingerPanEnd(DragEndDetails d) {
     if (lastDeviceKind != PointerDeviceKind.touch) {
       return;
     }
+    if (isDesktop) {
+      ffi.cursorModel.clearRemoteWindowCoords();
+    }
     inputModel.sendMouse('up', MouseButtons.left);
   }
 
@@ -261,7 +292,7 @@ class _RawTouchGestureDetectorRegionState
     if (lastDeviceKind != PointerDeviceKind.touch) {
       return;
     }
-    if (isDesktop) {
+    if ((isDesktop || isWebDesktop)) {
       final scale = ((d.scale - _scale) * 1000).toInt();
       _scale = d.scale;
 
@@ -274,7 +305,7 @@ class _RawTouchGestureDetectorRegionState
       }
     } else {
       // mobile
-      ffi.canvasModel.updateScale(d.scale / _scale);
+      ffi.canvasModel.updateScale(d.scale / _scale, d.focalPoint);
       _scale = d.scale;
       ffi.canvasModel.panX(d.focalPointDelta.dx);
       ffi.canvasModel.panY(d.focalPointDelta.dy);
@@ -285,7 +316,7 @@ class _RawTouchGestureDetectorRegionState
     if (lastDeviceKind != PointerDeviceKind.touch) {
       return;
     }
-    if (isDesktop) {
+    if ((isDesktop || isWebDesktop)) {
       bind.sessionSendPointer(
           sessionId: sessionId,
           msg: json.encode(
@@ -408,7 +439,9 @@ class RawPointerMouseRegion extends StatelessWidget {
       onPointerPanZoomUpdate: inputModel.onPointerPanZoomUpdate,
       onPointerPanZoomEnd: inputModel.onPointerPanZoomEnd,
       child: MouseRegion(
-        cursor: cursor ?? MouseCursor.defer,
+        cursor: inputModel.isViewOnly
+            ? MouseCursor.defer
+            : (cursor ?? MouseCursor.defer),
         onEnter: onEnter,
         onExit: onExit,
         child: child,