Sanitize internal storage file names

Sanitize an internally downloaded file's name during save process to prevent file transfer error for Windows users and potentially Linux users.

.github/workflows/build-win64.yml

@@ -17,26 +17,26 @@ jobs:
       - name: Install build-dependencies
         run: |
           msys2 -c './build-win64.sh --prepare'
-      - name: Build Dino (Meson, without saving)
+      - name: Build Dino+ (Meson, without saving)
         run: |
           msys2 -c './build-win64.sh -s meson -c -b -t -w'
-      - name: Build Dino (CMake)
+      - name: Build Dino+ (CMake)
         run: |
           msys2 -c './build-win64.sh -s cmake -c -b -t -i'
-      - name: Build Dino installer
+      - name: Build Dino+ installer
         run: |
           msys2 -c './build-win64.sh --build-installer'
-      - name: Upload Dino installer
+      - name: Upload Dino+ installer
         uses: actions/upload-artifact@v4
         with:
-          name: dino-installer
+          name: dino-plus-installer
           path: windows-installer/dino-installer.exe
-      - name: Release Dino installer
+      - name: Release Dino+ installer
         if: ${{ github.ref_type == 'tag' }}
         uses: svenstaro/upload-release-action@2.9.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: windows-installer/dino-installer.exe
-          asset_name: dino-installer.exe
+          asset_name: dino-plus-installer.exe
           tag: ${{ github.ref }}
-          release_name: Dino ${{ github.ref_name }}
+          release_name: Dino+ ${{ github.ref_name }}

.github/workflows/build.yml

@@ -7,22 +7,41 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
+      - run: sudo rm /etc/apt/sources.list.d/microsoft-prod.list
       - run: sudo apt-get update
       - run: sudo apt-get remove libunwind-14-dev
-      - run: sudo apt-get install -y build-essential gettext cmake valac libgee-0.8-dev libsqlite3-dev libgtk-4-dev libnotify-dev libgpgme-dev libsoup2.4-dev libgcrypt20-dev libqrencode-dev libnice-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libsrtp2-dev libwebrtc-audio-processing-dev libadwaita-1-dev libsignal-protocol-c-dev libcanberra-dev
+      - run: sudo apt-get install -y build-essential gettext cmake valac libgee-0.8-dev libsqlite3-dev libgtk-4-dev libnotify-dev libgpgme-dev libsoup2.4-dev libgcrypt20-dev libqrencode-dev libnice-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libsrtp2-dev libadwaita-1-dev libsignal-protocol-c-dev libcanberra-dev
-      - run: ./configure --with-tests --with-libsignal-in-tree
+      - run: ./configure --release --no-debug --with-tests --enable-plugin=notification-sound --prefix=/usr --without-webrtc
-      - run: make
+      - run: cmake --build build
-      - run: make test
+      - run: cmake --build build --target=test
+      - name: Build DEB-package
+        run: cd build && cpack -G DEB
+      - name: Upload Dino+ DEB-package
+        uses: actions/upload-artifact@v4
+        with:
+          name: dino-plus-deb
+          path: _packages/dino-plus.deb
+      - name: Release Dino+ DEB-package
+        if: ${{ github.ref_type == 'tag' }}
+        uses: svenstaro/upload-release-action@2.9.0
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: _packages/dino-plus.deb
+          asset_name: dino-plus.deb
+          tag: ${{ github.ref }}
+          release_name: Dino+ ${{ github.ref_name }}
+
   build-meson:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
+      - run: sudo rm /etc/apt/sources.list.d/microsoft-prod.list
       - run: sudo apt-get update
       - run: sudo apt-get remove libunwind-14-dev
-      - run: sudo apt-get install -y build-essential gettext libadwaita-1-dev libcanberra-dev libgcrypt20-dev libgee-0.8-dev libgpgme-dev libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev libgtk-4-dev libnice-dev libnotify-dev libqrencode-dev libsignal-protocol-c-dev libsoup2.4-dev libsqlite3-dev libsrtp2-dev libwebrtc-audio-processing-dev meson valac
+      - run: sudo apt-get install -y build-essential gettext libadwaita-1-dev libcanberra-dev libgcrypt20-dev libgee-0.8-dev libgpgme-dev libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev libgtk-4-dev libnice-dev libnotify-dev libqrencode-dev libsignal-protocol-c-dev libsoup2.4-dev libsqlite3-dev libsrtp2-dev meson valac
-      - run: meson setup build -Dcrypto-backend=auto -Dplugin-ice=enabled -Duse-soup2=true
+      - run: meson setup build -Duse-soup2=true -Dplugin-rtp-webrtc-audio-processing=disabled
       - run: meson compile -C build
       - run: meson test -C build
   build-flatpak:
@@ -40,7 +59,7 @@ jobs:
         with:
           manifest-path: im.dino.Dino.json
           build-bundle: true
-      - name: Release Dino installer
+      - name: Release Dino+ flatpak
         if: ${{ github.ref_type == 'tag' }}
         uses: svenstaro/upload-release-action@2.9.0
         with:
@@ -48,4 +67,4 @@ jobs:
           file: app.flatpak
           asset_name: app.flatpak
           tag: ${{ github.ref }}
-          release_name: Dino ${{ github.ref_name }}
+          release_name: Dino+ ${{ github.ref_name }}

BUILD_MACOS.md

@@ -0,0 +1,54 @@
+Here are the instructions to anyone whom wants to try the build themselves.
+It is assumed that you have `brew` installed, know your way around terminal, and generally understand what you're doing.
+
+## Build
+
+1. Start with an already existing build instructions of the original project:
+
+`https://github.com/dino/dino/wiki/macOS`
+
+2. On step 4, replace the path to the upstream repo with this one:
+
+```
+git clone https://github.com/mxlgv/dino
+cd dino
+```
+
+3. On step 5 run `./configure --with-libsoup3`.
+
+4. Continue the build according to the original instructions.
+
+## Install with Brew
+
+To build Dino using this formula, follow these instructions:
+
+```
+brew tap mxlgv/homebrew-dino
+brew install mxlgv/homebrew-dino/dino
+```
+
+You can start the Dino client installed via homebrew with the following command:
+
+```
+./opt/homebrew/Cellar/dino/3/bin/dino
+```
+
+You can create a shortcut with a symbolic link pointing to this file, so that you can open it in a more convenient way.
+
+If you encounter an error related to rpath, you need to add `DYLD_LIBRARY_PATH` to the environment variable:
+
+```
+export DYLD_LIBRARY_PATH=/opt/homebrew/Cellar/dino/3/lib
+```
+
+## Notifications
+
+There is a draft PR which can be used to enable notifications: https://github.com/mxlgv/dino/pull/45
+
+## Start Dino
+
+In order to run Dino, just run in the build folder:
+
+```
+./dino
+```

CMakeLists.txt

@@ -12,6 +12,14 @@ endif ()
 
 include(CTest)
 
+option(PLUGIN_RTP_WEBRTC_AUDIO_PROCESSING "Use WebRTC audio processing" ON)
+option(WITH_WASAPI "Use wasapi instead of directsound on windows" ON)
+
+# https://gitlab.kitware.com/cmake/cmake/-/issues/19804
+if (WIN32)
+    list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES .dll)
+endif()
+
 # Prepare Plugins
 set(DEFAULT_PLUGINS omemo;openpgp;http-files;ice;rtp)
 if (WIN32)
@@ -73,6 +81,8 @@ macro(set_path what val desc)
     endif()
 endmacro(set_path)
 
+set(LOCALEDIR_NAME "share/locale")
+
 string(REGEX REPLACE "^liblib" "lib" LIBDIR_NAME "lib${LIB_SUFFIX}")
 set_path(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" "Installation directory for architecture-independent files")
 set_path(EXEC_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" "Installation directory for architecture-dependent files")
@@ -86,7 +96,7 @@ set_path(SERVICE_FILE_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/services" "Ins
 set_path(ICON_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/icons" "Installation directory for icons")
 set_path(INCLUDE_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/include" "Installation directory for C header files")
 set_path(LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${LIBDIR_NAME}" "Installation directory for object code libraries")
-set_path(LOCALE_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/locale" "Installation directory for locale files")
+set_path(LOCALE_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${LOCALEDIR_NAME}" "Installation directory for locale files")
 set_path(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/dino/plugins" "Installation directory for dino plugin object code files")
 set_path(VAPI_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/vala/vapi" "Installation directory for Vala API files")
 
@@ -223,6 +233,9 @@ add_subdirectory(main)
 add_subdirectory(crypto-vala)
 add_subdirectory(plugins)
 
+# To generate a DEB package
+include(Packing)
+
 # uninstall target
 configure_file("${CMAKE_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
 add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/cmake_uninstall.cmake COMMENT "Uninstall the project...")

LICENSE_SHORT

@@ -1,5 +1,6 @@
-Dino - Modern Jabber/XMPP Client using GTK+/Vala
+Dino+, a modern XMPP/Jabber client software based on Dino
-Copyright (C) 2016-2020 Dino contributors
+Copyright (C) 2016-2023 Dino contributors
+Copyright (C) 2024 Dino+ contributors
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

README.md

@@ -32,15 +32,18 @@ OS support
 ------------
 * Linux (flatpaks are targeted for Ubuntu 22.04+)
 * Windows 10\11
+* MacOS via [brew](https://brew.sh/) (very experimental, see below)
 
-We only support 64 bit platforms.
+Officially, we support only x86_64 architecture. Whilst you may be able to compile this code for ARM-based platforms (like Pinephone or MacOS), there's zero guarantees that it'll compile or function properly, as we don't have the hardware and the time to test it out.
 
-Installation (prebuilt packages)
+Installation (prebuilt packages & AUR)
 ------------
 Have a look at our [releases](https://github.com/mxlgv/dino/releases).
 
 Windows installer is self-explanatory, and will place a shortcut on your desktop. Ignore the possible warning from Windows Defender: it's caused by the fact that installer does not have a digital signature.
 
+Deb package is built and tested only for Ubuntu 22.04, but it may work on its derivatives as well, such as Pop!_OS or Linux Mint.
+
 Flatpak is not present in Flathub yet, but you can install it manually. The commands below assume that you have "flatpak" package of your distro installed in your system. If it is not, please refer to https://flatpak.org/setup/
 
 1) Download the .flatpak file from [releases](https://github.com/mxlgv/dino/releases)
@@ -48,7 +51,7 @@ Flatpak is not present in Flathub yet, but you can install it manually. The comm
     ```
     flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
     ```
-3) Change the directory to the one you've downloaded the .flatpak to and run:
+3) Change the directory to the one you've downloaded the .flatpak to and run (you may have to change the file name in this command):
     ```
     flatpak install ./im.dino.Dino.flatpak
     ```
@@ -61,19 +64,23 @@ Flatpak is not present in Flathub yet, but you can install it manually. The comm
     flatpak run im.dino.Dino
     ```
 
-Flatpak distribution is confirmed to be working on Arch Testing, Manjaro Stable and Void Linux.
+Flatpak distribution is confirmed to be working on Arch Testing, Manjaro Stable, Void Linux and Linux Mint.
+
+Arch Linux & Manjaro users may install `dino-plus-git` package from [AUR](https://aur.archlinux.org/packages/dino-plus-git) via any helper of their choice.
 
 Build on Linux
 -----
 Make sure to install all [dependencies](https://github.com/dino/dino/wiki/Build#dependencies).
 
-    ./configure
+    ./configure --release --no-debug --with-tests --enable-plugin=notification-sound --prefix=/usr
     make
     build/dino
 
+Additionally, you might need to install `gst-plugins-bad` and `webrtc-audio-processing` packages (or however they might be called in your distro), if you want to have noise cancelling and gain control. If you don't want that or your distro don't have that package, add "--without-webrtc" (without quotes) to the first command.
+
 If you want to use `meson` build system, follow the next instructions:
 
-    meson setup build -Dcrypto-backend=gnutls -Dplugin-ice=enabled
+    meson setup build
     meson configure --prefix $PWD/build/install --libdir lib build
     meson compile -C build
     meson install -C build
@@ -84,6 +91,12 @@ If your `nice` library depends on `libsoup-2.4` (consider `ldd` output for the `
 Skip `meson configure` step, if you want to install the program globally.
 You can specify any convenient directory in the option `--prefix` where the program will be installed.
 
+If there is no `webrtcdsp` plugin in your system (check this by calling `gst-inspect-1.0 webrtcdsp`) you should pass extra argument:
+
+* `--without-webrtcdsp` for `./configure`;
+* `-Dplugin-rtp-webrtc-audio-processing=disabled` for `meson`;
+* `-DPLUGIN_RTP_WEBRTC_AUDIO_PROCESSING=OFF` for `cmake`.
+
 Build on Windows (x86_64)
 ------------
 - Install and configure the [MSYS2](https://www.msys2.org/) package;
@@ -116,6 +129,12 @@ Now you should run:
 ./build-win64.sh --build-installer
 ```
 
+Build on MacOS
+------------
+Builds for Mac are currently available only as a [brew](https://brew.sh/) formulae. Please follow [these instructions](https://github.com/mxlgv/dino/blob/master/BUILD_MACOS.md) to produce a build.
+
+Please note that Mac support is very experimental, and currently missing support for event notifications, among other things. You have been warned.
+
 Resources
 ---------
 - Original project's [website](https://dino.im).

build-win64.sh

@@ -21,13 +21,13 @@ fatal()
 
 download_yolort()
 {
-    file_name=cppwinrt-2.0.210122.3+windows-10.0.19041+yolort-835cd4e.zip
+    file_name=yolort.zip
     yolort_dir="$PROJ_DIR/plugins/windows-notification/yolort"
 
     rm -rf "$yolort_dir"
     mkdir "$yolort_dir"
-    curl -L -o "$file_name" "https://github.com/LAGonauta/YoloRT/releases/download/v1.0.0/$file_name"
+    curl -L -o "$file_name" "https://github.com/mxlgv/YoloRT/releases/download/dev1/$file_name"
-    echo "675a6d943c97b4acdbfaa473f68d3241d1798b31a67b5529c8d29fc0176a1707 $file_name" | sha256sum --check --status
+    echo "c2727e390da7e842f66e0a4cf0a9f5d9dfb665115bb554152d98f108d322bbc1 $file_name" | sha256sum --check --status
     unzip -o "$file_name" -d "$yolort_dir"
     rm -f "$file_name"
 }
@@ -74,7 +74,6 @@ prepare()
        mingw64/mingw-w64-x86_64-nsis \
        mingw64/mingw-w64-x86_64-libsignal-protocol-c \
        mingw64/mingw-w64-x86_64-icu \
-       mingw64/mingw-w64-x86_64-webrtc-audio-processing \
        mingw64/mingw-w64-x86_64-meson \
        git \
        make \

cmake/FindGstWebrtcDsp.cmake

@@ -0,0 +1,11 @@
+find_library(GstWebrtcDsp_LIBRARY gstwebrtcdsp PATH_SUFFIXES gstreamer-1.0)
+
+if(GstWebrtcDsp_LIBRARY_FOUND)
+    find_package(Gst)
+    set(GstWebrtcDsp_VERSION ${Gst_VERSION})
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GstWebrtcDsp
+    REQUIRED_VARS GstWebrtcDsp_LIBRARY
+    VERSION_VAR GstWebrtcDsp_VERSION)

cmake/FindWebRTCAudioProcessing.cmake

@@ -1,12 +0,0 @@
-include(PkgConfigWithFallback)
-find_pkg_config_with_fallback(WebRTCAudioProcessing
-    PKG_CONFIG_NAME webrtc-audio-processing
-    LIB_NAMES webrtc_audio_processing
-    INCLUDE_NAMES webrtc/modules/audio_processing/include/audio_processing.h
-    INCLUDE_DIR_SUFFIXES webrtc-audio-processing webrtc_audio_processing
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(WebRTCAudioProcessing
-    REQUIRED_VARS WebRTCAudioProcessing_LIBRARY
-    VERSION_VAR WebRTCAudioProcessing_VERSION)

cmake/Packing.cmake

@@ -0,0 +1,34 @@
+# This is a package creation module using CPack.
+# Currently only DEB package generation is supported.
+
+set(CPACK_PACKAGE_NAME dino-plus)
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
+    "modern XMPP/Jabber client software, based on Dino.
+Dino+ is a fork of Dino, a modern XMPP/Jabber client
+written in Vala using GTK+, which includes a few
+relatively minor but important quality-of-life features.")
+
+set(CPACK_VERBATIM_VARIABLES YES)
+set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME})
+set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
+set(CPACK_OUTPUT_FILE_PREFIX "${CMAKE_SOURCE_DIR}/_packages")
+set(CPACK_PACKAGE_VERSION ${VERSION_FULL})
+set(CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/mxlgv/dino")
+set(CPACK_PACKAGE_CONTACT "maxlogaev@proton.me")
+set(CPACK_COMPONENTS_GROUPING ALL_COMPONENTS_IN_ONE)
+set(CPACK_STRIP_FILES TRUE)
+
+# For DEB only
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Maxim Logaev <${CPACK_PACKAGE_CONTACT}>")
+set(CPACK_DEB_COMPONENT_INSTALL YES)
+set(CPACK_DEBIAN_PACKAGE_SECTION "net")
+set(CPACK_DEBIAN_PACKAGE_CONFLICTS "dino-im, dino-im-common")
+set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "ca-certificates, dbus, fonts-noto-color-emoji, network-manager")
+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS ON)
+set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY ">=")
+
+install(FILES ${CMAKE_SOURCE_DIR}/LICENSE_SHORT DESTINATION ${SHARE_INSTALL_PREFIX}/doc/${CPACK_PACKAGE_NAME} RENAME copyright)
+install(FILES ${CMAKE_SOURCE_DIR}/README.md DESTINATION ${SHARE_INSTALL_PREFIX}/doc/${CPACK_PACKAGE_NAME})
+
+include(CPack)

configure

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 OPTS=`getopt -o "h" --long \
-help,fetch-only,no-debug,disable-fast-vapi,with-tests,release,with-libsoup3,\
+help,fetch-only,no-debug,disable-fast-vapi,with-tests,release,with-libsoup3,without-webrtcdsp,\
 enable-plugin:,disable-plugin:,\
 prefix:,program-prefix:,exec-prefix:,lib-suffix:,\
 bindir:,libdir:,includedir:,datadir:,\
@@ -21,6 +21,7 @@ DISABLE_FAST_VAPI=
 LIB_SUFFIX=
 NO_DEBUG=
 USE_SOUP3=
+PLUGIN_RTP_WEBRTC_AUDIO_PROCESSING=yes
 
 EXEC_PREFIX=
 BINDIR=
@@ -54,6 +55,7 @@ Configuration:
   --no-debug                 Build without debug symbols
   --release                  Configure to build an optimized release version
   --with-libsoup3            Build with libsoup-3.0
+  --without-webrtcdsp        Build without WebRTC audio processing
   --with-tests               Also build tests.
 
 Plugin configuration:
@@ -109,6 +111,7 @@ while true; do
         --valac-flags ) VALACFLAGS="$2"; shift; shift ;;
         --lib-suffix ) LIB_SUFFIX="$2"; shift; shift ;;
         --with-libsoup3 ) USE_SOUP3=yes; shift ;;
+        --without-webrtcdsp ) PLUGIN_RTP_WEBRTC_AUDIO_PROCESSING=no; shift ;;
         --disable-fast-vapi ) DISABLE_FAST_VAPI=yes; shift ;;
         --no-debug ) NO_DEBUG=yes; shift ;;
         --release ) BUILD_TYPE=RelWithDebInfo; shift ;;
@@ -219,6 +222,7 @@ cmake -G "$cmake_type" \
     -DBIN_INSTALL_DIR="$BINDIR" \
     -DINCLUDE_INSTALL_DIR="$INCLUDEDIR" \
     -DLIB_INSTALL_DIR="$LIBDIR" \
+    -DPLUGIN_RTP_WEBRTC_AUDIO_PROCESSING="$PLUGIN_RTP_WEBRTC_AUDIO_PROCESSING" \
     -Wno-dev \
     .. || exit 9
 

im.dino.Dino.json

@@ -1,7 +1,7 @@
 {
     "id": "im.dino.Dino",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "44",
+    "runtime-version": "46",
     "sdk": "org.gnome.Sdk",
     "command": "dino",
     "finish-args": [
@@ -60,7 +60,11 @@
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "config-opts": [
-                "-DSOUP_VERSION=3"
+                "-DSOUP_VERSION=3",
+                "-DNO_DEBUG=yes",
+                "-DCMAKE_BUILD_TYPE=Release",
+                "-DENABLED_PLUGINS=notification-sound",
+                "-DPLUGIN_RTP_WEBRTC_AUDIO_PROCESSING=OFF"
             ],
             "cleanup": [
                 "/include",

libdino/CMakeLists.txt

@@ -102,7 +102,8 @@ DEPENDS
     ${CMAKE_BINARY_DIR}/exports/dino_i18n.h
 )
 
-add_definitions(${VALA_CFLAGS} -DDINO_SYSTEM_PLUGIN_DIR="${PLUGIN_INSTALL_DIR}" -DDINO_SYSTEM_LIBDIR_NAME="${LIBDIR_NAME}" -DG_LOG_DOMAIN="libdino" -DDINO_VERSION=\"${PROJECT_VERSION}\")
+add_definitions(${VALA_CFLAGS} -DDINO_SYSTEM_PLUGIN_DIR="${PLUGIN_INSTALL_DIR}" -DDINO_SYSTEM_LIBDIR_NAME="${LIBDIR_NAME}" -DG_LOG_DOMAIN="libdino"
+    -DDINO_VERSION=\"${PROJECT_VERSION}\" -DDINO_SYSTEM_LOCALEDIR_NAME="${LOCALEDIR_NAME}")
 add_library(libdino SHARED ${LIBDINO_VALA_C} ${CMAKE_BINARY_DIR}/exports/dino_i18n.h)
 add_dependencies(libdino dino-vapi)
 target_link_libraries(libdino xmpp-vala qlite ${LIBDINO_PACKAGES} m)

libdino/meson.build

@@ -80,6 +80,7 @@ sources = files(
 sources += [version_vala]
 c_args = [
     '-DDINO_SYSTEM_LIBDIR_NAME="@0@"'.format(get_option('libdir')),
+    '-DDINO_SYSTEM_LOCALEDIR_NAME="@0@"'.format(get_option('localedir')),
     '-DDINO_SYSTEM_PLUGIN_DIR="@0@"'.format(get_option('prefix') / get_option('libdir') / get_option('plugindir')),
     '-DG_LOG_DOMAIN="libdino"',
 ]

libdino/src/application.vala

@@ -25,13 +25,13 @@ public interface Application : GLib.Application {
 
     public abstract void handle_uri(string jid, string query, Gee.Map<string, string> options);
 
-    public void init() throws Error {
+    public void init(bool default_dark_theme) throws Error {
         if (DirUtils.create_with_parents(get_storage_dir(), 0700) == -1) {
             throw new Error(-1, 0, "Could not create storage dir \"%s\": %s", get_storage_dir(), FileUtils.error_from_errno(errno).to_string());
         }
 
         this.db = new Database(Path.build_filename(get_storage_dir(), "dino.db"));
-        this.settings = new Dino.Entities.Settings.from_db(db);
+        this.settings = new Dino.Entities.Settings.from_db(db, default_dark_theme);
         this.stream_interactor = new StreamInteractor(db);
 
         MessageProcessor.start(stream_interactor, db);

libdino/src/entity/file_transfer.vala

@@ -71,6 +71,7 @@ public class FileTransfer : Object {
     public int provider { get; set; }
     public string info { get; set; }
     public Cancellable cancellable { get; default=new Cancellable(); }
+    public uint64 transferred_bytes { get; set; }
 
     private Database? db;
     private string storage_dir;

libdino/src/entity/settings.vala

@@ -4,7 +4,7 @@ public class Settings : Object {
 
     private Database db;
 
-    public Settings.from_db(Database db) {
+    public Settings.from_db(Database db, bool default_dark_theme) {
         this.db = db;
 
         send_typing_ = col_to_bool_or_default("send_typing", true);
@@ -15,6 +15,7 @@ public class Settings : Object {
         default_encryption = col_to_encryption_or_default("default_encryption", Encryption.UNKNOWN);
         send_button = col_to_bool_or_default("send_button", false);
         enter_newline = col_to_bool_or_default("enter_newline", false);
+        dark_theme = col_to_bool_or_default("dark_theme", default_dark_theme);
     }
 
     private bool col_to_bool_or_default(string key, bool def) {
@@ -128,6 +129,20 @@ public class Settings : Object {
             enter_newline_ = value;
         }
     }
+
+    public signal void dark_theme_update(bool is_dark);
+    private bool dark_theme_;
+    public bool dark_theme {
+        get { return dark_theme_; }
+        set {
+            db.settings.upsert()
+                .value(db.settings.key, "dark_theme", true)
+                .value(db.settings.value, value.to_string())
+                .perform();
+            dark_theme_ = value;
+            dark_theme_update(value);
+        }
+    }
 }
 
 }

libdino/src/service/file_manager.vala

@@ -46,6 +46,15 @@ public class FileManager : StreamInteractionModule, Object {
         return ret;
     }
 
+    private string sanitize_filename(string filename) {
+#if _WIN32
+        GLib.Regex regex = new GLib.Regex("[<>:\"/\\|?*]");
+#else
+        GLib.Regex regex = new GLib.Regex("[/]");
+#endif
+        return regex.replace(filename, -1, 0, "_");
+    }
+
     public async void send_file(File file, Conversation conversation) {
         FileTransfer file_transfer = new FileTransfer();
         file_transfer.account = conversation.account;
@@ -120,6 +129,7 @@ public class FileManager : StreamInteractionModule, Object {
             }
 
             yield file_sender.send_file(conversation, file_transfer, file_send_data, file_meta);
+            file_transfer.state = FileTransfer.State.COMPLETE;
 
         } catch (Error e) {
             warning("Send file error: %s", e.message);
@@ -242,7 +252,7 @@ public class FileManager : StreamInteractionModule, Object {
             }
 
             // Save file
-            string filename = Random.next_int().to_string("%x") + "_" + file_transfer.file_name;
+            string filename = Random.next_int().to_string("%x") + "_" + sanitize_filename(file_transfer.file_name);
             File file = File.new_for_path(Path.build_filename(get_storage_dir(), filename));
 
             OutputStream os = file.create(FileCreateFlags.REPLACE_DESTINATION);
@@ -250,6 +260,7 @@ public class FileManager : StreamInteractionModule, Object {
             ssize_t read;
             while ((read = yield input_stream.read_async(buffer, Priority.LOW, file_transfer.cancellable)) > 0) {
                 buffer.length = (int) read;
+                file_transfer.transferred_bytes += (uint64)read;
                 yield os.write_async(buffer, Priority.LOW, file_transfer.cancellable);
                 buffer.length = 1024;
             }
@@ -297,6 +308,7 @@ public class FileManager : StreamInteractionModule, Object {
         file_transfer.file_name = file_meta.file_name;
         file_transfer.size = (int)file_meta.size;
         file_transfer.info = info;
+        file_transfer.transferred_bytes = 0;
 
         var encryption = file_provider.get_encryption(file_transfer, receive_data, file_meta);
         if (encryption != Encryption.NONE) file_transfer.encryption = encryption;
@@ -329,11 +341,11 @@ public class FileManager : StreamInteractionModule, Object {
 
     private async void save_file(FileTransfer file_transfer) throws FileSendError {
         try {
-            string filename = Random.next_int().to_string("%x") + "_" + file_transfer.file_name;
+            string filename = Random.next_int().to_string("%x") + "_" + sanitize_filename(file_transfer.file_name);
             File file = File.new_for_path(Path.build_filename(get_storage_dir(), filename));
             OutputStream os = file.create(FileCreateFlags.REPLACE_DESTINATION);
             yield os.splice_async(file_transfer.input_stream, OutputStreamSpliceFlags.CLOSE_SOURCE|OutputStreamSpliceFlags.CLOSE_TARGET);
-            file_transfer.state = FileTransfer.State.COMPLETE;
+            file_transfer.state = FileTransfer.State.IN_PROGRESS;
             file_transfer.path = filename;
             file_transfer.input_stream = yield file.read_async();
         } catch (Error e) {

libdino/src/service/jingle_file_transfers.vala

@@ -220,7 +220,19 @@ public class JingleFileSender : FileSender, Object {
                 }
             }
             try {
-                yield stream.get_module(Xep.JingleFileTransfer.Module.IDENTITY).offer_file_stream(stream, full_jid, file_transfer.input_stream, file_transfer.server_file_name, file_meta.size, precondition_name, precondition_options);
+                var? module = stream.get_module(Xep.JingleFileTransfer.Module.IDENTITY);
+
+                if (module == null)
+                    throw new FileSendError.UPLOAD_FAILED("unexpected null module");
+
+                module.transferred_bytes.connect((bytes) => {
+                    file_transfer.transferred_bytes += bytes;
+                });
+
+                yield module.offer_file_stream(stream, full_jid,
+                    file_transfer.cancellable, file_transfer.input_stream,
+                    file_transfer.server_file_name, file_meta.size,
+                    precondition_name, precondition_options);
             } catch (Error e) {
                 throw new FileSendError.UPLOAD_FAILED(@"offer_file_stream failed: $(e.message)");
             }

libdino/src/service/util.vala

@@ -6,7 +6,7 @@ namespace Dino {
 public class Util {
     #if _WIN32
     [CCode (cname = "ShellExecuteA", cheader_filename = "windows.h")]
-    private static extern int ShellExecuteA(int* hwnd, string operation, string file, string parameters, string directory, int showCmd);
+    private static extern int* ShellExecuteA(int* hwnd, string operation, string file, string parameters, string directory, int showCmd);
 
     [CCode (cname = "CoInitialize", cheader_filename = "windows.h")]
     private static extern int CoInitialize(void* reserved);
@@ -14,7 +14,7 @@ public class Util {
     [CCode (cname = "CoUninitialize", cheader_filename = "windows.h")]
     private static extern void CoUninitialize();
 
-    private static int ShellExecute(string operation, string file) {
+    private static int* ShellExecute(string operation, string file) {
         CoInitialize(null);
         var result = ShellExecuteA(null, operation, file, null, null, 1);
         CoUninitialize();

libdino/src/util/util.vala

@@ -2,6 +2,7 @@ namespace Dino {
 
 private extern const string SYSTEM_LIBDIR_NAME;
 private extern const string SYSTEM_PLUGIN_DIR;
+private extern const string SYSTEM_LOCALEDIR_NAME;
 
 public class SearchPathGenerator {
 
@@ -12,14 +13,21 @@ public class SearchPathGenerator {
     }
 
     public string get_locale_path(string gettext_package, string locale_install_dir) {
-        string? locale_dir = null;
+        if (exec_path != null) {
-        if (Path.get_dirname(exec_path).contains("dino") || Path.get_dirname(exec_path) == "." || Path.get_dirname(exec_path).contains("build")) {
+            var exec_dir = Path.get_dirname(exec_path);
-            string exec_locale = Path.build_filename(Path.get_dirname(exec_path), "locale");
+            string[] search_paths = new string[] {
-            if (FileUtils.test(Path.build_filename(exec_locale, "en", "LC_MESSAGES", gettext_package + ".mo"), FileTest.IS_REGULAR)) {
+                Path.build_filename(exec_dir, "locale"),
-                locale_dir = exec_locale;
+                Path.build_filename(Path.get_dirname(exec_dir), SYSTEM_LOCALEDIR_NAME)
+            };
+            foreach (var path in search_paths) {
+                if (FileUtils.test(Path.build_filename(path, "en", "LC_MESSAGES", gettext_package + ".mo"), FileTest.IS_REGULAR)) {
+                    debug(@"Found locale $(gettext_package).mo in $(path)");
+                    return path;
                 }
             }
-        return locale_dir ?? locale_install_dir;
+        }
+
+        return locale_install_dir;
     }
 
     public string[] get_plugin_paths() {

main/data/im.dino.Dino.appdata.xml

@@ -4,7 +4,7 @@
   <launchable type="desktop-id">im.dino.Dino.desktop</launchable>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
-  <name>Dino</name>
+  <name>Dino+</name>
   <summary>Modern XMPP Chat Client</summary>
   <summary xml:lang="zh_TW">現代化的 XMPP 用戶端聊天軟件</summary>
   <summary xml:lang="zh_CN">现代 XMPP 聊天客户端</summary>

main/data/im.dino.Dino.appdata.xml.in

@@ -4,7 +4,7 @@
   <launchable type="desktop-id">im.dino.Dino.desktop</launchable>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
-  <name>Dino</name>
+  <name>Dino+</name>
   <summary>Modern XMPP Chat Client</summary>
   <description>
     <p>Dino is a modern open-source chat client for the desktop. It focuses on providing a clean and reliable Jabber/XMPP experience while having your privacy in mind.</p>

main/data/occupant_list_item.ui

@@ -26,14 +26,5 @@
                 </layout>
             </object>
         </child>
-        <child>
-            <object class="GtkImage" id="status_image">
-                <property name="pixel-size">12</property>
-                <layout>
-                    <property name="column">2</property>
-                    <property name="row">0</property>
-                </layout>
-            </object>
-        </child>
     </object>
 </interface>

main/data/settings_dialog.ui

@@ -140,6 +140,22 @@
                         </child>
                     </object>
                 </child>
+                <child>
+                    <object class="AdwPreferencesGroup">
+                        <child>
+                            <object class="AdwActionRow">
+                                <property name="title" translatable="yes">_Dark theme</property>
+                                <property name="use-underline">True</property>
+                                <property name="activatable-widget">dark_theme</property>
+                                <child type="suffix">
+                                    <object class="GtkSwitch" id="dark_theme">
+                                        <property name="valign">center</property>
+                                    </object>
+                                </child>
+                            </object>
+                        </child>
+                    </object>
+                </child>
             </object>
         </child>
     </template>

main/po/en.po

@@ -533,12 +533,10 @@ msgid "Local Settings"
 msgstr ""
 
 #: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:23
 msgid "Send typing notifications"
 msgstr ""
 
 #: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:32
 msgid "Send read receipts"
 msgstr ""
 
@@ -1012,16 +1010,48 @@ msgstr ""
 msgid "Add Contact"
 msgstr ""
 
-#: main/data/settings_dialog.ui:41
+#: main/data/settings_dialog.ui:14
+msgid "Default encryption for 1-on-1 chats"
+msgstr ""
+
+#: main/data/settings_dialog.ui:19
+msgid "Ask"
+msgstr ""
+
+#: main/data/settings_dialog.ui:57
+msgid "Send _Typing Notifications"
+msgstr ""
+
+#: main/data/settings_dialog.ui:85
+msgid "_Notifications"
+msgstr ""
+
+#: main/data/settings_dialog.ui:69
+msgid "Send _Read Receipts"
+msgstr ""
+
+#: main/data/settings_dialog.ui:86
 msgid "Notify when a new message arrives"
 msgstr ""
 
-#: main/data/settings_dialog.ui:50
+#: main/data/settings_dialog.ui:102
-msgid "Convert smileys to emojis"
+msgid "_Convert Smileys to Emoji"
 msgstr ""
 
-#: main/data/settings_dialog.ui:59
+#: main/data/settings_dialog.ui:118
-msgid "Check spelling"
+msgid "_Display send button"
+msgstr ""
+
+#: main/data/settings_dialog.ui:130
+msgid "_Use Enter key to start a new line"
+msgstr ""
+
+#: main/data/settings_dialog.ui:131
+msgid "If disabled, use Shift+Enter to start a new line"
+msgstr ""
+
+#: main/data/settings_dialog.ui:147
+msgid "_Dark theme"
 msgstr ""
 
 #: main/data/im.dino.Dino.appdata.xml.in:7

main/po/ru.po

@@ -563,7 +563,7 @@ msgstr "Уведомления"
 
 #: main/src/ui/contact_details/settings_provider.vala:55
 msgid "Pin conversation"
-msgstr ""
+msgstr "Закрепить беседу"
 
 #: main/src/ui/contact_details/settings_provider.vala:55
 msgid "Pins the conversation to the top of the conversation list"
@@ -826,16 +826,16 @@ msgstr "Прочтите %s, чтобы узнать о процессе авт
 
 #: main/src/ui/conversation_content_view/message_widget.vala:213
 msgid "Edit message"
-msgstr ""
+msgstr "Редактировать сообщение"
 
 #: main/src/ui/conversation_content_view/reactions_widget.vala:102
 msgid "You"
-msgstr ""
+msgstr "Вы"
 
 #: main/src/ui/conversation_content_view/reactions_widget.vala:128
 #: main/src/ui/conversation_content_view/item_actions.vala:8
 msgid "Add reaction"
-msgstr ""
+msgstr "Добавить реакцию"
 
 #: main/src/ui/conversation_content_view/file_image_widget.vala:53
 #: main/src/ui/conversation_content_view/file_default_widget.vala:57
@@ -947,7 +947,7 @@ msgstr "несколько секунд"
 
 #: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:191
 msgid "Delivered"
-msgstr ""
+msgstr "Доставленo"
 
 #: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:195
 msgid "Read"
@@ -959,15 +959,15 @@ msgstr "Этот контакт хочет добавить вас в свой
 
 #: main/src/ui/conversation_content_view/item_actions.vala:21
 msgid "This conversation does not support reactions."
-msgstr ""
+msgstr "Этот разговор не поддерживает реакции."
 
 #: main/src/ui/conversation_content_view/item_actions.vala:33
 msgid "Reply"
-msgstr ""
+msgstr "Ответить"
 
 #: main/src/ui/conversation_content_view/item_actions.vala:43
 msgid "This conversation does not support replies."
-msgstr ""
+msgstr "Этот разговор не поддерживает ответы"
 
 #: main/src/ui/conversation_content_view/file_default_widget.vala:64
 #, c-format
@@ -1006,7 +1006,7 @@ msgstr "Тут пустовато"
 
 #: main/data/unified_main_content.ui:47
 msgid "Click + to start a chat or join a channel"
-msgstr ""
+msgstr "Нажмите +, чтобы начать чат или присоединиться к каналу"
 
 #: main/data/add_conversation/conference_details_fragment.ui:20
 #: main/data/add_conversation/add_groupchat_dialog.ui:40
@@ -1028,17 +1028,49 @@ msgstr "Псевдоним"
 msgid "Add Contact"
 msgstr "Добавить контакт"
 
-#: main/data/settings_dialog.ui:41
+#: main/data/settings_dialog.ui:14
+msgid "Default encryption for 1-on-1 chats"
+msgstr "Шифрование по умолчанию для 1-на-1 чатов"
+
+#: main/data/settings_dialog.ui:19
+msgid "Ask"
+msgstr "Спрашивать"
+
+#: main/data/settings_dialog.ui:57
+msgid "Send _Typing Notifications"
+msgstr "Отправлять уведомления при наборе сообщения"
+
+#: main/data/settings_dialog.ui:85
+msgid "_Notifications"
+msgstr "Уведомления"
+
+#: main/data/settings_dialog.ui:69
+msgid "Send _Read Receipts"
+msgstr "Отправлять уведомления о прочтении"
+
+#: main/data/settings_dialog.ui:86
 msgid "Notify when a new message arrives"
 msgstr "Уведомлять о новых сообщениях"
 
-#: main/data/settings_dialog.ui:50
+#: main/data/settings_dialog.ui:102
-msgid "Convert smileys to emojis"
+msgid "_Convert Smileys to Emoji"
 msgstr "Превращать смайлы в эмодзи"
 
-#: main/data/settings_dialog.ui:59
+#: main/data/settings_dialog.ui:118
-msgid "Check spelling"
+msgid "_Display send button"
-msgstr "Проверка орфографии"
+msgstr "Показывать кнопку отправки"
+
+#: main/data/settings_dialog.ui:130
+msgid "_Use Enter key to start a new line"
+msgstr "Использовать Enter для вставки новой строки"
+
+#: main/data/settings_dialog.ui:131
+msgid "If disabled, use Shift+Enter to start a new line"
+msgstr "Если опция недоступна, используйте Shift+Enter для вставки новой строки"
+
+#: main/data/settings_dialog.ui:147
+msgid "_Dark theme"
+msgstr "Тёмная тема"
 
 #: main/data/im.dino.Dino.appdata.xml.in:7
 msgid "Modern XMPP Chat Client"

main/src/ui/add_conversation/roster_list.vala

@@ -34,7 +34,13 @@ protected class RosterList {
             foreach (ulong handler_id in handler_ids) stream_interactor.get_module(RosterManager.IDENTITY).disconnect(handler_id);
         });
 
-        foreach (Account a in accounts) fetch_roster_items(a);
+        foreach (Account a in accounts) {
+            ListRow own_account_row = new ListRow.from_jid(stream_interactor, a.bare_jid, a, accounts.size > 1);
+            ListBoxRow own_account_lbrow = new ListBoxRow() { child = own_account_row };
+            list_box.append(own_account_lbrow);
+
+            fetch_roster_items(a);
+        }
     }
 
     private void on_removed_roster_item(Account account, Jid jid, Roster.Item roster_item) {
@@ -47,7 +53,7 @@ protected class RosterList {
     private void on_updated_roster_item(Account account, Jid jid, Roster.Item roster_item) {
         on_removed_roster_item(account, jid, roster_item);
         ListRow row = new ListRow.from_jid(stream_interactor, roster_item.jid, account, accounts.size > 1);
-        ListBoxRow list_box_row = new ListBoxRow() { child=row };
+        ListBoxRow list_box_row = new ListBoxRow() { child = row };
         rows[account][jid] = list_box_row;
         list_box.append(list_box_row);
         list_box.invalidate_sort();

main/src/ui/application.vala

@@ -29,7 +29,10 @@ public class Dino.Ui.Application : Adw.Application, Dino.Application {
 
     public Application() throws Error {
         Object(application_id: "im.dino.Dino", flags: ApplicationFlags.HANDLES_OPEN);
-        init();
+
+        var style_manager = Adw.StyleManager.get_default();
+        bool system_dark_theme = style_manager.system_supports_color_schemes && style_manager.dark;
+        init(system_dark_theme);
         Environment.set_application_name("Dino");
         Window.set_default_icon_name("im.dino.Dino");
 
@@ -68,6 +71,19 @@ public class Dino.Ui.Application : Adw.Application, Dino.Application {
                     }
                 }
             });
+
+            settings.dark_theme_update.connect((is_dark) => {
+                var manager = Adw.StyleManager.get_default();
+                if (is_dark != manager.dark) {
+                    if (is_dark) {
+                        manager.set_color_scheme(Adw.ColorScheme.FORCE_DARK);
+                    } else {
+                        manager.set_color_scheme(Adw.ColorScheme.FORCE_LIGHT);
+                    }
+                }
+            });
+
+            settings.dark_theme_update(settings.dark_theme); // Change theme at startup.
         });
 
         activate.connect(() => {

main/src/ui/conversation_content_view/file_default_widget.vala

@@ -39,7 +39,8 @@ public class FileDefaultWidget : Box {
         });
     }
 
-    public void update_file_info(string? mime_type, FileTransfer.State state, long size) {
+    public void update_file_info(string? mime_type, uint64 transferred_bytes,
+        bool direction, FileTransfer.State state, long size) {
         this.state = state;
 
         spinner.stop(); // A hidden spinning spinner still uses CPU. Deactivate asap
@@ -49,7 +50,7 @@ public class FileDefaultWidget : Box {
 
         switch (state) {
             case FileTransfer.State.COMPLETE:
-                mime_label.label = mime_description;
+                mime_label.label = _("%s offered: %s").printf(mime_description, get_size_string(size));
                 image_stack.set_visible_child_name("content_type_image");
 
                 // Create a menu
@@ -61,7 +62,17 @@ public class FileDefaultWidget : Box {
                 popover_menu.closed.connect(on_pointer_left);
                 break;
             case FileTransfer.State.IN_PROGRESS:
-                mime_label.label = _("Downloading %s…").printf(get_size_string(size));
+                uint progress = 0;
+
+                if (size > 0)
+                    progress = (uint)((transferred_bytes * (uint64)100) / (uint64)size);
+
+                if (direction == FileTransfer.DIRECTION_SENT) {
+                    mime_label.label = _("Uploading %s (%u%%)…").printf(get_size_string(size), progress);
+                }
+                else {
+                    mime_label.label = _("Downloading %s (%u%%)…").printf(get_size_string(size), progress);
+                }
                 spinner.start();
                 image_stack.set_visible_child_name("spinner");
 

main/src/ui/conversation_content_view/file_image_widget.vala

@@ -73,6 +73,9 @@ public class FileImageWidget : Box {
             image_overlay_toolbar.visible = false;
         });
 
+        // Set tooltip to display the file name on hover
+        image.set_tooltip_text(file_name);
+
         this.append(overlay);
     }
 }

main/src/ui/conversation_content_view/file_widget.vala

@@ -89,7 +89,9 @@ public class FileWidget : SizeRequestBox {
     }
 
     private async void update_widget() {
-        if (show_image() && state != State.IMAGE) {
+        if (show_image() && state != State.IMAGE
+            && file_transfer.state == FileTransfer.State.COMPLETE
+            && file_transfer.get_file().query_exists()) {
             var content_bak = content;
 
             FileImageWidget file_image_widget = null;
@@ -108,7 +110,8 @@ public class FileWidget : SizeRequestBox {
             } catch (Error e) { }
         }
 
-        if (!show_image() && state != State.DEFAULT) {
+        if (state != State.DEFAULT ||
+            (file_transfer.state == FileTransfer.State.COMPLETE && !file_transfer.get_file().query_exists())) {
             if (content != null) this.remove(content);
             FileDefaultWidget default_file_widget = new FileDefaultWidget();
             default_widget_controller = new FileDefaultWidgetController(default_file_widget);
@@ -175,11 +178,17 @@ public class FileWidgetController : Object {
     }
 
     private void open_file() {
-        try{
+        if (file_transfer.get_file().query_exists()) {
+            try {
                 Dino.Util.launch_default_for_uri(file_transfer.get_file().get_uri());
             } catch (Error err) {
                 warning("Failed to open %s - %s", file_transfer.get_file().get_uri(), err.message);
             }
+        } else {
+            warning("File %s does not exist", file_transfer.get_file().get_uri());
+            file_transfer.state = FileTransfer.State.NOT_STARTED;
+            widget.activate_action("file.download", null);
+        }
     }
 
     private void save_file() {
@@ -215,6 +224,7 @@ public class FileDefaultWidgetController : Object {
     private FileTransfer? file_transfer;
     public string file_transfer_state { get; set; }
     public string file_transfer_mime_type { get; set; }
+    public uint64 file_transfer_transferred_bytes { get; set; }
 
     private FileTransfer.State state;
 
@@ -225,6 +235,7 @@ public class FileDefaultWidgetController : Object {
 
         this.notify["file-transfer-state"].connect(update_file_info);
         this.notify["file-transfer-mime-type"].connect(update_file_info);
+        this.notify["file-transfer-transferred-bytes"].connect(update_file_info);
     }
 
     public void set_file_transfer(FileTransfer file_transfer) {
@@ -234,13 +245,19 @@ public class FileDefaultWidgetController : Object {
 
         file_transfer.bind_property("state", this, "file-transfer-state");
         file_transfer.bind_property("mime-type", this, "file-transfer-mime-type");
+        file_transfer.bind_property("transferred-bytes", this, "file-transfer-transferred-bytes");
 
         update_file_info();
     }
 
     private void update_file_info() {
         state = file_transfer.state;
-        widget.update_file_info(file_transfer.mime_type, file_transfer.state, file_transfer.size);
+        if (state == FileTransfer.State.COMPLETE && !file_transfer.get_file().query_exists()) {
+            state = FileTransfer.State.NOT_STARTED;
+            file_transfer.state = FileTransfer.State.NOT_STARTED;
+        }
+        widget.update_file_info(file_transfer.mime_type, file_transfer.transferred_bytes,
+            file_transfer.direction, state, file_transfer.size);
     }
 
     private void on_clicked() {
@@ -249,10 +266,11 @@ public class FileDefaultWidgetController : Object {
                 widget.activate_action("file.open", null);
                 break;
             case FileTransfer.State.NOT_STARTED:
+            case FileTransfer.State.FAILED:
                 widget.activate_action("file.download", null);
                 break;
             default:
-                // Clicking doesn't do anything in FAILED and IN_PROGRESS states
+                // Clicking doesn't do anything in IN_PROGRESS state
                 break;
         }
     }

main/src/ui/file_send_overlay.vala

@@ -81,7 +81,8 @@ public class FileSendOverlay {
         if (widget == null) {
             FileDefaultWidget default_widget = new FileDefaultWidget();
             default_widget.name_label.label = file_name;
-            default_widget.update_file_info(mime_type, FileTransfer.State.COMPLETE, (long)file_info.get_size());
+            default_widget.update_file_info(mime_type, 0, FileTransfer.DIRECTION_SENT,
+                FileTransfer.State.COMPLETE, (long)file_info.get_size());
             widget = default_widget;
         }
 

main/src/ui/manage_accounts/dialog.vala

@@ -44,7 +44,11 @@ public class Dialog : Gtk.Dialog {
         });
         image_button.clicked.connect(show_select_avatar);
         alias_hybrid.entry.changed.connect(() => { selected_account.alias = alias_hybrid.text; });
-        password_hybrid.entry.changed.connect(() => { selected_account.password = password_hybrid.text; });
+        password_hybrid.entry.changed.connect(() => {
+            if (password_hybrid.text != "************") {
+                selected_account.password = password_hybrid.text;
+            }
+        });
         password_change_btn.clicked.connect(show_change_psswd_dialog);
 
         Util.LabelHybridGroup label_hybrid_group = new Util.LabelHybridGroup();
@@ -68,6 +72,7 @@ public class Dialog : Gtk.Dialog {
 
             settings_list.attach(widget, 1, row_index, 2);
             row_index++;
+            password_hybrid.text = "************";
         }
     }
 
@@ -192,6 +197,7 @@ public class Dialog : Gtk.Dialog {
     }
 
     private void populate_grid_data(Account account) {
+        active_switch.sensitive = false;
         active_switch.state_set.disconnect(change_account_state);
 
         picture.model = new ViewModel.CompatAvatarPictureModel(stream_interactor).add_participant(new Conversation(account.bare_jid, account, Conversation.Type.CHAT), account.bare_jid);
@@ -200,7 +206,7 @@ public class Dialog : Gtk.Dialog {
 
         alias_hybrid.text = account.alias ?? "";
         password_hybrid.entry.input_purpose = InputPurpose.PASSWORD;
-        password_hybrid.text = account.password;
+        
 
         update_status_label(account);
 
@@ -222,11 +228,14 @@ public class Dialog : Gtk.Dialog {
             ConnectionManager.ConnectionState state = stream_interactor.connection_manager.get_state(account);
             switch (state) {
                 case ConnectionManager.ConnectionState.CONNECTING:
+                    active_switch.sensitive = false;
                     state_label.label = _("Connecting…"); break;
                 case ConnectionManager.ConnectionState.CONNECTED:
+                    active_switch.sensitive = true;
                     password_change_btn.sensitive = true;
                     state_label.label = _("Connected"); break;
                 case ConnectionManager.ConnectionState.DISCONNECTED:
+                    active_switch.sensitive = true;
                     password_change_btn.sensitive = false;
                     state_label.label = _("Disconnected"); break;
             }

main/src/ui/occupant_menu/list.vala

@@ -29,8 +29,8 @@ public class List : Box {
         list_box.set_filter_func(filter);
         search_entry.search_changed.connect(refilter);
 
-        stream_interactor.get_module(PresenceManager.IDENTITY).show_received.connect(on_received_online_presence);
+        stream_interactor.get_module(PresenceManager.IDENTITY).show_received.connect(on_show_received);
-        stream_interactor.get_module(PresenceManager.IDENTITY).received_offline_presence.connect(on_received_offline_presence);
+        stream_interactor.get_module(PresenceManager.IDENTITY).received_offline_presence.connect(on_quit_received);
 
         initialize_for_conversation(conversation);
     }
@@ -63,12 +63,11 @@ public class List : Box {
         this.conversation = conversation;
 
         var identity = stream_interactor.get_module(MucManager.IDENTITY);
-        Gee.List<Jid>? members = identity.get_all_members(conversation.counterpart, conversation.account);
+        Gee.List<Jid>? members = identity.get_members(conversation.counterpart, conversation.account);
         if (members != null) {
             // Add all members and their status to the list
             foreach (Jid member in members) {
-                bool online = get_status(member, conversation.account);
+                add_member(member); //use add_member_with_status if you want to get online/offline statuses
-                add_member(member, online);
             }
         }
         list_box.invalidate_filter();
@@ -83,7 +82,7 @@ public class List : Box {
         list_box.invalidate_filter();
     }
 
-    public void add_member(Jid jid, bool online) {
+    public void add_member_with_status(Jid jid, bool online) {
         // HACK:
         // Here we track members based on their names (not jids)
         // Sometimes the same member can be referenced with different jids, for example:
@@ -124,6 +123,35 @@ public class List : Box {
         }
     }
 
+    public void add_member(Jid jid) {
+        var row_wrapper = new ListRow(stream_interactor, conversation, jid);
+        var widget = row_wrapper.get_widget();
+
+        string member_name = null;
+        if (jid.resourcepart != null) {
+            member_name = jid.resourcepart;
+        } else {
+            member_name = jid.localpart;
+        }
+
+        if (member_name == null) {
+            return;
+        }
+
+        row_wrappers[widget] = row_wrapper;
+        rows[member_name] = widget;
+        list_box.append(widget);
+    }
+
+    public void remove_member(Jid jid) {
+        var member_name = jid.resourcepart;
+        if (member_name == null) {
+            return;
+        }
+        list_box.remove(rows[member_name]);
+        rows.unset(member_name);
+    }
+
     private void on_received_offline_presence(Jid jid, Account account) {
         if (conversation != null && conversation.counterpart.equals_bare(jid) && jid.is_full()) {
             var member_name = jid.resourcepart;
@@ -139,6 +167,19 @@ public class List : Box {
         }
     }
 
+    private void on_quit_received(Jid jid, Account account) {
+        if (conversation != null && conversation.counterpart.equals_bare(jid) && jid.is_full()) {
+            var member_name = jid.resourcepart;
+            if (member_name == null) {
+                return;
+            }
+            if (rows.has_key(member_name)) {
+                remove_member(jid);
+            }
+            list_box.invalidate_filter();
+        }
+    }
+
     private void on_received_online_presence(Jid jid, Account account) {
         if (conversation != null && conversation.counterpart.equals_bare(jid) && jid.is_full()) {
             var member_name = jid.resourcepart;
@@ -147,7 +188,7 @@ public class List : Box {
             }
 
             if (!rows.has_key(member_name)) {
-                add_member(jid, true);
+                add_member_with_status(jid, true);
             }
 
             row_wrappers[rows[member_name]].set_online();
@@ -156,6 +197,20 @@ public class List : Box {
         }
     }
 
+    private void on_show_received(Jid jid, Account account) {
+        if (conversation != null && conversation.counterpart.equals_bare(jid) && jid.is_full()) {
+            var member_name = jid.resourcepart;
+            if (member_name == null) {
+               return;
+            }
+            if (!rows.has_key(member_name)) {
+                add_member(jid);
+            }
+            list_box.invalidate_filter();
+        }
+    }
+
+
     private void header(ListBoxRow row, ListBoxRow? before_row) {
         ListRow row_wrapper1 = row_wrappers[row.get_child()];
         Xmpp.Xep.Muc.Affiliation? a1 = stream_interactor.get_module(MucManager.IDENTITY).get_affiliation(conversation.counterpart, row_wrapper1.jid, row_wrapper1.conversation.account);

main/src/ui/occupant_menu/list_row.vala

@@ -10,7 +10,6 @@ public class ListRow : Object {
     private Grid main_grid;
     private AvatarPicture picture;
     public Label name_label;
-    public Image status_image;
     public Conversation? conversation;
     public Jid? jid;
 
@@ -19,7 +18,6 @@ public class ListRow : Object {
         main_grid = (Grid) builder.get_object("main_grid");
         picture = (AvatarPicture) builder.get_object("picture");
         name_label = (Label) builder.get_object("name_label");
-        status_image = (Image) builder.get_object("status_image");
         main_grid.set_column_spacing(10);
         main_grid.set_column_homogeneous(false);
         main_grid.set_baseline_row(1);
@@ -43,11 +41,9 @@ public class ListRow : Object {
     }
 
     public void set_online() {
-        status_image.icon_name = "dino-status-online-bright";
     }
 
     public void set_offline() {
-        status_image.icon_name = "dino-status-offline";
     }
 }
 

main/src/ui/settings_dialog.vala

@@ -15,6 +15,7 @@ class SettingsDialog : Adw.PreferencesWindow {
     [GtkChild] private unowned CheckButton encryption_radio_openpgp;
     [GtkChild] private unowned Switch send_button_switch;
     [GtkChild] private unowned Switch enter_newline_switch;
+    [GtkChild] private unowned Switch dark_theme;
 
     Dino.Entities.Settings settings = Dino.Application.get_default().settings;
 
@@ -32,6 +33,7 @@ class SettingsDialog : Adw.PreferencesWindow {
         send_button_switch.active = settings.send_button;
         enter_newline_switch.active = settings.enter_newline;
         enter_newline_switch.sensitive = settings.send_button;
+        dark_theme.active = settings.dark_theme;
 
         typing_switch.notify["active"].connect(() => { settings.send_typing = typing_switch.active; } );
         marker_switch.notify["active"].connect(() => { settings.send_marker = marker_switch.active; } );
@@ -65,6 +67,7 @@ class SettingsDialog : Adw.PreferencesWindow {
                 enter_newline_switch.active = visible;
             }
         });
+        dark_theme.notify["active"].connect(() => { settings.dark_theme = dark_theme.active; });
     }
 }
 

meson.build

@@ -58,6 +58,8 @@ else
     libsoup_version = '3.0'
 endif
 
+cc = meson.get_compiler('c')
+
 dep_gdk_pixbuf = dependency('gdk-pixbuf-2.0')
 dep_gee = dependency('gee-0.8')
 dep_gio = dependency('gio-2.0')
@@ -81,9 +83,12 @@ dep_libsrtp2 = dependency('libsrtp2', disabler: true, required: plugin_crypto)
 dep_libsignal_protocol_c = dependency('libsignal-protocol-c', version: ['>=2.3.2', '<2.3.4'], disabler: true, required: get_option('plugin-omemo'))
 dep_libsoup = dependency('libsoup-@0@'.format(libsoup_version), disabler: true, required: get_option('plugin-http-files'))
 dep_nice = dependency('nice', version: '>=0.1.15', disabler: true, required: get_option('plugin-ice'))
-dep_m = meson.get_compiler('c').find_library('m', required: false)
+dep_m = cc.find_library('m', required: false)
 dep_sqlite3 = dependency('sqlite3', version: '>=3.24')
-dep_webrtc_audio_processing = dependency('webrtc-audio-processing', version: ['>=0.2', '<0.4'], required: get_option('plugin-rtp-webrtc-audio-processing'))
+
+dep_gstreamer_bad = dependency('gstreamer-plugins-bad-1.0', disabler: true, required: get_option('plugin-rtp-webrtc-audio-processing'))
+gstpluginsdir = dep_gstreamer_bad.get_variable('pluginsdir')
+dep_webrtcdsp = cc.find_library('gstwebrtcdsp', dirs: gstpluginsdir, disabler: true, required: get_option('plugin-rtp-webrtc-audio-processing'))
 
 prog_git = find_program('git', required: false)
 prog_python = python.find_installation()

meson_options.txt

@@ -16,3 +16,4 @@ option('plugin-rtp-vp9', type: 'feature', value: 'disabled', description: 'VP9 c
 option('plugin-rtp-webrtc-audio-processing', type: 'feature', description: 'Voice preprocessing')
 
 option('use-soup2', type: 'boolean', value: false, description: 'Use libsoup version 2 instead of 3')
+option('with-wasapi', type: 'boolean', value: true, description: 'Use wasapi insted of directsound on windows')

plugins/http-files/src/file_sender.vala

@@ -103,6 +103,18 @@ public class HttpFileSender : FileSender, Object {
         put_message.wrote_headers.connect(() => transfer_more_bytes(file_transfer.input_stream, put_message.request_body));
         put_message.wrote_chunk.connect(() => transfer_more_bytes(file_transfer.input_stream, put_message.request_body));
 #endif
+
+        file_transfer.transferred_bytes = 0;
+        put_message.wrote_body_data.connect((chunk) => {
+            if (file_transfer.size != 0) {
+#if SOUP_3_0
+                file_transfer.transferred_bytes += chunk;
+#else
+                file_transfer.transferred_bytes += chunk.length;
+#endif
+            }
+        });
+
         foreach (var entry in file_send_data.headers.entries) {
             put_message.request_headers.append(entry.key, entry.value);
         }

plugins/ice/src/plugin.vala

@@ -6,6 +6,21 @@ using Xmpp.Xep;
 private extern const size_t NICE_ADDRESS_STRING_LEN;
 
 public class Dino.Plugins.Ice.Plugin : RootInterface, Object {
+    private const int64 delay_min = 300; // 10mn
+    private const int64 delay_max = (int64) uint.MAX;
+
+    private class TimerPayload {
+        public Account account { get; set; }
+        public uint timeout_handle_id;
+
+        public TimerPayload(Account account, uint timeout_handle_id) {
+            this.account = account;
+            this.timeout_handle_id = timeout_handle_id;
+        }
+    }
+
+    private HashMap<XmppStream, TimerPayload> timeouts = new HashMap<XmppStream, TimerPayload>(XmppStream.hash_func, XmppStream.equals_func);
+
     public Dino.Application app;
 
     public void registered(Dino.Application app) {
@@ -22,10 +37,10 @@ public class Dino.Plugins.Ice.Plugin : RootInterface, Object {
                 stream.get_module(JingleRawUdp.Module.IDENTITY).set_local_ip_address_handler(get_local_ip_addresses);
             }
         });
-        app.stream_interactor.stream_negotiated.connect(on_stream_negotiated);
+        app.stream_interactor.connection_manager.connection_state_changed.connect(on_connection_state_changed);
     }
 
-    private async void on_stream_negotiated(Account account, XmppStream stream) {
+    private async void external_discovery_refresh_services(Account account, XmppStream stream) {
         Module? ice_udp_module = stream.get_module(JingleIceUdp.Module.IDENTITY) as Module;
         if (ice_udp_module == null) return;
         Gee.List<Xep.ExternalServiceDiscovery.Service> services = yield ExternalServiceDiscovery.request_services(stream);
@@ -45,6 +60,28 @@ public class Dino.Plugins.Ice.Plugin : RootInterface, Object {
                 }
             }
         }
+
+        if (ice_udp_module.turn_service != null) {
+            DateTime? expires = ice_udp_module.turn_service.expires;
+            if (expires != null) {
+                int64 delay = (expires.to_unix() - new DateTime.now_utc().to_unix()) / 2;
+
+                if (delay >= delay_min && delay <= delay_max) {
+                    debug("Next server external service discovery in %lds (because of TURN credentials' expiry time)", (long) delay);
+
+                    uint timeout_handle_id = Timeout.add_seconds((uint) delay, () => {
+                            on_timeout(stream);
+                            return false;
+                        });
+                    timeouts[stream] = new TimerPayload(account, timeout_handle_id);
+                    timeouts[stream].account = account;
+                    timeouts[stream].timeout_handle_id = timeout_handle_id;
+                } else {
+                    warning("Bogus TURN credentials' expiry time (delay value = %ld), *not* planning next service discovery", (long) delay);
+                }
+            }
+        }
+
         if (ice_udp_module.stun_ip == null) {
             InetAddress ip = yield lookup_ipv4_addess("stun.dino.im");
             if (ip == null) return;
@@ -56,6 +93,31 @@ public class Dino.Plugins.Ice.Plugin : RootInterface, Object {
         }
     }
 
+    public void on_timeout(XmppStream stream) {
+        if (!timeouts.has_key(stream)) return;
+        TimerPayload pl = timeouts[stream];
+        timeouts.unset(stream);
+        external_discovery_refresh_services.begin(pl.account, stream);
+    }
+
+    public void on_connection_state_changed(Account account, ConnectionManager.ConnectionState state) {
+        switch(state)
+        {
+            case ConnectionManager.ConnectionState.DISCONNECTED:
+                XmppStream? stream = app.stream_interactor.connection_manager.get_stream(account);
+                if (stream == null) return;
+                if (!timeouts.has_key(stream)) return;
+
+                Source.remove(timeouts[stream].timeout_handle_id);
+                timeouts.unset(stream);
+            break;
+            case ConnectionManager.ConnectionState.CONNECTED:
+                XmppStream? stream = app.stream_interactor.connection_manager.get_stream(account);
+                external_discovery_refresh_services(account, stream);
+            break;
+        }
+    }
+
     public void shutdown() {
         // Nothing to do
     }

plugins/openpgp/po/de.po

@@ -1,9 +1,10 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: dino-openpgp-0.0\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-07 21:31+0100\n"
+"POT-Creation-Date: 2024-06-09 22:16+0200\n"
-"PO-Revision-Date: 2020-04-16 20:11+0000\n"
+"PO-Revision-Date: 2024-06-09 22:39+0200\n"
+"Last-Translator: eerielili \n"
 "Language-Team: German <https://hosted.weblate.org/projects/dino/plugin-"
 "openpgp/de/>\n"
 "Language: de\n"
@@ -11,11 +12,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.0.1-dev\n"
+"X-Generator: Poedit 3.4.2\n"
 
 #: plugins/openpgp/src/account_settings_entry.vala:68
 #: plugins/openpgp/src/account_settings_entry.vala:72
-#: plugins/openpgp/src/account_settings_entry.vala:101
+#: plugins/openpgp/src/account_settings_entry.vala:113
 msgid "Key publishing disabled"
 msgstr "Schlüsselveröffentlichung deaktiviert"
 
@@ -24,18 +25,40 @@ msgid "Error in GnuPG"
 msgstr "Fehler in GnuPG"
 
 #: plugins/openpgp/src/account_settings_entry.vala:72
-msgid "No keys available. Generate one!"
+msgid ""
-msgstr "Keine Schlüssel vorhanden. Erzeuge einen!"
+"No keys available. Generate one or check if your keys aren't expired or "
+"revoked!"
+msgstr ""
+"Keine Schlüssel vorhanden. Erstellen Sie einen oder prüfen Sie,"
+"ob Ihre Schlüssel nicht abgelaufen sind oder widerrufen!"
 
-#: plugins/openpgp/src/account_settings_entry.vala:101
+
+#: plugins/openpgp/src/account_settings_entry.vala:95
+msgid "expired!"
+msgstr "abgelaufen"
+
+#: plugins/openpgp/src/account_settings_entry.vala:95
+msgid "revoked!"
+msgstr "widerrufen!"
+
+#: plugins/openpgp/src/account_settings_entry.vala:96
+msgid "Attention required!"
+msgstr "Achtung!"
+
+#: plugins/openpgp/src/account_settings_entry.vala:96
+#, c-format
+msgid "Your key %s is %s"
+msgstr "Ihr Schlüssel %s is %s"
+
+#: plugins/openpgp/src/account_settings_entry.vala:113
 msgid "Select key"
 msgstr "Wähle einen Schlüssel"
 
-#: plugins/openpgp/src/account_settings_entry.vala:114
+#: plugins/openpgp/src/account_settings_entry.vala:126
 msgid "Loading…"
 msgstr "Lade…"
 
-#: plugins/openpgp/src/account_settings_entry.vala:114
+#: plugins/openpgp/src/account_settings_entry.vala:126
 msgid "Querying GnuPG"
 msgstr "Frage GnuPG ab"
 
@@ -46,6 +69,3 @@ msgstr "Schlüssel nicht im Schlüsselbund"
 #: plugins/openpgp/src/contact_details_provider.vala:30
 msgid "Encryption"
 msgstr "Verschlüsselung"
-
-#~ msgid "OpenPGP"
-#~ msgstr "OpenPGP"

plugins/openpgp/po/dino-openpgp.pot

@@ -1,52 +1,68 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: PACKAGE VERSION+\n"
-"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-06-09 22:16+0200\n"
-"POT-Creation-Date: 2023-02-07 21:31+0100\n"
+"PO-Revision-Date: 2024-06-09 22:18+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: \n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dino+\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: en\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 3.4.2\n"
+"X-Poedit-Basepath: ../src\n"
+"X-Poedit-KeywordsList: _(\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-SearchPath-0: .\n"
 
-#: plugins/openpgp/src/account_settings_entry.vala:68
+#: account_settings_entry.vala:68 account_settings_entry.vala:72
-#: plugins/openpgp/src/account_settings_entry.vala:72
+#: account_settings_entry.vala:113
-#: plugins/openpgp/src/account_settings_entry.vala:101
 msgid "Key publishing disabled"
 msgstr ""
 
-#: plugins/openpgp/src/account_settings_entry.vala:68
+#: account_settings_entry.vala:68
 msgid "Error in GnuPG"
 msgstr ""
 
-#: plugins/openpgp/src/account_settings_entry.vala:72
+#: account_settings_entry.vala:72
-msgid "No keys available. Generate one!"
+msgid ""
+"No keys available. Generate one or check if your keys aren't expired or "
+"revoked!"
 msgstr ""
 
-#: plugins/openpgp/src/account_settings_entry.vala:101
+#: account_settings_entry.vala:95
+msgid "expired!"
+msgstr ""
+
+#: account_settings_entry.vala:95
+msgid "revoked!"
+msgstr ""
+
+#: account_settings_entry.vala:96
+msgid "Attention required!"
+msgstr ""
+
+#: account_settings_entry.vala:96
+#, c-format
+msgid "Your key %s is %s"
+msgstr ""
+
+#: account_settings_entry.vala:113
 msgid "Select key"
 msgstr ""
 
-#: plugins/openpgp/src/account_settings_entry.vala:114
+#: account_settings_entry.vala:126
 msgid "Loading…"
 msgstr ""
 
-#: plugins/openpgp/src/account_settings_entry.vala:114
+#: account_settings_entry.vala:126
 msgid "Querying GnuPG"
 msgstr ""
 
-#: plugins/openpgp/src/contact_details_provider.vala:28
+#: contact_details_provider.vala:28
 msgid "Key not in keychain"
 msgstr ""
 
-#: plugins/openpgp/src/contact_details_provider.vala:30
+#: contact_details_provider.vala:30
 msgid "Encryption"
 msgstr ""

plugins/openpgp/po/en.po

@@ -20,7 +20,7 @@ msgstr ""
 
 #: plugins/openpgp/src/account_settings_entry.vala:72
 msgid "No keys available. Generate one!"
-msgstr ""
+msgstr "No keys available. Generate one or check if your keys aren't expired or revoked!"
 
 #: plugins/openpgp/src/account_settings_entry.vala:101
 msgid "Select key"

plugins/openpgp/po/fr.po

@@ -7,8 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-07 21:31+0100\n"
+"POT-Creation-Date: 2024-06-09 22:16+0200\n"
-"PO-Revision-Date: 2020-11-12 17:21+0000\n"
+"PO-Revision-Date: 2024-06-09 22:22+0200\n"
+"Last-Translator: \n"
 "Language-Team: French <https://hosted.weblate.org/projects/dino/plugin-"
 "openpgp/fr/>\n"
 "Language: fr\n"
@@ -16,11 +17,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.4-dev\n"
+"X-Generator: Poedit 3.4.2\n"
 
 #: plugins/openpgp/src/account_settings_entry.vala:68
 #: plugins/openpgp/src/account_settings_entry.vala:72
-#: plugins/openpgp/src/account_settings_entry.vala:101
+#: plugins/openpgp/src/account_settings_entry.vala:113
 msgid "Key publishing disabled"
 msgstr "La publication des clés est désactivée"
 
@@ -29,18 +30,39 @@ msgid "Error in GnuPG"
 msgstr "Erreur dans GnuPG"
 
 #: plugins/openpgp/src/account_settings_entry.vala:72
-msgid "No keys available. Generate one!"
+msgid ""
-msgstr "Aucune clé n’est disponible. Générez-en une !"
+"No keys available. Generate one or check if your keys aren't expired or "
+"revoked!"
+msgstr ""
+"Pas de clés disponibles. Générez-en une nouvelle ou vérifier si vos "
+"clés ne seraient pas expirées ou révoquées!"
 
-#: plugins/openpgp/src/account_settings_entry.vala:101
+#: plugins/openpgp/src/account_settings_entry.vala:95
+msgid "expired!"
+msgstr "expirée!"
+
+#: plugins/openpgp/src/account_settings_entry.vala:95
+msgid "revoked!"
+msgstr "révoquée!"
+
+#: plugins/openpgp/src/account_settings_entry.vala:96
+msgid "Attention required!"
+msgstr "Attention requise!"
+
+#: plugins/openpgp/src/account_settings_entry.vala:96
+#, c-format
+msgid "Your key %s is %s"
+msgstr "Votre clé %s est %s"
+
+#: plugins/openpgp/src/account_settings_entry.vala:113
 msgid "Select key"
 msgstr "Choix d’une clé"
 
-#: plugins/openpgp/src/account_settings_entry.vala:114
+#: plugins/openpgp/src/account_settings_entry.vala:126
 msgid "Loading…"
 msgstr "Chargement…"
 
-#: plugins/openpgp/src/account_settings_entry.vala:114
+#: plugins/openpgp/src/account_settings_entry.vala:126
 msgid "Querying GnuPG"
 msgstr "Interrogation de GnuPG"
 

plugins/openpgp/po/ru.po

@@ -7,8 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-07 21:31+0100\n"
+"POT-Creation-Date: 2024-06-09 22:16+0200\n"
-"PO-Revision-Date: 2020-06-02 11:41+0000\n"
+"PO-Revision-Date: 2024-06-09 22:39+0200\n"
+"Last-Translator: eerielili\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/dino/plugin-"
 "openpgp/ru/>\n"
 "Language: ru\n"
@@ -17,11 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.1-dev\n"
+"X-Generator: Poedit 3.4.2\n"
 
 #: plugins/openpgp/src/account_settings_entry.vala:68
 #: plugins/openpgp/src/account_settings_entry.vala:72
-#: plugins/openpgp/src/account_settings_entry.vala:101
+#: plugins/openpgp/src/account_settings_entry.vala:113
 msgid "Key publishing disabled"
 msgstr "Публикация ключа отключена"
 
@@ -30,18 +31,37 @@ msgid "Error in GnuPG"
 msgstr "Ошибка в GnuPG"
 
 #: plugins/openpgp/src/account_settings_entry.vala:72
-msgid "No keys available. Generate one!"
+msgid ""
-msgstr "Нет доступных ключей. Стоило бы сгенерировать один!"
+"No keys available. Generate one or check if your keys aren't expired or "
+"revoked!"
+msgstr "Нет доступных ключей. Создайте как минимум один, либо проверьте что уже существующие (ранее созданные) ключи не были отозваны или срок их действия не закончился!"
 
-#: plugins/openpgp/src/account_settings_entry.vala:101
+#: plugins/openpgp/src/account_settings_entry.vala:95
+msgid "expired!"
+msgstr "истёк!"
+
+#: plugins/openpgp/src/account_settings_entry.vala:95
+msgid "revoked!"
+msgstr "отозван!"
+
+#: plugins/openpgp/src/account_settings_entry.vala:96
+msgid "Attention required!"
+msgstr "внимание!"
+
+#: plugins/openpgp/src/account_settings_entry.vala:96
+#, c-format
+msgid "Your key %s is %s"
+msgstr "Ваш ключ %s %s"
+
+#: plugins/openpgp/src/account_settings_entry.vala:113
 msgid "Select key"
 msgstr "Выбрать ключ"
 
-#: plugins/openpgp/src/account_settings_entry.vala:114
+#: plugins/openpgp/src/account_settings_entry.vala:126
 msgid "Loading…"
 msgstr "Загрузка…"
 
-#: plugins/openpgp/src/account_settings_entry.vala:114
+#: plugins/openpgp/src/account_settings_entry.vala:126
 msgid "Querying GnuPG"
 msgstr "Запрос GnuPG"
 

plugins/openpgp/src/account_settings_entry.vala

@@ -69,7 +69,7 @@ public class AccountSettingsEntry : Plugins.AccountSettingsEntry {
             return;
         }
         if (keys.size == 0) {
-            label.set_markup(build_markup_string(_("Key publishing disabled"), _("No keys available. Generate one!")));
+            label.set_markup(build_markup_string(_("Key publishing disabled"), _("No keys available. Generate one or check if your keys aren't expired or revoked!")));
             return;
         }
 
@@ -88,6 +88,18 @@ public class AccountSettingsEntry : Plugins.AccountSettingsEntry {
         set_label_active(selected);
 
         combobox.changed.connect(key_changed);
+        if (account_key != null) {
+            try {
+                GPG.Key key_check = GPGHelper.get_public_key(account_key);
+                if(key_check.expired || key_check.revoked) {
+                    string status_str = key_check.expired ? _("expired!") : _("revoked!");
+                    label.set_markup(build_markup_string(_("Attention required!"), _("Your key %s is %s").printf("<span color='red'><b>"+ key_check.fpr +"</b></span>", status_str) ) );
+                }
+            }
+            catch {
+                debug("Coudn't check GPG key status.");
+            }
+        }
     }
 
     private void populate_list_store() {

plugins/openpgp/src/encryption_list_entry.vala

@@ -40,6 +40,16 @@ private class EncryptionListEntry : Plugins.EncryptionListEntry, Object {
             return;
         }
 
+        GPG.Key key_check = GPGHelper.get_public_key(db.get_account_key(conversation.account));
+        if (key_check.expired || key_check.revoked) {
+            string status_str = key_check.expired ? " has expired." : " has been revoked.";
+            debug("GPG public key %s is NOT fine for encryption: it %s.\n", key_check.fpr, status_str);
+            input_status_callback(new Plugins.InputFieldStatus("Your GPG key " + key_check.fpr + status_str,
+                                                               Plugins.InputFieldStatus.MessageType.ERROR,
+                                                               Plugins.InputFieldStatus.InputState.NO_SEND));
+            return;
+        }
+
         if (conversation.type_ == Conversation.Type.CHAT) {
             string? key_id = stream_interactor.get_module(Manager.IDENTITY).get_key_id(conversation.account, conversation.counterpart);
             if (key_id == null) {

plugins/openpgp/src/gpgme_helper.vala

@@ -112,7 +112,12 @@ public static Gee.List<Key> get_keylist(string? pattern = null, bool secret_only
         try {
             while (true) {
                 Key key = context.op_keylist_next();
+                if (!key.expired && !key.revoked) {
+                    debug("PGP Key " + key.fpr + " is valid!");
                     keys.add(key);
+                } else {
+                    debug("PGP Key " + key.fpr + " is either expired or revoked!");
+                }
             }
         } catch (Error e) {
             if (e.code != GPGError.ErrorCode.EOF) throw e;

plugins/openpgp/vapi/gpgme.vapi

@@ -55,9 +55,9 @@ namespace GPG {
         public string issuer_name;
         public string chain_id;
         public Validity owner_trust;
-        [CCode(array_null_terminated = true)]
+        [CCode(array_length = false, array_null_terminated = true)]
         public SubKey[] subkeys;
-        [CCode(array_null_terminated = true)]
+        [CCode(array_length = false, array_null_terminated = true)]
         public UserID[] uids;
         public KeylistMode keylist_mode;
         public string fpr { get { return subkeys[0].fpr; } }

plugins/rtp/CMakeLists.txt

@@ -1,5 +1,13 @@
 find_package(GLib ${GLib_GLOBAL_VERSION} REQUIRED)
-find_package(WebRTCAudioProcessing 0.2)
+
+set(RTP_DEFINITIONS)
+set(RTP_EXTRA_OPTIONS)
+
+if(PLUGIN_RTP_WEBRTC_AUDIO_PROCESSING)
+    set(EXTRA_RTP_PACKAGES GstWebrtcDsp)
+    list(APPEND RTP_DEFINITIONS WITH_VOICE_PROCESSOR)
+endif()
+
 find_packages(RTP_PACKAGES REQUIRED
     Gee
     GLib
@@ -11,11 +19,9 @@ find_packages(RTP_PACKAGES REQUIRED
     GstAudio
     GstRtp
     GstVideo
+    ${EXTRA_RTP_PACKAGES}
 )
 
-set(RTP_DEFINITIONS)
-set(RTP_EXTRA_OPTIONS)
-
 if(GstRtp_VERSION VERSION_GREATER_EQUAL "1.16")
     set(RTP_DEFINITIONS ${RTP_DEFINITIONS} GST_1_16)
 endif()
@@ -52,18 +58,8 @@ if(RTP_ENABLE_MSDK)
     set(RTP_DEFINITIONS ${RTP_DEFINITIONS} ENABLE_MSDK)
 endif()
 
-if(WebRTCAudioProcessing_VERSION GREATER "0.4")
+if(WIN32 AND WITH_WASAPI)
-    message(STATUS "Ignoring WebRTCAudioProcessing, only versions < 0.4 supported so far")
+    list(APPEND RTP_DEFINITIONS WITH_WASAPI)
-    unset(WebRTCAudioProcessing_FOUND)
-endif()
-
-if(WebRTCAudioProcessing_FOUND)
-    set(RTP_DEFINITIONS ${RTP_DEFINITIONS} WITH_VOICE_PROCESSOR)
-    set(RTP_VOICE_PROCESSOR_VALA src/voice_processor.vala)
-    set(RTP_VOICE_PROCESSOR_CXX src/voice_processor_native.cpp)
-    set(RTP_VOICE_PROCESSOR_LIB webrtc-audio-processing)
-else()
-    message(STATUS "WebRTCAudioProcessing not found, build without voice pre-processing!")
 endif()
 
 vala_precompile(RTP_VALA_C

plugins/rtp/meson.build

@@ -30,12 +30,8 @@ c_args = [
 vala_args = [
     '--vapidir', meson.current_source_dir() / 'vapi',
 ]
-if dep_webrtc_audio_processing.found()
+if dep_webrtcdsp.found()
-    dependencies += [dep_webrtc_audio_processing]
+    dependencies += [dep_webrtcdsp]
-    sources += files(
-        'src/voice_processor.vala',
-        'src/voice_processor_native.cpp',
-    )
     vala_args += ['-D', 'WITH_VOICE_PROCESSOR']
 endif
 if dep_gstreamer_rtp.version() == 'unknown' or dep_gstreamer_rtp.version().version_compare('>=1.16')
@@ -59,5 +55,8 @@ endif
 if get_option('plugin-rtp-vp9').allowed()
     vala_args += ['-D', 'ENABLE_VP9']
 endif
+if host_machine.system() == 'windows' and get_option('with-wasapi')
+    vala_args += ['-D', 'WITH_WASAPI']
+endif
 lib_rtp = shared_library('rtp', sources, name_prefix: '', c_args: c_args, vala_args: vala_args, include_directories: include_directories('src'), dependencies: dependencies, kwargs: install_options)
 dep_rtp = declare_dependency(link_with: lib_rtp, include_directories: include_directories('.'))

plugins/rtp/src/device.vala

@@ -55,12 +55,12 @@ public class Dino.Plugins.Rtp.Device : MediaDevice, Object {
     private string device_name;
     private string device_display_name;
 
-    private Gst.Caps device_caps;
+    private Gst.Caps device_caps = null;
-    private Gst.Element element;
+    private Gst.Element element = null;
-    private Gst.Element tee;
+    private Gst.Element tee = null;
-    private Gst.Element dsp;
+    private Gst.Element dsp = null;
-    private Gst.Base.Aggregator mixer;
+    private Gst.Base.Aggregator mixer = null;
-    private Gst.Element filter;
+    private Gst.Element filter = null;
     private int links;
 
     // Codecs
@@ -348,9 +348,46 @@ public class Dino.Plugins.Rtp.Device : MediaDevice, Object {
         }
     }
 
+    private Gst.Caps get_best_audio_caps() {
+        // Choose caps based on the highest rate
+        int best_index = -1;
+        int best_rate = 0;
+        for (int i = 0; i < device.caps.get_size(); i++) {
+            unowned Gst.Structure? structure = device.caps.get_structure(i);
+            if (structure == null) {
+                continue;
+            }
+
+            if (!structure.has_field("rate")) {
+                continue;
+            }
+
+            int rate = 0;
+            if (!structure.get_int("rate", out rate)) {
+                continue;
+            }
+
+            if (rate > best_rate) {
+                best_rate = rate;
+                best_index = i;
+            }
+        }
+
+        if (best_index != -1) {
+            Gst.Caps caps = caps_copy_nth(device.caps, best_index);
+            info("Selected Audio Caps: %s", caps.to_string());
+            return caps;
+        }
+
+        // Default Caps
+        string default_caps = "audio/x-raw,rate=48000,channels=1";
+        info("Selected Default Audio Caps: %s", default_caps);
+        return Gst.Caps.from_string(default_caps);
+    }
+
     private Gst.Caps get_best_caps() {
         if (media == "audio") {
-            return Gst.Caps.from_string("audio/x-raw,rate=48000,channels=1");
+            return get_best_audio_caps();
         } else if (media == "video" && device.caps.get_size() > 0) {
             int best_index = -1;
             Value? best_fraction = null;
@@ -433,6 +470,29 @@ public class Dino.Plugins.Rtp.Device : MediaDevice, Object {
         return target;
     }
 
+#if WITH_VOICE_PROCESSOR
+    private Gst.Element create_voice_processor() {
+        Gst.Bin bin = new Gst.Bin("voiceprocessorbin");
+        Gst.Element converter = Gst.ElementFactory.make("audioconvert", @"dsp_convert_$id");
+        Gst.Element resampler = Gst.ElementFactory.make("audioresample", @"dsp_resmaple_$id");
+        Gst.Element voiceproc = Gst.ElementFactory.make("webrtcdsp", @"dsp_$id");
+
+        bin.add_many(converter, resampler, voiceproc);
+        converter.link(resampler);
+        resampler.link(voiceproc);
+        voiceproc.@set("probe", "webrtcechoprobe0");
+
+        Gst.Pad sink_pad = bin.find_unlinked_pad(Gst.PadDirection.SINK);
+        Gst.Pad src_pad = bin.find_unlinked_pad(Gst.PadDirection.SRC);
+        Gst.Pad ghost_source = new Gst.GhostPad("source", src_pad);
+        Gst.Pad ghost_sink = new Gst.GhostPad("sink", sink_pad);
+        bin.add_pad(ghost_source);
+        bin.add_pad(ghost_sink);
+
+        return (Gst.Element)bin;
+    }
+#endif
+
     private void create() {
         debug("Creating device %s", id);
         plugin.pause();
@@ -451,8 +511,7 @@ public class Dino.Plugins.Rtp.Device : MediaDevice, Object {
             element.link(filter);
 #if WITH_VOICE_PROCESSOR
             if (media == "audio" && plugin.echoprobe != null) {
-                dsp = new VoiceProcessor(plugin.echoprobe as EchoProbe, element as Gst.Audio.StreamVolume);
+                dsp = create_voice_processor();
-                dsp.name = @"dsp_$id";
                 pipe.add(dsp);
                 filter.link(dsp);
             }

plugins/rtp/src/plugin.vala

@@ -42,6 +42,19 @@ public class Dino.Plugins.Rtp.Plugin : RootInterface, VideoCallPlugin, Object {
         if (pause_count < 0) warning("Pause count below zero!");
     }
 
+    private bool is_skipped(Gst.Device device) {
+        bool is_noprops = device.properties == null;
+#if WITH_WASAPI
+        bool is_disabled_sound = device.properties.get_string("device.api") == "directsound";
+#else
+        bool is_disabled_sound = device.properties.get_string("device.api") == "wasapi";
+#endif
+        bool is_proplist = device.properties.has_name("pipewire-proplist") && device.has_classes("Audio");
+        bool is_monitor = device.properties.get_string("device.class") == "monitor";
+        bool is_in_devices = devices.any_match((it) => it.matches(device));
+        return is_noprops || is_disabled_sound || is_proplist || is_monitor || is_in_devices;
+    }
+
     private void init_device_monitor() {
         if (device_monitor != null) return;
         device_monitor = new Gst.DeviceMonitor();
@@ -49,15 +62,34 @@ public class Dino.Plugins.Rtp.Plugin : RootInterface, VideoCallPlugin, Object {
         device_monitor.get_bus().add_watch(Priority.DEFAULT, on_device_monitor_message);
         device_monitor.start();
         foreach (Gst.Device device in device_monitor.get_devices()) {
-            if (device.properties == null) continue;
+            if (is_skipped(device)) continue;
-            if (device.properties.get_string("device.api") == "wasapi") continue;
+            debug(@"(Init) Add name=$(device.name) device=$(device.display_name)");
-            if (device.properties.has_name("pipewire-proplist") && device.has_classes("Audio")) continue;
-            if (device.properties.get_string("device.class") == "monitor") continue;
-            if (devices.any_match((it) => it.matches(device))) continue;
             devices.add(new Device(this, device));
         }
     }
 
+#if WITH_VOICE_PROCESSOR
+    private Gst.Element create_echo_probe() {
+        Gst.Bin bin = new Gst.Bin("echoprobebin");
+        Gst.Element converter = Gst.ElementFactory.make("audioconvert", "echo_convert_");
+        Gst.Element resampler = Gst.ElementFactory.make("audioresample", "echo_resample_");
+        Gst.Element webrtcechoprobe = Gst.ElementFactory.make("webrtcechoprobe", "webrtcechoprobe0");
+
+        bin.add_many(webrtcechoprobe, converter, resampler);
+        webrtcechoprobe.link(converter);
+        converter.link(resampler);
+
+        Gst.Pad sink_pad = bin.find_unlinked_pad(Gst.PadDirection.SINK);
+        Gst.Pad src_pad = bin.find_unlinked_pad(Gst.PadDirection.SRC);
+        Gst.Pad ghost_source = new Gst.GhostPad("source", src_pad);
+        Gst.Pad ghost_sink = new Gst.GhostPad("sink", sink_pad);
+        bin.add_pad(ghost_source);
+        bin.add_pad(ghost_sink);
+
+        return (Gst.Element)bin;
+    }
+#endif
+
     private void init_call_pipe() {
         if (pipe != null) return;
         pipe = new Gst.Pipeline(null);
@@ -79,8 +111,8 @@ public class Dino.Plugins.Rtp.Plugin : RootInterface, VideoCallPlugin, Object {
 
 #if WITH_VOICE_PROCESSOR
         // Audio echo probe
-        echoprobe = new EchoProbe();
+        echoprobe = create_echo_probe();
-        if (echoprobe != null) pipe.add(echoprobe);
+        pipe.add(echoprobe);
 #endif
 
         // Pipeline
@@ -205,20 +237,23 @@ public class Dino.Plugins.Rtp.Plugin : RootInterface, VideoCallPlugin, Object {
         switch (message.type) {
             case Gst.MessageType.DEVICE_ADDED:
                 message.parse_device_added(out gst_device);
-                if (devices.any_match((it) => it.matches(gst_device))) return Source.CONTINUE;
+                if (is_skipped(gst_device)) return Source.CONTINUE;
                 device = new Device(this, gst_device);
+                debug(@"(Notify) Add name=$(gst_device.name) device=$(gst_device.display_name)");
                 devices.add(device);
                 break;
 #if GST_1_16
             case Gst.MessageType.DEVICE_CHANGED:
                 message.parse_device_changed(out gst_device, out old_gst_device);
                 device = devices.first_match((it) => it.matches(old_gst_device));
+                debug(@"(Notify) Change name=$(gst_device.name) device=$(gst_device.display_name)");
                 if (device != null) device.update(gst_device);
                 break;
 #endif
             case Gst.MessageType.DEVICE_REMOVED:
                 message.parse_device_removed(out gst_device);
                 device = devices.first_match((it) => it.matches(gst_device));
+                debug(@"(Notify) Remove name=$(gst_device.name) device=$(gst_device.display_name)");
                 if (device != null) devices.remove(device);
                 break;
             default:

plugins/rtp/src/voice_processor.vala

@@ -1,176 +0,0 @@
-using Gst;
-
-namespace Dino.Plugins.Rtp {
-public static extern Buffer adjust_to_running_time(Base.Transform transform, Buffer buf);
-}
-
-public class Dino.Plugins.Rtp.EchoProbe : Audio.Filter {
-    private static StaticPadTemplate sink_template = {"sink", PadDirection.SINK, PadPresence.ALWAYS, {null, "audio/x-raw,rate=48000,channels=1,layout=interleaved,format=S16LE"}};
-    private static StaticPadTemplate src_template = {"src", PadDirection.SRC, PadPresence.ALWAYS, {null, "audio/x-raw,rate=48000,channels=1,layout=interleaved,format=S16LE"}};
-    public Audio.Info audio_info { get; private set; }
-    public signal void on_new_buffer(Buffer buffer);
-    private uint period_samples;
-    private uint period_size;
-    private Base.Adapter adapter = new Base.Adapter();
-
-    static construct {
-        add_static_pad_template(sink_template);
-        add_static_pad_template(src_template);
-        set_static_metadata("Acoustic Echo Canceller probe", "Generic/Audio", "Gathers playback buffers for echo cancellation", "Dino Team <contact@dino.im>");
-    }
-
-    construct {
-        set_passthrough(true);
-    }
-
-    public override bool setup(Audio.Info info) {
-        audio_info = info;
-        period_samples = info.rate / 100; // 10ms buffers
-        period_size = period_samples * info.bpf;
-        return true;
-    }
-
-
-    public override FlowReturn transform_ip(Buffer buf) {
-        lock (adapter) {
-            adapter.push(adjust_to_running_time(this, buf));
-            while (adapter.available() > period_size) {
-                on_new_buffer(adapter.take_buffer(period_size));
-            }
-        }
-        return FlowReturn.OK;
-    }
-
-    public override bool stop() {
-        adapter.clear();
-        return true;
-    }
-}
-
-public class Dino.Plugins.Rtp.VoiceProcessor : Audio.Filter {
-    private static StaticPadTemplate sink_template = {"sink", PadDirection.SINK, PadPresence.ALWAYS, {null, "audio/x-raw,rate=48000,channels=1,layout=interleaved,format=S16LE"}};
-    private static StaticPadTemplate src_template = {"src", PadDirection.SRC, PadPresence.ALWAYS, {null, "audio/x-raw,rate=48000,channels=1,layout=interleaved,format=S16LE"}};
-    public Audio.Info audio_info { get; private set; }
-    private ulong process_outgoing_buffer_handler_id;
-    private uint adjust_delay_timeout_id;
-    private uint period_samples;
-    private uint period_size;
-    private Base.Adapter adapter = new Base.Adapter();
-    private EchoProbe? echo_probe;
-    private Audio.StreamVolume? stream_volume;
-    private ClockTime last_reverse;
-    private void* native;
-
-    static construct {
-        add_static_pad_template(sink_template);
-        add_static_pad_template(src_template);
-        set_static_metadata("Voice Processor (AGC, AEC, filters, etc.)", "Generic/Audio", "Pre-processes voice with WebRTC Audio Processing Library", "Dino Team <contact@dino.im>");
-    }
-
-    construct {
-        set_passthrough(false);
-    }
-
-    public VoiceProcessor(EchoProbe? echo_probe = null, Audio.StreamVolume? stream_volume = null) {
-        this.echo_probe = echo_probe;
-        this.stream_volume = stream_volume;
-    }
-
-    private static extern void* init_native(int stream_delay);
-    private static extern void setup_native(void* native);
-    private static extern void destroy_native(void* native);
-    private static extern void analyze_reverse_stream(void* native, Audio.Info info, Buffer buffer);
-    private static extern void process_stream(void* native, Audio.Info info, Buffer buffer);
-    private static extern void adjust_stream_delay(void* native);
-    private static extern void notify_gain_level(void* native, int gain_level);
-    private static extern int get_suggested_gain_level(void* native);
-    private static extern bool get_stream_has_voice(void* native);
-
-    public override bool setup(Audio.Info info) {
-        debug("VoiceProcessor.setup(%s)", info.to_caps().to_string());
-        audio_info = info;
-        period_samples = info.rate / 100; // 10ms buffers
-        period_size = period_samples * info.bpf;
-        adapter.clear();
-        setup_native(native);
-        return true;
-    }
-
-    public override bool start() {
-        native = init_native(150);
-        if (process_outgoing_buffer_handler_id == 0 && echo_probe != null) {
-            process_outgoing_buffer_handler_id = echo_probe.on_new_buffer.connect(process_outgoing_buffer);
-        }
-        if (stream_volume == null && sinkpad.get_peer() != null && sinkpad.get_peer().get_parent_element() is Audio.StreamVolume) {
-            stream_volume = sinkpad.get_peer().get_parent_element() as Audio.StreamVolume;
-        }
-        return true;
-    }
-
-    private bool adjust_delay() {
-        if (native != null) {
-            adjust_stream_delay(native);
-            return Source.CONTINUE;
-        } else {
-            adjust_delay_timeout_id = 0;
-            return Source.REMOVE;
-        }
-    }
-
-    private void process_outgoing_buffer(Buffer buffer) {
-        if (buffer.pts != uint64.MAX) {
-            last_reverse = buffer.pts;
-        }
-        analyze_reverse_stream(native, echo_probe.audio_info, buffer);
-        if (adjust_delay_timeout_id == 0 && echo_probe != null) {
-            adjust_delay_timeout_id = Timeout.add(1000, adjust_delay);
-        }
-    }
-
-    public override FlowReturn submit_input_buffer(bool is_discont, Buffer input) {
-        lock (adapter) {
-            if (is_discont) {
-                adapter.clear();
-            }
-            adapter.push(adjust_to_running_time(this, input));
-        }
-        return FlowReturn.OK;
-    }
-
-    public override FlowReturn generate_output(out Buffer output_buffer) {
-        lock (adapter) {
-            if (adapter.available() >= period_size) {
-                output_buffer = (Gst.Buffer) adapter.take_buffer(period_size).make_writable();
-                int old_gain_level = 0;
-                if (stream_volume != null) {
-                    old_gain_level = (int) (stream_volume.get_volume(Audio.StreamVolumeFormat.LINEAR) * 255.0);
-                    notify_gain_level(native, old_gain_level);
-                }
-                process_stream(native, audio_info, output_buffer);
-                if (stream_volume != null) {
-                    int new_gain_level = get_suggested_gain_level(native);
-                    if (old_gain_level != new_gain_level) {
-                        debug("Gain: %i -> %i", old_gain_level, new_gain_level);
-                        stream_volume.set_volume(Audio.StreamVolumeFormat.LINEAR, ((double)new_gain_level) / 255.0);
-                    }
-                }
-            }
-        }
-        return FlowReturn.OK;
-    }
-
-    public override bool stop() {
-        if (process_outgoing_buffer_handler_id != 0) {
-            echo_probe.disconnect(process_outgoing_buffer_handler_id);
-            process_outgoing_buffer_handler_id = 0;
-        }
-        if (adjust_delay_timeout_id != 0) {
-            Source.remove(adjust_delay_timeout_id);
-            adjust_delay_timeout_id = 0;
-        }
-        adapter.clear();
-        destroy_native(native);
-        native = null;
-        return true;
-    }
-}

plugins/rtp/src/voice_processor_native.cpp

@@ -1,148 +0,0 @@
-#include <algorithm>
-#include <gst/gst.h>
-#include <gst/audio/audio.h>
-#include <webrtc/modules/audio_processing/include/audio_processing.h>
-#include <webrtc/modules/interface/module_common_types.h>
-#include <webrtc/system_wrappers/include/trace.h>
-
-#define SAMPLE_RATE 48000
-#define SAMPLE_CHANNELS 1
-
-struct _DinoPluginsRtpVoiceProcessorNative {
-    webrtc::AudioProcessing *apm;
-    gint stream_delay;
-    gint last_median;
-    gint last_poor_delays;
-};
-
-extern "C" void *dino_plugins_rtp_adjust_to_running_time(GstBaseTransform *transform, GstBuffer *buffer) {
-    GstBuffer *copy = gst_buffer_copy(buffer);
-    GST_BUFFER_PTS(copy) = gst_segment_to_running_time(&transform->segment, GST_FORMAT_TIME, GST_BUFFER_PTS(buffer));
-    return copy;
-}
-
-extern "C" void *dino_plugins_rtp_voice_processor_init_native(gint stream_delay) {
-    _DinoPluginsRtpVoiceProcessorNative *native = new _DinoPluginsRtpVoiceProcessorNative();
-    webrtc::Config config;
-    config.Set<webrtc::ExtendedFilter>(new webrtc::ExtendedFilter(true));
-    config.Set<webrtc::ExperimentalAgc>(new webrtc::ExperimentalAgc(true, 85));
-    native->apm = webrtc::AudioProcessing::Create(config);
-    native->stream_delay = stream_delay;
-    native->last_median = 0;
-    native->last_poor_delays = 0;
-    return native;
-}
-
-extern "C" void dino_plugins_rtp_voice_processor_setup_native(void *native_ptr) {
-    _DinoPluginsRtpVoiceProcessorNative *native = (_DinoPluginsRtpVoiceProcessorNative *) native_ptr;
-    webrtc::AudioProcessing *apm = native->apm;
-    webrtc::ProcessingConfig pconfig;
-    pconfig.streams[webrtc::ProcessingConfig::kInputStream] =
-            webrtc::StreamConfig(SAMPLE_RATE, SAMPLE_CHANNELS, false);
-    pconfig.streams[webrtc::ProcessingConfig::kOutputStream] =
-            webrtc::StreamConfig(SAMPLE_RATE, SAMPLE_CHANNELS, false);
-    pconfig.streams[webrtc::ProcessingConfig::kReverseInputStream] =
-            webrtc::StreamConfig(SAMPLE_RATE, SAMPLE_CHANNELS, false);
-    pconfig.streams[webrtc::ProcessingConfig::kReverseOutputStream] =
-            webrtc::StreamConfig(SAMPLE_RATE, SAMPLE_CHANNELS, false);
-    apm->Initialize(pconfig);
-    apm->high_pass_filter()->Enable(true);
-    apm->echo_cancellation()->enable_drift_compensation(false);
-    apm->echo_cancellation()->set_suppression_level(webrtc::EchoCancellation::kModerateSuppression);
-    apm->echo_cancellation()->enable_delay_logging(true);
-    apm->echo_cancellation()->Enable(true);
-    apm->noise_suppression()->set_level(webrtc::NoiseSuppression::kModerate);
-    apm->noise_suppression()->Enable(true);
-    apm->gain_control()->set_analog_level_limits(0, 255);
-    apm->gain_control()->set_mode(webrtc::GainControl::kAdaptiveAnalog);
-    apm->gain_control()->set_target_level_dbfs(3);
-    apm->gain_control()->set_compression_gain_db(9);
-    apm->gain_control()->enable_limiter(true);
-    apm->gain_control()->Enable(true);
-    apm->voice_detection()->set_likelihood(webrtc::VoiceDetection::Likelihood::kLowLikelihood);
-    apm->voice_detection()->Enable(true);
-}
-
-extern "C" void
-dino_plugins_rtp_voice_processor_analyze_reverse_stream(void *native_ptr, GstAudioInfo *info, GstBuffer *buffer) {
-    _DinoPluginsRtpVoiceProcessorNative *native = (_DinoPluginsRtpVoiceProcessorNative *) native_ptr;
-    webrtc::StreamConfig config(SAMPLE_RATE, SAMPLE_CHANNELS, false);
-    webrtc::AudioProcessing *apm = native->apm;
-
-    GstMapInfo map;
-    gst_buffer_map(buffer, &map, GST_MAP_READ);
-
-    webrtc::AudioFrame frame;
-    frame.num_channels_ = info->channels;
-    frame.sample_rate_hz_ = info->rate;
-    frame.samples_per_channel_ = gst_buffer_get_size(buffer) / info->bpf;
-    memcpy(frame.data_, map.data, frame.samples_per_channel_ * info->bpf);
-
-    int err = apm->AnalyzeReverseStream(&frame);
-    if (err < 0) g_warning("voice_processor_native.cpp: ProcessReverseStream %i", err);
-
-    gst_buffer_unmap(buffer, &map);
-}
-
-extern "C" void dino_plugins_rtp_voice_processor_notify_gain_level(void *native_ptr, gint gain_level) {
-    _DinoPluginsRtpVoiceProcessorNative *native = (_DinoPluginsRtpVoiceProcessorNative *) native_ptr;
-    webrtc::AudioProcessing *apm = native->apm;
-    apm->gain_control()->set_stream_analog_level(gain_level);
-}
-
-extern "C" gint dino_plugins_rtp_voice_processor_get_suggested_gain_level(void *native_ptr) {
-    _DinoPluginsRtpVoiceProcessorNative *native = (_DinoPluginsRtpVoiceProcessorNative *) native_ptr;
-    webrtc::AudioProcessing *apm = native->apm;
-    return apm->gain_control()->stream_analog_level();
-}
-
-extern "C" bool dino_plugins_rtp_voice_processor_get_stream_has_voice(void *native_ptr) {
-    _DinoPluginsRtpVoiceProcessorNative *native = (_DinoPluginsRtpVoiceProcessorNative *) native_ptr;
-    webrtc::AudioProcessing *apm = native->apm;
-    return apm->voice_detection()->stream_has_voice();
-}
-
-extern "C" void dino_plugins_rtp_voice_processor_adjust_stream_delay(void *native_ptr) {
-    _DinoPluginsRtpVoiceProcessorNative *native = (_DinoPluginsRtpVoiceProcessorNative *) native_ptr;
-    webrtc::AudioProcessing *apm = native->apm;
-    int median, std, poor_delays;
-    float fraction_poor_delays;
-    apm->echo_cancellation()->GetDelayMetrics(&median, &std, &fraction_poor_delays);
-    poor_delays = (int)(fraction_poor_delays * 100.0);
-    if (fraction_poor_delays < 0 || (native->last_median == median && native->last_poor_delays == poor_delays)) return;
-    g_debug("voice_processor_native.cpp: Stream delay metrics: median=%i std=%i poor_delays=%i%%", median, std, poor_delays);
-    native->last_median = median;
-    native->last_poor_delays = poor_delays;
-    if (poor_delays > 90) {
-        native->stream_delay = std::min(std::max(0, native->stream_delay + std::min(48, std::max(median, -48))), 384);
-        g_debug("voice_processor_native.cpp: set stream_delay=%i", native->stream_delay);
-    }
-}
-
-extern "C" void
-dino_plugins_rtp_voice_processor_process_stream(void *native_ptr, GstAudioInfo *info, GstBuffer *buffer) {
-    _DinoPluginsRtpVoiceProcessorNative *native = (_DinoPluginsRtpVoiceProcessorNative *) native_ptr;
-    webrtc::StreamConfig config(SAMPLE_RATE, SAMPLE_CHANNELS, false);
-    webrtc::AudioProcessing *apm = native->apm;
-
-    GstMapInfo map;
-    gst_buffer_map(buffer, &map, GST_MAP_READWRITE);
-
-    webrtc::AudioFrame frame;
-    frame.num_channels_ = info->channels;
-    frame.sample_rate_hz_ = info->rate;
-    frame.samples_per_channel_ = info->rate / 100;
-    memcpy(frame.data_, map.data, frame.samples_per_channel_ * info->bpf);
-
-    apm->set_stream_delay_ms(native->stream_delay);
-    int err = apm->ProcessStream(&frame);
-    if (err >= 0) memcpy(map.data, frame.data_, frame.samples_per_channel_ * info->bpf);
-    if (err < 0) g_warning("voice_processor_native.cpp: ProcessStream %i", err);
-
-    gst_buffer_unmap(buffer, &map);
-}
-
-extern "C" void dino_plugins_rtp_voice_processor_destroy_native(void *native_ptr) {
-    _DinoPluginsRtpVoiceProcessorNative *native = (_DinoPluginsRtpVoiceProcessorNative *) native_ptr;
-    delete native;
-}

windows-installer/dino.nsi

@@ -13,7 +13,7 @@ SetCompressor /SOLID lzma
 
 # Modern Interface
 !include "MUI2.nsh"
-!insertmacro MUI_PAGE_LICENSE "LICENSE_SHORT"
+!insertmacro MUI_PAGE_LICENSE "../LICENSE_SHORT"
 !insertmacro MUI_PAGE_INSTFILES
 !include "english.nsh"
 

xmpp-vala/src/core/xmpp_stream.vala

@@ -191,4 +191,12 @@ public abstract class Xmpp.XmppStream : Object {
             }
         }
     }
+
+    public static bool equals_func(XmppStream str1, XmppStream str2) {
+        return str1.remote_name.to_string() == str2.remote_name.to_string();
+    }
+
+    public static uint hash_func(XmppStream str) {
+        return str.remote_name.to_string().hash();
+    }
 }

xmpp-vala/src/module/xep/0215_external_service_discovery.vala

@@ -25,6 +25,9 @@ namespace Xmpp.Xep.ExternalServiceDiscovery {
 
             service.username = service_node.get_attribute("username", NS_URI);
             service.password = service_node.get_attribute("password", NS_URI);
+            string? expires_str = service_node.get_attribute("expires", NS_URI);
+            if (expires_str != null) service.expires = DateTimeProfiles.parse_string(expires_str);
+
             service.transport = service_node.get_attribute("transport", NS_URI);
             service.name = service_node.get_attribute("name", NS_URI);
             string? restricted_str = service_node.get_attribute("restricted", NS_URI);
@@ -41,6 +44,7 @@ namespace Xmpp.Xep.ExternalServiceDiscovery {
 
         public string username { get; set; }
         public string password { get; set; }
+        public DateTime? expires { get; set; }
 
         public string transport { get; set; }
         public string name { get; set; }

xmpp-vala/src/module/xep/0234_jingle_file_transfer.vala

@@ -8,6 +8,7 @@ private const string NS_URI = "urn:xmpp:jingle:apps:file-transfer:5";
 
 public class Module : Jingle.ContentType, XmppStreamModule {
 
+    public signal void transferred_bytes(size_t bytes);
     public signal void file_incoming(XmppStream stream, FileTransfer file_transfer);
 
     public static Xmpp.ModuleIdentity<Module> IDENTITY = new Xmpp.ModuleIdentity<Module>(NS_URI, "0234_jingle_file_transfer");
@@ -42,7 +43,10 @@ public class Module : Jingle.ContentType, XmppStreamModule {
         return yield stream.get_module(Jingle.Module.IDENTITY).is_available(stream, required_transport_type, required_components, full_jid);
     }
 
-    public async void offer_file_stream(XmppStream stream, Jid receiver_full_jid, InputStream input_stream, string basename, int64 size, string? precondition_name = null, Object? precondition_options = null) throws Jingle.Error {
+    public async void offer_file_stream(XmppStream stream, Jid receiver_full_jid,
+        Cancellable cancellable, InputStream input_stream, string basename,
+        int64 size, string? precondition_name = null,
+        Object? precondition_options = null) throws Jingle.Error {
         StanzaNode file_node;
         StanzaNode description = new StanzaNode.build("description", NS_URI)
             .add_self_xmlns()
@@ -107,7 +111,18 @@ public class Module : Jingle.ContentType, XmppStreamModule {
             }
             IOStream io_stream = yield connection.stream.wait_async();
             yield io_stream.input_stream.close_async();
-            yield io_stream.output_stream.splice_async(input_stream, OutputStreamSpliceFlags.CLOSE_SOURCE|OutputStreamSpliceFlags.CLOSE_TARGET);
+
+            ssize_t read;
+            var buffer = new uint8[1024];
+            while ((read = yield input_stream.read_async(buffer, Priority.LOW, cancellable)) > 0) {
+                buffer.length = (int) read;
+                transferred_bytes((size_t)read);
+                yield io_stream.output_stream.write_async(buffer, Priority.LOW, cancellable);
+                buffer.length = 1024;
+            }
+
+            yield input_stream.close_async();
+            yield io_stream.output_stream.close_async();
             yield connection.terminate(true);
         } catch (Error e) {
             if (session != null) {