qrencode: windows: bump submodule version

Use version with latest vcxproj.

Change-Id: I61cb0168e684566f47cf32e993371a25539d4c8a

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "3rdparty/qrencode-win32"]
 	path = 3rdparty/qrencode-win32
-	url = https://github.com/BlueDragon747/qrencode-win32.git
+	url = https://github.com/blizzard4591/qrencode-win32.git
 	ignore = dirty
 [submodule "3rdparty/libqrencode"]
 	url = https://github.com/fukuchi/libqrencode.git

CMakeLists.txt

@@ -29,12 +29,40 @@ else()
   project(jami)
 endif()
 
-option(WITH_DAEMON_SUBMODULE "Build with daemon submodule" OFF)
+option(WITH_DAEMON_SUBMODULE "Build with daemon submodule" ON)
+option(JAMICORE_AS_SUBDIR "Build Jami-core as a subdir dependency" OFF)
 option(ENABLE_TESTS "Build with tests" OFF)
 option(WITH_WEBENGINE "Build with WebEngine" ON)
 if(WITH_WEBENGINE)
   add_definitions(-DWITH_WEBENGINE)
 endif()
+option(ENABLE_LIBWRAP "Enable libwrap (single process mode)" ON)
+if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    OR ENABLE_LIBWRAP
+    # because mocks use the same interface present in qtwrapper/
+    OR ENABLE_TEST)
+  set(ENABLE_LIBWRAP true)
+endif()
+option(ENABLE_ASAN "Enable address sanitization" OFF)
+if(ENABLE_ASAN AND NOT MSVC)
+  message(STATUS "Address sanitization enabled for client")
+  # Add AddressSanitizer flags for both compiler and linker
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
+endif()
+
+# jami-core
+if(NOT WITH_DAEMON_SUBMODULE)
+  set(DAEMON_DIR ${PROJECT_SOURCE_DIR}/../daemon)
+else()
+  set(DAEMON_DIR ${PROJECT_SOURCE_DIR}/daemon)
+endif()
+
+# For now only MSVC is supported for building Jami-core within the
+# client cmake.
+if(JAMICORE_AS_SUBDIR)
+  add_subdirectory(${DAEMON_DIR})
+endif()
 
 # init some variables for includes, libs, etc.
 set(CLIENT_INCLUDE_DIRS, "")
@@ -43,21 +71,16 @@ set(CLIENT_LIBS, "")
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_FLAGS_DEBUG "-Og -ggdb")
+if(NOT MSVC)
+  set(CMAKE_CXX_FLAGS_DEBUG "-Og -ggdb")
+endif()
+
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-# Main project directories:
-
-# jami-daemon
-if(NOT WITH_DAEMON_SUBMODULE)
-  set(DAEMON_DIR ${PROJECT_SOURCE_DIR}/../daemon)
-else()
-  set(DAEMON_DIR ${PROJECT_SOURCE_DIR}/daemon)
-endif()
 # src
 set(LIBCLIENT_SRC_DIR ${PROJECT_SOURCE_DIR}/src/libclient)
 set(APP_SRC_DIR ${PROJECT_SOURCE_DIR}/src/app)
@@ -74,26 +97,19 @@ set(TESTS_DIR ${PROJECT_SOURCE_DIR}/tests)
 # Here we let find_package(<PackageName>...) try to find Qt 6,
 # If it is found, find_package will succeed, and the CMake variable
 # QT_VERSION_MAJOR will be defined 6.
+set(QT6_MINVER_MINOR 4)
 if(QT6_VER AND QT6_PATH)
   find_package(QT NAMES Qt6 REQUIRED
     PATHS ${QT6_PATH} NO_DEFAULT_PATH)
 else()
+  message(STATUS "Looking for Qt 6" ${CMAKE_PREFIX_PATH})
   find_package(QT NAMES Qt6 REQUIRED)
 endif()
-if (${QT_VERSION_MAJOR} STRLESS 6)
-  if (${QT_VERSION_MINOR} STRLESS 4)
-    message(FATAL_ERROR "Qt 6.4 or higher is required.")
-  endif()
-endif()
-
-if(MSVC)
-  set(DEFAULT_BUILD_TYPE "Debug")
-  if(NOT CMAKE_BUILD_TYPE)
-    message(STATUS "Setting build type to '${DEFAULT_BUILD_TYPE}' as none was specified.")
-    set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE
-        STRING "Choose the type of build." FORCE)
-  endif()
-  set(OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/x64/${CMAKE_BUILD_TYPE}")
+if (${QT_VERSION_MINOR} GREATER_EQUAL ${QT6_MINVER_MINOR})
+  # Qt version is 6.4 or higher
+  message(STATUS "Found a suitable Qt version ${QT_VERSION}")
+else()
+  message(FATAL_ERROR "Qt 6.4 or higher is required. Found ${QT_VERSION}")
 endif()
 
 # libjamiclient
@@ -241,6 +257,8 @@ set(COMMON_SOURCES
   ${APP_SRC_DIR}/messageparser.cpp
   ${APP_SRC_DIR}/previewengine.cpp
   ${APP_SRC_DIR}/imagedownloader.cpp
+  ${APP_SRC_DIR}/pluginversionmanager.cpp
+  ${APP_SRC_DIR}/connectioninfolistmodel.cpp
   ${APP_SRC_DIR}/pluginversionmanager.cpp)
 
 set(COMMON_HEADERS
@@ -307,8 +325,9 @@ set(COMMON_HEADERS
   ${APP_SRC_DIR}/messageparser.h
   ${APP_SRC_DIR}/htmlparser.h
   ${APP_SRC_DIR}/imagedownloader.h
-  ${APP_SRC_DIR}/pluginversionmanager.h)
-
+  ${APP_SRC_DIR}/pluginversionmanager.h
+  ${APP_SRC_DIR}/connectioninfolistmodel.h
+  ${APP_SRC_DIR}/pttlistener.h)
 
 # For libavutil/avframe.
 set(LIBJAMI_CONTRIB_DIR "${DAEMON_DIR}/contrib")
@@ -344,10 +363,6 @@ if(MSVC)
   # preprocessor defines
   add_definitions(-DUNICODE -DQT_NO_DEBUG -DNDEBUG)
 
-  # dependencies
-  set(QRENCODE_DIR
-    ${PROJECT_SOURCE_DIR}/3rdparty/qrencode-win32/qrencode-win32)
-
   # compiler options
   add_compile_options(
     /wd4068 /wd4099 /wd4189 /wd4267 /wd4577 /wd4467 /wd4715 /wd4828)
@@ -365,12 +380,13 @@ if(MSVC)
     "/NODEFAULTLIB:LIBCMT")
 
   # client deps
-  set(QRENCODE_LIB
-    ${QRENCODE_DIR}/vc8/qrcodelib/x64/Release-Lib/qrcodelib.lib)
+  set(QRENCODE_DIR ${PROJECT_SOURCE_DIR}/3rdparty/qrencode-win32/qrencode-win32)
+  file(GLOB_RECURSE QRENCODE_LIB ${QRENCODE_DIR}/qrcodelib.lib)
+  file(GLOB_RECURSE QRENCODE_INCLUDE ${QRENCODE_DIR}/qrencode.h)
+  get_filename_component(QRENCODE_INCLUDE_DIR ${QRENCODE_INCLUDE} DIRECTORY)
 
   # daemon
   set(JAMID_SRC_PATH ${DAEMON_DIR}/contrib/msvc/include)
-  set(JAMID_LIB ${DAEMON_DIR}/build/x64/ReleaseLib_win32/bin/libjami.lib)
   set(GNUTLS_LIB ${DAEMON_DIR}/contrib/msvc/lib/x64/libgnutls.lib)
 
   # Beta config
@@ -386,7 +402,7 @@ if(MSVC)
   include_directories(
     ${JAMID_SRC_PATH}
     ${LIBCLIENT_SRC_DIR}
-    ${QRENCODE_DIR})
+    ${QRENCODE_INCLUDE_DIR})
 elseif (NOT APPLE)
   list(APPEND COMMON_SOURCES
     ${APP_SRC_DIR}/xrectsel.c
@@ -490,6 +506,29 @@ else()
     OPTIONAL_COMPONENTS LinguistTools)
 endif()
 
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    if (DEFINED ENV{XDG_SESSION_TYPE})
+        if ($ENV{XDG_SESSION_TYPE} STREQUAL "x11")
+            set(PTT_PLATFORM "x11")
+            list(APPEND COMMON_HEADER ${APP_SRC_DIR}/platform/X11/xcbkeyboard.H)
+        # TODO: add Wayland support
+        endif ()
+    endif ()
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    set(PTT_PLATFORM "windows")
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    set(PTT_PLATFORM "macos")
+endif ()
+
+if (NOT ${PTT_PLATFORM} STREQUAL "")
+    message(STATUS "Platform: ${PTT_PLATFORM}")
+    add_definitions(-DHAVE_GLOBAL_PTT)
+    list(APPEND COMMON_SOURCES ${APP_SRC_DIR}/platform/${PTT_PLATFORM}/pttlistener.cpp)
+else ()
+    message(WARNING "Global push-to-talk not supported.")
+    list(APPEND COMMON_SOURCES ${APP_SRC_DIR}/platform/local/pttlistener.cpp)
+endif ()
+
 # common includes
 include_directories(
   ${PROJECT_SOURCE_DIR}
@@ -543,7 +582,7 @@ if(MSVC)
     WIN32_EXECUTABLE TRUE)
 
   list(APPEND CLIENT_LIBS
-    ${JAMID_LIB}
+    ${LIBJAMI_LIB}
     ${GNUTLS_LIB}
     ${LIBCLIENT_NAME}
     ${QT_LIBS}
@@ -590,7 +629,6 @@ elseif (NOT APPLE)
     ${GLIB_LIBRARIES}
     ${GIO_LIBRARIES})
 
-  # Installation rules
   install(
     TARGETS ${PROJECT_NAME}
     RUNTIME DESTINATION bin)
@@ -721,7 +759,7 @@ else()
   list(APPEND CLIENT_LIBS
     "-framework AVFoundation"
     "-framework CoreAudio -framework CoreMedia -framework CoreVideo"
-    "-framework VideoToolbox -framework AudioUnit"
+    "-framework VideoToolbox -framework AudioUnit -framework Carbon"
     "-framework Security"
       compression
       resolv
@@ -760,6 +798,7 @@ else()
           MACOSX_BUNDLE_COPYRIGHT "${PROJ_COPYRIGHT}")
       if(APPSTORE)
           message(STATUS "app store version")
+          add_definitions(-DAPPSTORE)
           set_target_properties(${PROJECT_NAME} PROPERTIES
                XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/resources/entitlements/appstore/Jami.entitlements")
       else()

build.py

@@ -28,6 +28,7 @@ import shutil
 import subprocess
 import sys
 import time
+import re
 
 OSX_DISTRIBUTION_NAME = "osx"
 WIN32_DISTRIBUTION_NAME = "win32"
@@ -363,10 +364,10 @@ def cwd(path):
 def run_install(args):
     # Platforms with special compilation scripts
     if args.distribution == WIN32_DISTRIBUTION_NAME:
-        with cwd('daemon/compat/msvc'):
-            execute_script(
-                ['python winmake.py -iv '
-                 f'-s {args.sdk} -b daemon'])
+        if not args.pywinmake:
+            with cwd('daemon/compat/msvc'):
+                execute_script([f'python winmake.py -iv -s {args.sdk} -b daemon'])
+
         build_windows = 'extras/scripts/build-windows.py'
         execute_script([f'python {build_windows} --init'])
         execute_script([f'python {build_windows} --qt={args.qt}'])
@@ -386,6 +387,8 @@ def run_install(args):
         install_args.append('-u')
     if args.debug:
         install_args.append('-d')
+    if args.asan:
+        install_args.append('-A')
     if args.no_libwrap:
         install_args.append('-W')
     if args.no_webengine:
@@ -416,6 +419,11 @@ def run_install(args):
 
     command = ['extras/scripts/install.sh'] + install_args
 
+    if 'TARBALLS' not in os.environ:
+        print('info: consider setting the TARBALLS environment variable '
+              'to a stable writable location to avoid loosing '
+              'cached tarballs')
+
     if args.distribution == 'guix':
         if args.global_install:
             print('error: global install is not supported when using Guix.')
@@ -425,10 +433,6 @@ def run_install(args):
         if 'TARBALLS' in os.environ:
             share_tarballs_args = ['--preserve=TARBALLS',
                                    f'--share={os.environ["TARBALLS"]}']
-        else:
-            print('info: consider setting the TARBALLS environment variable '
-                  'to a stable writable location to avoid loosing '
-                  'cached tarballs')
         command = ['guix', 'shell', f'--manifest={GUIX_MANIFEST}',
                    '--symlink=/usr/bin/env=bin/env',
                    '--symlink=/etc/ssl/certs=etc/ssl/certs',
@@ -457,6 +461,93 @@ def run_clean():
                     'git submodule foreach git clean -xfd'])
 
 
+def clean_contribs(contribs):
+    """
+    Helper to clean one or more of the libjami contribs.
+
+    Takes a list of contrib names(space separated) to clean, or 'all' to clean all contribs.
+
+    Contribs are assumed to be in the contrib_dir: daemon/contrib
+    Artifacts to remove include:
+    - build directory: <contrib_dir>/<native_dir>/<contrib_name>
+    - build stamp: <contrib_dir>/<native_dir>/.<contrib_name>
+    - tarball: <contrib_dir>/tarballs/<contrib_name>*.tar.*
+    - build artifacts (we don't care about the contents of share):
+        - <contrib_dir>/<abi_triplet>/bin/<contrib_name>
+        - <contrib_dir>/<abi_triplet>/lib/<contrib_name>*
+        - <contrib_dir>/<abi_triplet>/include/<contrib_name>*
+    """
+
+    # Not supported on Windows
+    if platform.system() == 'Windows':
+        print('Cleaning contribs is not supported on Windows. Exiting.')
+        sys.exit(1)
+
+    # Assume we are using the submodule here.
+    contrib_dir = 'daemon/contrib'
+    sub_dirs = os.listdir(contrib_dir)
+
+    # Let's find the abi triplet:
+    # The abi_triplet is 3 parts: <arch>-<vendor>-<sys> and should be the only directory
+    # named like that in the contrib directory. We can use a regex to find it.
+    triplet_pattern = re.compile(r'^[a-zA-Z0-9_]+-[a-zA-Z0-9_]+-[a-zA-Z0-9_]+$')
+    def is_triplet(s):
+        return bool(triplet_pattern.match(s))
+    abi_triplet = ''
+    for sub_dir in sub_dirs:
+        if is_triplet(sub_dir):
+            abi_triplet = sub_dir
+            break
+
+    # If we didn't find the abi triplet, we need to stop.
+    if abi_triplet == '':
+        print('Could not find the abi triplet for the contribs. Exiting.')
+        sys.exit(1)
+
+    # Let's find the native build source directory (native-*)
+    native_dir = ''
+    for sub_dir in sub_dirs:
+        if sub_dir.startswith('native'):
+            native_dir = os.path.join(contrib_dir, sub_dir)
+            break
+
+    # If we didn't find the native build source directory, we need to stop.
+    if native_dir == '':
+        print('Could not find the native build source directory. Exiting.')
+        sys.exit(1)
+
+    # If contribs is 'all', construct the list of all contribs from the contrib native directory
+    # list of directories only
+    if contribs == ['all']:
+        contribs = [d for d in os.listdir(native_dir) if os.path.isdir(os.path.join(native_dir, d))]
+
+    # Clean each contrib
+    for contrib in contribs:
+        print(f'Cleaning contrib: {contrib} for {abi_triplet} in {native_dir}')
+        build_dir = os.path.join(native_dir, contrib, '*')
+        build_stamp = os.path.join(native_dir, f'.{contrib}*')
+        tarball = os.path.join(contrib_dir, 'tarballs', f'{contrib}*.tar.*')
+        bins = os.path.join(contrib_dir, abi_triplet, 'bin', contrib)
+        libs = os.path.join(contrib_dir, abi_triplet, 'lib', f'lib{contrib}*')
+        includes = os.path.join(contrib_dir, abi_triplet, 'include', f'{contrib}*')
+
+        # EXCEPTIONS: pjproject and ffmpeg
+        if contrib == 'pjproject':
+            libs =  f' {os.path.join(contrib_dir, abi_triplet, "lib", "libpj*")}' \
+                    f' {os.path.join(contrib_dir, abi_triplet, "lib", "libsrtp*")}'
+            includes = os.path.join(contrib_dir, abi_triplet, 'include', 'pj*')
+        elif contrib == 'ffmpeg':
+            libs = f' {os.path.join(contrib_dir, abi_triplet, "lib", "libav*")}' \
+                   f' {os.path.join(contrib_dir, abi_triplet, "lib", "libsw*")}'
+            includes = f' {os.path.join(contrib_dir, abi_triplet, "include", "libav*")}' \
+                       f' {os.path.join(contrib_dir, abi_triplet, "include", "libsw*")}'
+
+        # For a dry run:
+        #  execute_script([f'find {build_dir} {build_stamp} {tarball} {bins} {libs} {includes}'], fail=False)
+
+        execute_script([f'rm -rf {build_dir} {build_stamp} {tarball} {bins} {libs} {includes}'], fail=False)
+
+
 def run_run(args):
     run_env = os.environ
 
@@ -625,6 +716,8 @@ def parse_args():
     ap.add_argument('--global-install', default=False, action='store_true')
     ap.add_argument('--debug', default=False, action='store_true',
                     help='Build with debug support; run in GDB')
+    ap.add_argument('--asan', default=False, action='store_true',
+                    help='Build both daemon and client with ASAN')
     ap.add_argument('--background', default=False, action='store_true')
     ap.add_argument('--no-priv-install', dest='priv_install',
                     default=True, action='store_false')
@@ -639,6 +732,12 @@ def parse_args():
                     default=False, action='store_true',
                     help='Do not use Qt WebEngine.')
     ap.add_argument('--arch')
+    ap.add_argument('--clean-contribs', nargs='+',
+                    help='Clean the specified contribs (space separated) or \
+                          "all" to clean all contribs before building.')
+    ap.add_argument('--pywinmake', dest='pywinmake',
+                    default=False, action='store_true',
+                    help='Build Jami for Windows using pywinmake')
 
     dist = choose_distribution()
 
@@ -685,6 +784,10 @@ def choose_distribution():
 def main():
     parsed_args = parse_args()
 
+    # Clean contribs if specified first.
+    if parsed_args.clean_contribs:
+        clean_contribs(parsed_args.clean_contribs)
+
     if parsed_args.dependencies:
         run_dependencies(parsed_args)
 

extras/build/cmake/modules/FindLibJami.cmake

@@ -53,33 +53,36 @@ set(CMAKE_FIND_LIBRARY_SUFFIXES_orig ${CMAKE_FIND_LIBRARY_SUFFIXES})
 
 set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib;.so;.dll")
 
-# Add the lib prefix for Windows checks.
-if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-  set(CMAKE_FIND_LIBRARY_PREFIXES "lib;")
-endif()
+set(LIBJAMI_NAMES
+  jami-core
+  jami
+  ring
+)
 
 if(WITH_DAEMON_SUBMODULE)
-  find_library(LIBJAMI_LIB NAMES jami ring
+  find_library(LIBJAMI_LIB NAMES ${LIBJAMI_NAMES}
     PATHS ${DAEMON_DIR}/src/.libs
     PATHS ${CMAKE_INSTALL_PREFIX}/lib
     PATHS ${CMAKE_INSTALL_PREFIX}/daemon/lib
     PATHS ${CMAKE_INSTALL_PREFIX}/libexec
     PATHS ${CMAKE_INSTALL_PREFIX}/bin
+    PATHS ${CMAKE_INSTALL_PREFIX}/daemon/build/bin
     NO_DEFAULT_PATH)
 else()
   # Search only in these given PATHS.
-  find_library(LIBJAMI_LIB NAMES jami ring
+  find_library(LIBJAMI_LIB NAMES ${LIBJAMI_NAMES}
     PATHS ${LIBJAMI_BUILD_DIR}/.libs
     PATHS ${RING_BUILD_DIR}/.libs
     PATHS ${CMAKE_INSTALL_PREFIX}/lib
     PATHS ${CMAKE_INSTALL_PREFIX}/daemon/lib
     PATHS ${CMAKE_INSTALL_PREFIX}/libexec
     PATHS ${CMAKE_INSTALL_PREFIX}/bin
+    PATHS ${CMAKE_INSTALL_PREFIX}/daemon/build/bin
     NO_DEFAULT_PATH)
 
   # Search elsewhere as well (e.g. system-wide).
   if(NOT LIBJAMI_LIB)
-    find_library(LIBJAMI_LIB NAMES jami ring)
+    find_library(LIBJAMI_LIB NAMES ${LIBJAMI_NAMES})
   endif()
 endif()
 
@@ -88,27 +91,29 @@ if(NOT LIBJAMI_LIB)
   set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.lib")
 
   if(WITH_DAEMON_SUBMODULE)
-    find_library(LIBJAMI_LIB NAMES jami ring
+    find_library(LIBJAMI_LIB NAMES ${LIBJAMI_NAMES}
       PATHS ${DAEMON_DIR}/src/.libs
       PATHS ${CMAKE_INSTALL_PREFIX}
       PATHS ${CMAKE_INSTALL_PREFIX}/lib
       PATHS ${CMAKE_INSTALL_PREFIX}/daemon/lib
       PATHS ${CMAKE_INSTALL_PREFIX}/libexec
+      PATHS ${CMAKE_INSTALL_PREFIX}/daemon/build/lib
       NO_DEFAULT_PATH)
   else()
     # Search only in these given PATHS.
-    find_library(LIBJAMI_LIB NAMES jami ring
+    find_library(LIBJAMI_LIB NAMES ${LIBJAMI_NAMES}
       PATHS ${LIBJAMI_BUILD_DIR}/.libs
       PATHS ${RING_BUILD_DIR}/.libs
       PATHS ${CMAKE_INSTALL_PREFIX}
       PATHS ${CMAKE_INSTALL_PREFIX}/lib
       PATHS ${CMAKE_INSTALL_PREFIX}/daemon/lib
       PATHS ${CMAKE_INSTALL_PREFIX}/libexec
+      PATHS ${CMAKE_INSTALL_PREFIX}/daemon/build/lib
       NO_DEFAULT_PATH)
 
     # Search elsewhere as well (e.g. system-wide).
     if(NOT LIBJAMI_LIB)
-      find_library(LIBJAMI_LIB NAMES jami ring)
+      find_library(LIBJAMI_LIB NAMES ${LIBJAMI_NAMES})
     endif()
 
     if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")

extras/packaging/gnu-linux/Makefile

@@ -49,7 +49,7 @@ QT_MAJOR := 6
 QT_MINOR := 4
 QT_PATCH := 3
 QT_TARBALL_CHECKSUM := 29a7eebdbba0ea57978dea6083709c93593a60f0f3133a3de08b9571ee8eaab4
-DEBIAN_QT_VERSION := $(QT_MAJOR).$(QT_MINOR).$(QT_PATCH)-2
+DEBIAN_QT_VERSION := $(QT_MAJOR).$(QT_MINOR).$(QT_PATCH)-3
 DEBIAN_QT_DSC_FILENAME := libqt-jami_$(DEBIAN_QT_VERSION).dsc
 QT_JAMI_PREFIX := /usr/lib/libqt-jami
 
@@ -166,10 +166,11 @@ DISTRIBUTIONS := \
 	debian_unstable \
 	ubuntu_20.04 \
 	ubuntu_22.04 \
-	ubuntu_22.10 \
 	ubuntu_23.04 \
+	ubuntu_23.10 \
 	fedora_37 \
 	fedora_38 \
+	fedora_39 \
 	opensuse-leap_15.4 \
 	snap
 

extras/packaging/gnu-linux/docker/Dockerfile_fedora_39

@@ -0,0 +1,104 @@
+FROM fedora:39
+
+RUN dnf clean all
+RUN dnf update -y
+
+RUN dnf install -y dnf-command\(builddep\) rpmdevtools && \
+    dnf install -y mock
+
+RUN dnf groupinstall -y "X Software Development"
+
+RUN dnf install -y \
+        git \
+        rpm-build \
+        tar \
+        make \
+        autoconf \
+        automake \
+        nasm \
+        speexdsp-devel \
+        pulseaudio-libs-devel \
+        libcanberra-devel \
+        libcurl-devel \
+        libtool \
+        mesa-libgbm-devel \
+        mesa-dri-drivers \
+        dbus-devel \
+        expat-devel \
+        pcre-devel \
+        yaml-cpp-devel \
+        libXext-devel \
+        libXfixes-devel \
+        yasm \
+        speex-devel \
+        gsm-devel \
+        chrpath \
+        check \
+        astyle \
+        uuid-c++-devel \
+        gettext-devel \
+        gcc-c++ \
+        which \
+        alsa-lib-devel \
+        systemd-devel \
+        libuuid-devel \
+        uuid-devel \
+        gnutls-devel \
+        nettle-devel \
+        opus-devel \
+        patch \
+        jsoncpp-devel \
+        libnatpmp-devel \
+        webkitgtk4-devel \
+        cryptopp-devel \
+        libva-devel \
+        libvdpau-devel \
+        msgpack-devel \
+        NetworkManager-libnm-devel \
+        openssl-devel \
+        clutter-devel \
+        clutter-gtk-devel \
+        libappindicator-gtk3-devel \
+        libnotify-devel \
+        libupnp-devel \
+        qrencode-devel \
+        libargon2-devel \
+        libsndfile-devel \
+        libdrm \
+        gperf \
+        bison \
+        clang \
+        clang-devel \
+        llvm-devel \
+        nodejs \
+        flex \
+        gstreamer1 gstreamer1-devel \
+        gstreamer1-plugins-base-devel \
+        gstreamer1-plugins-good \
+        gstreamer1-plugins-bad-free-devel \
+        nss-devel \
+        libxcb* \
+        libxkb* \
+        libX11-devel \
+        vulkan-devel \
+        libXrender-devel \
+        xcb-util-* \
+        xz \
+        xkeyboard-config \
+        libnotify \
+        wget \
+        libstdc++-static \
+        sqlite-devel \
+        perl-generators \
+        perl-English \
+        libxshmfence-devel \
+        ninja-build \
+        clang \
+        cmake \
+        fmt-devel \
+        python3.10 \
+        cups-devel
+
+ADD extras/packaging/gnu-linux/scripts/build-package-rpm.sh /opt/build-package-rpm.sh
+
+CMD ["/opt/build-package-rpm.sh"]

extras/packaging/gnu-linux/docker/Dockerfile_opensuse-leap_15.4

@@ -70,6 +70,7 @@ RUN zypper --non-interactive install -y \
         nodejs12 \
         mozilla-nss-devel \
         python-xml \
+        python-six \
         libxcb* \
         libxkb* \
         libX11-devel \

extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_23.10

@@ -1,4 +1,4 @@
-FROM ubuntu:22.10
+FROM ubuntu:23.10
 
 ENV DEBIAN_FRONTEND=noninteractive
 

extras/packaging/gnu-linux/rules/debian-qt/patches/0003-fix-mathops.patch

@@ -0,0 +1,81 @@
+From ecae5d93b0a89e2b8c16a2227b2d176f58579d04 Mon Sep 17 00:00:00 2001
+From: Rémi Denis-Courmont <remi@remlab.net>
+Date: Sun, 16 Jul 2023 18:18:02 +0300
+Subject: [PATCH] Fix ffmpeg assembly with newer binutil
+
+avcodec/x86/mathops: clip constants used with shift instructions within inline assembly
+
+Fixes assembling with binutil as >= 2.41
+
+FFmpeg commit effadce6c756247ea8bae32dc13bb3e6f464f0eb.
+
+Deals with: "Error: operand type mismatch for `shr'"
+
+Fixes: QTBUG-116649
+Change-Id: I094e8c23fed4a61fba3f1e3a9c73c016d129d830
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/495990
+Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
+(cherry picked from commit 29354c7c7def7bdc66bcd25d401677fd9421f657)
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/509219
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+---
+
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
+index 6298f5e..ca7e2df 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
++++ b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
+@@ -35,12 +35,20 @@
+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
+ {
+     int rt, dummy;
++    if (__builtin_constant_p(shift))
+     __asm__ (
+         "imull %3               \n\t"
+         "shrdl %4, %%edx, %%eax \n\t"
+         :"=a"(rt), "=d"(dummy)
+-        :"a"(a), "rm"(b), "ci"((uint8_t)shift)
++        :"a"(a), "rm"(b), "i"(shift & 0x1F)
+     );
++    else
++        __asm__ (
++            "imull %3               \n\t"
++            "shrdl %4, %%edx, %%eax \n\t"
++            :"=a"(rt), "=d"(dummy)
++            :"a"(a), "rm"(b), "c"((uint8_t)shift)
++        );
+     return rt;
+ }
+
+@@ -113,19 +121,31 @@
+ // avoid +32 for shift optimization (gcc should do that ...)
+ #define NEG_SSR32 NEG_SSR32
+ static inline  int32_t NEG_SSR32( int32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("sarl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("sarl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }
+
+ #define NEG_USR32 NEG_USR32
+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("shrl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("shrl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }

extras/packaging/gnu-linux/rules/debian-qt/patches/0004-fix-binary-tokenizer.patch

@@ -0,0 +1,16 @@
+ qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+index 3488120..120e47a 100644
+--- a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
++++ b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+@@ -472,7 +472,7 @@ void TokenizeBinary(TokenList& output_tokens, const char* input, size_t length)
+     }
+     catch (const DeadlyImportError& e)
+     {
+-        if (!is64bits && (length > std::numeric_limits<std::uint32_t>::max())) {
++        if (!is64bits && (length > std::numeric_limits<uint32_t>::max())) {
+             throw DeadlyImportError("The FBX file is invalid. This may be because the content is too big for this older version (", ai_to_string(version), ") of the FBX format. (", e.what(), ")");
+         }
+         throw;

extras/packaging/gnu-linux/rules/debian-qt/patches/0005-importlib.patch

@@ -0,0 +1,433 @@
+ qtbase/src/corelib/debug_script.py                                                                            | 2 +-
+ qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py                       | 2 +-
+ qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py                  | 2 +-
+ qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py                                  | 2 +-
+ qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py                    | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py                                   | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py                          | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py                | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py                | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py                         | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py        | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py                                | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py                       | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py                      | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py                 | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py                                              | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py                    | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py                                           | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py                                             | 2 +-
+ .../src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py    | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py   | 2 +-
+ .../src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py        | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py         | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py  | 2 +-
+ .../src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py       | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py   | 2 +-
+ .../3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py  | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py             | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py            | 2 +-
+ qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py                                       | 2 +-
+ qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py                       | 2 +-
+ 31 files changed, 31 insertions(+), 31 deletions(-)
+
+diff --git a/qtbase/src/corelib/debug_script.py b/qtbase/src/corelib/debug_script.py
+index f6207c6104..663c8e0ac1 100644
+--- a/qtbase/src/corelib/debug_script.py
++++ b/qtbase/src/corelib/debug_script.py
+@@ -3,7 +3,7 @@
+
+ import os
+ import sys
+-import imp
++import importlib
+
+ from distutils.version import LooseVersion
+
+diff --git a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
+index 681039d34b..a1fe56fa05 100644
+--- a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
++++ b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
+@@ -16,7 +16,7 @@ import subprocess
+ import sys
+ import tempfile
+ import time
+-import imp
++import importlib
+
+ # from TestCasePackagerConfig import *
+
+diff --git a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
+index 92d4e6139b..7a18e12ced 100644
+--- a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
++++ b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
+@@ -7,7 +7,7 @@ import unittest
+
+ import os
+ import yaml
+-import imp
++import importlib
+
+ # add parent dir to search path
+ import sys
+diff --git a/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py b/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py
+index c7412927c8..ad2caff318 100755
+--- a/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py
++++ b/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py
+@@ -5,7 +5,7 @@
+
+ import os
+ import sys
+-import imp
++import importlib
+ import tempfile
+ import unittest
+ import PRESUBMIT
+diff --git a/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py b/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
+index 5daee773ba..2d6b124162 100755
+--- a/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
++++ b/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
+@@ -9,7 +9,7 @@
+ """
+ from __future__ import print_function
+ import abc
+-import imp
++import importlib
+ import optparse
+ import os
+ import re
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
+index bf626f5479..3fae129aaa 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
+@@ -3,7 +3,7 @@
+ # found in the LICENSE file.
+
+ import errno
+-import imp
++import importlib
+ import os.path
+ import sys
+
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
+index ff5753a291..04fc34f742 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import shutil
+ import sys
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
+index 32c884a8c0..e761faa54c 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
+index 95a916db08..4331e2fbfa 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
+index 62798631db..28e9dbf705 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
+index cba249b0f3..5a4051827a 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
+index 4a2fefc712..11a9879cb7 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
+index cc17ae0253..bcc944f06b 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
+index bd72830e54..f2fdc9ae28 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py b/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py
+index 1feb303a48..8428de61bb 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py
+@@ -6,7 +6,7 @@
+ angle_presubmit_utils_unittest.py: Top-level unittest script for ANGLE presubmit checks.
+ """
+
+-import imp
++import importlib
+ import os
+ import unittest
+ from angle_presubmit_utils import *
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py b/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py
+index ed4f38c67b..cac734cefa 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py
+@@ -7,7 +7,7 @@ See https://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
+ for more details about the presubmit API built into gcl.
+ """
+
+-import imp
++import importlib
+ import inspect
+ import os
+ import re
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py b/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py
+index 0244c9787e..f535afe99c 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py
+@@ -32,7 +32,7 @@ if PY3:
+     memoryview_type = memoryview
+     struct_bool_decl = "?"
+ else:
+-    import imp
++    import importlib
+     string_types = (unicode,)
+     if PY26 or PY27:
+         binary_types = (str,bytearray)
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py b/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py
+index 8430390eea..29212205bc 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py
+@@ -732,7 +732,7 @@ class Environment(object):
+                 )
+                 py_compile = False
+             else:
+-                import imp
++                import importlib
+                 import marshal
+
+                 py_header = imp.get_magic() + u"\xff\xff\xff\xff".encode("iso-8859-15")
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py b/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py
+index 06bb8d99f5..05089dc982 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py
+@@ -115,7 +115,7 @@ if py3k:
+             return module
+
+ else:
+-    import imp
++    import importlib
+
+     def load_module(module_id, path):
+         fp = open(path, "rb")
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py
+index a7dc683365..68b6804c78 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py
+@@ -14,7 +14,7 @@
+ # ==============================================================================
+ """Tests for call_trees module."""
+
+-import imp
++import importlib
+
+ from tensorflow.python.autograph.converters import call_trees
+ from tensorflow.python.autograph.converters import functions
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py
+index 81a7fde808..1370f900fd 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py
+@@ -14,7 +14,7 @@
+ # ==============================================================================
+ """Tests for converter module."""
+
+-import imp
++import importlib
+
+ from tensorflow.python.autograph.core import converter
+ from tensorflow.python.autograph.core import converter_testing
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py
+index b93cbb627b..452ec71f5b 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py
+@@ -15,7 +15,7 @@
+ """Base class for tests in this module."""
+
+ import contextlib
+-import imp
++import importlib
+ import inspect
+ import sys
+
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py
+index 9a62d7c0d2..7ec4fa6dca 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py
+@@ -19,7 +19,7 @@ import collections
+ import contextlib
+ import functools
+ import gc
+-import imp
++import importlib
+ import inspect
+ import os
+ import re
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py
+index 852af3efe7..6456c50446 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py
+@@ -14,7 +14,7 @@
+ # ==============================================================================
+ """Tests for conversion module."""
+
+-import imp
++import importlib
+ import sys
+ import types
+ import weakref
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py
+index a50a64534a..ba0f31afa2 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py
+@@ -17,7 +17,7 @@
+ import abc
+ import collections
+ import functools
+-import imp
++import importlib
+ import textwrap
+
+ import six
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py
+index 29f38d853a..7ca88fa371 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py
+@@ -14,7 +14,7 @@
+ # ==============================================================================
+ """Tests for templates module."""
+
+-import imp
++import importlib
+
+ from absl.testing import parameterized
+ import gast
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py
+index e46460574b..a40fea6568 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py
+@@ -14,7 +14,7 @@
+ # =============================================================================
+ """Tests for create_python_api."""
+
+-import imp
++import importlib
+ import sys
+
+ from tensorflow.python.platform import test
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py
+index 73d1742714..ea77dd7647 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py
+@@ -1,5 +1,5 @@
+ import importlib
+-import imp
++import importlib
+
+ from .browsers import product_list
+
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py
+index 6a744472b5..9175cb5d34 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py
+@@ -1,6 +1,6 @@
+ import copy
+ import functools
+-import imp
++import importlib
+ import io
+ import os
+ from collections import OrderedDict, defaultdict
+diff --git a/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py b/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py
+index 6912b6f3c0..7d851f7f76 100755
+--- a/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py
++++ b/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py
+@@ -16,7 +16,7 @@
+
+ from __future__ import print_function
+
+-import imp
++import importlib
+ import optparse
+ import os
+ import pipes
+diff --git a/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py b/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py
+index 1c2aba80af..55260d697e 100644
+--- a/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py
++++ b/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py
+@@ -10,7 +10,7 @@ from __future__ import print_function
+
+ import os
+ import re
+-import imp
++import importlib
+
+ from _monkeyYaml import load as yamlLoad
+

extras/packaging/gnu-linux/rules/debian-qt/patches/series

@@ -1,2 +1,5 @@
 0001-fix-gcc13.patch
-0002-OpenFile-portal-do-not-use-O_PATH-fds.patch
+0002-OpenFile-portal-do-not-use-O_PATH-fds.patch
+0003-fix-mathops.patch
+0004-fix-binary-tokenizer.patch
+0005-importlib.patch

extras/packaging/gnu-linux/rules/debian/jami-all.postinst

@@ -99,10 +99,10 @@ if [ -f /etc/os-release ]; then
         ENDTAG="ubuntu_20.04"
     elif [ "${UBUNTU_CODENAME}" = "jammy" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_22.04" ]; then
         ENDTAG="ubuntu_22.04"
-    elif [ "${UBUNTU_CODENAME}" = "kinetic" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_22.10" ]; then
-        ENDTAG="ubuntu_22.10"
     elif [ "${UBUNTU_CODENAME}" = "lunar" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_23.04" ]; then
         ENDTAG="ubuntu_23.04"
+    elif [ "${UBUNTU_CODENAME}" = "mantic" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_23.10" ]; then
+        ENDTAG="ubuntu_23.10"
     elif [ "${ID}" = "debian" ] && \
              [ "$(command -v lsb_release)" ] && \
              [ "$(lsb_release -rs)" = "testing" ]; then

extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec

@@ -28,6 +28,9 @@ URL:           https://jami.net/
 Source:        jami-libqt-%{version}.tar.xz
 Patch0:        0001-fix-gcc13.patch
 Patch1:        0002-OpenFile-portal-do-not-use-O_PATH-fds.patch
+Patch2:        0003-fix-mathops.patch
+Patch3:        0004-fix-binary-tokenizer.patch
+Patch4:        0005-importlib.patch
 
 %global gst 0.10
 %if 0%{?fedora} || 0%{?rhel} > 7
@@ -42,6 +45,7 @@ BuildRequires: bison
 BuildRequires: gperf
 BuildRequires: flex
 BuildRequires: vulkan-devel
+BuildRequires: python-six
 %if %{defined suse_version}
 BuildRequires: ffmpeg-devel
 BuildRequires: ffmpeg
@@ -64,6 +68,9 @@ This package contains Qt libraries for Jami.
 %setup -n qt-everywhere-src-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 echo "Building Qt using %{job_count} parallel jobs"
@@ -84,6 +91,15 @@ cat qtbase/src/corelib/global/qendian.h
 sed -i 's,#include <string.h>,#include <string.h>\n#include <limits>,g' qtbase/src/corelib/global/qfloat16.h
 sed -i 's,#include <QtCore/qbytearray.h>,#include <QtCore/qbytearray.h>\n#include <limits>,g' qtbase/src/corelib/text/qbytearraymatcher.h
 cat qtwebengine/configure.cmake
+
+#https://bugreports.qt.io/browse/QTBUG-117979
+if test -f "/usr/bin/python3.10"; then
+  /usr/bin/python3.10 -m venv env
+  source env/bin/activate
+  python -m pip install html5lib
+  python -m pip install six
+fi
+
 # recent gcc version do not like lto from qt
 CXXFLAGS="${CXXFLAGS} -fno-lto" CFLAGS="${CFLAGS} -fno-lto" LDFLAGS="$(CFLAGS) ${LDFLAGS}" ./configure \
   -opensource \

extras/packaging/gnu-linux/rules/rpm/patches/0003-fix-mathops.patch

@@ -0,0 +1,81 @@
+From ecae5d93b0a89e2b8c16a2227b2d176f58579d04 Mon Sep 17 00:00:00 2001
+From: Rémi Denis-Courmont <remi@remlab.net>
+Date: Sun, 16 Jul 2023 18:18:02 +0300
+Subject: [PATCH] Fix ffmpeg assembly with newer binutil
+
+avcodec/x86/mathops: clip constants used with shift instructions within inline assembly
+
+Fixes assembling with binutil as >= 2.41
+
+FFmpeg commit effadce6c756247ea8bae32dc13bb3e6f464f0eb.
+
+Deals with: "Error: operand type mismatch for `shr'"
+
+Fixes: QTBUG-116649
+Change-Id: I094e8c23fed4a61fba3f1e3a9c73c016d129d830
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/495990
+Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
+(cherry picked from commit 29354c7c7def7bdc66bcd25d401677fd9421f657)
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/509219
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+---
+
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
+index 6298f5e..ca7e2df 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
++++ b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
+@@ -35,12 +35,20 @@
+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
+ {
+     int rt, dummy;
++    if (__builtin_constant_p(shift))
+     __asm__ (
+         "imull %3               \n\t"
+         "shrdl %4, %%edx, %%eax \n\t"
+         :"=a"(rt), "=d"(dummy)
+-        :"a"(a), "rm"(b), "ci"((uint8_t)shift)
++        :"a"(a), "rm"(b), "i"(shift & 0x1F)
+     );
++    else
++        __asm__ (
++            "imull %3               \n\t"
++            "shrdl %4, %%edx, %%eax \n\t"
++            :"=a"(rt), "=d"(dummy)
++            :"a"(a), "rm"(b), "c"((uint8_t)shift)
++        );
+     return rt;
+ }
+
+@@ -113,19 +121,31 @@
+ // avoid +32 for shift optimization (gcc should do that ...)
+ #define NEG_SSR32 NEG_SSR32
+ static inline  int32_t NEG_SSR32( int32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("sarl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("sarl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }
+
+ #define NEG_USR32 NEG_USR32
+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("shrl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("shrl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }

extras/packaging/gnu-linux/rules/rpm/patches/0004-fix-binary-tokenizer.patch

@@ -0,0 +1,16 @@
+ qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+index 3488120..120e47a 100644
+--- a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
++++ b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+@@ -472,7 +472,7 @@ void TokenizeBinary(TokenList& output_tokens, const char* input, size_t length)
+     }
+     catch (const DeadlyImportError& e)
+     {
+-        if (!is64bits && (length > std::numeric_limits<std::uint32_t>::max())) {
++        if (!is64bits && (length > std::numeric_limits<uint32_t>::max())) {
+             throw DeadlyImportError("The FBX file is invalid. This may be because the content is too big for this older version (", ai_to_string(version), ") of the FBX format. (", e.what(), ")");
+         }
+         throw;

extras/packaging/gnu-linux/rules/rpm/patches/0005-importlib.patch

@@ -0,0 +1,433 @@
+ qtbase/src/corelib/debug_script.py                                                                            | 2 +-
+ qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py                       | 2 +-
+ qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py                  | 2 +-
+ qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py                                  | 2 +-
+ qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py                    | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py                                   | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py                          | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py                | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py                | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py                         | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py        | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py                                | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py                       | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py                      | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py                 | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py                                              | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py                    | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py                                           | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py                                             | 2 +-
+ .../src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py    | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py   | 2 +-
+ .../src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py        | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py         | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py  | 2 +-
+ .../src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py       | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py   | 2 +-
+ .../3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py  | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py             | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py            | 2 +-
+ qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py                                       | 2 +-
+ qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py                       | 2 +-
+ 31 files changed, 31 insertions(+), 31 deletions(-)
+
+diff --git a/qtbase/src/corelib/debug_script.py b/qtbase/src/corelib/debug_script.py
+index f6207c6104..663c8e0ac1 100644
+--- a/qtbase/src/corelib/debug_script.py
++++ b/qtbase/src/corelib/debug_script.py
+@@ -3,7 +3,7 @@
+
+ import os
+ import sys
+-import imp
++import importlib
+
+ from distutils.version import LooseVersion
+
+diff --git a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
+index 681039d34b..a1fe56fa05 100644
+--- a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
++++ b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
+@@ -16,7 +16,7 @@ import subprocess
+ import sys
+ import tempfile
+ import time
+-import imp
++import importlib
+
+ # from TestCasePackagerConfig import *
+
+diff --git a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
+index 92d4e6139b..7a18e12ced 100644
+--- a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
++++ b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
+@@ -7,7 +7,7 @@ import unittest
+
+ import os
+ import yaml
+-import imp
++import importlib
+
+ # add parent dir to search path
+ import sys
+diff --git a/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py b/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py
+index c7412927c8..ad2caff318 100755
+--- a/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py
++++ b/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py
+@@ -5,7 +5,7 @@
+
+ import os
+ import sys
+-import imp
++import importlib
+ import tempfile
+ import unittest
+ import PRESUBMIT
+diff --git a/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py b/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
+index 5daee773ba..2d6b124162 100755
+--- a/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
++++ b/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
+@@ -9,7 +9,7 @@
+ """
+ from __future__ import print_function
+ import abc
+-import imp
++import importlib
+ import optparse
+ import os
+ import re
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
+index bf626f5479..3fae129aaa 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
+@@ -3,7 +3,7 @@
+ # found in the LICENSE file.
+
+ import errno
+-import imp
++import importlib
+ import os.path
+ import sys
+
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
+index ff5753a291..04fc34f742 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import shutil
+ import sys
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
+index 32c884a8c0..e761faa54c 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
+index 95a916db08..4331e2fbfa 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
+index 62798631db..28e9dbf705 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
+index cba249b0f3..5a4051827a 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
+index 4a2fefc712..11a9879cb7 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
+index cc17ae0253..bcc944f06b 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
+index bd72830e54..f2fdc9ae28 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py b/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py
+index 1feb303a48..8428de61bb 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py
+@@ -6,7 +6,7 @@
+ angle_presubmit_utils_unittest.py: Top-level unittest script for ANGLE presubmit checks.
+ """
+
+-import imp
++import importlib
+ import os
+ import unittest
+ from angle_presubmit_utils import *
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py b/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py
+index ed4f38c67b..cac734cefa 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py
+@@ -7,7 +7,7 @@ See https://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
+ for more details about the presubmit API built into gcl.
+ """
+
+-import imp
++import importlib
+ import inspect
+ import os
+ import re
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py b/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py
+index 0244c9787e..f535afe99c 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py
+@@ -32,7 +32,7 @@ if PY3:
+     memoryview_type = memoryview
+     struct_bool_decl = "?"
+ else:
+-    import imp
++    import importlib
+     string_types = (unicode,)
+     if PY26 or PY27:
+         binary_types = (str,bytearray)
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py b/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py
+index 8430390eea..29212205bc 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py
+@@ -732,7 +732,7 @@ class Environment(object):
+                 )
+                 py_compile = False
+             else:
+-                import imp
++                import importlib
+                 import marshal
+
+                 py_header = imp.get_magic() + u"\xff\xff\xff\xff".encode("iso-8859-15")
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py b/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py
+index 06bb8d99f5..05089dc982 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py
+@@ -115,7 +115,7 @@ if py3k:
+             return module
+
+ else:
+-    import imp
++    import importlib
+
+     def load_module(module_id, path):
+         fp = open(path, "rb")
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py
+index a7dc683365..68b6804c78 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py
+@@ -14,7 +14,7 @@
+ # ==============================================================================
+ """Tests for call_trees module."""
+
+-import imp
++import importlib
+
+ from tensorflow.python.autograph.converters import call_trees
+ from tensorflow.python.autograph.converters import functions
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py
+index 81a7fde808..1370f900fd 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py
+@@ -14,7 +14,7 @@
+ # ==============================================================================
+ """Tests for converter module."""
+
+-import imp
++import importlib
+
+ from tensorflow.python.autograph.core import converter
+ from tensorflow.python.autograph.core import converter_testing
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py
+index b93cbb627b..452ec71f5b 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py
+@@ -15,7 +15,7 @@
+ """Base class for tests in this module."""
+
+ import contextlib
+-import imp
++import importlib
+ import inspect
+ import sys
+
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py
+index 9a62d7c0d2..7ec4fa6dca 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py
+@@ -19,7 +19,7 @@ import collections
+ import contextlib
+ import functools
+ import gc
+-import imp
++import importlib
+ import inspect
+ import os
+ import re
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py
+index 852af3efe7..6456c50446 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py
+@@ -14,7 +14,7 @@
+ # ==============================================================================
+ """Tests for conversion module."""
+
+-import imp
++import importlib
+ import sys
+ import types
+ import weakref
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py
+index a50a64534a..ba0f31afa2 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py
+@@ -17,7 +17,7 @@
+ import abc
+ import collections
+ import functools
+-import imp
++import importlib
+ import textwrap
+
+ import six
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py
+index 29f38d853a..7ca88fa371 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py
+@@ -14,7 +14,7 @@
+ # ==============================================================================
+ """Tests for templates module."""
+
+-import imp
++import importlib
+
+ from absl.testing import parameterized
+ import gast
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py
+index e46460574b..a40fea6568 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py
+@@ -14,7 +14,7 @@
+ # =============================================================================
+ """Tests for create_python_api."""
+
+-import imp
++import importlib
+ import sys
+
+ from tensorflow.python.platform import test
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py
+index 73d1742714..ea77dd7647 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py
+@@ -1,5 +1,5 @@
+ import importlib
+-import imp
++import importlib
+
+ from .browsers import product_list
+
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py
+index 6a744472b5..9175cb5d34 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py
+@@ -1,6 +1,6 @@
+ import copy
+ import functools
+-import imp
++import importlib
+ import io
+ import os
+ from collections import OrderedDict, defaultdict
+diff --git a/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py b/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py
+index 6912b6f3c0..7d851f7f76 100755
+--- a/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py
++++ b/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py
+@@ -16,7 +16,7 @@
+
+ from __future__ import print_function
+
+-import imp
++import importlib
+ import optparse
+ import os
+ import pipes
+diff --git a/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py b/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py
+index 1c2aba80af..55260d697e 100644
+--- a/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py
++++ b/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py
+@@ -10,7 +10,7 @@ from __future__ import print_function
+
+ import os
+ import re
+-import imp
++import importlib
+
+ from _monkeyYaml import load as yamlLoad
+

extras/packaging/gnu-linux/scripts/build-package-rpm.sh

@@ -46,7 +46,7 @@ CMAKE_PREFIX_PATH="${QT_JAMI_PREFIX}/lib/cmake:${CMAKE_PREFIX_PATH}"
 QT_MAJOR=6
 QT_MINOR=4
 QT_PATCH=3
-QT_RELEASE_PATCH=2
+QT_RELEASE_PATCH=3
 
 QT_MAJOR_MINOR=${QT_MAJOR}.${QT_MINOR}
 QT_MAJOR_MINOR_PATCH=${QT_MAJOR}.${QT_MINOR}.${QT_PATCH}
@@ -105,18 +105,14 @@ if [ ! -f "${RPM_PATH}" ]; then
         # Cache the built Qt RPM package.
         if [[ "${DISTRIBUTION:0:4}" == "rhel" ]]; then
             cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.el8.x86_64.rpm "${RPM_PATH}"
-        elif [[ "${DISTRIBUTION}" == "fedora_33" ]]; then
-            cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc33.x86_64.rpm "${RPM_PATH}"
-        elif [[ "${DISTRIBUTION}" == "fedora_34" ]]; then
-            cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc34.x86_64.rpm "${RPM_PATH}"
-        elif [[ "${DISTRIBUTION}" == "fedora_35" ]]; then
-            cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc35.x86_64.rpm "${RPM_PATH}"
         elif [[ "${DISTRIBUTION}" == "fedora_36" ]]; then
             cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc36.x86_64.rpm "${RPM_PATH}"
         elif [[ "${DISTRIBUTION}" == "fedora_37" ]]; then
             cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc37.x86_64.rpm "${RPM_PATH}"
         elif [[ "${DISTRIBUTION}" == "fedora_38" ]]; then
             cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc38.x86_64.rpm "${RPM_PATH}"
+        elif [[ "${DISTRIBUTION}" == "fedora_39" ]]; then
+            cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc39.x86_64.rpm "${RPM_PATH}"
         else
             cp /root/rpmbuild/RPMS/x86_64/jami-libqt-*.rpm "${RPM_PATH}"
         fi

extras/packaging/gnu-linux/scripts/deploy-packages.sh

@@ -272,7 +272,7 @@ function package()
 {
     if [[ $DISTRIBUTION =~ debian|ubuntu|raspbian|guix-deb-pack ]]; then
         package_deb
-    elif [[ $DISTRIBUTION =~ fedora|rhel|opensuse|guix-rpm-pack ]]; then
+    elif [[ $DISTRIBUTION =~ alma|fedora|rhel|opensuse|guix-rpm-pack ]]; then
         package_rpm
     elif [[ $DISTRIBUTION =~ snap ]]; then
         package_snap

extras/scripts/build-windows.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-
+# -*- coding: utf-8 -*-
 """
 Build, test, and package the project.
 
@@ -65,6 +65,15 @@ this_dir = os.path.dirname(os.path.realpath(__file__))
 repo_root_dir = os.path.abspath(os.path.join(this_dir, os.pardir, os.pardir))
 build_dir = os.path.join(repo_root_dir, "build")
 
+def get_latest_toolset_version():
+    """Get the latest toolset version."""
+    # Get the visual studio version. Use only the major version number.
+    # Then: toolset = 2022 ? "v143" : 2019 ? "v142" : 2017 ? "v141" : "v140"
+    vs_ver = get_vs_prop("installationVersion")
+    if vs_ver is None:
+        return None
+    vs_ver = int(vs_ver.split(".")[0])
+    return "v143" if vs_ver >= 16 else "v142" if vs_ver >= 15 else "v141"
 
 def find_latest_qt_path():
     """Find the latest Qt installation path."""
@@ -190,40 +199,31 @@ def init_submodules():
     """Initialize any git submodules in the project."""
     print("Initializing submodules...")
 
-    if execute_cmd(["git", "submodule", "update", "--init"], False):
+    # Init the client submodules for Windows other than the daemon.
+    submodules = [
+        "3rdparty/qrencode-win32",
+        "3rdparty/SortFilterProxyModel",
+        "3rdparty/md4c",
+        "3rdparty/tidy-html5",
+    ]
+    if execute_cmd(["git", "submodule", "update", "--init" ] + submodules,
+                   False):
         print("Submodule initialization error.")
-    else:
-        if execute_cmd(["git", "submodule", "update", "--recursive"], False):
-            print("Submodule recursive checkout error.")
-        else:
-            print("Submodule recursive checkout finished.")
+        sys.exit(1)
 
 
 def build_deps():
     """Build the dependencies for the project."""
-    print('Patching and building qrencode')
-    apply_cmd = [
-        'git',
-        'apply',
-        '--reject',
-        '--ignore-whitespace',
-        '--whitespace=fix'
-    ]
+    print('Building qrencode')
     qrencode_dir = os.path.join(repo_root_dir, '3rdparty', 'qrencode-win32')
-    patch_file = os.path.join(repo_root_dir, 'qrencode-win32.patch')
-    apply_cmd.append(patch_file)
-    if execute_cmd(apply_cmd, False, None, qrencode_dir):
-        print("Couldn't patch qrencode-win32.")
-
     vs_env_vars = {}
     vs_env_vars.update(get_vs_env())
-
-    msbuild_args = get_ms_build_args("x64", "Release-Lib")
-
+    toolset = get_latest_toolset_version()
+    print(f'Using toolset {toolset}')
+    msbuild_args = get_ms_build_args("x64", "Release-Lib", toolset)
     proj_path = os.path.join(
-        qrencode_dir, "qrencode-win32", "vc8", "qrcodelib", "qrcodelib.vcxproj"
+        qrencode_dir, "qrencode-win32", "vc15", "qrcodelib", "qrcodelib.vcxproj"
     )
-
     build_project(msbuild_args, proj_path, vs_env_vars)
 
 
@@ -264,17 +264,15 @@ def build(config_str, qt_dir, tests):
 
     # Get the daemon bin/include directories.
     daemon_dir = os.path.join(repo_root_dir, "daemon")
-    daemon_bin_dir = os.path.join(
-        daemon_dir, "build", "x64", "ReleaseLib_win32", "bin")
+    daemon_bin_dir = os.path.join(daemon_dir, "build", "lib")
 
     # We need to update the minimum SDK version to be able to
     # build with system theme support
     cmake_options = [
-        "-DWITH_DAEMON_SUBMODULE=ON",
+        "-DJAMICORE_AS_SUBDIR=ON",
         "-DCMAKE_PREFIX_PATH=" + qt_dir,
         "-DCMAKE_MSVCIDE_RUN_PATH=" + qt_dir + "\\bin",
-        "-DCMAKE_INSTALL_PREFIX=" + daemon_bin_dir,
-        "-DLIBJAMI_INCLUDE_DIR=" + daemon_dir + "\\src\\jami",
+        "-DCMAKE_INSTALL_PREFIX=" + os.getcwd(),
         "-DCMAKE_SYSTEM_VERSION=" + WIN_SDK_VERSION,
         "-DCMAKE_BUILD_TYPE=" + "Release",
         "-DENABLE_TESTS=" + str(tests).lower(),

extras/scripts/install.sh

@@ -43,9 +43,10 @@ proc='1'
 priv_install=true
 enable_libwrap=true
 enable_webengine=true
+asan=
 arch=''
 
-while getopts gsc:dQ:P:p:uWwa: OPT; do
+while getopts gsc:dQ:P:p:uWwa:A OPT; do
   case "$OPT" in
     g)
       global='true'
@@ -77,6 +78,9 @@ while getopts gsc:dQ:P:p:uWwa: OPT; do
     a)
       arch="${OPTARG}"
     ;;
+    A)
+      asan='true'
+    ;;
     \?)
       exit 1
     ;;
@@ -116,7 +120,7 @@ else
     mkdir -p contrib/native
     (
         cd contrib/native
-        ../bootstrap ${prefix:+"--prefix=$prefix"}
+        ../bootstrap ${prefix:+"--prefix=$prefix"} ${asan:+"--enable-asan"}
         make -j"${proc}"
     )
 
@@ -125,6 +129,8 @@ else
       if [[ "$OSTYPE" != "darwin"* ]]; then
         CONFIGURE_FLAGS+=" --disable-shared"
       fi
+    else
+      CONFIGURE_FLAGS+="--without-dbus"
     fi
 
     BUILD_TYPE="Release"
@@ -133,6 +139,10 @@ else
       CONFIGURE_FLAGS+=" --enable-debug"
     fi
 
+    if [ "${asan}" = "true" ]; then
+      CONFIGURE_FLAGS+=" --enable-asan"
+    fi
+
     # Build the daemon itself.
     test -f configure || ./autogen.sh
 
@@ -181,6 +191,11 @@ client_cmake_flags=(-DCMAKE_BUILD_TYPE="${BUILD_TYPE}"
                     -DCMAKE_PREFIX_PATH="${qtpath}"
                     -DENABLE_LIBWRAP="${enable_libwrap}"
                     -DWITH_WEBENGINE="${enable_webengine}")
+
+if [ "${asan}" = "true" ]; then
+    client_cmake_flags+=(-DENABLE_ASAN=true)
+fi
+
 if [[ "$OSTYPE" == "darwin"* ]]; then
     #detect arch for macos
     CMAKE_OSX_ARCHITECTURES="arm64"

qrencode-win32.patch

@@ -1,243 +0,0 @@
-From 261d830b9b4126d76519db0e6b6b51b5a730eb40 Mon Sep 17 00:00:00 2001
-From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
-Date: Tue, 4 Dec 2018 17:42:43 -0500
-Subject: [PATCH] b
-
----
- .../vc8/qrcodelib/qrcodelib.vcxproj           | 129 +++++++++++++++++-
- 1 file changed, 125 insertions(+), 4 deletions(-)
-
-diff --git a/qrencode-win32/vc8/qrcodelib/qrcodelib.vcxproj b/qrencode-win32/vc8/qrcodelib/qrcodelib.vcxproj
-index aabc6b6..8d8293b 100644
---- a/qrencode-win32/vc8/qrcodelib/qrcodelib.vcxproj
-+++ b/qrencode-win32/vc8/qrcodelib/qrcodelib.vcxproj
-@@ -5,45 +5,84 @@
-       <Configuration>Debug-Dll</Configuration>
-       <Platform>Win32</Platform>
-     </ProjectConfiguration>
-+    <ProjectConfiguration Include="Debug-Dll|x64">
-+      <Configuration>Debug-Dll</Configuration>
-+      <Platform>x64</Platform>
-+    </ProjectConfiguration>
-     <ProjectConfiguration Include="Debug-Lib|Win32">
-       <Configuration>Debug-Lib</Configuration>
-       <Platform>Win32</Platform>
-     </ProjectConfiguration>
-+    <ProjectConfiguration Include="Debug-Lib|x64">
-+      <Configuration>Debug-Lib</Configuration>
-+      <Platform>x64</Platform>
-+    </ProjectConfiguration>
-     <ProjectConfiguration Include="Release-Dll|Win32">
-       <Configuration>Release-Dll</Configuration>
-       <Platform>Win32</Platform>
-     </ProjectConfiguration>
-+    <ProjectConfiguration Include="Release-Dll|x64">
-+      <Configuration>Release-Dll</Configuration>
-+      <Platform>x64</Platform>
-+    </ProjectConfiguration>
-     <ProjectConfiguration Include="Release-Lib|Win32">
-       <Configuration>Release-Lib</Configuration>
-       <Platform>Win32</Platform>
-     </ProjectConfiguration>
-+    <ProjectConfiguration Include="Release-Lib|x64">
-+      <Configuration>Release-Lib</Configuration>
-+      <Platform>x64</Platform>
-+    </ProjectConfiguration>
-   </ItemGroup>
-   <PropertyGroup Label="Globals">
-     <ProjectGuid>{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}</ProjectGuid>
-     <RootNamespace>qrcodelib</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|Win32'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110_xp</PlatformToolset>
-+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-+    <CharacterSet>MultiByte</CharacterSet>
-+    <WholeProgramOptimization>true</WholeProgramOptimization>
-+  </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|x64'" Label="Configuration">
-+    <ConfigurationType>StaticLibrary</ConfigurationType>
-+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-     <CharacterSet>MultiByte</CharacterSet>
-     <WholeProgramOptimization>true</WholeProgramOptimization>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|Win32'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110_xp</PlatformToolset>
-+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-+    <CharacterSet>MultiByte</CharacterSet>
-+  </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|x64'" Label="Configuration">
-+    <ConfigurationType>StaticLibrary</ConfigurationType>
-+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|Win32'" Label="Configuration">
-     <ConfigurationType>DynamicLibrary</ConfigurationType>
--    <PlatformToolset>v110_xp</PlatformToolset>
-+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-+    <CharacterSet>MultiByte</CharacterSet>
-+    <WholeProgramOptimization>true</WholeProgramOptimization>
-+  </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|x64'" Label="Configuration">
-+    <ConfigurationType>DynamicLibrary</ConfigurationType>
-+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-     <CharacterSet>MultiByte</CharacterSet>
-     <WholeProgramOptimization>true</WholeProgramOptimization>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|Win32'" Label="Configuration">
-     <ConfigurationType>DynamicLibrary</ConfigurationType>
--    <PlatformToolset>v110_xp</PlatformToolset>
-+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-+    <CharacterSet>MultiByte</CharacterSet>
-+  </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|x64'" Label="Configuration">
-+    <ConfigurationType>DynamicLibrary</ConfigurationType>
-+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-@@ -52,15 +91,27 @@
-   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|Win32'" Label="PropertySheets">
-     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-   </ImportGroup>
-+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|x64'" Label="PropertySheets">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+  </ImportGroup>
-   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|Win32'" Label="PropertySheets">
-     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-   </ImportGroup>
-+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|x64'" Label="PropertySheets">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+  </ImportGroup>
-   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|Win32'" Label="PropertySheets">
-     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-   </ImportGroup>
-+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|x64'" Label="PropertySheets">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+  </ImportGroup>
-   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|Win32'" Label="PropertySheets">
-     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-   </ImportGroup>
-+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|x64'" Label="PropertySheets">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+  </ImportGroup>
-   <PropertyGroup Label="UserMacros" />
-   <PropertyGroup>
-     <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-@@ -70,11 +121,17 @@
-     <IntDir>../.build/$(ProjectName)/$(Configuration)\</IntDir>
-     <LinkIncremental>true</LinkIncremental>
-   </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|x64'">
-+    <LinkIncremental>true</LinkIncremental>
-+  </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|Win32'">
-     <OutDir>../.build/$(Configuration)\</OutDir>
-     <IntDir>../.build/$(ProjectName)/$(Configuration)\</IntDir>
-     <LinkIncremental>false</LinkIncremental>
-   </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|x64'">
-+    <LinkIncremental>false</LinkIncremental>
-+  </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|Win32'">
-     <OutDir>../.build/$(Configuration)\</OutDir>
-     <IntDir>../.build/$(ProjectName)/$(Configuration)\</IntDir>
-@@ -104,6 +161,26 @@
-       <TargetMachine>MachineX86</TargetMachine>
-     </Link>
-   </ItemDefinitionGroup>
-+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|x64'">
-+    <ClCompile>
-+      <Optimization>Disabled</Optimization>
-+      <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;QRCODELIB_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-+      <PrecompiledHeader>
-+      </PrecompiledHeader>
-+      <WarningLevel>Level3</WarningLevel>
-+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-+    </ClCompile>
-+    <Link>
-+      <AdditionalDependencies>libpng15d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalLibraryDirectories>..\qrcode\png;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-+      <ModuleDefinitionFile>qrcodelib.def</ModuleDefinitionFile>
-+      <GenerateDebugInformation>true</GenerateDebugInformation>
-+      <SubSystem>Windows</SubSystem>
-+    </Link>
-+  </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|Win32'">
-     <ClCompile>
-       <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-@@ -124,6 +201,26 @@
-       <TargetMachine>MachineX86</TargetMachine>
-     </Link>
-   </ItemDefinitionGroup>
-+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|x64'">
-+    <ClCompile>
-+      <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;QRCODELIB_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+      <PrecompiledHeader>
-+      </PrecompiledHeader>
-+      <WarningLevel>Level3</WarningLevel>
-+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-+    </ClCompile>
-+    <Link>
-+      <AdditionalDependencies>libpng15.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalLibraryDirectories>..\qrcode\png;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-+      <ModuleDefinitionFile>qrcodelib.def</ModuleDefinitionFile>
-+      <GenerateDebugInformation>true</GenerateDebugInformation>
-+      <SubSystem>Windows</SubSystem>
-+      <OptimizeReferences>true</OptimizeReferences>
-+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-+    </Link>
-+  </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|Win32'">
-     <ClCompile>
-       <Optimization>Disabled</Optimization>
-@@ -137,6 +234,19 @@
-       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-     </ClCompile>
-   </ItemDefinitionGroup>
-+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|x64'">
-+    <ClCompile>
-+      <Optimization>Disabled</Optimization>
-+      <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;QRCODELIB_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-+      <PrecompiledHeader>
-+      </PrecompiledHeader>
-+      <WarningLevel>Level3</WarningLevel>
-+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-+    </ClCompile>
-+  </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|Win32'">
-     <ClCompile>
-       <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-@@ -147,6 +257,17 @@
-       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-     </ClCompile>
-   </ItemDefinitionGroup>
-+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|x64'">
-+    <ClCompile>
-+      <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;QRCODELIB_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-+      <PrecompiledHeader>
-+      </PrecompiledHeader>
-+      <WarningLevel>Level3</WarningLevel>
-+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-+    </ClCompile>
-+  </ItemDefinitionGroup>
-   <ItemGroup>
-     <ClCompile Include="qrcodelib.cpp" />
-     <ClCompile Include="..\..\bitstream.c" />
--- 
-2.19.0.windows.1
-

resources/Info.plist

@@ -36,5 +36,7 @@
 	<string>Jami requires to access your microphone to make calls and record audio</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<true/>
+    <key>NSAppleEventsUsageDescription</key>
+    <string>Jami requires to monitor global key events for push-to-talk functionality.</string>
 </dict>
 </plist>

resources/icons/Connected_Black_24dp.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<path id="noun-connection-5025318" d="M18,6.3c1.2,0,2.2-1,2.2-2.1C20.1,3,19.2,2,18,2c-1.2,0-2.2,1-2.2,2.1c0,0.5,0.2,1.1,0.6,1.5
+	l-3.3,3.8c-0.8-0.6-2-0.5-2.7,0.2L7.3,7.1c0.5-0.8,0.2-1.9-0.6-2.4C5.9,4.2,4.8,4.5,4.3,5.3C3.8,6.1,4,7.2,4.9,7.7
+	C5.6,8.1,6.4,8,7,7.5l3.1,2.5c-0.5,0.8-0.4,1.9,0.3,2.6l-2.9,2.9c-1.1-0.7-2.5-0.4-3.2,0.7c-0.7,1.1-0.4,2.5,0.7,3.2
+	c1.1,0.7,2.5,0.4,3.2-0.7c0.6-0.9,0.5-2.1-0.3-2.9l2.9-2.9c0.3,0.2,0.7,0.3,1.2,0.3c0,0,0.1,0,0.1,0l0.8,4.8
+	c-1.1,0.3-1.7,1.4-1.4,2.5c0.3,1.1,1.4,1.7,2.5,1.4c1.1-0.3,1.7-1.4,1.4-2.5c-0.3-0.9-1-1.4-1.9-1.4c0,0-0.1,0-0.1,0l-0.8-4.8
+	c0.4-0.1,0.7-0.3,0.9-0.6l3.6,2.7c-0.4,0.8-0.2,1.8,0.6,2.2c0.8,0.4,1.8,0.2,2.2-0.6c0.4-0.8,0.2-1.8-0.6-2.2
+	c-0.6-0.4-1.4-0.3-1.9,0.2l-3.6-2.7c0.2-0.3,0.3-0.7,0.3-1.1c0-0.5-0.2-1.1-0.6-1.5l3.3-3.8C17.1,6.2,17.5,6.3,18,6.3L18,6.3z"/>
+</svg>

resources/icons/Connecting_Black_24dp.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<g id="noun-waiting-3611673" transform="translate(-13.64 -30.48)">
+	<path id="Path_278" d="M25.9,34.5c0.5,0,0.8-0.4,0.8-0.8c0-0.5-0.4-0.8-0.8-0.8c-0.5,0-0.8,0.4-0.8,0.8c0,0.2,0.1,0.4,0.2,0.6
+		C25.4,34.4,25.6,34.5,25.9,34.5z"/>
+	<path id="Path_279" d="M32.7,36.9c0.4-0.4,0.4-1.1,0-1.5c-0.4-0.4-1.1-0.4-1.5,0c-0.4,0.4-0.4,1.1,0,1.5c0.2,0.2,0.5,0.3,0.8,0.3
+		C32.2,37.2,32.5,37.1,32.7,36.9z"/>
+	<path id="Path_280" d="M34.5,41c-0.7,0-1.2,0.5-1.2,1.2s0.5,1.2,1.2,1.2c0.7,0,1.2-0.5,1.2-1.2c0-0.3-0.1-0.6-0.3-0.8
+		C35.1,41.1,34.8,41,34.5,41z"/>
+	<path id="Path_281" d="M31.9,47c-0.7,0-1.3,0.6-1.3,1.3c0,0.7,0.6,1.3,1.3,1.3c0.7,0,1.3-0.6,1.3-1.3c0-0.3-0.1-0.7-0.4-0.9
+		C32.6,47.1,32.3,47,31.9,47z"/>
+	<path id="Path_282" d="M25.9,49.4c-0.8,0-1.4,0.6-1.4,1.4c0,0.8,0.6,1.4,1.4,1.4c0.8,0,1.4-0.6,1.4-1.4c0-0.4-0.1-0.7-0.4-1
+		C26.6,49.5,26.2,49.4,25.9,49.4z"/>
+	<path id="Path_283" d="M18.7,47.2L18.7,47.2c-0.6,0.6-0.6,1.6,0,2.2c0.6,0.6,1.6,0.6,2.2,0c0.6-0.6,0.6-1.6,0-2.2
+		c-0.3-0.3-0.7-0.5-1.1-0.5C19.4,46.7,19,46.9,18.7,47.2z"/>
+	<path id="Path_284" d="M18.9,42.2c0-0.9-0.7-1.7-1.6-1.7s-1.7,0.7-1.7,1.6c0,0.9,0.7,1.7,1.6,1.7c0.4,0,0.9-0.2,1.2-0.5
+		C18.8,43,18.9,42.6,18.9,42.2z"/>
+	<path id="Path_285" d="M21.1,34.9c-0.7-0.3-1.5-0.1-1.9,0.6c-0.3,0.7-0.1,1.5,0.6,1.9c0.7,0.3,1.5,0.1,1.9-0.6
+		c0.1-0.2,0.2-0.5,0.1-0.7C21.8,35.5,21.5,35.1,21.1,34.9z"/>
+</g>
+</svg>

resources/icons/Icon_Donate.svg

@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="43" height="52.655" viewBox="0 0 43 52.655">
+  <defs>
+    <clipPath id="clip-path">
+      <rect id="Rectangle_268" data-name="Rectangle 268" width="38" height="24" transform="translate(-0.407 0.083)" fill="#fff" stroke="#707070" stroke-width="1"/>
+    </clipPath>
+  </defs>
+  <g id="Icon_Donate" transform="translate(-22 -189.345)">
+    <rect id="Rectangle_267" data-name="Rectangle 267" width="43" height="10" rx="5" transform="translate(22 232)" fill="#9eb3c3"/>
+    <path id="Path_459" data-name="Path 459" d="M9.674,17.083,8.562,16.07C4.609,12.486,2,10.122,2,7.221A4.18,4.18,0,0,1,6.221,3,4.6,4.6,0,0,1,9.674,4.6,4.6,4.6,0,0,1,13.128,3a4.18,4.18,0,0,1,4.221,4.221c0,2.9-2.609,5.265-6.562,8.856Z" transform="translate(22.407 199.828)" fill="#ff0045" opacity="0.3"/>
+    <path id="Path_460" data-name="Path 460" d="M6.953,12.088l-.718-.654C3.684,9.122,2,7.6,2,5.724A2.7,2.7,0,0,1,4.724,3,2.966,2.966,0,0,1,6.953,4.035,2.966,2.966,0,0,1,9.182,3a2.7,2.7,0,0,1,2.724,2.724c0,1.872-1.684,3.4-4.235,5.716Z" transform="translate(45.571 186.345)" fill="#ff0045" opacity="0.16"/>
+    <g id="Mask_Group_38" data-name="Mask Group 38" transform="translate(24.407 213.918)" clip-path="url(#clip-path)">
+      <path id="Path_270" data-name="Path 270" d="M12.649,22.542l-1.544-1.406C5.621,16.163,2,12.883,2,8.857A5.8,5.8,0,0,1,7.857,3a6.377,6.377,0,0,1,4.792,2.226A6.377,6.377,0,0,1,17.442,3,5.8,5.8,0,0,1,23.3,8.857c0,4.025-3.621,7.306-9.105,12.289Z" transform="translate(5.992 5.54)" fill="#ff0045"/>
+    </g>
+  </g>
+</svg>

resources/icons/assignment_ind_black_24dp.svg

@@ -0,0 +1,4 @@
+<svg id="assignment_ind_black_24dp" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <path id="Path_311" data-name="Path 311" d="M0,0H24V24H0Z" fill="none"/>
+  <path id="Path_312" data-name="Path 312" d="M19,3H14.82A2.988,2.988,0,0,0,9.18,3H5A2.006,2.006,0,0,0,3,5V19a2.006,2.006,0,0,0,2,2H19a2.006,2.006,0,0,0,2-2V5A2.006,2.006,0,0,0,19,3Zm-7-.25a.767.767,0,1,1-.55.25A.749.749,0,0,1,12,2.75ZM19,19H5V5H19ZM12,6a3,3,0,1,0,3,3A3.009,3.009,0,0,0,12,6Zm0,4a1,1,0,1,1,1-1A1,1,0,0,1,12,10ZM6,16.47V18H18V16.47c0-2.5-3.97-3.58-6-3.58S6,13.96,6,16.47ZM8.31,16A7.011,7.011,0,0,1,12,14.88,6.982,6.982,0,0,1,15.69,16Z" fill="#005699"/>
+</svg>

resources/icons/content_copy_24dp.svg

@@ -1,9 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path d="M20.4,2.2H8.5c-0.9,0-1.6,0.7-1.6,1.6v2.9H3.6C2.7,6.7,2,7.4,2,8.3v11.9c0,0.9,0.7,1.6,1.6,1.6h11.9c0.9,0,1.6-0.7,1.6-1.6
-	v-2.9h3.3c0.9,0,1.6-0.7,1.6-1.6V3.8C22,2.9,21.3,2.2,20.4,2.2z M15.8,20.2c0,0.2-0.1,0.3-0.3,0.3H3.6c-0.2,0-0.3-0.1-0.3-0.3V8.3
-	C3.3,8.2,3.4,8,3.6,8h11.9c0.2,0,0.3,0.1,0.3,0.3V20.2z M20.7,15.7c0,0.2-0.1,0.3-0.3,0.3h-3.3V8.3c0-0.9-0.7-1.6-1.6-1.6H8.2V3.8
-	c0-0.2,0.1-0.3,0.3-0.3h11.9c0.2,0,0.3,0.1,0.3,0.3V15.7z"/>
-</svg>
+<svg id="content_copy_24dp" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <path id="Path_305" data-name="Path 305" d="M0,0H24V24H0Z" fill="none"/>
+  <path id="Path_306" data-name="Path 306" d="M16,1H4A2.006,2.006,0,0,0,2,3V17H4V3H16Zm3,4H8A2.006,2.006,0,0,0,6,7V21a2.006,2.006,0,0,0,2,2H19a2.006,2.006,0,0,0,2-2V7A2.006,2.006,0,0,0,19,5Zm0,16H8V7H19Z" fill="#005699"/>
+</svg>

resources/icons/favorite_black_24dp.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="21.5" height="20.112" viewBox="0 0 21.5 20.112">
+  <g id="favorite_black_24dp" transform="translate(-1.25 -2.25)">
+    <path id="Path_270" data-name="Path 270" d="M12,21.35l-1.45-1.32C5.4,15.36,2,12.28,2,8.5A5.447,5.447,0,0,1,7.5,3,5.988,5.988,0,0,1,12,5.09,5.988,5.988,0,0,1,16.5,3,5.447,5.447,0,0,1,22,8.5c0,3.78-3.4,6.86-8.55,11.54Z" fill="none" stroke="#03b9e9" stroke-width="1.5"/>
+  </g>
+</svg>

resources/icons/reply.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="48" width="48"><path d="M39 38v-8.7q0-2.7-1.9-4.6-1.9-1.9-4.6-1.9H11.7l7.7 7.7-2.1 2.1L6 21.3 17.3 10l2.1 2.1-7.7 7.7h20.8q3.9 0 6.7 2.775Q42 25.35 42 29.3V38Z"/></svg>

resources/icons/reply_black_24dp.svg

@@ -0,0 +1,4 @@
+<svg id="reply_black_24dp" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <path id="Path_333" data-name="Path 333" d="M0,0H24V24H0Z" fill="none"/>
+  <path id="Path_334" data-name="Path 334" d="M10,9V5L3,12l7,7V14.9c5,0,8.5,1.6,11,5.1C20,15,17,10,10,9Z" fill="none" stroke="#000" stroke-linecap="round" stroke-width="1.5"/>
+</svg>

resources/icons/share_24dp.svg

@@ -1,11 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>Share</title>
-    <g id="Icones" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Share" fill="#000000" stroke="#000000" stroke-width="0.75">
-            <g id="SHARE" transform="translate(4.000000, 2.000000)">
-                <path d="M13.5,15.00005 C14.6105,15.00005 15.5,15.88955 15.5,17.00005 C15.5,18.1103 14.6105,19.00005 13.5,19.00005 C12.3895,19.00005 11.5,18.1103 11.5,17.00005 C11.5,15.88955 12.3895,15.00005 13.5,15.00005 M3,8.00005 C4.1105,8.00005 5,8.88955 5,10.00005 C5,11.11055 4.1105,12.00005 3,12.00005 C1.8895,12.00005 1,11.11055 1,10.00005 C1,8.88955 1.8895,8.00005 3,8.00005 M13.5,1.00005 C14.6105,1.00005 15.5,1.88955 15.5,3.00005 C15.5,4.11055 14.6105,5.00005 13.5,5.00005 C12.3895,5.00005 11.5,4.11055 11.5,3.00005 C11.5,1.88955 12.3895,1.00005 13.5,1.00005 M13.5,5e-05 C11.849,5e-05 10.5,1.34905 10.5,3.00005 C10.5,3.47555 10.6135,3.92755 10.8125,4.32805 L5.086,7.85155 C4.545,7.3263 3.8095,7.00005 3,7.00005 C1.349,7.00005 0,8.34905 0,10.00005 C0,11.65105 1.349,13.00005 3,13.00005 C3.81525,13.00005 4.552,12.67255 5.09375,12.14055 L10.82025,15.66405 C10.6165,16.0683 10.5,16.51805 10.5,17.00005 C10.5,18.65105 11.849,20.00005 13.5,20.00005 C15.151,20.00005 16.5,18.65105 16.5,17.00005 C16.5,15.34905 15.151,14.00005 13.5,14.00005 C12.6905,14.00005 11.955,14.3263 11.414,14.85155 L5.6875,11.32805 C5.8865,10.92755 6,10.47555 6,10.00005 C6,9.51805 5.8835,9.06855 5.67975,8.66405 L11.40625,5.14055 C11.94825,5.67255 12.68475,6.00005 13.5,6.00005 C15.151,6.00005 16.5,4.65105 16.5,3.00005 C16.5,1.34905 15.151,5e-05 13.5,5e-05" id="Fill-1"></path>
-            </g>
-        </g>
+<svg id="share_24dp" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <g id="Group_66" data-name="Group 66">
+    <rect id="Rectangle_305" data-name="Rectangle 305" width="24" height="24" fill="none"/>
+  </g>
+  <g id="Group_68" data-name="Group 68">
+    <g id="Group_67" data-name="Group 67">
+      <path id="Path_302" data-name="Path 302" d="M3,11h8V3H3ZM5,5H9V9H5Z" fill="#005699"/>
+      <path id="Path_303" data-name="Path 303" d="M3,21h8V13H3Zm2-6H9v4H5Z" fill="#005699"/>
+      <path id="Path_304" data-name="Path 304" d="M13,3v8h8V3Zm6,6H15V5h4Z" fill="#005699"/>
+      <rect id="Rectangle_306" data-name="Rectangle 306" width="2" height="2" transform="translate(19 19)" fill="#005699"/>
+      <rect id="Rectangle_307" data-name="Rectangle 307" width="2" height="2" transform="translate(13 13)" fill="#005699"/>
+      <rect id="Rectangle_308" data-name="Rectangle 308" width="2" height="2" transform="translate(15 15)" fill="#005699"/>
+      <rect id="Rectangle_309" data-name="Rectangle 309" width="2" height="2" transform="translate(13 17)" fill="#005699"/>
+      <rect id="Rectangle_310" data-name="Rectangle 310" width="2" height="2" transform="translate(15 19)" fill="#005699"/>
+      <rect id="Rectangle_311" data-name="Rectangle 311" width="2" height="2" transform="translate(17 17)" fill="#005699"/>
+      <rect id="Rectangle_312" data-name="Rectangle 312" width="2" height="2" transform="translate(17 13)" fill="#005699"/>
+      <rect id="Rectangle_313" data-name="Rectangle 313" width="2" height="2" transform="translate(19 15)" fill="#005699"/>
     </g>
-</svg>
+  </g>
+</svg>

src/app/MainApplicationWindow.qml

@@ -65,6 +65,15 @@ ApplicationWindow {
         }
     }
 
+    header: Loader {
+        active: true
+        sourceComponent: GenericErrorsRow {
+            id: genericError
+            text: CurrentAccount.enabled ? JamiStrings.noNetworkConnectivity : JamiStrings.disabledAccount
+            height: visible? JamiTheme.chatViewHeaderPreferredHeight : 0
+        }
+    }
+
     Rectangle {
         id: focusOverlay
         objectName: "focusOverlay"
@@ -259,7 +268,7 @@ ApplicationWindow {
     }
 
     function presentUpdateInfoDialog(infoText) {
-        viewCoordinator.presentDialog(appWindow, "commoncomponents/SimpleMessageDialog.qml", {
+        return viewCoordinator.presentDialog(appWindow, "commoncomponents/SimpleMessageDialog.qml", {
                 "title": JamiStrings.updateDialogTitle,
                 "infoText": infoText,
                 "buttonTitles": [JamiStrings.optionOk],
@@ -268,6 +277,36 @@ ApplicationWindow {
             });
     }
 
+    function presentUpdateConfirmInstallDialog(switchToBeta=false) {
+        return viewCoordinator.presentDialog(appWindow, "commoncomponents/SimpleMessageDialog.qml", {
+                "title": JamiStrings.updateDialogTitle,
+                "infoText": switchToBeta ? JamiStrings.confirmBeta : JamiStrings.updateFound,
+                "buttonTitles": [JamiStrings.optionUpgrade, JamiStrings.optionLater],
+                "buttonStyles": [SimpleMessageDialog.ButtonStyle.TintedBlue, SimpleMessageDialog.ButtonStyle.TintedBlue],
+                "buttonCallBacks": [function () {
+                        AppVersionManager.applyUpdates(switchToBeta);
+                    }]
+            });
+    }
+
+    function translateErrorToString(error) {
+        switch (error) {
+        case NetworkManager.DISCONNECTED:
+            return JamiStrings.networkDisconnected;
+        case NetworkManager.CONTENT_NOT_FOUND:
+            return JamiStrings.contentNotFoundError;
+        case NetworkManager.ACCESS_DENIED:
+            return JamiStrings.accessError;
+        case NetworkManager.SSL_ERROR:
+            return JamiStrings.updateSSLError;
+        case NetworkManager.CANCELED:
+            return JamiStrings.updateDownloadCanceled;
+        case NetworkManager.NETWORK_ERROR:
+        default:
+            return JamiStrings.updateNetworkError;
+        }
+    }
+
     Connections {
         target: AppVersionManager
 
@@ -279,41 +318,22 @@ ApplicationWindow {
 
         function onUpdateCheckReplyReceived(ok, found) {
             if (!ok) {
+                // Show an error dialog describing that we could not successfully check for an update.
                 presentUpdateInfoDialog(JamiStrings.updateCheckError);
                 return;
             }
             if (!found) {
+                // Show a dialog describing that no update was found.
                 presentUpdateInfoDialog(JamiStrings.updateNotFound);
             } else {
-                viewCoordinator.presentDialog(appWindow, "commoncomponents/SimpleMessageDialog.qml", {
-                        "title": JamiStrings.updateDialogTitle,
-                        "infoText": JamiStrings.updateFound,
-                        "buttonTitles": [JamiStrings.optionUpgrade, JamiStrings.optionLater],
-                        "buttonStyles": [SimpleMessageDialog.ButtonStyle.TintedBlue, SimpleMessageDialog.ButtonStyle.TintedBlue],
-                        "buttonCallBacks": [function () {
-                                AppVersionManager.applyUpdates();
-                            }]
-                    });
+                // Show a dialog describing that an update were found, and offering to install it.
+                presentUpdateConfirmInstallDialog()
             }
         }
 
-        function onUpdateErrorOccurred(error) {
-            presentUpdateInfoDialog((function () {
-                        switch (error) {
-                        case NetworkManager.ACCESS_DENIED:
-                            return JamiStrings.genericError;
-                        case NetworkManager.DISCONNECTED:
-                            return JamiStrings.networkDisconnected;
-                        case NetworkManager.NETWORK_ERROR:
-                            return JamiStrings.updateNetworkError;
-                        case NetworkManager.SSL_ERROR:
-                            return JamiStrings.updateSSLError;
-                        case NetworkManager.CANCELED:
-                            return JamiStrings.updateDownloadCanceled;
-                        default:
-                            return {};
-                        }
-                    })());
+        function onNetworkErrorOccurred(error) {
+            var errorStr = translateErrorToString(error);
+            presentUpdateInfoDialog(errorStr);
         }
     }
 

src/app/ViewCoordinator.qml

@@ -74,7 +74,7 @@ QtObject {
     // Create, present, and return a dialog object.
     function presentDialog(parent, path, props = {}) {
         // Open the dialog once the object is created
-        return viewManager.createView(path, parent, function (obj) {
+        return viewManager.createUniqueView(path, parent, function (obj) {
                 const doneCb = function () {
                     viewManager.destroyView(path);
                 };

src/app/ViewManager.qml

@@ -36,36 +36,70 @@ QtObject {
         }
     }
 
+    // Create a view from a path only if it doesn't already exist. This is used
+    // by the view coordinator to create views that are not self-destructing
+    // (main views) and only exist once per instance of the app.
     function createView(path, parent = null, cb = null, props = {}) {
-        if (views.hasOwnProperty(path)) {
-            // an instance of <path> already exists
+        const component = Qt.createComponent(Qt.resolvedUrl(path));
+        return createViewFromComponent(component, path, parent, cb, props);
+    }
+
+    // Create a new view. Useful when we want to create multiple views that are
+    // self-destructing (dialogs).
+    function createUniqueView(path, parent = null, cb = null, props = {}) {
+        const component = Qt.createComponent(Qt.resolvedUrl(path));
+        return createViewFromComponent(component, getViewName(path), parent, cb,
+                                       props);
+    }
+
+    // Create a new view from a component. If a view with the same path already
+    // exists, it is returned instead.
+    function createViewFromComponent(component, viewName, parent = null,
+                                     cb = null, props = {}) {
+        if (views.hasOwnProperty(viewName)) {
+            // an instance of the view already exists
             if (cb !== null) {
-                cb(views[path])
+                cb(views[viewName])
             }
-            return views[path]
+            return views[viewName]
         }
-        const component = Qt.createComponent(Qt.resolvedUrl(path))
         if (component.status === Component.Ready) {
             const obj = component.createObject(parent, props)
             if (obj === null) {
-                print("error creating object")
+                console.error("error creating object")
                 return null
             }
-            views[path] = obj
+            views[viewName] = obj
             // Set the view name to the object name if it has one.
-            const viewName = obj.objectName.toString() !== '' ? obj.objectName : path.replace(/^.*[\\\/]/, '').replace(/\.[^/.]+$/, "")
-            viewPaths[viewName] = path
+            const friendlyName = obj.objectName.toString() !== '' ?
+                obj.objectName :
+                viewName.replace(/^.*[\\\/]/, '').replace(/\.[^/.]+$/, "")
+            viewPaths[friendlyName] = viewName
             if (cb !== null) {
                 cb(obj)
             }
-            return views[path]
+            return views[viewName]
         }
-        print("error creating component", path)
+        console.error("error creating component", component.url)
         console.error(component.errorString())
         Qt.exit(1)
         return null
     }
 
+    // Finds a unique view name for a given path by appending a number to the
+    // base name. For example, if a view named "MyView" already exists, the next
+    // view will be named "MyView_1".
+    function getViewName(path) {
+        const baseName = path.replace(/^.*[\\\/]/, '').replace(/\.[^/.]+$/, "")
+        let viewName = baseName
+        let suffix = 1
+        while (views.hasOwnProperty(viewName)) {
+            viewName = `${baseName}_${suffix}`
+            suffix++
+        }
+        return viewName
+    }
+
     function destroyView(path) {
         // The view may already have been destroyed.
         if (!views.hasOwnProperty(path)) {

src/app/appsettingsmanager.h

@@ -33,6 +33,7 @@
 extern const QString defaultDownloadPath;
 
 // clang-format off
+#ifdef APPSTORE
 #define KEYS \
     X(MinimizeOnClose, false) \
     X(DownloadPath, defaultDownloadPath) \
@@ -46,7 +47,7 @@ extern const QString defaultDownloadPath;
     X(AppTheme, "System") \
     X(BaseZoom, 1.0) \
     X(ParticipantsSide, false) \
-    X(HideSelf, false) \
+    X(HideSelf, true) \
     X(HideSpectators, false) \
     X(AutoUpdate, true) \
     X(PluginAutoUpdate, false) \
@@ -57,12 +58,53 @@ extern const QString defaultDownloadPath;
     X(WindowState, QWindow::AutomaticVisibility) \
     X(EnableExperimentalSwarm, false) \
     X(LANG, "SYSTEM") \
+    X(PluginStoreEndpoint, "https://plugins.jami.net") \
     X(PositionShareDuration, 15) \
     X(PositionShareLimit, true) \
     X(FlipSelf, true) \
     X(ShowMardownOption, false) \
     X(ChatViewEnterIsNewLine, false) \
-    X(ShowSendOption, false)
+    X(ShowSendOption, false)  \
+    X(EnablePtt, false) \
+    X(pttKey, 36)
+#else
+#define KEYS \
+    X(MinimizeOnClose, false) \
+    X(DownloadPath, defaultDownloadPath) \
+    X(ScreenshotPath, {}) \
+    X(EnableNotifications, true) \
+    X(EnableTypingIndicator, true) \
+    X(EnableReadReceipt, true) \
+    X(AcceptTransferBelow, 20) \
+    X(AutoAcceptFiles, true) \
+    X(DisplayHyperlinkPreviews, true) \
+    X(AppTheme, "System") \
+    X(BaseZoom, 1.0) \
+    X(ParticipantsSide, false) \
+    X(HideSelf, true) \
+    X(HideSpectators, false) \
+    X(AutoUpdate, true) \
+    X(PluginAutoUpdate, false) \
+    X(StartMinimized, false) \
+    X(ShowChatviewHorizontally, true) \
+    X(NeverShowMeAgain, false) \
+    X(WindowGeometry, QRectF(qQNaN(), qQNaN(), 0., 0.)) \
+    X(WindowState, QWindow::AutomaticVisibility) \
+    X(EnableExperimentalSwarm, false) \
+    X(LANG, "SYSTEM") \
+    X(PluginStoreEndpoint, "https://plugins.jami.net") \
+    X(PositionShareDuration, 15) \
+    X(PositionShareLimit, true) \
+    X(FlipSelf, true) \
+    X(ShowMardownOption, false) \
+    X(ChatViewEnterIsNewLine, false) \
+    X(ShowSendOption, false) \
+    X(DonationVisibleDate, "2023-11-01 05:00") \
+    X(IsDonationVisible, true) \
+    X(DonationEndDate, "2024-01-01 00:00") \
+    X(EnablePtt, false) \
+    X(pttKey, 36)
+#endif
 
 /*
  * A class to expose settings keys in both c++ and QML.

src/app/appversionmanager.cpp

@@ -44,7 +44,6 @@ struct AppVersionManager::Impl : public QObject
         , parent_(parent)
         , lrcInstance_(instance)
         , baseUrlString_(url.isEmpty() ? downloadUrl : url)
-        , tempPath_(QDir::tempPath())
         , updateTimer_(new QTimer(this))
     {
         connect(updateTimer_, &QTimer::timeout, this, [this] {
@@ -62,11 +61,11 @@ struct AppVersionManager::Impl : public QObject
             connect(&parent_,
                     &NetworkManager::errorOccurred,
                     &parent_,
-                    &AppVersionManager::updateErrorOccurred);
+                    &AppVersionManager::networkErrorOccurred);
 
         cleanUpdateFiles();
-        QUrl versionUrl {isBeta ? QUrl::fromUserInput(baseUrlString_ + betaVersionSubUrl)
-                                : QUrl::fromUserInput(baseUrlString_ + versionSubUrl)};
+        const QUrl versionUrl {isBeta ? QUrl::fromUserInput(baseUrlString_ + betaVersionSubUrl)
+                                      : QUrl::fromUserInput(baseUrlString_ + versionSubUrl)};
         parent_.sendGetRequest(versionUrl, [this, quiet](const QByteArray& latestVersionString) {
             if (latestVersionString.isEmpty()) {
                 qWarning() << "Error checking version";
@@ -76,14 +75,15 @@ struct AppVersionManager::Impl : public QObject
             }
             auto currentVersion = QString(VERSION_STRING).toULongLong();
             auto latestVersion = latestVersionString.toULongLong();
-            qDebug() << "latest: " << latestVersion << " current: " << currentVersion;
-            if (latestVersion > currentVersion) {
-                qDebug() << "New version found";
+            const QString channelStr = isBeta ? "beta" : "stable";
+            const auto newVersionFound = latestVersion > currentVersion;
+            qInfo().noquote() << "--------- Version info ------------"
+                              << QString("\n - Current: %1 (%2)").arg(currentVersion).arg(channelStr);
+            if (newVersionFound) {
+                qDebug() << " - Latest: " << latestVersion;
                 Q_EMIT parent_.updateCheckReplyReceived(true, true);
-            } else {
-                qDebug() << "No new version found";
-                if (!quiet)
-                    Q_EMIT parent_.updateCheckReplyReceived(true, false);
+            } else if (!quiet) {
+                Q_EMIT parent_.updateCheckReplyReceived(true, false);
             }
         });
     };
@@ -94,20 +94,21 @@ struct AppVersionManager::Impl : public QObject
         connect(&parent_,
                 &NetworkManager::errorOccurred,
                 &parent_,
-                &AppVersionManager::updateErrorOccurred);
+                &AppVersionManager::networkErrorOccurred);
 
         const QUrl downloadUrl {(beta || isBeta)
                                     ? QUrl::fromUserInput(baseUrlString_ + betaMsiSubUrl)
                                     : QUrl::fromUserInput(baseUrlString_ + msiSubUrl)};
 
-        int uuid = parent_.downloadFile(
+        const auto lastDownloadReplyId = parent_.replyId_;
+        parent_.replyId_ = parent_.downloadFile(
             downloadUrl,
-            *(parent_.replyId_),
-            [this, downloadUrl](bool success, const QString& errorMessage) {
+            lastDownloadReplyId,
+            [downloadUrl](bool success, const QString& errorMessage) {
                 Q_UNUSED(success)
                 Q_UNUSED(errorMessage)
-                const QProcess process;
-                auto basePath = tempPath_ + QDir::separator();
+                QProcess process;
+                auto basePath = QDir::tempPath() + QDir::separator();
                 auto msiPath = QDir::toNativeSeparators(basePath + downloadUrl.fileName());
                 auto logPath = QDir::toNativeSeparators(basePath + "jami_x64_install.log");
                 process.startDetached("msiexec",
@@ -116,13 +117,12 @@ struct AppVersionManager::Impl : public QObject
                                                     << "WIXNONUILAUNCH=1"
                                                     << "/L*V" << logPath);
             },
-            tempPath_);
-        parent_.replyId_.reset(&uuid);
+            QDir::tempPath());
     };
 
     void cancelUpdate()
     {
-        parent_.cancelDownload(*(parent_.replyId_));
+        parent_.cancelDownload(parent_.replyId_);
     };
 
     void setAutoUpdateCheck(bool state)
@@ -138,7 +138,7 @@ struct AppVersionManager::Impl : public QObject
     void cleanUpdateFiles()
     {
         // Delete all logs and msi in the temporary directory before launching.
-        QString dir = QDir::tempPath();
+        const QString dir = QDir::tempPath();
         QDir log_dir(dir, {"jami*.log"});
         for (const QString& filename : log_dir.entryList()) {
             log_dir.remove(filename);
@@ -157,7 +157,6 @@ struct AppVersionManager::Impl : public QObject
 
     LRCInstance* lrcInstance_ {nullptr};
     QString baseUrlString_;
-    QString tempPath_;
     QTimer* updateTimer_;
 };
 
@@ -166,13 +165,13 @@ AppVersionManager::AppVersionManager(const QString& url,
                                      LRCInstance* instance,
                                      QObject* parent)
     : NetworkManager(cm, parent)
-    , replyId_(new int(0))
+    , replyId_(0)
     , pimpl_(std::make_unique<Impl>(url, instance, *this))
 {}
 
 AppVersionManager::~AppVersionManager()
 {
-    cancelDownload(*replyId_);
+    cancelDownload(replyId_);
 }
 
 void

src/app/appversionmanager.h

@@ -47,10 +47,10 @@ Q_SIGNALS:
     void appCloseRequested();
     void updateCheckReplyReceived(bool ok, bool found = false);
     void updateDownloadProgressChanged(qint64 bytesRead, qint64 totalBytes);
-    void updateErrorOccurred(const NetworkManager::GetError& error);
+    void networkErrorOccurred(const NetworkManager::GetError& error);
 
 private:
-    QScopedPointer<int> replyId_;
+    int replyId_;
     struct Impl;
     friend struct Impl;
     std::unique_ptr<Impl> pimpl_;

src/app/avadapter.cpp

@@ -195,8 +195,28 @@ AvAdapter::shareFile(const QString& filePath)
     auto callId = lrcInstance_->getCurrentCallId();
     if (!callId.isEmpty()) {
         muteCamera_ = !isCapturing();
-        lrcInstance_->getCurrentCallModel()
-            ->addMedia(callId, filePath, lrc::api::CallModel::MediaRequestType::FILESHARING);
+        auto resource = QString("%1%2%3")
+                            .arg(libjami::Media::VideoProtocolPrefix::FILE)
+                            .arg(libjami::Media::VideoProtocolPrefix::SEPARATOR)
+                            .arg(QUrl(filePath).toLocalFile());
+
+        Utils::oneShotConnect(&lrcInstance_->avModel(),
+                              &lrc::api::AVModel::fileOpened,
+                              this,
+                              [this, callId, filePath, resource](bool hasAudio, bool hasVideo) {
+                                  // TODO: allow audio only sharing
+                                  if (hasVideo) { // only start sharing if video is available
+                                      lrcInstance_->avModel().pausePlayer(resource, false);
+                                      lrcInstance_->avModel().setAutoRestart(resource, true);
+                                      lrcInstance_->getCurrentCallModel()
+                                          ->addMedia(callId, filePath, lrc::api::CallModel::MediaRequestType::FILESHARING, false, hasAudio);
+                                  } else {
+                                      // Close media player because we are not going to start sharing
+                                      lrcInstance_->avModel().closeMediaPlayer(resource);
+                                  }
+                              });
+
+        lrcInstance_->avModel().createMediaPlayer(resource);
     }
 }
 
@@ -300,14 +320,16 @@ AvAdapter::stopSharing(const QString& source)
                 ->removeMedia(callId,
                               libjami::Media::Details::MEDIA_TYPE_VIDEO,
                               libjami::Media::VideoProtocolPrefix::DISPLAY,
-                              muteCamera_);
+                              muteCamera_,
+                              true);
         } else {
             qDebug() << "Stopping file: " << source;
             lrcInstance_->getCurrentCallModel()
                 ->removeMedia(callId,
                               libjami::Media::Details::MEDIA_TYPE_VIDEO,
                               libjami::Media::VideoProtocolPrefix::FILE,
-                              muteCamera_);
+                              muteCamera_,
+                              true);
         }
     }
 }

src/app/avatarimageprovider.h

@@ -53,21 +53,21 @@ public:
             return {};
         }
 
-        auto imageId = idInfo.at(1);
+        const auto& imageId = idInfo.at(1);
         if (!imageId.size()) {
             qWarning() << Q_FUNC_INFO << "Missing id in the image url";
             return {};
         }
 
-        auto type = idInfo.at(0);
+        const auto& type = idInfo.at(0);
         if (type == "conversation") {
             if (imageId == "temp")
                 return Utils::tempConversationAvatar(requestedSize);
-
             return Utils::conversationAvatar(lrcInstance_, imageId, requestedSize);
-        } else if (type == "account")
+        }
+        if (type == "account")
             return Utils::accountPhoto(lrcInstance_, imageId, requestedSize);
-        else if (type == "contact")
+        if (type == "contact")
             return Utils::contactPhoto(lrcInstance_, imageId, requestedSize);
 
         qWarning() << Q_FUNC_INFO << "Missing valid prefix in the image url";

src/app/calladapter.cpp

@@ -7,6 +7,7 @@
  * Author: Isa Nanic <isa.nanic@savoirfairelinux.com>
  * Author: Mingrui Zhang <mingrui.zhang@savoirfairelinux.com>
  * Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
+ * Author: Capucine Berthet <capucine.berthet@savoirfairelinux.com>
  *
  * 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
@@ -25,29 +26,36 @@
 #include "calladapter.h"
 
 #include "systemtray.h"
-#include "utils.h"
 #include "qmlregister.h"
-
-#include <QApplication>
-#include <QTimer>
-#include <QJsonObject>
+#include "appsettingsmanager.h"
 
 #include <api/callmodel.h>
 #include <api/callparticipantsmodel.h>
 
 #include <media_const.h>
 
-CallAdapter::CallAdapter(SystemTray* systemTray, LRCInstance* instance, QObject* parent)
+#include <QApplication>
+#include <QTimer>
+#include <QJsonObject>
+
+CallAdapter::CallAdapter(AppSettingsManager* settingsManager,
+                         SystemTray* systemTray,
+                         LRCInstance* instance,
+                         QObject* parent)
     : QmlAdapterBase(instance, parent)
     , systemTray_(systemTray)
     , callInformationListModel_(std::make_unique<CallInformationListModel>())
+    , listener_(new PTTListener(settingsManager, this))
 {
+    // Expose the Push-to-talk listener to QML as a singleton
+    QML_REGISTERSINGLETONTYPE_POBJECT(NS_MODELS, listener_, "PttListener");
+
     set_callInformationList(QVariant::fromValue(callInformationListModel_.get()));
 
     timer = new QTimer(this);
     connect(timer, &QTimer::timeout, this, &CallAdapter::updateAdvancedInformation);
 
-    overlayModel_.reset(new CallOverlayModel(lrcInstance_, this));
+    overlayModel_.reset(new CallOverlayModel(lrcInstance_, listener_, this));
     QML_REGISTERSINGLETONTYPE_POBJECT(NS_MODELS, overlayModel_.get(), "CallOverlayModel");
 
     accountId_ = lrcInstance_->get_currentAccountId();
@@ -97,6 +105,65 @@ CallAdapter::CallAdapter(SystemTray* systemTray, LRCInstance* instance, QObject*
             &LRCInstance::selectedConvUidChanged,
             this,
             &CallAdapter::saveConferenceSubcalls);
+
+#ifdef HAVE_GLOBAL_PTT
+    connectPtt();
+#endif
+}
+
+CallAdapter::~CallAdapter()
+{
+#ifdef HAVE_GLOBAL_PTT
+    disconnectPtt();
+#endif
+}
+
+void
+CallAdapter::connectPtt()
+{
+#ifdef HAVE_GLOBAL_PTT
+    if (listener_->getPttState()) {
+        QObject::connect(
+            listener_,
+            &PTTListener::pttKeyPressed,
+            this,
+            [this]() {
+                const auto callId
+                    = lrcInstance_->getCallIdForConversationUid(lrcInstance_->get_selectedConvUid(),
+                                                                accountId_);
+                try {
+                    isMicrophoneMuted_ = isMuted(callId);
+                    if (isMicrophoneMuted_)
+                        muteAudioToggle();
+                } catch (const std::exception& e) {
+                    qWarning() << e.what();
+                }
+            },
+            Qt::QueuedConnection);
+
+        QObject::connect(
+            listener_,
+            &PTTListener::pttKeyReleased,
+            this,
+            [this]() {
+                if (isMicrophoneMuted_) {
+                    muteAudioToggle();
+                }
+            },
+            Qt::QueuedConnection);
+    }
+#endif
+}
+
+void
+CallAdapter::disconnectPtt()
+{
+#ifdef HAVE_GLOBAL_PTT
+    if (listener_->getPttState()) {
+        QObject::disconnect(listener_, &PTTListener::pttKeyPressed, this, nullptr);
+        QObject::disconnect(listener_, &PTTListener::pttKeyReleased, this, nullptr);
+    }
+#endif
 }
 
 void
@@ -172,6 +239,12 @@ CallAdapter::onCallStarted(const QString& callId)
     // update call Information list by adding the new information related to the callId
     callInformationListModel_->addElement(
         qMakePair(callId, callModel->advancedInformationForCallId(callId)));
+    if (listener_->getPttState()) {
+#ifdef HAVE_GLOBAL_PTT
+        listener_->startListening();
+        toMute += callId;
+#endif
+    }
 }
 
 void
@@ -181,6 +254,10 @@ CallAdapter::onCallEnded(const QString& callId)
         return;
     // update call Information list by removing information related to the callId
     callInformationListModel_->removeElement(callId);
+#ifdef HAVE_GLOBAL_PTT
+    if (listener_->getPttState() && !hasCall_)
+        listener_->stopListening();
+#endif
 }
 
 void
@@ -271,6 +348,15 @@ CallAdapter::onCallStatusChanged(const QString& callId, int code)
     }
 }
 
+void
+CallAdapter::onCallInfosChanged(const QString& accountId, const QString& callId)
+{
+    Q_UNUSED(accountId)
+    auto mute = toMute.remove(callId);
+    if (mute && listener_->getPttState())
+        muteAudioToggle();
+}
+
 void
 CallAdapter::onCallAddedToConference(const QString& callId, const QString& confId)
 {
@@ -494,6 +580,12 @@ CallAdapter::connectCallModel(const QString& accountId)
             QOverload<const QString&, int>::of(&CallAdapter::onCallStatusChanged),
             Qt::UniqueConnection);
 
+    connect(accInfo.callModel.get(),
+            &CallModel::callInfosChanged,
+            this,
+            &CallAdapter::onCallInfosChanged,
+            Qt::UniqueConnection);
+
     connect(accInfo.callModel.get(),
             &CallModel::callAddedToConference,
             this,
@@ -816,6 +908,23 @@ CallAdapter::holdThisCallToggle()
     }
 }
 
+bool
+CallAdapter::isMuted(const QString& callId)
+{
+    if (!(callId.isEmpty() || !lrcInstance_->getCurrentCallModel()->hasCall(callId))) {
+        auto* callModel = lrcInstance_->getCurrentCallModel();
+        if (callModel->hasCall(callId)) {
+            const auto callInfo = lrcInstance_->getCurrentCallModel()->getCall(callId);
+            auto mute = false;
+            for (const auto& m : callInfo.mediaList)
+                if (m[libjami::Media::MediaAttributeKey::LABEL] == "audio_0")
+                    mute = m[libjami::Media::MediaAttributeKey::MUTED] == TRUE_STR;
+            return mute;
+        }
+    }
+    throw std::runtime_error("CallAdapter::isMuted: callId is empty or call does not exist");
+}
+
 void
 CallAdapter::muteAudioToggle()
 {
@@ -825,13 +934,10 @@ CallAdapter::muteAudioToggle()
         return;
     }
     auto* callModel = lrcInstance_->getCurrentCallModel();
-    if (callModel->hasCall(callId)) {
-        const auto callInfo = lrcInstance_->getCurrentCallModel()->getCall(callId);
-        auto mute = false;
-        for (const auto& m : callInfo.mediaList)
-            if (m[libjami::Media::MediaAttributeKey::LABEL] == "audio_0")
-                mute = m[libjami::Media::MediaAttributeKey::MUTED] == FALSE_STR;
-        callModel->muteMedia(callId, "audio_0", mute);
+    try {
+        callModel->muteMedia(callId, "audio_0", !isMuted(callId));
+    } catch (const std::exception& e) {
+        qWarning() << e.what();
     }
 }
 
@@ -877,7 +983,8 @@ CallAdapter::muteCameraToggle()
             callModel->removeMedia(callId,
                                    libjami::Media::Details::MEDIA_TYPE_VIDEO,
                                    libjami::Media::VideoProtocolPrefix::CAMERA,
-                                   mute);
+                                   mute,
+                                   false);
         else
             callModel->addMedia(callId,
                                 lrcInstance_->avModel().getCurrentVideoCaptureDevice(),

src/app/calladapter.h

@@ -25,6 +25,10 @@
 #include "screensaver.h"
 #include "calloverlaymodel.h"
 
+#ifdef HAVE_GLOBAL_PTT
+#include "pttlistener.h"
+#endif
+
 #include <QObject>
 #include <QString>
 #include <QVariant>
@@ -33,6 +37,7 @@
 #include "callInformationListModel.h"
 
 class SystemTray;
+class AppSettingsManager;
 
 class CallAdapter final : public QmlAdapterBase
 {
@@ -45,8 +50,11 @@ public:
     enum MuteStates { UNMUTED, LOCAL_MUTED, MODERATOR_MUTED, BOTH_MUTED };
     Q_ENUM(MuteStates)
 
-    explicit CallAdapter(SystemTray* systemTray, LRCInstance* instance, QObject* parent = nullptr);
-    ~CallAdapter() = default;
+    explicit CallAdapter(AppSettingsManager* settingsManager,
+                         SystemTray* systemTray,
+                         LRCInstance* instance,
+                         QObject* parent = nullptr);
+    ~CallAdapter();
 
 public:
     Q_INVOKABLE void startTimerInformation();
@@ -76,6 +84,9 @@ public:
     Q_INVOKABLE void holdThisCallToggle();
     Q_INVOKABLE void recordThisCallToggle();
     Q_INVOKABLE void muteAudioToggle();
+    Q_INVOKABLE bool isMuted(const QString& callId);
+    Q_INVOKABLE void connectPtt();
+    Q_INVOKABLE void disconnectPtt();
     Q_INVOKABLE void muteCameraToggle();
     Q_INVOKABLE bool isRecordingThisCall();
     Q_INVOKABLE void muteParticipant(const QString& accountUri,
@@ -109,6 +120,7 @@ public Q_SLOTS:
     void onCallAddedToConference(const QString& callId, const QString& confId);
     void onCallStarted(const QString& callId);
     void onCallEnded(const QString& callId);
+    void onCallInfosChanged(const QString& accountId, const QString& callId);
 
 private:
     void showNotification(const QString& accountId, const QString& convUid);
@@ -121,6 +133,9 @@ private:
     SystemTray* systemTray_;
     QScopedPointer<CallOverlayModel> overlayModel_;
     VectorString currentConfSubcalls_;
-
     std::unique_ptr<CallInformationListModel> callInformationListModel_;
+
+    PTTListener* listener_;
+    bool isMicrophoneMuted_ = true;
+    QSet<QString> toMute;
 };

src/app/calloverlaymodel.cpp

@@ -22,6 +22,7 @@
 #include <QEvent>
 #include <QMouseEvent>
 #include <QQuickWindow>
+#include <QKeyEvent>
 
 IndexRangeFilterProxyModel::IndexRangeFilterProxyModel(QAbstractListModel* parent)
     : QSortFilterProxyModel(parent)
@@ -74,10 +75,10 @@ PendingConferenceesListModel::data(const QModelIndex& index, int role) const
     using namespace PendingConferences;
 
     // WARNING: not swarm ready
+    lrc::api::call::Status callStatus;
     QString pendingConferenceeCallId;
     QString pendingConferenceeContactUri;
     ContactModel* contactModel {nullptr};
-    lrc::api::call::Status callStatus;
     try {
         auto callModel = lrcInstance_->getCurrentCallModel();
         auto currentPendingConferenceeInfo = callModel->getPendingConferencees().at(index.row());
@@ -268,7 +269,7 @@ CallControlListModel::clearData()
     data_.clear();
 }
 
-CallOverlayModel::CallOverlayModel(LRCInstance* instance, QObject* parent)
+CallOverlayModel::CallOverlayModel(LRCInstance* instance, PTTListener* listener, QObject* parent)
     : QObject(parent)
     , lrcInstance_(instance)
     , primaryModel_(new CallControlListModel(this))
@@ -283,6 +284,10 @@ CallOverlayModel::CallOverlayModel(LRCInstance* instance, QObject* parent)
             this,
             &CallOverlayModel::setControlRanges);
     overflowVisibleModel_->setFilterRole(CallControl::Role::UrgentCount);
+
+#ifndef HAVE_GLOBAL_PTT
+    listener_ = listener;
+#endif
 }
 
 void
@@ -386,6 +391,19 @@ CallOverlayModel::eventFilter(QObject* object, QEvent* event)
             }
         }
     }
+#ifndef HAVE_GLOBAL_PTT
+    else if (event->type() == QEvent::KeyPress && listener_->getPttState()) {
+        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+        if (keyEvent->key() == listener_->getCurrentKey() && !keyEvent->isAutoRepeat()) {
+            Q_EMIT pttKeyPressed();
+        }
+    } else if (event->type() == QEvent::KeyRelease && listener_->getPttState()) {
+        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+        if (keyEvent->key() == listener_->getCurrentKey() && !keyEvent->isAutoRepeat()) {
+            Q_EMIT pttKeyReleased();
+        }
+    }
+#endif
     return QObject::eventFilter(object, event);
 }
 

src/app/calloverlaymodel.h

@@ -21,6 +21,9 @@
 
 #include "lrcinstance.h"
 #include "qtutils.h"
+#include "mainapplication.h"
+
+#include "pttlistener.h"
 
 #include <QAbstractListModel>
 #include <QObject>
@@ -36,7 +39,7 @@
 
 namespace CallControl {
 Q_NAMESPACE
-enum Role { ItemAction = Qt::UserRole + 1, UrgentCount, Enabled};
+enum Role { ItemAction = Qt::UserRole + 1, UrgentCount, Enabled };
 Q_ENUM_NS(Role)
 
 struct Item
@@ -121,7 +124,7 @@ class CallOverlayModel : public QObject
     QML_PROPERTY(int, overflowIndex)
 
 public:
-    CallOverlayModel(LRCInstance* instance, QObject* parent = nullptr);
+    CallOverlayModel(LRCInstance* instance, PTTListener* listener, QObject* parent = nullptr);
 
     Q_INVOKABLE void addPrimaryControl(const QVariant& action, bool enabled);
     Q_INVOKABLE void addSecondaryControl(const QVariant& action, bool enabled);
@@ -142,6 +145,8 @@ public:
 
 Q_SIGNALS:
     void mouseMoved(QQuickItem* item);
+    void pttKeyPressed();
+    void pttKeyReleased();
 
 private Q_SLOTS:
     void setControlRanges();
@@ -157,4 +162,8 @@ private:
     PendingConferenceesListModel* pendingConferenceesModel_;
 
     QList<QQuickItem*> watchedItems_;
+
+#ifndef HAVE_GLOBAL_PTT
+    PTTListener* listener_ {nullptr};
+#endif
 };

src/app/commoncomponents/Avatar.qml

@@ -38,7 +38,7 @@ Item {
     property string imageId
 
     readonly property string divider: '_'
-    readonly property string baseProviderPrefix: 'image://avatarImage'
+    readonly property string baseProviderPrefix: 'image://avatarimage'
     property string typePrefix: {
         switch (mode) {
         case Avatar.Mode.Account:

src/app/commoncomponents/BaseModalDialog.qml

@@ -20,6 +20,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Qt5Compat.GraphicalEffects
 import net.jami.Constants 1.1
+import "../mainview/components"
 
 Popup {
     id: root
@@ -28,65 +29,80 @@ Popup {
     property bool autoClose: true
     property alias backgroundColor: container.color
     property alias title: titleText.text
-    property var popupContentLoader: containerSubContentLoader
+    property var popupcontainerSubContentLoader: containerSubContentLoader
+    property bool topLayoutVisible: true
     property alias popupContentLoadStatus: containerSubContentLoader.status
     property alias popupContent: containerSubContentLoader.sourceComponent
-    property int popupContentPreferredHeight: 0
-    property int popupContentPreferredWidth: 0
-    property int popupContentMargins: 0
+    property int popupContentMargins: JamiTheme.preferredMarginSize
 
     parent: Overlay.overlay
-
-    // center in parent
-    x: Math.round((parent.width - width) / 2)
-    y: Math.round((parent.height - height) / 2)
-
+    anchors.centerIn: parent
     modal: true
+    padding: popupContentMargins
 
-    padding: 0
-
-    // A popup is invisible until opened.
-    visible: false
     focus: true
     closePolicy: autoClose ? (Popup.CloseOnEscape | Popup.CloseOnPressOutside) : Popup.NoAutoClose
 
-    Rectangle {
+    contentItem: Control {
         id: container
 
-        anchors.fill: parent
+        property color color: JamiTheme.secondaryBackgroundColor
+        padding: popupContentMargins
+        anchors.margins: popupContentMargins
+        anchors.centerIn: parent
 
-        ColumnLayout {
-            anchors.fill: parent
+        background: Rectangle {
+            id: bgRect
+            radius: JamiTheme.modalPopupRadius
+            color: container.color
+            layer.enabled: true
+            layer.effect: DropShadow {
+                horizontalOffset: 3.0
+                verticalOffset: 3.0
+                radius: bgRect.radius * 4
+                color: JamiTheme.shadowColor
+                source: bgRect
+                transparentBorder: true
+                samples: radius + 1
+            }
+        }
 
-            spacing: 0
+        contentItem: ColumnLayout {
+            id: contentLayout
 
-            Text {
-                id: titleText
+            RowLayout {
+                Layout.preferredWidth: parent.width
+                Layout.bottomMargin: JamiTheme.preferredMarginSize
+                visible: topLayoutVisible
 
-                Layout.alignment: Qt.AlignTop | Qt.AlignLeft
-                Layout.margins: text.length === 0 ? 0 : 10
+                Label {
+                    id: titleText
 
-                Layout.preferredHeight: text.length === 0 ? 0 : contentHeight
+                    Layout.alignment: Qt.AlignTop | Qt.AlignLeft
+                    font.pointSize: JamiTheme.menuFontSize
+                    color: JamiTheme.textColor
 
-                font.pointSize: JamiTheme.menuFontSize
-                color: JamiTheme.textColor
+
+                    visible: text.length > 0
+                }
+
+                JamiPushButton {
+                    id: closeButton
+                    Layout.alignment: Qt.AlignRight
+                    imageColor: "grey"
+                    normalColor: "transparent"
+
+                    source: JamiResources.round_close_24dp_svg
+                    onClicked: close()
+                }
             }
 
             Loader {
                 id: containerSubContentLoader
 
-                Layout.topMargin: popupContentMargins
-                Layout.bottomMargin: popupContentMargins
                 Layout.alignment: Qt.AlignCenter
-                Layout.fillWidth: popupContentPreferredWidth === 0
-                Layout.fillHeight: popupContentPreferredHeight === 0
-                Layout.preferredHeight: popupContentPreferredHeight
-                Layout.preferredWidth: popupContentPreferredWidth
             }
         }
-
-        radius: JamiTheme.modalPopupRadius
-        color: JamiTheme.secondaryBackgroundColor
     }
 
     background: Rectangle {
@@ -103,19 +119,6 @@ Popup {
         }
     }
 
-    DropShadow {
-        z: -1
-        width: root.width
-        height: root.height
-        horizontalOffset: 3.0
-        verticalOffset: 3.0
-        radius: container.radius * 4
-        color: JamiTheme.shadowColor
-        source: container
-        transparentBorder: true
-        samples: radius + 1
-    }
-
     enter: Transition {
         NumberAnimation {
             properties: "opacity"

src/app/commoncomponents/ChangePttKeyPopup.qml

@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2023 Savoir-faire Linux Inc.
+
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import net.jami.Models 1.1
+import net.jami.Adapters 1.1
+import net.jami.Constants 1.1
+
+BaseModalDialog {
+    id: pttPage
+
+    property string bestName: ""
+    property string accountId: ""
+    property int pressedKey: Qt.Key_unknown
+
+    signal accepted
+    signal choiceMade(int chosenKey)
+
+    title: JamiStrings.changeShortcut
+
+    popupContent: ColumnLayout {
+        id: deleteAccountContentColumnLayout
+        anchors.centerIn: parent
+        spacing: JamiTheme.preferredMarginSize
+
+        Component.onCompleted: keyItem.forceActiveFocus()
+        Label {
+            id: instructionLabel
+
+            Layout.alignment: Qt.AlignCenter
+            Layout.preferredWidth: JamiTheme.preferredDialogWidth - 4*JamiTheme.preferredMarginSize
+            color: JamiTheme.textColor
+            text: JamiStrings.assignmentIndication
+
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
+
+            font.pointSize: JamiTheme.textFontSize
+            font.kerning: true
+
+            wrapMode: Text.Wrap
+        }
+
+        Label {
+            id: keyLabel
+            Layout.alignment: Qt.AlignCenter
+
+            color: JamiTheme.blackColor
+            wrapMode: Text.WordWrap
+            text: ""
+            font.pointSize: JamiTheme.settingsFontSize
+            font.kerning: true
+
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
+
+            background: Rectangle {
+                 id: backgroundRect
+
+                 anchors.centerIn: parent
+
+                 width: keyLabel.width + 2 * JamiTheme.preferredMarginSize
+                 height: keyLabel.height + JamiTheme.preferredMarginSize
+                 color: JamiTheme.lightGrey_
+                 border.color: JamiTheme.darkGreyColor
+                 radius: 4
+            }
+
+        }
+
+        MaterialButton {
+            id: btnAssign
+
+            Layout.alignment: Qt.AlignHCenter
+            Layout.topMargin: JamiTheme.preferredMarginSize
+
+            preferredWidth: JamiTheme.preferredFieldWidth / 2 - 8
+            buttontextHeightMargin: JamiTheme.buttontextHeightMargin
+
+            color: JamiTheme.buttonTintedBlack
+            hoveredColor: JamiTheme.buttonTintedBlackHovered
+            pressedColor: JamiTheme.buttonTintedBlackPressed
+            secondary: true
+
+            text: JamiStrings.assign
+            autoAccelerator: true
+
+            onClicked: {
+                if (!(pressedKey === Qt.Key_unknown)){
+                    PttListener.setPttKey(pressedKey);
+                    choiceMade(pressedKey);
+                }
+                close();
+            }
+        }
+
+        Item {
+            id: keyItem
+
+            Keys.onPressed: (event)=>{
+                keyLabel.text = PttListener.keyToString(event.key);
+                pressedKey = event.key;
+            }
+        }
+    }
+
+
+}

src/app/commoncomponents/ConfirmDialog.qml

@@ -27,9 +27,6 @@ BaseModalDialog {
 
     signal accepted
 
-    width: Math.min(appWindow.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogWidth)
-    height: Math.min(appWindow.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogHeight)
-
     property string confirmLabel: ""
     property string textLabel: ""
 
@@ -40,7 +37,7 @@ BaseModalDialog {
             id: labelAction
 
             Layout.alignment: Qt.AlignHCenter
-            Layout.preferredWidth: column.width - JamiTheme.preferredMarginSize * 2
+            Layout.maximumWidth: root.width - JamiTheme.preferredMarginSize * 4
 
             color: JamiTheme.textColor
             text: root.textLabel
@@ -55,8 +52,8 @@ BaseModalDialog {
 
         RowLayout {
             spacing: 16
-            Layout.fillWidth: true
             Layout.alignment: Qt.AlignCenter
+            Layout.topMargin: JamiTheme.preferredMarginSize
 
             MaterialButton {
                 id: primaryBtn

src/app/commoncomponents/DaemonReconnectPopup.qml

@@ -68,7 +68,8 @@ BaseModalDialog {
             id: daemonReconnectPopupTextLabel
 
             Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
-            Layout.topMargin: preferredMargin
+            Layout.maximumWidth: root.parent.width - 4 * JamiTheme.preferredMarginSize
+            wrapMode: Text.Wrap
 
             text: connectionFailed ? JamiStrings.reconnectionFailed : JamiStrings.reconnectDaemon
             font.pointSize: JamiTheme.textFontSize + 2

src/app/commoncomponents/DataTransferMessageDelegate.qml

@@ -88,8 +88,11 @@ Loader {
                         target: parent
                         enabled: canOpen
                         onHoveredChanged: {
-                            dataTransferItem.hoveredLink = enabled && hovered ?
-                                        ("file:///" + Body) : ""
+                            if (enabled && hovered) {
+                                dataTransferItem.hoveredLink = UtilsAdapter.urlFromLocalPath(Body)
+                            } else {
+                                dataTransferItem.hoveredLink = ""
+                            }
                         }
                         cursorShape: enabled ?
                                          Qt.PointingHandCursor :
@@ -199,10 +202,12 @@ Loader {
                                                  Qt.PointingHandCursor :
                                                  Qt.ArrowCursor
                                 onClicked: function (mouse) {
-                                    dataTransferItem.hoveredLink = canOpen ?
-                                                ("file:///" + Body) : ""
-                                    if (dataTransferItem.hoveredLink)
+                                    if (canOpen) {
+                                        dataTransferItem.hoveredLink = UtilsAdapter.urlFromLocalPath(Body)
                                         Qt.openUrlExternally(new Url(dataTransferItem.hoveredLink))
+                                    } else {
+                                        dataTransferItem.hoveredLink = ""
+                                    }
                                 }
                             }
                         }
@@ -303,7 +308,7 @@ Loader {
                             antialiasing: true
                             autoTransform: true
                             asynchronous: true
-                            source: "file:///" + Body
+                            source: UtilsAdapter.urlFromLocalPath(Body)
                             property real aspectRatio: implicitWidth / implicitHeight
                             property real adjustedWidth: Math.min(maxSize,
                                                                   Math.max(minSize,
@@ -348,7 +353,7 @@ Loader {
                             antialiasing: true
                             autoTransform: true
                             asynchronous: true
-                            source: Body !== undefined ? "file:///" + Body : ''
+                            source: Body !== undefined ? UtilsAdapter.urlFromLocalPath(Body) : ''
 
                             // The sourceSize represents the maximum source dimensions.
                             // This should not be a dynamic binding, as property changes

src/app/commoncomponents/DeleteAccountDialog.qml

@@ -33,17 +33,15 @@ BaseModalDialog {
 
     title: JamiStrings.deleteAccount
 
-    width: Math.min(appWindow.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogWidth)
-    height: Math.min(appWindow.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogHeight)
-
     popupContent: ColumnLayout {
         id: deleteAccountContentColumnLayout
+        anchors.centerIn: parent
 
         Label {
             id: labelDeletion
 
             Layout.alignment: Qt.AlignHCenter
-            Layout.preferredWidth: deleteAccountContentColumnLayout.width - JamiTheme.preferredMarginSize * 2
+            Layout.maximumWidth: root.width - 4*JamiTheme.preferredMarginSize
 
             color: JamiTheme.textColor
             text: JamiStrings.confirmDeleteQuestion
@@ -51,8 +49,6 @@ BaseModalDialog {
             font.pointSize: JamiTheme.textFontSize
             font.kerning: true
 
-            horizontalAlignment: Text.AlignHCenter
-            verticalAlignment: Text.AlignVCenter
             wrapMode: Text.Wrap
         }
 
@@ -60,7 +56,6 @@ BaseModalDialog {
             id: labelBestId
 
             Layout.alignment: Qt.AlignHCenter
-            Layout.preferredWidth: deleteAccountContentColumnLayout.width - JamiTheme.preferredMarginSize * 2
 
             color: JamiTheme.textColor
             text: bestName
@@ -68,9 +63,6 @@ BaseModalDialog {
             font.pointSize: JamiTheme.textFontSize
             font.kerning: true
             font.bold: true
-
-            horizontalAlignment: Text.AlignHCenter
-            verticalAlignment: Text.AlignVCenter
             wrapMode: Text.Wrap
         }
 
@@ -78,7 +70,7 @@ BaseModalDialog {
             id: labelAccountHash
 
             Layout.alignment: Qt.AlignHCenter
-            Layout.preferredWidth: deleteAccountContentColumnLayout.width - JamiTheme.preferredMarginSize * 2
+            Layout.preferredWidth: root.width - 4*JamiTheme.preferredMarginSize
 
             color: JamiTheme.textColor
             text: accountId
@@ -87,7 +79,6 @@ BaseModalDialog {
             font.kerning: true
 
             horizontalAlignment: Text.AlignHCenter
-            verticalAlignment: Text.AlignVCenter
             wrapMode: Text.Wrap
         }
 
@@ -97,7 +88,7 @@ BaseModalDialog {
             visible: !isSIP
 
             Layout.alignment: Qt.AlignHCenter
-            Layout.preferredWidth: deleteAccountContentColumnLayout.width - JamiTheme.preferredMarginSize * 2
+            Layout.preferredWidth: root.width - 4*JamiTheme.preferredMarginSize
 
             text: JamiStrings.deleteAccountInfos
 
@@ -120,6 +111,7 @@ BaseModalDialog {
                 id: btnDelete
 
                 Layout.alignment: Qt.AlignHCenter
+                Layout.topMargin: JamiTheme.preferredMarginSize
 
                 preferredWidth: JamiTheme.preferredFieldWidth / 2 - 8
                 buttontextHeightMargin: JamiTheme.buttontextHeightMargin
@@ -164,6 +156,7 @@ BaseModalDialog {
                 id: btnCancel
 
                 Layout.alignment: Qt.AlignHCenter
+                Layout.topMargin: JamiTheme.preferredMarginSize
 
                 preferredWidth: JamiTheme.preferredFieldWidth / 2 - 8
                 buttontextHeightMargin: JamiTheme.buttontextHeightMargin

src/app/commoncomponents/EditedPopup.qml

@@ -25,19 +25,13 @@ import net.jami.Constants 1.1
 BaseModalDialog {
     id: root
 
-    width: 488
-    height: 256
+    width: JamiTheme.secondaryDialogDimension
 
     property var previousBodies: undefined
 
-    popupContent: Item {
-        id: rect
-
-        width: root.width
-
-        JamiListView {
-            anchors.fill: parent
-            anchors.margins: JamiTheme.preferredMarginSize
+    popupContent: JamiListView {
+            width: root.width - 4 * JamiTheme.preferredMarginSize
+            height: Math.min(count * 50, 150)
 
             model: root.previousBodies
 
@@ -79,17 +73,4 @@ BaseModalDialog {
                 }
             }
         }
-
-        PushButton {
-            id: btnCancel
-            imageColor: "grey"
-            normalColor: "transparent"
-            anchors.right: parent.right
-            anchors.top: parent.top
-            anchors.topMargin: 10
-            anchors.rightMargin: 10
-            source: JamiResources.round_close_24dp_svg
-            onClicked: close()
-        }
     }
-}

src/app/commoncomponents/JamiIdentifier.qml

@@ -24,6 +24,7 @@ import net.jami.Constants 1.1
 
 Item {
     id: jamiId
+
     property bool slimDisplay: true
     property color backgroundColor: JamiTheme.welcomeBlockColor
     property color contentColor: JamiTheme.tintedBlue
@@ -51,7 +52,7 @@ Item {
 
         RoundedBorderRectangle {
             id: leftRect
-            fillColor: jamiId.backgroundColor
+            fillColor: JamiTheme.jamiIdBackgroundColor
             Layout.preferredWidth: childrenRect.width
             Layout.maximumWidth: jamiId.width - rightRect.width
             Layout.preferredHeight: childrenRect.height
@@ -72,7 +73,7 @@ Item {
                     containerWidth: 40
                     Layout.leftMargin: JamiTheme.pushButtonMargins
                     source: JamiResources.jami_id_logo_svg
-                    color: jamiId.contentColor
+                    color: JamiTheme.tintedBlue
                 }
 
                 UsernameTextEdit {
@@ -80,7 +81,7 @@ Item {
                     visible: !readOnly
                     Layout.preferredHeight: 40
                     Layout.alignment: Qt.AlignVCenter
-                    textColor: jamiId.contentColor
+                    textColor: JamiTheme.tintedBlue
                     fontPixelSize: staticText.length > 16 || dynamicText.length > 16 ? JamiTheme.jamiIdSmallFontSize : JamiTheme.bigFontSize
                     editMode: false
                     isPersistent: false
@@ -104,7 +105,9 @@ Item {
                     visible: usernameTextEdit.readOnly
                     Layout.alignment: Qt.AlignVCenter
                     Layout.rightMargin: JamiTheme.pushButtonMargins
-                    color: jamiId.contentColor
+                    Layout.maximumWidth: leftRect.width - 50
+                    elide: Text.ElideRight
+                    color: JamiTheme.tintedBlue
                     font.pixelSize : text.length > 16 ? JamiTheme.jamiIdSmallFontSize : JamiTheme.bigFontSize
                     property string registeredName: CurrentAccount.registeredName
                     property string infohash: CurrentAccount.uri
@@ -115,7 +118,7 @@ Item {
 
         RoundedBorderRectangle {
             id: rightRect
-            fillColor: jamiId.backgroundColor
+            fillColor: JamiTheme.jamiIdBackgroundColor
             Layout.preferredWidth: childrenRect.width + 2 * JamiTheme.pushButtonMargins
 
             Layout.preferredHeight: leftRect.height
@@ -139,8 +142,8 @@ Item {
                     id: btnEdit
                     anchors.leftMargin: JamiTheme.pushButtonMargins
                     visible: CurrentAccount.registeredName === ""
-                    border.color: enabled ? jamiId.contentColor : JamiTheme.buttonTintedBlack
-                    imageColor: enabled ? jamiId.contentColor : JamiTheme.buttonTintedBlack
+                    imageColor: enabled ? JamiTheme.tintedBlue : JamiTheme.buttonTintedBlack
+                    border.color: usernameTextEdit.editMode ? jamiId.contentColor : "transparent"
                     enabled: {
                         if (!usernameTextEdit.editMode)
                             return true;
@@ -154,7 +157,7 @@ Item {
                             return false;
                         }
                     }
-                    source: usernameTextEdit.editMode ? JamiResources.check_black_24dp_svg : JamiResources.round_edit_24dp_svg
+                    source: usernameTextEdit.editMode ? JamiResources.check_black_24dp_svg : JamiResources.assignment_ind_black_24dp_svg
                     toolTipText: JamiStrings.chooseUsername
                     onClicked: {
                         if (usernameTextEdit.readOnly) {
@@ -164,6 +167,19 @@ Item {
                             usernameTextEdit.accepted();
                         }
                     }
+
+                    Rectangle {
+                        width: 10
+                        height: 10
+                        visible: !usernameTextEdit.editMode
+
+                        anchors.top: parent.top
+                        anchors.right: parent.right
+                        radius: width / 2
+                        color: JamiTheme.redDotColor
+                        border.color: JamiTheme.jamiIdBackgroundColor
+                        border.width: 2
+                    }
                 }
 
                 JamiIdControlButton {
@@ -185,7 +201,7 @@ Item {
 
                 JamiIdControlButton {
                     id: btnId
-                    source: JamiResources.key_black_24dp_svg
+                    source: JamiResources.outline_info_24dp_svg
                     visible: CurrentAccount.registeredName !== ""
                     border.color: "transparent"
                     toolTipText: JamiStrings.identifierURI
@@ -214,7 +230,7 @@ Item {
         imageContainerWidth: JamiTheme.pushButtonSize
         imageContainerHeight: JamiTheme.pushButtonSize
         border.color: jamiId.contentColor
-        imageColor: jamiId.contentColor
+        imageColor: JamiTheme.tintedBlue
         duration: 0
     }
 }

src/app/commoncomponents/JamiSplitView.qml

@@ -68,6 +68,7 @@ SplitView {
     }
 
     handle: Rectangle {
+        visible: !isSinglePane
         implicitWidth: JamiTheme.splitViewHandlePreferredWidth
         implicitHeight: root.height
         color: JamiTheme.primaryBackgroundColor

src/app/commoncomponents/LineEditContextMenu.qml

@@ -35,8 +35,10 @@ ContextMenuAutoLoader {
         GeneralMenuItem {
             id: copy
 
-            canTrigger: lineEditObj.selectedText.length
+            canTrigger: true
+            isActif: lineEditObj.selectedText.length
             itemName: JamiStrings.copy
+            hasIcon: false
             onClicked: {
                 lineEditObj.copy();
             }
@@ -44,9 +46,10 @@ ContextMenuAutoLoader {
         GeneralMenuItem {
             id: cut
 
-            canTrigger: lineEditObj.selectedText.length && !selectOnly
+            canTrigger: true
+            isActif: lineEditObj.selectedText.length && !selectOnly
             itemName: JamiStrings.cut
-
+            hasIcon: false
             onClicked: {
                 lineEditObj.cut();
             }
@@ -56,6 +59,7 @@ ContextMenuAutoLoader {
 
             canTrigger: !selectOnly
             itemName: JamiStrings.paste
+            hasIcon: false
             onClicked: {
                 if (customizePaste)
                     root.contextMenuRequirePaste();
@@ -76,10 +80,6 @@ ContextMenuAutoLoader {
         lineEditObj.select(selectionStart, selectionEnd);
     }
 
-    contextMenuItemPreferredHeight: JamiTheme.lineEditContextMenuItemsHeight
-    contextMenuItemPreferredWidth: JamiTheme.lineEditContextMenuItemsWidth
-    contextMenuSeparatorPreferredHeight: JamiTheme.lineEditContextMenuSeparatorsHeight
-
     Connections {
         target: root.item
         enabled: root.status === Loader.Ready

src/app/commoncomponents/MaterialTextField.qml

@@ -36,6 +36,7 @@ TextField {
     }
 
     signal keyPressed
+    signal rejected
 
     property bool inputIsValid: true
 
@@ -87,6 +88,9 @@ TextField {
                 root.accepted();
             }
             event.accepted = true;
+        } else if (event.key === Qt.Key_Escape) {
+            root.focus = false;
+            root.rejected();
         } else {
             root.keyPressed();
         }

src/app/commoncomponents/MessageOptionsPopup.qml

@@ -1,297 +0,0 @@
-/*
- * Copyright (C) 2022-2023 Savoir-faire Linux Inc.
- * Author: Nicolas Vengeon <nicolas.vengeon@savoirfairelinux.com>
- *
- * 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import QtQuick
-import QtQuick.Controls
-import Qt5Compat.GraphicalEffects
-import QtQuick.Layouts
-
-import net.jami.Models 1.1
-import net.jami.Adapters 1.1
-import net.jami.Constants 1.1
-
-Popup {
-    id: root
-
-    width: emojiColumn.width + JamiTheme.emojiMargins
-    height: emojiColumn.height + JamiTheme.emojiMargins
-    padding: 0
-    background.visible: false
-
-    required property var emojiReactions
-    property var emojiReplied: emojiReactions.ownEmojis
-
-    required property string msgId
-    required property string msgBody
-    required property bool isOutgoing
-    required property int type
-    required property string transferName
-    required property Item msgBubble
-    required property ListView listView
-
-    property string transferId: msgId
-    property string location: msgBody
-    property bool closeWithoutAnimation: false
-    property var emojiPicker
-
-    focus: true
-    closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
-
-    function xPositionProvider(width) {
-        // Use the width at function scope to retrigger property evaluation.
-        const listViewWidth = listView.width
-        if (isOutgoing) {
-            const leftMargin = msgBubble.mapToItem(listView, 0, 0).x
-            return width > leftMargin ? -leftMargin : -width
-        } else {
-            const rightMargin = listViewWidth - (msgBubble.x + msgBubble.width)
-            return width > rightMargin ? msgBubble.width - width : msgBubble.width
-        }
-    }
-    function yPositionProvider(height) {
-        const topOffset = msgBubble.mapToItem(listView, 0, 0).y
-        if (topOffset < 0) return -topOffset
-        const bottomOffset = topOffset + height - listView.height
-        if (bottomOffset > 0) return -bottomOffset
-        return 0
-    }
-    x: xPositionProvider(width)
-    y: yPositionProvider(height)
-
-    signal addMoreEmoji
-    onAddMoreEmoji: {
-        JamiQmlUtils.updateMessageBarButtonsPoints()
-        openEmojiPicker()
-    }
-
-    function openEmojiPicker() {
-        var component =  WITH_WEBENGINE ?
-                    Qt.createComponent("qrc:/webengine/emojipicker/EmojiPicker.qml") :
-                    Qt.createComponent("qrc:/nowebengine/EmojiPicker.qml")
-        emojiPicker = component.createObject(root.parent, { listView: listView })
-        emojiPicker.emojiIsPicked.connect(function(content) {
-            if (emojiReplied.includes(content)) {
-                MessagesAdapter.removeEmojiReaction(CurrentConversation.id, content, msgId)
-            } else {
-                MessagesAdapter.addEmojiReaction(CurrentConversation.id, content, msgId)
-            }
-        })
-        if (emojiPicker !== null) {
-            root.opacity = 0
-            emojiPicker.closed.connect(() => close())
-            emojiPicker.x = xPositionProvider(JamiTheme.emojiPickerWidth)
-            emojiPicker.y = yPositionProvider(JamiTheme.emojiPickerHeight)
-            emojiPicker.open()
-        } else {
-            console.log("Error creating emojiPicker from message options popup");
-        }
-    }
-
-    // Close the picker when listView vertical properties change.
-    property real listViewHeight: listView.height
-    onListViewHeightChanged: close()
-    property bool isScrolling: listView.verticalScrollBar.active
-    onIsScrollingChanged: close()
-
-    onOpened: root.closeWithoutAnimation = false
-    onClosed: if (emojiPicker) emojiPicker.closeEmojiPicker()
-
-    function getModel() {
-        const defaultModel = ["👍", "👎", "😂"]
-        const reactedEmojis = Array.isArray(emojiReplied) ? emojiReplied.slice(0, defaultModel.length) : []
-        const uniqueEmojis = Array.from(new Set(reactedEmojis))
-        const missingEmojis = defaultModel.filter(emoji => !uniqueEmojis.includes(emoji))
-        return uniqueEmojis.concat(missingEmojis)
-    }
-
-    Rectangle {
-        id: bubble
-
-        color: JamiTheme.chatviewBgColor
-        anchors.fill: parent
-        radius: JamiTheme.modalPopupRadius
-
-        ColumnLayout {
-            id: emojiColumn
-
-            anchors.centerIn: parent
-
-            RowLayout {
-                id: emojiRow
-                Layout.alignment: Qt.AlignCenter
-
-                Repeater {
-                    model: root.getModel()
-
-                    delegate: Button {
-                        id: emojiButton
-
-                        height: 50
-                        width: 50
-                        text: modelData
-                        font.pointSize: JamiTheme.emojiBubbleSize
-
-                        Text {
-                            visible: emojiButton.hovered
-                            anchors.centerIn: parent
-                            text: modelData
-                            font.pointSize: JamiTheme.emojiBubbleSizeBig
-                            z: 1
-                        }
-
-                        background: Rectangle {
-                            anchors.fill: parent
-                            opacity: emojiReplied ? (emojiReplied.includes(modelData) ? 1 : 0) : 0
-                            color: JamiTheme.emojiReactPushButtonColor
-                            radius: 10
-                        }
-
-                        onClicked: {
-                            if (emojiReplied.includes(modelData))
-                                MessagesAdapter.removeEmojiReaction(CurrentConversation.id,text,msgId)
-                            else
-                                MessagesAdapter.addEmojiReaction(CurrentConversation.id,text,msgId)
-                            close()
-                        }
-                    }
-                }
-                PushButton {
-                    toolTipText: JamiStrings.moreEmojis
-                    source: JamiResources.add_reaction_svg
-                    normalColor: JamiTheme.emojiReactBubbleBgColor
-                    imageColor: JamiTheme.emojiReactPushButtonColor
-                    visible: WITH_WEBENGINE
-                    onClicked: {
-                        root.closeWithoutAnimation = true
-                        root.addMoreEmoji()
-                        //close()
-                    }
-                }
-            }
-
-            Rectangle {
-                Layout.margins: 5
-                color: JamiTheme.timestampColor
-                Layout.fillWidth: true
-                Layout.preferredHeight: 1
-                radius: width * 0.5
-                opacity: 0.6
-            }
-
-            MessageOptionButton {
-                textButton: JamiStrings.copy
-                iconSource: JamiResources.copy_svg
-                Layout.fillWidth: true
-                Layout.margins: 5
-                onClicked: {
-                    UtilsAdapter.setClipboardText(msgBody)
-                    close()
-                }
-            }
-
-            MessageOptionButton {
-                visible: type === Interaction.Type.DATA_TRANSFER
-                textButton: JamiStrings.saveFile
-                iconSource: JamiResources.save_file_svg
-                Layout.fillWidth: true
-                Layout.margins: 5
-                onClicked: {
-                    MessagesAdapter.copyToDownloads(root.transferId, root.transferName)
-                    close()
-                }
-            }
-
-            MessageOptionButton {
-                visible: type === Interaction.Type.DATA_TRANSFER
-                textButton: JamiStrings.openLocation
-                iconSource: JamiResources.round_folder_24dp_svg
-                Layout.fillWidth: true
-                Layout.margins: 5
-                onClicked: {
-                    MessagesAdapter.openDirectory(root.location)
-                    close()
-                }
-            }
-
-            MessageOptionButton {
-                id: buttonEdit
-
-                visible: root.isOutgoing && type === Interaction.Type.TEXT
-                textButton: JamiStrings.editMessage
-                iconSource: JamiResources.edit_svg
-                Layout.fillWidth: true
-                Layout.margins: 5
-
-                onClicked: {
-                    MessagesAdapter.replyToId = ""
-                    MessagesAdapter.editId = root.msgId
-                    close()
-                }
-            }
-
-            MessageOptionButton {
-                visible: root.isOutgoing && type === Interaction.Type.TEXT
-                textButton: JamiStrings.deleteMessage
-                iconSource: JamiResources.delete_svg
-                Layout.fillWidth: true
-                Layout.margins: 5
-                onClicked: {
-                    MessagesAdapter.editMessage(CurrentConversation.id, "", root.msgId)
-                    close()
-                }
-            }
-        }
-    }
-
-    Overlay.modal: Rectangle {
-        color: JamiTheme.transparentColor
-        // Color animation for overlay when pop up is shown.
-        ColorAnimation on color {
-            to: JamiTheme.popupOverlayColor
-            duration: 500
-        }
-    }
-
-    DropShadow {
-        z: -1
-
-        width: bubble.width
-        height: bubble.height
-        horizontalOffset: 3.0
-        verticalOffset: 3.0
-        radius: bubble.radius * 4
-        color: JamiTheme.shadowColor
-        source: bubble
-        transparentBorder: true
-        samples: radius + 1
-    }
-
-    enter: Transition {
-        NumberAnimation {
-            properties: "opacity"; from: 0.0; to: 1.0
-            duration: JamiTheme.shortFadeDuration
-        }
-    }
-
-    exit: Transition {
-        NumberAnimation {
-            properties: "opacity"; from: 1.0; to: 0.0
-            duration: root.closeWithoutAnimation ? 0 : JamiTheme.shortFadeDuration
-        }
-    }
-}

src/app/commoncomponents/ModalTextEdit.qml

@@ -122,6 +122,10 @@ Loader {
             echoMode: root.echoMode
             placeholderText: root.placeholderText
             onAccepted: root.accepted()
+            onRejected: {
+                root.editMode = false;
+                text = staticText;
+            }
             onKeyPressed: root.keyPressed()
             onTextChanged: dynamicText = text
             text: staticText

src/app/commoncomponents/PasswordDialog.qml

@@ -35,9 +35,6 @@ BaseModalDialog {
 
     signal done(bool success, int purpose)
 
-    width: Math.min(appWindow.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogWidth)
-    height: Math.min(appWindow.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogHeight)
-
     title: {
         switch (purpose) {
         case PasswordDialog.ExportAccount:
@@ -75,7 +72,7 @@ BaseModalDialog {
     popupContent: ColumnLayout {
         id: popupContentColumnLayout
 
-        spacing: 0
+        spacing: 16
 
         function validatePassword() {
             switch (purpose) {
@@ -128,6 +125,8 @@ BaseModalDialog {
             Layout.alignment: Qt.AlignHCenter
             Layout.preferredWidth: JamiTheme.preferredFieldWidth
             Layout.preferredHeight: visible ? 48 : 0
+            Layout.leftMargin: JamiTheme.preferredMarginSize
+            Layout.rightMargin: JamiTheme.preferredMarginSize
 
             visible: purpose === PasswordDialog.ChangePassword || purpose === PasswordDialog.ExportAccount
             placeholderText: JamiStrings.enterCurrentPassword
@@ -141,6 +140,8 @@ BaseModalDialog {
             Layout.alignment: Qt.AlignHCenter
             Layout.preferredWidth: JamiTheme.preferredFieldWidth
             Layout.preferredHeight: visible ? 48 : 0
+            Layout.leftMargin: JamiTheme.preferredMarginSize
+            Layout.rightMargin: JamiTheme.preferredMarginSize
 
             visible: purpose === PasswordDialog.ChangePassword || purpose === PasswordDialog.SetPassword
 
@@ -155,6 +156,8 @@ BaseModalDialog {
             Layout.alignment: Qt.AlignHCenter
             Layout.preferredWidth: JamiTheme.preferredFieldWidth
             Layout.preferredHeight: visible ? 48 : 0
+            Layout.leftMargin: JamiTheme.preferredMarginSize
+            Layout.rightMargin: JamiTheme.preferredMarginSize
 
             visible: purpose === PasswordDialog.ChangePassword || purpose === PasswordDialog.SetPassword
 
@@ -163,49 +166,24 @@ BaseModalDialog {
             onDynamicTextChanged: popupContentColumnLayout.validatePassword()
         }
 
-        RowLayout {
-            spacing: 16
-            Layout.fillWidth: true
-            Layout.alignment: Qt.AlignCenter
+        MaterialButton {
+            id: btnConfirm
 
-            MaterialButton {
-                id: btnConfirm
+            Layout.alignment: Qt.AlignHCenter
+            preferredWidth: JamiTheme.preferredFieldWidth / 2 - 8
 
-                Layout.alignment: Qt.AlignHCenter
+            color: enabled ? JamiTheme.buttonTintedBlack : JamiTheme.buttonTintedGrey
+            hoveredColor: JamiTheme.buttonTintedBlackHovered
+            pressedColor: JamiTheme.buttonTintedBlackPressed
+            secondary: true
+            autoAccelerator: true
+            enabled: purpose === PasswordDialog.SetPassword
 
-                preferredWidth: JamiTheme.preferredFieldWidth / 2 - 8
+            text: (purpose === PasswordDialog.ExportAccount) ? JamiStrings.exportAccount : JamiStrings.change
 
-                color: enabled ? JamiTheme.buttonTintedBlack : JamiTheme.buttonTintedGrey
-                hoveredColor: JamiTheme.buttonTintedBlackHovered
-                pressedColor: JamiTheme.buttonTintedBlackPressed
-                secondary: true
-                autoAccelerator: true
-                enabled: purpose === PasswordDialog.SetPassword
-
-                text: (purpose === PasswordDialog.ExportAccount) ? JamiStrings.exportAccount : JamiStrings.change
-
-                onClicked: {
-                    btnConfirm.enabled = false;
-                    timerToOperate.restart();
-                }
-            }
-
-            MaterialButton {
-                id: btnCancel
-
-                Layout.alignment: Qt.AlignHCenter
-
-                preferredWidth: JamiTheme.preferredFieldWidth / 2 - 8
-
-                color: JamiTheme.buttonTintedBlack
-                hoveredColor: JamiTheme.buttonTintedBlackHovered
-                pressedColor: JamiTheme.buttonTintedBlackPressed
-                secondary: true
-                autoAccelerator: true
-
-                text: JamiStrings.optionCancel
-
-                onClicked: close()
+            onClicked: {
+                btnConfirm.enabled = false;
+                timerToOperate.restart();
             }
         }
     }

src/app/commoncomponents/PhotoboothPopup.qml

@@ -32,15 +32,12 @@ import "../mainview/components"
 BaseModalDialog {
     id: root
 
-    height: 157
-    x: - width / 2
-    y: - height / 5
-
     property string imageId
     property bool newItem
     property real buttonSize: JamiTheme.smartListAvatarSize
     property real imageSize: 25
 
+
     signal focusOnPreviousItem
     signal focusOnNextItem
 
@@ -60,9 +57,15 @@ BaseModalDialog {
         importButton.forceActiveFocus()
     }
 
+    width: JamiTheme.preferredDialogWidth
+
+    title: JamiStrings.chooseAvatarPicture
+
     RecordBox {
         id: recordBox
 
+        anchors.centerIn: parent
+
         isPhoto: true
         visible: false
 
@@ -77,223 +80,176 @@ BaseModalDialog {
         }
     }
 
-    popupContent: Item {
+    popupContent: RowLayout {
+            id: buttonsRowLayout
 
-        Component.onCompleted: {
-            root.width = Qt.binding(() => clearButton.visible ? 283 : 210)
-        }
-
-        Rectangle {
-            id: container
-
-            anchors.fill: parent
-            radius: JamiTheme.photoPopupRadius
-            color: JamiTheme.inviteHoverColor
+            spacing: 10
 
             PushButton {
-                id: btnCancel
-                imageColor: "grey"
+                id: takePhotoButton
+
+                objectName: "takePhotoButton"
+
+                Layout.alignment: Qt.AlignHCenter
+
+                height: buttonSize
+                width: buttonSize
+                imageContainerWidth: imageSize
+                imageContainerHeight: imageSize
+                radius: height / 2
+                border.color: JamiTheme.buttonTintedBlue
                 normalColor: "transparent"
-                anchors.right: parent.right
-                anchors.top: parent.top
-                anchors.topMargin: 10
-                anchors.rightMargin: 10
-                source: JamiResources.round_close_24dp_svg
-                onClicked: { close();}
-            }
+                imageColor: JamiTheme.buttonTintedBlue
+                toolTipText: JamiStrings.takePhoto
+                source: JamiResources.baseline_camera_alt_24dp_svg
+                hoveredColor: JamiTheme.smartListHoveredColor
 
-
-            ColumnLayout {
-                id:  mainLayout
-                anchors.fill: parent
-                anchors.margins: JamiTheme.preferredMarginSize
-
-                Text {
-                    id: informativeLabel
-
-                    Layout.alignment: Qt.AlignCenter
-                    Layout.fillWidth: true
-                    Layout.topMargin: 26
-                    horizontalAlignment: Text.AlignHCenter
-                    verticalAlignment: Text.AlignVCenter
-                    text: JamiStrings.chooseAvatarPicture
-                    color: JamiTheme.primaryForegroundColor
-                    font.pixelSize: JamiTheme.popupPhotoTextSize
-                    elide: Text.ElideRight
+                Keys.onPressed: function (keyEvent) {
+                    if (keyEvent.key === Qt.Key_Enter ||
+                            keyEvent.key === Qt.Key_Return) {
+                        clicked()
+                        keyEvent.accepted = true
+                    } else if (keyEvent.key === Qt.Key_Up) {
+                        root.focusOnPreviousItem()
+                        keyEvent.accepted = true
+                    }
                 }
 
-                RowLayout {
-                    id: buttonsRowLayout
-                    Layout.preferredHeight: childrenRect.height
-                    Layout.alignment: Qt.AlignCenter
-                    spacing: 10
+                KeyNavigation.tab: {
+                    if (clearButton.visible)
+                        return clearButton
+                    return importButton
+                }
+                KeyNavigation.down: KeyNavigation.tab
 
-                    PushButton {
-                        id: takePhotoButton
+                onClicked: {
+                    recordBox.parent = buttonsRowLayout
 
-                        objectName: "takePhotoButton"
+                    recordBox.x = Qt.binding(function() {
+                        var buttonCenterX = buttonsRowLayout.width / 2
+                        return buttonCenterX - recordBox.width / 2
+                    })
+                    recordBox.y = Qt.binding(function() {
+                        return - recordBox.height / 2
+                    })
+                    startBooth()
+                }
+            }
 
-                        Layout.alignment: Qt.AlignHCenter
+            PushButton {
+                id: importButton
 
-                        height: buttonSize
-                        width: buttonSize
-                        imageContainerWidth: imageSize
-                        imageContainerHeight: imageSize
-                        radius: height / 2
-                        border.color: JamiTheme.buttonTintedBlue
-                        normalColor: "transparent"
-                        imageColor: JamiTheme.buttonTintedBlue
-                        toolTipText: JamiStrings.takePhoto
-                        source: JamiResources.baseline_camera_alt_24dp_svg
-                        hoveredColor: JamiTheme.smartListHoveredColor
+                objectName: "photoboothViewImportButton"
 
-                        Keys.onPressed: function (keyEvent) {
-                            if (keyEvent.key === Qt.Key_Enter ||
-                                    keyEvent.key === Qt.Key_Return) {
-                                clicked()
-                                keyEvent.accepted = true
-                            } else if (keyEvent.key === Qt.Key_Up) {
-                                root.focusOnPreviousItem()
-                                keyEvent.accepted = true
-                            }
-                        }
+                Layout.alignment: Qt.AlignHCenter
+                visible: parent.visible
 
-                        KeyNavigation.tab: {
-                            if (clearButton.visible)
-                                return clearButton
-                            return importButton
-                        }
-                        KeyNavigation.down: KeyNavigation.tab
+                height: buttonSize
+                width: buttonSize
+                imageContainerWidth: imageSize
+                imageContainerHeight: imageSize
+                radius: height / 2
+                border.color: JamiTheme.buttonTintedBlue
+                normalColor: "transparent"
+                source: JamiResources.round_folder_24dp_svg
+                toolTipText: JamiStrings.importFromFile
+                imageColor: JamiTheme.buttonTintedBlue
+                hoveredColor: JamiTheme.smartListHoveredColor
 
-                        onClicked: {
-                            recordBox.parent = buttonsRowLayout
 
-                            recordBox.x = Qt.binding(function() {
-                                var buttonCenterX = buttonsRowLayout.width / 2
-                                return buttonCenterX - recordBox.width / 2
-                            })
-                            recordBox.y = Qt.binding(function() {
-                                return - recordBox.height / 2
-                            })
-                            startBooth()
-                        }
+                Keys.onPressed: function (keyEvent) {
+                    if (keyEvent.key === Qt.Key_Enter ||
+                            keyEvent.key === Qt.Key_Return) {
+                        clicked()
+                        keyEvent.accepted = true
+                    } else if (keyEvent.key === Qt.Key_Down ||
+                               keyEvent.key === Qt.Key_Tab) {
+                        clearButton.forceActiveFocus()
+                        keyEvent.accepted = true
                     }
+                }
 
-                    PushButton {
-                        id: importButton
+                KeyNavigation.up: takePhotoButton
 
-                        objectName: "photoboothViewImportButton"
-
-                        Layout.alignment: Qt.AlignHCenter
-                        visible: parent.visible
-
-                        height: buttonSize
-                        width: buttonSize
-                        imageContainerWidth: imageSize
-                        imageContainerHeight: imageSize
-                        radius: height / 2
-                        border.color: JamiTheme.buttonTintedBlue
-                        normalColor: "transparent"
-                        source: JamiResources.round_folder_24dp_svg
-                        toolTipText: JamiStrings.importFromFile
-                        imageColor: JamiTheme.buttonTintedBlue
-                        hoveredColor: JamiTheme.smartListHoveredColor
-
-
-                        Keys.onPressed: function (keyEvent) {
-                            if (keyEvent.key === Qt.Key_Enter ||
-                                    keyEvent.key === Qt.Key_Return) {
-                                clicked()
-                                keyEvent.accepted = true
-                            } else if (keyEvent.key === Qt.Key_Down ||
-                                       keyEvent.key === Qt.Key_Tab) {
-                                clearButton.forceActiveFocus()
-                                keyEvent.accepted = true
-                            }
+                onClicked: {
+                    stopBooth()
+                    var dlg = viewCoordinator.presentDialog(
+                                appWindow,
+                                "commoncomponents/JamiFileDialog.qml",
+                                {
+                                    title: JamiStrings.chooseAvatarImage,
+                                    fileMode: JamiFileDialog.OpenFile,
+                                    folder: StandardPaths.writableLocation(
+                                                StandardPaths.PicturesLocation),
+                                    nameFilters: [JamiStrings.imageFiles,
+                                        JamiStrings.allFiles]
+                                })
+                    dlg.fileAccepted.connect(function(file) {
+                        var filePath = UtilsAdapter.getAbsPath(file)
+                        if (!root.newItem) {
+                            AccountAdapter.setCurrentAccountAvatarFile(filePath)
+                        } else {
+                            UtilsAdapter.setTempCreationImageFromFile(filePath, root.imageId)
                         }
+                        root.close()
+                    })
+                }
+            }
 
-                        KeyNavigation.up: takePhotoButton
+            PushButton {
+                id: clearButton
 
-                        onClicked: {
-                            stopBooth()
-                            var dlg = viewCoordinator.presentDialog(
-                                        appWindow,
-                                        "commoncomponents/JamiFileDialog.qml",
-                                        {
-                                            title: JamiStrings.chooseAvatarImage,
-                                            fileMode: JamiFileDialog.OpenFile,
-                                            folder: StandardPaths.writableLocation(
-                                                        StandardPaths.PicturesLocation),
-                                            nameFilters: [JamiStrings.imageFiles,
-                                                JamiStrings.allFiles]
-                                        })
-                            dlg.fileAccepted.connect(function(file) {
-                                var filePath = UtilsAdapter.getAbsPath(file)
-                                if (!root.newItem) {
-                                    AccountAdapter.setCurrentAccountAvatarFile(filePath)
-                                } else {
-                                    UtilsAdapter.setTempCreationImageFromFile(filePath, root.imageId)
-                                }
-                                root.close()
-                            })
-                        }
+                objectName: "photoboothViewClearButton"
+
+                Layout.alignment: Qt.AlignHCenter
+
+                height: buttonSize
+                width: buttonSize
+                imageContainerWidth: imageSize
+                imageContainerHeight: imageSize
+                radius: height / 2
+                border.color: JamiTheme.buttonTintedBlue
+                normalColor: "transparent"
+                source: JamiResources.ic_hangup_participant_24dp_svg
+                toolTipText: JamiStrings.clearAvatar
+                imageColor: JamiTheme.buttonTintedBlue
+                hoveredColor: JamiTheme.smartListHoveredColor
+
+
+                visible: {
+                    if (!newItem && LRCInstance.currentAccountAvatarSet)
+                        return true
+                    if (newItem && UtilsAdapter.tempCreationImage(imageId).length !== 0)
+                        return true
+                    return false
+                }
+
+                KeyNavigation.up: importButton
+
+                Keys.onPressed: function (keyEvent) {
+                    if (keyEvent.key === Qt.Key_Enter ||
+                            keyEvent.key === Qt.Key_Return) {
+                        clicked()
+                        importButton.forceActiveFocus()
+                        keyEvent.accepted = true
+                    } else if (keyEvent.key === Qt.Key_Down ||
+                               keyEvent.key === Qt.Key_Tab) {
+                        btnCancel.forceActiveFocus()
+                        keyEvent.accepted = true
                     }
+                }
 
-                    PushButton {
-                        id: clearButton
-
-                        objectName: "photoboothViewClearButton"
-
-                        Layout.alignment: Qt.AlignHCenter
-
-                        height: buttonSize
-                        width: buttonSize
-                        imageContainerWidth: imageSize
-                        imageContainerHeight: imageSize
-                        radius: height / 2
-                        border.color: JamiTheme.buttonTintedBlue
-                        normalColor: "transparent"
-                        source: JamiResources.ic_hangup_participant_24dp_svg
-                        toolTipText: JamiStrings.clearAvatar
-                        imageColor: JamiTheme.buttonTintedBlue
-                        hoveredColor: JamiTheme.smartListHoveredColor
-
-
-                        visible: {
-                            if (!newItem && LRCInstance.currentAccountAvatarSet)
-                                return true
-                            if (newItem && UtilsAdapter.tempCreationImage(imageId).length !== 0)
-                                return true
-                            return false
-                        }
-
-                        KeyNavigation.up: importButton
-
-                        Keys.onPressed: function (keyEvent) {
-                            if (keyEvent.key === Qt.Key_Enter ||
-                                    keyEvent.key === Qt.Key_Return) {
-                                clicked()
-                                importButton.forceActiveFocus()
-                                keyEvent.accepted = true
-                            } else if (keyEvent.key === Qt.Key_Down ||
-                                       keyEvent.key === Qt.Key_Tab) {
-                                btnCancel.forceActiveFocus()
-                                keyEvent.accepted = true
-                            }
-                        }
-
-                        onClicked: {
-                            if (!root.newItem)
-                                AccountAdapter.setCurrentAccountAvatarBase64()
-                            else
-                                UtilsAdapter.setTempCreationImageFromString("", imageId)
-                            visible = false
-                            stopBooth()
-                            root.close()
-                        }
-                    }
+                onClicked: {
+                    if (!root.newItem)
+                        AccountAdapter.setCurrentAccountAvatarBase64()
+                    else
+                        UtilsAdapter.setTempCreationImageFromString("", imageId)
+                    visible = false
+                    stopBooth()
+                    root.close()
                 }
             }
         }
     }
-}
+
+

src/app/commoncomponents/PushButton.qml

@@ -53,6 +53,7 @@ AbstractButton {
     property alias toolTipText: toolTip.text
     property alias hasShortcut: toolTip.hasShortcut
     property alias shortcutKey: toolTip.shortcutKey
+    property int buttonTextFontSize: 12
 
     // State colors
     property string pressedColor: JamiTheme.pressedButtonColor
@@ -143,7 +144,7 @@ AbstractButton {
 
         color: JamiTheme.primaryForegroundColor
         font.kerning: true
-        font.pixelSize: 12
+        font.pixelSize: buttonTextFontSize
         elide: Qt.ElideRight
     }
 

src/app/commoncomponents/SBSContextMenu.qml

@@ -37,6 +37,7 @@ ContextMenuAutoLoader {
 
             canTrigger: root.transferId !== ""
             itemName: JamiStrings.saveFile
+            iconSource: JamiResources.save_file_svg
             onClicked: MessagesAdapter.copyToDownloads(root.transferId, root.transferName)
         },
         GeneralMenuItem {
@@ -44,6 +45,7 @@ ContextMenuAutoLoader {
 
             canTrigger: root.transferId !== ""
             itemName: JamiStrings.openLocation
+            iconSource: JamiResources.round_folder_24dp_svg
             onClicked: {
                 MessagesAdapter.openDirectory(root.location);
             }
@@ -52,6 +54,7 @@ ContextMenuAutoLoader {
             id: reply
 
             itemName: JamiStrings.reply
+            iconSource: JamiResources.reply_black_24dp_svg
             onClicked: {
                 MessagesAdapter.editId = "";
                 MessagesAdapter.replyToId = root.msgId;
@@ -62,6 +65,7 @@ ContextMenuAutoLoader {
 
             canTrigger: transferId === "" && isOutgoing
             itemName: JamiStrings.edit
+            iconSource: JamiResources.edit_svg
             onClicked: {
                 MessagesAdapter.replyToId = "";
                 MessagesAdapter.editId = root.msgId;
@@ -73,6 +77,7 @@ ContextMenuAutoLoader {
 
             canTrigger: transferId === "" && isOutgoing
             itemName: JamiStrings.optionDelete
+            iconSource: JamiResources.delete_svg
             onClicked: {
                 MessagesAdapter.editMessage(CurrentConversation.id, "", root.msgId);
             }

src/app/commoncomponents/SBSMessageBase.qml

@@ -243,6 +243,7 @@ Control {
 
                     anchors.fill: bubble
                     hoverEnabled: true
+
                     onClicked: function (mouse) {
                         if (root.hoveredLink) {
                             MessagesAdapter.openUrl(root.hoveredLink);
@@ -277,8 +278,8 @@ Control {
                         anchors.rightMargin: isOutgoing ? 10 : 0
                         anchors.leftMargin: !isOutgoing ? 10 : 0
 
-                        imageColor: JamiTheme.emojiReactPushButtonColor
-                        normalColor: JamiTheme.transparentColor
+                        imageColor: hovered ? JamiTheme.chatViewFooterImgHoverColor : JamiTheme.chatViewFooterImgColor
+                        normalColor: JamiTheme.primaryBackgroundColor
                         toolTipText: JamiStrings.moreOptions
                         anchors.verticalCenter: parent.verticalCenter
                         anchors.right: isOutgoing ? optionButtonItem.right : undefined
@@ -287,33 +288,54 @@ Control {
                         source: JamiResources.more_vert_24dp_svg
                         width: optionButtonItem.width / 2
                         height: optionButtonItem.height
+                        circled: false
+                        property bool isOpen: false
+                        property var obj: undefined
+
+                        function bind() {
+                            more.isOpen = false;
+                            visible = Qt.binding(() => CurrentAccount.type !== Profile.Type.SIP && Body !== "" && (bubbleArea.bubbleHovered || hovered || reply.hovered || bgHandler.hovered));
+                            imageColor = Qt.binding(() => hovered ? JamiTheme.chatViewFooterImgHoverColor : JamiTheme.chatViewFooterImgColor);
+                            normalColor = Qt.binding(() => JamiTheme.primaryBackgroundColor);
+                        }
 
                         onClicked: {
-                            var component = Qt.createComponent("qrc:/commoncomponents/MessageOptionsPopup.qml");
-                            var obj = component.createObject(bubble, {
-                                    "emojiReactions": emojiReactions,
-                                    "isOutgoing": isOutgoing,
-                                    "msgId": Id,
-                                    "msgBody": Body,
-                                    "type": Type,
-                                    "transferName": TransferName,
-                                    "msgBubble": bubble,
-                                    "listView": listView
-                                });
-                            obj.open();
+                            if (more.isOpen) {
+                                more.bind();
+                                obj.close();
+                            } else {
+                                var component = Qt.createComponent("qrc:/commoncomponents/ShowMoreMenu.qml");
+                                obj = component.createObject(more, {
+                                        "emojiReactions": emojiReactions,
+                                        "isOutgoing": isOutgoing,
+                                        "msgId": Id,
+                                        "msgBody": Body,
+                                        "type": Type,
+                                        "transferName": TransferName,
+                                        "msgBubble": bubble,
+                                        "listView": listView
+                                    });
+                                obj.open();
+                                more.isOpen = true;
+                                visible = true;
+                                imageColor = JamiTheme.chatViewFooterImgHoverColor;
+                                normalColor = JamiTheme.hoveredButtonColor;
+                            }
                         }
                     }
 
                     PushButton {
                         id: reply
 
-                        imageColor: JamiTheme.emojiReactPushButtonColor
-                        normalColor: JamiTheme.transparentColor
+                        circled: false
+                        imageColor: hovered ? JamiTheme.chatViewFooterImgHoverColor : JamiTheme.chatViewFooterImgColor
+                        normalColor: JamiTheme.primaryBackgroundColor
                         toolTipText: JamiStrings.reply
-                        source: JamiResources.reply_svg
+                        source: JamiResources.reply_black_24dp_svg
                         width: optionButtonItem.width / 2
                         height: optionButtonItem.height
                         anchors.verticalCenter: parent.verticalCenter
+                        anchors.rightMargin: 5
                         anchors.right: isOutgoing ? more.left : undefined
                         anchors.left: !isOutgoing ? more.right : undefined
                         visible: CurrentAccount.type !== Profile.Type.SIP && Body !== "" && (bubbleArea.bubbleHovered || hovered || more.hovered || bgHandler.hovered)

src/app/commoncomponents/ShareMenu.qml

@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2020-2023 Savoir-faire Linux Inc.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+import QtQuick
+import net.jami.Constants 1.1
+import "contextmenu"
+
+BaseContextMenu {
+    id: root
+    property var modelList
+    signal audioRecordMessageButtonClicked
+    signal videoRecordMessageButtonClicked
+    signal showMapClicked
+
+    property list<GeneralMenuItem> menuItems: [
+        GeneralMenuItem {
+            id: audioMessage
+
+            canTrigger: true
+            iconSource: JamiResources.message_audio_black_24dp_svg
+            itemName: JamiStrings.leaveAudioMessage
+            onClicked: {
+                root.audioRecordMessageButtonClicked();
+            }
+        },
+        GeneralMenuItem {
+            id: videoMessage
+
+            canTrigger: true
+            iconSource: JamiResources.message_video_black_24dp_svg
+            itemName: JamiStrings.leaveVideoMessage
+
+            onClicked: {
+                root.videoRecordMessageButtonClicked();
+            }
+        },
+        GeneralMenuItem {
+            id: shareLocation
+
+            canTrigger: true
+            iconSource: JamiResources.localisation_sharing_send_pin_svg
+            itemName: JamiStrings.shareLocation
+            onClicked: {
+                root.showMapClicked();
+            }
+        }
+    ]
+
+    Component.onCompleted: {
+        root.loadMenuItems(menuItems);
+    }
+}

src/app/commoncomponents/SharePopup.qml

@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2023 Savoir-faire Linux Inc.
- *
- * 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import Qt.labs.platform
-import Qt5Compat.GraphicalEffects
-import net.jami.Models 1.1
-import net.jami.Adapters 1.1
-import net.jami.Constants 1.1
-import "../mainview/components"
-
-Popup {
-    id: root
-    padding: 0
-    property list<Action> menuMoreButton
-
-    height: childrenRect.height
-    width: childrenRect.width
-
-    focus: true
-    closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
-
-    Rectangle {
-        id: rect
-
-        color: JamiTheme.primaryBackgroundColor
-        border.color: JamiTheme.chatViewFooterRectangleBorderColor
-        border.width: 2
-        radius: 5
-        height: listViewMoreButton.childrenRect.height + 16
-        width: listViewMoreButton.childrenRect.width + 16
-
-        ListView {
-            id: listViewMoreButton
-
-            anchors.centerIn: parent
-            orientation: ListView.Vertical
-
-            spacing: 0
-
-            width: contentItem.childrenRect.width
-            height: contentHeight
-
-            model: menuMoreButton
-
-            Rectangle {
-                z: -1
-                anchors.fill: parent
-                color: "transparent"
-            }
-
-            onCountChanged: {
-                for (var i = 0; i < count; i++) {
-                    var item = listViewMoreButton.itemAtIndex(i);
-                    item.width = listViewMoreButton.width;
-                }
-            }
-
-            delegate: ItemDelegate {
-                id: control
-
-                text: modelData.toolTip
-
-                contentItem: RowLayout {
-                    Rectangle {
-                        id: image
-                        width: 26
-                        height: 26
-                        radius: 5
-                        color: JamiTheme.transparentColor
-                        ResponsiveImage {
-                            anchors.fill: parent
-                            source: modelData.iconSrc
-                            color: control.hovered ? JamiTheme.chatViewFooterImgHoverColor : JamiTheme.chatViewFooterImgColor
-                        }
-                    }
-                    Text {
-                        Layout.alignment: Qt.AlignLeft
-                        text: control.text
-                        color: control.hovered ? JamiTheme.chatViewFooterImgHoverColor : "#7f7f7f"
-                    }
-                }
-                background: Rectangle {
-                    color: control.hovered ? JamiTheme.showMoreButtonOpenColor : JamiTheme.transparentColor
-                }
-
-                action: modelData
-
-                onClicked: {
-                    root.close();
-                }
-            }
-        }
-    }
-
-    background: Rectangle {
-        anchors.fill: parent
-        color: JamiTheme.transparentColor
-        radius: 5
-        z: -1
-    }
-
-    enter: Transition {
-        NumberAnimation {
-            properties: "opacity"
-            from: 0.0
-            to: 1.0
-            duration: JamiTheme.shortFadeDuration
-        }
-    }
-    exit: Transition {
-        NumberAnimation {
-            properties: "opacity"
-            from: 1.0
-            to: 0.0
-            duration: JamiTheme.shortFadeDuration
-        }
-    }
-}

src/app/commoncomponents/ShowMoreMenu.qml

@@ -0,0 +1,190 @@
+/*
+ * Copyright (C) 2020-2023 Savoir-faire Linux Inc.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+import QtQuick
+import net.jami.Constants 1.1
+import Qt5Compat.GraphicalEffects
+import QtQuick.Controls
+import net.jami.Models 1.1
+import net.jami.Adapters 1.1
+import "contextmenu"
+
+BaseContextMenu {
+    id: root
+
+    required property var emojiReactions
+    property var emojiReplied: emojiReactions.ownEmojis
+
+    required property string msgId
+    required property string msgBody
+    required property bool isOutgoing
+    required property int type
+    required property string transferName
+    required property Item msgBubble
+    required property ListView listView
+
+    property string location: msgBody
+    property bool closeWithoutAnimation: false
+    property var emojiPicker
+
+    function xPositionProvider(width) {
+        // Use the width at function scope to retrigger property evaluation.
+        const listViewWidth = listView.width;
+        const parentX = parent.x;
+        if (isOutgoing) {
+            return parentX - width - 21;
+        } else {
+            return parentX + 21;
+        }
+    }
+
+    x: xPositionProvider(width)
+    y: parent.y
+
+    signal addMoreEmoji
+    onAddMoreEmoji: {
+        JamiQmlUtils.updateMessageBarButtonsPoints();
+        openEmojiPicker();
+    }
+
+    function openEmojiPicker() {
+        var component = WITH_WEBENGINE ? Qt.createComponent("qrc:/webengine/emojipicker/EmojiPicker.qml") : Qt.createComponent("qrc:/nowebengine/EmojiPicker.qml");
+        emojiPicker = component.createObject(root.parent, {
+                "listView": listView
+            });
+        emojiPicker.emojiIsPicked.connect(function (content) {
+                if (emojiReplied.includes(content)) {
+                    MessagesAdapter.removeEmojiReaction(CurrentConversation.id, content, msgId);
+                } else {
+                    MessagesAdapter.addEmojiReaction(CurrentConversation.id, content, msgId);
+                }
+            });
+        if (emojiPicker !== null) {
+            root.opacity = 0;
+            emojiPicker.closed.connect(() => close());
+            emojiPicker.x = xPositionProvider(JamiTheme.emojiPickerWidth);
+            emojiPicker.y = yPositionProvider(JamiTheme.emojiPickerHeight);
+            emojiPicker.open();
+        } else {
+            console.log("Error creating emojiPicker from message options popup");
+        }
+    }
+
+    // Close the picker when listView vertical properties change.
+    property real listViewHeight: listView.height
+    onListViewHeightChanged: close()
+    property bool isScrolling: listView.verticalScrollBar.active
+    onIsScrollingChanged: close()
+
+    onOpened: root.closeWithoutAnimation = false
+    onClosed: if (emojiPicker)
+        emojiPicker.closeEmojiPicker()
+
+    function getModel() {
+        const defaultModel = ["👍", "👎", "😂"];
+        const reactedEmojis = Array.isArray(emojiReplied) ? emojiReplied.slice(0, defaultModel.length) : [];
+        const uniqueEmojis = Array.from(new Set(reactedEmojis));
+        const missingEmojis = defaultModel.filter(emoji => !uniqueEmojis.includes(emoji));
+        return uniqueEmojis.concat(missingEmojis);
+    }
+
+    property list<MenuItem> menuItems: [
+        GeneralMenuItemList {
+            id: audioMessage
+
+            modelList: getModel()
+            canTrigger: true
+            iconSource: JamiResources.add_reaction_svg
+            itemName: JamiStrings.copy
+            addMenuSeparatorAfter: true
+            messageId: msgId
+        },
+        GeneralMenuItem {
+            id: saveFile
+
+            canTrigger: type === Interaction.Type.DATA_TRANSFER
+            iconSource: JamiResources.save_file_svg
+            itemName: JamiStrings.saveFile
+            onClicked: {
+                MessagesAdapter.copyToDownloads(root.msgId, root.transferName);
+            }
+        },
+        GeneralMenuItem {
+            id: openLocation
+
+            canTrigger: type === Interaction.Type.DATA_TRANSFER
+            iconSource: JamiResources.round_folder_24dp_svg
+            itemName: JamiStrings.openLocation
+            onClicked: {
+                MessagesAdapter.openDirectory(root.location);
+            }
+        },
+        GeneralMenuItem {
+            id: removeLocally
+
+            canTrigger: type === Interaction.Type.DATA_TRANSFER && Status === Interaction.Status.TRANSFER_FINISHED
+            iconSource: JamiResources.trash_black_24dp_svg
+            itemName: JamiStrings.removeLocally
+            onClicked: {
+                MessagesAdapter.removeFile(msgId, root.location);
+                ;
+            }
+        },
+        GeneralMenuItem {
+            id: editMessage
+
+            canTrigger: root.isOutgoing && type === Interaction.Type.TEXT
+            iconSource: JamiResources.edit_svg
+            itemName: JamiStrings.editMessage
+            onClicked: {
+                MessagesAdapter.replyToId = "";
+                MessagesAdapter.editId = root.msgId;
+            }
+        },
+        GeneralMenuItem {
+            id: deleteMessage
+
+            canTrigger: root.isOutgoing && type === Interaction.Type.TEXT
+            iconSource: JamiResources.delete_svg
+            itemName: JamiStrings.deleteMessage
+            onClicked: {
+                MessagesAdapter.editMessage(CurrentConversation.id, "", root.msgId);
+            }
+        },
+        GeneralMenuItem {
+            id: copyMessage
+
+            canTrigger: true
+            iconSource: JamiResources.copy_svg
+            itemName: JamiStrings.copy
+            onClicked: {
+                UtilsAdapter.setClipboardText(msgBody);
+            }
+        }
+    ]
+
+    Component.onCompleted: {
+        root.loadMenuItems(menuItems);
+    }
+
+    onAboutToHide: {
+        root.destroy();
+    }
+
+    Component.onDestruction: {
+        parent.bind();
+    }
+}

src/app/commoncomponents/SimpleMessageDialog.qml

@@ -44,9 +44,6 @@ BaseModalDialog {
         open();
     }
 
-    width: Math.max(JamiTheme.preferredDialogWidth, buttonTitles.length * (JamiTheme.preferredFieldWidth / 2 + JamiTheme.preferredMarginSize))
-    height: JamiTheme.preferredDialogHeight / 2 - JamiTheme.preferredMarginSize
-
     popupContent: ColumnLayout {
         Label {
             id: infoTextLabel
@@ -72,12 +69,10 @@ BaseModalDialog {
 
             data: innerContentData
         }
-
         RowLayout {
             spacing: JamiTheme.preferredMarginSize
 
             Layout.fillWidth: true
-            Layout.preferredHeight: contentHeight
             Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
             Layout.bottomMargin: JamiTheme.preferredMarginSize
 

src/app/commoncomponents/contextmenu/BaseContextMenu.qml

@@ -23,6 +23,8 @@ import net.jami.Constants 1.1
 Menu {
     id: root
 
+    closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside | Popup.CloseOnPressOutsideParent
+
     property int menuPreferredWidth: 0
     property int menuItemsPreferredHeight: 0
     property int menuSeparatorPreferredHeight: 0
@@ -43,11 +45,9 @@ Menu {
 
     function loadMenuItems(menuItems) {
         root.addItem(menuTopBorder);
-
-        // use the maximum text width as the preferred width for menu
         for (var j = 0; j < menuItems.length; ++j) {
             var currentItemWidth = menuItems[j].itemPreferredWidth;
-            if (currentItemWidth !== JamiTheme.menuItemsPreferredWidth && currentItemWidth > menuPreferredWidth)
+            if (currentItemWidth !== JamiTheme.menuItemsPreferredWidth && currentItemWidth > menuPreferredWidth && menuItems[j].canTrigger)
                 menuPreferredWidth = currentItemWidth;
         }
         for (var i = 0; i < menuItems.length; ++i) {
@@ -55,17 +55,28 @@ Menu {
                 menuItems[i].parentMenu = root;
                 root.addItem(menuItems[i]);
                 if (menuPreferredWidth)
-                    menuItems[i].itemPreferredWidth = menuPreferredWidth;
+                    menuItems[i].itemRealWidth = menuPreferredWidth;
                 if (menuItemsPreferredHeight)
                     menuItems[i].itemPreferredHeight = menuItemsPreferredHeight;
-            }
-            if (menuItems[i].addMenuSeparatorAfter) {
-                // If the QML file to be loaded is a local file,
-                // you could omit the finishCreation() function
-                var menuSeparatorComponent = Qt.createComponent("GeneralMenuSeparator.qml", Component.PreferSynchronous, root);
-                var menuSeparatorComponentObj = menuSeparatorComponent.createObject();
-                generalMenuSeparatorList.push(menuSeparatorComponentObj);
-                root.addItem(menuSeparatorComponentObj);
+                if (i !== menuItems.length - 1) {
+                    var menuSeparatorComponent = Qt.createComponent("GeneralMenuSeparator.qml", Component.PreferSynchronous, root);
+                    var menuSeparatorComponentObj = menuSeparatorComponent.createObject();
+                    generalMenuSeparatorList.push(menuSeparatorComponentObj);
+                    root.addItem(menuSeparatorComponentObj);
+                }
+                if (menuItems[i].addMenuSeparatorAfter) {
+                    var menuSeparatorComponent = Qt.createComponent("GeneralMenuSeparator.qml", Component.PreferSynchronous, root);
+                    var menuSeparatorComponentObj = menuSeparatorComponent.createObject(root, {
+                            "separatorColor": "#DEDEDE",
+                            "separatorPreferredHeight": 0
+                        });
+                    generalMenuSeparatorList.push(menuSeparatorComponentObj);
+                    root.addItem(menuSeparatorComponentObj);
+                    var menuSeparatorComponent = Qt.createComponent("GeneralMenuSeparator.qml", Component.PreferSynchronous, root);
+                    var menuSeparatorComponentObj = menuSeparatorComponent.createObject();
+                    generalMenuSeparatorList.push(menuSeparatorComponentObj);
+                    root.addItem(menuSeparatorComponentObj);
+                }
             }
         }
         root.addItem(menuBottomBorder);
@@ -77,28 +88,22 @@ Menu {
             root.close();
     }
 
-    modal: true
-    Overlay.modal: Rectangle {
-        color: "transparent"
-    }
     font.pointSize: JamiTheme.menuFontSize
 
     background: Rectangle {
-        id: container
 
         implicitWidth: menuPreferredWidth ? menuPreferredWidth : JamiTheme.menuItemsPreferredWidth
 
-        border.width: JamiTheme.menuItemsCommonBorderWidth
-        border.color: JamiTheme.tabbarBorderColor
-        color: JamiTheme.backgroundColor
+        color: JamiTheme.primaryBackgroundColor
+        radius: 5
 
         layer.enabled: true
         layer.effect: DropShadow {
             z: -1
-            horizontalOffset: 3.0
+            horizontalOffset: 0.0
             verticalOffset: 3.0
-            radius: 16.0
-            color: JamiTheme.shadowColor
+            radius: 6
+            color: "#29000000"
             transparentBorder: true
             samples: radius + 1
         }

src/app/commoncomponents/contextmenu/ContextMenuAutoLoader.qml

@@ -30,6 +30,8 @@ Loader {
 
     active: false
 
+    visible: false
+
     function openMenu() {
         root.active = true;
         root.sourceComponent = menuComponent;

src/app/commoncomponents/contextmenu/GeneralMenuItem.qml

@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2020-2023 Savoir-faire Linux Inc.
- * Author: Mingrui Zhang <mingrui.zhang@savoirfairelinux.com>
  *
  * 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
@@ -32,34 +31,41 @@ MenuItem {
     property alias iconSource: contextMenuItemImage.source
     property string iconColor: ""
     property bool canTrigger: true
+    property bool hasIcon: true
     property bool addMenuSeparatorAfter: false
     property bool autoTextSizeAdjustment: true
     property bool dangerous: false
     property BaseContextMenu parentMenu
+    property bool isActif: true
 
-    property int itemPreferredWidth: JamiTheme.menuItemsPreferredWidth
+    property int itemPreferredWidth: hasIcon ? 50 + contextMenuItemText.contentWidth + contextMenuItemImage.width : 35 + contextMenuItemText.contentWidth
+    property int itemRealWidth: itemPreferredWidth
     property int itemPreferredHeight: JamiTheme.menuItemsPreferredHeight
     property int leftBorderWidth: JamiTheme.menuItemsCommonBorderWidth
     property int rightBorderWidth: JamiTheme.menuItemsCommonBorderWidth
 
-    property int itemImageLeftMargin: 24
-    property int itemTextMargin: 20
+    property int itemImageLeftMargin: 10
+    property int itemTextMargin: 10
 
     signal clicked
     property bool itemHovered: menuItemContentRect.hovered
 
-    contentItem: AbstractButton {
+    width: itemRealWidth
+
+    contentItem: PushButton {
         id: menuItemContentRect
 
-        background: Rectangle {
-            id: background
+        enabled: isActif
+        hoverEnabled: isActif
 
-            anchors.fill: parent
-            anchors.leftMargin: 1
-            anchors.rightMargin: 1
+        hoveredColor: JamiTheme.hoverColor
+        normalColor: JamiTheme.primaryBackgroundColor
+        circled: false
+        radius: 5
 
-            color: menuItemContentRect.hovered ? JamiTheme.hoverColor : JamiTheme.backgroundColor
-        }
+        //duration: 1000
+        anchors.leftMargin: 6
+        anchors.rightMargin: 6
 
         anchors.fill: parent
 
@@ -76,41 +82,25 @@ MenuItem {
 
                 visible: status === Image.Ready
 
-                color: iconColor !== "" ? iconColor : JamiTheme.textColor
-                opacity: 0.7
+                color: menuItemContentRect.hovered ? JamiTheme.textColor : JamiTheme.chatViewFooterImgColor
             }
 
-            Text {
-                id: contextMenuItemText
-
+            Item {
                 Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
-                Layout.leftMargin: contextMenuItemImage.status === Image.Ready ? itemTextMargin : itemTextMargin / 2
-                Layout.rightMargin: contextMenuItemImage.status === Image.Ready ? itemTextMargin : itemTextMargin / 2
+                Layout.leftMargin: contextMenuItemImage.status === Image.Ready ? itemTextMargin : itemTextMargin
+                Layout.rightMargin: contextMenuItemImage.status === Image.Ready ? itemImageLeftMargin : itemTextMargin
                 Layout.preferredHeight: itemPreferredHeight
                 Layout.fillWidth: true
 
-                text: itemName
-                color: dangerous ? JamiTheme.redColor : JamiTheme.textColor
-                font.pointSize: JamiTheme.textFontSize
-                horizontalAlignment: Text.AlignLeft
-                verticalAlignment: Text.AlignVCenter
-
-                TextMetrics {
-                    id: contextMenuItemTextMetrics
-
-                    font: contextMenuItemText.font
-                    text: contextMenuItemText.text
-
-                    onBoundingRectChanged: {
-                        var sizeToCompare = itemPreferredWidth - (contextMenuItemImage.source.toString().length > 0 ? itemTextMargin + itemImageLeftMargin + contextMenuItemImage.width : itemTextMargin / 2);
-                        if (autoTextSizeAdjustment && boundingRect.width > sizeToCompare) {
-                            if (boundingRect.width > JamiTheme.contextMenuItemTextMaxWidth) {
-                                itemPreferredWidth += JamiTheme.contextMenuItemTextMaxWidth - JamiTheme.contextMenuItemTextPreferredWidth + itemTextMargin;
-                                contextMenuItemText.elide = Text.ElideRight;
-                            } else
-                                itemPreferredWidth += boundingRect.width + itemTextMargin - sizeToCompare;
-                        }
-                    }
+                Text {
+                    id: contextMenuItemText
+                    height: parent.height
+                    text: itemName
+                    color: dangerous ? JamiTheme.redColor : isActif ? JamiTheme.textColor : JamiTheme.chatViewFooterImgColor
+                    font.pointSize: JamiTheme.textFontSize
+                    horizontalAlignment: Text.AlignLeft
+                    verticalAlignment: Text.AlignVCenter
+                    elide: Text.ElideRight
                 }
             }
         }
@@ -130,7 +120,9 @@ MenuItem {
         anchors.leftMargin: leftBorderWidth
         anchors.rightMargin: rightBorderWidth
 
-        implicitWidth: itemPreferredWidth
+        color: JamiTheme.primaryBackgroundColor
+
+        implicitWidth: itemRealWidth
         implicitHeight: itemPreferredHeight
 
         border.width: 0
@@ -141,7 +133,7 @@ MenuItem {
             rBorderwidth: rightBorderWidth
             tBorderwidth: 0
             bBorderwidth: 0
-            borderColor: JamiTheme.tabbarBorderColor
+            borderColor: JamiTheme.primaryBackgroundColor
         }
     }
 }

src/app/commoncomponents/contextmenu/GeneralMenuItemList.qml

@@ -0,0 +1,231 @@
+/*
+ * Copyright (C) 2020-2023 Savoir-faire Linux Inc.
+ * Author: Mingrui Zhang <mingrui.zhang@savoirfairelinux.com>
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import net.jami.Constants 1.1
+import "../"
+import net.jami.Adapters 1.1
+
+// General menu item.
+// Can control top, bottom, left, right border width.
+// Use onClicked slot to simulate item click event.
+// Can have image icon at the left of the text.
+MenuItem {
+    id: menuItem
+
+    property var modelList: undefined
+    property string itemName: ""
+    property var iconSource: undefined
+    property string iconColor: ""
+    property bool canTrigger: true
+    property bool hasIcon: true
+    property bool addMenuSeparatorAfter: false
+    property bool autoTextSizeAdjustment: true
+    property bool dangerous: false
+    property BaseContextMenu parentMenu
+    property string messageId
+
+    signal addMoreEmoji
+
+    property int itemPreferredWidth: 207
+    property int itemRealWidth: itemPreferredWidth
+    property int itemPreferredHeight: JamiTheme.menuItemsPreferredHeight
+    property int leftBorderWidth: JamiTheme.menuItemsCommonBorderWidth
+    property int rightBorderWidth: JamiTheme.menuItemsCommonBorderWidth
+
+    property int itemImageLeftMargin: 18
+
+    signal clicked
+
+    width: itemRealWidth
+
+    contentItem: Item {
+        id: menuItemContentRect
+
+        anchors.fill: parent
+
+        RowLayout {
+            spacing: 0
+
+            anchors.fill: menuItemContentRect
+
+            Rectangle {
+                id: contextMenuItemImage
+                Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
+                Layout.leftMargin: itemImageLeftMargin
+                height: 36
+                width: 36
+                color: emojiReplied.includes(modelList[0]) ? JamiTheme.hoveredButtonColor : JamiTheme.primaryBackgroundColor
+                radius: 5
+                Behavior on color  {
+                    ColorAnimation {
+                        duration: JamiTheme.shortFadeDuration
+                    }
+                }
+
+                Text {
+                    anchors.centerIn: parent
+                    text: modelList[0]
+                    font.pointSize: JamiTheme.emojiBubbleSize
+                }
+
+                MouseArea {
+                    anchors.fill: parent
+                    hoverEnabled: true
+                    onEntered: {
+                        contextMenuItemImage.color = JamiTheme.hoveredButtonColor;
+                    }
+                    onExited: {
+                        contextMenuItemImage.color = emojiReplied.includes(modelList[0]) ? JamiTheme.hoveredButtonColor : JamiTheme.primaryBackgroundColor;
+                    }
+                    onClicked: {
+                        if (emojiReplied.includes(modelList[0])) {
+                            MessagesAdapter.removeEmojiReaction(CurrentConversation.id, modelList[0], msgId);
+                        } else {
+                            MessagesAdapter.addEmojiReaction(CurrentConversation.id, modelList[0], msgId);
+                        }
+                        close();
+                    }
+                }
+            }
+
+            Rectangle {
+                id: contextMenuItemImage2
+                Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
+                Layout.leftMargin: itemImageLeftMargin / 2
+                height: 36
+                width: 36
+                color: emojiReplied.includes(modelList[1]) ? JamiTheme.hoveredButtonColor : JamiTheme.primaryBackgroundColor
+                radius: 5
+                Behavior on color  {
+                    ColorAnimation {
+                        duration: JamiTheme.shortFadeDuration
+                    }
+                }
+
+                Text {
+                    anchors.centerIn: parent
+                    text: modelList[1]
+                    font.pointSize: JamiTheme.emojiBubbleSize
+                }
+
+                MouseArea {
+                    anchors.fill: parent
+                    hoverEnabled: true
+                    onEntered: {
+                        contextMenuItemImage2.color = JamiTheme.hoveredButtonColor;
+                    }
+                    onExited: {
+                        contextMenuItemImage2.color = emojiReplied.includes(modelList[1]) ? JamiTheme.hoveredButtonColor : JamiTheme.primaryBackgroundColor;
+                    }
+                    onClicked: {
+                        if (emojiReplied.includes(modelList[1])) {
+                            MessagesAdapter.removeEmojiReaction(CurrentConversation.id, modelList[1], msgId);
+                        } else {
+                            MessagesAdapter.addEmojiReaction(CurrentConversation.id, modelList[1], msgId);
+                        }
+                        close();
+                    }
+                }
+            }
+
+            Rectangle {
+                id: contextMenuItemImage3
+                Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
+                Layout.leftMargin: itemImageLeftMargin / 2
+                height: 36
+                width: 36
+                color: emojiReplied.includes(modelList[2]) ? JamiTheme.hoveredButtonColor : JamiTheme.primaryBackgroundColor
+                radius: 5
+                Behavior on color  {
+                    ColorAnimation {
+                        duration: JamiTheme.shortFadeDuration
+                    }
+                }
+
+                Text {
+                    anchors.centerIn: parent
+                    text: modelList[2]
+                    font.pointSize: JamiTheme.emojiBubbleSize
+                }
+
+                MouseArea {
+                    anchors.fill: parent
+                    hoverEnabled: true
+                    onEntered: {
+                        contextMenuItemImage3.color = JamiTheme.hoveredButtonColor;
+                    }
+                    onExited: {
+                        contextMenuItemImage3.color = emojiReplied.includes(modelList[2]) ? JamiTheme.hoveredButtonColor : JamiTheme.primaryBackgroundColor;
+                    }
+                    onClicked: {
+                        if (emojiReplied.includes(modelList[2])) {
+                            MessagesAdapter.removeEmojiReaction(CurrentConversation.id, modelList[2], msgId);
+                        } else {
+                            MessagesAdapter.addEmojiReaction(CurrentConversation.id, modelList[2], msgId);
+                        }
+                        close();
+                    }
+                }
+            }
+
+            PushButton {
+                id: contextMenuItemImage4
+                Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
+                Layout.leftMargin: itemImageLeftMargin / 2
+                Layout.rightMargin: itemImageLeftMargin
+                height: 36
+                width: 36
+                imageColor: hovered ? JamiTheme.chatViewFooterImgHoverColor : JamiTheme.chatViewFooterImgColor
+                normalColor: JamiTheme.primaryBackgroundColor
+                radius: 5
+                source: iconSource
+                onClicked: {
+                    root.addMoreEmoji();
+                }
+            }
+        }
+    }
+
+    highlighted: true
+
+    background: Rectangle {
+        id: contextMenuBackgroundRect
+
+        anchors.fill: parent
+        anchors.leftMargin: leftBorderWidth
+        anchors.rightMargin: rightBorderWidth
+
+        color: JamiTheme.primaryBackgroundColor
+
+        implicitWidth: itemRealWidth
+        implicitHeight: itemPreferredHeight
+
+        border.width: 0
+
+        CustomBorder {
+            commonBorder: false
+            lBorderwidth: leftBorderWidth
+            rBorderwidth: rightBorderWidth
+            tBorderwidth: 0
+            bBorderwidth: 0
+            borderColor: JamiTheme.primaryBackgroundColor
+        }
+    }
+}

src/app/commoncomponents/contextmenu/GeneralMenuSeparator.qml

@@ -23,19 +23,24 @@ MenuSeparator {
     id: menuSeparator
 
     property int separatorPreferredWidth: JamiTheme.menuItemsPreferredWidth
-    property int separatorPreferredHeight: 1
-    property string separatorColor: JamiTheme.tabbarBorderColor
+    property int separatorPreferredHeight: 5
+    property string separatorColor: JamiTheme.primaryBackgroundColor
 
     padding: 0
     topPadding: 1
     bottomPadding: 1
+
     contentItem: Rectangle {
         implicitWidth: separatorPreferredWidth
         implicitHeight: separatorPreferredHeight
         color: separatorColor
+        radius: 5
     }
 
     background: Rectangle {
-        color: JamiTheme.backgroundColor
+        width: parent.width - 10
+        anchors.horizontalCenter: parent.horizontalCenter
+        color: separatorColor
+        radius: 5
     }
 }

src/app/connectioninfolistmodel.cpp

@@ -0,0 +1,228 @@
+/*
+ * Copyright (C) 2023 Savoir-faire Linux Inc.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "connectioninfolistmodel.h"
+
+ConnectionInfoListModel::ConnectionInfoListModel(LRCInstance* instance, QObject* parent)
+    : AbstractListModelBase(parent)
+{
+    lrcInstance_ = instance;
+    connect(lrcInstance_,
+            &LRCInstance::currentAccountIdChanged,
+            this,
+            &ConnectionInfoListModel::resetData);
+}
+
+int
+ConnectionInfoListModel::rowCount(const QModelIndex& parent) const
+{
+    return peerIds_.size();
+}
+
+QVariant
+ConnectionInfoListModel::data(const QModelIndex& index, int role) const
+{
+    const auto accountId = lrcInstance_->get_currentAccountId();
+
+    if (accountId.isEmpty()) {
+        qWarning() << "ConnectionInfoListModel::data: accountId or peerID is empty";
+        return {};
+    }
+    const auto peerId = peerIds_[index.row()];
+    const auto peerData = peerData_[peerId];
+
+    switch (role) {
+    case ConnectionInfoList::ChannelsMap: {
+        QVariantMap channelsMapMap;
+        int i = 0;
+        for (const auto& device : peerData.keys()) {
+            QString channelsId = peerData[device]["id"].toString();
+            QVariantMap channelsMap;
+            const auto channelInfoList = lrcInstance_->getChannelList(accountId, channelsId);
+            for (const auto& channelInfo : channelInfoList) {
+                channelsMap.insert(channelInfo["id"], channelInfo["name"]);
+            }
+            channelsMapMap.insert(QString::number(i++), channelsMap);
+        }
+        return QVariant(channelsMapMap);
+    }
+    case ConnectionInfoList::ConnectionDatas: {
+        QString peerString;
+        peerString += "Peer:" + peerId;
+        for (const auto& device : peerData.keys()) {
+            peerString += "{";
+            peerString += "Device:" + device + ",";
+            peerString += "Status:" + peerData[device]["status"].toString() + ",";
+            peerString += "Channels:" + peerData[device]["channels"].toString() + ",";
+            peerString += "Remote Address" + peerData[device]["remoteAddress"].toString();
+            peerString += "}";
+        }
+        return peerString;
+    }
+    case ConnectionInfoList::PeerId:
+        return peerId;
+    case ConnectionInfoList::RemoteAddress: {
+        QVariantMap remoteAddressMap;
+        int i = 0;
+        for (const auto& device : peerData.keys()) {
+            remoteAddressMap.insert(QString::number(i++), peerData[device]["remoteAddress"]);
+        }
+        return QVariant(remoteAddressMap);
+    }
+    case ConnectionInfoList::DeviceId: {
+        QVariantMap deviceMap;
+        int i = 0;
+        for (const auto& device : peerData.keys()) {
+            deviceMap.insert(QString::number(i++), device);
+        }
+        return QVariant(deviceMap);
+    }
+    case ConnectionInfoList::Status: {
+        QVariantMap statusMap;
+        int i = 0;
+        for (const auto& device : peerData.keys()) {
+            statusMap.insert(QString::number(i++), peerData[device]["status"]);
+        }
+        return QVariantMap(statusMap);
+    }
+    case ConnectionInfoList::Channels: {
+        QVariantMap channelsMap;
+        int i = 0;
+        for (const auto& device : peerData.keys()) {
+            channelsMap.insert(QString::number(i++), peerData[device]["channels"]);
+        }
+        return QVariant(channelsMap);
+    }
+    case ConnectionInfoList::Count:
+        return peerData.size();
+    }
+    return {};
+}
+
+QHash<int, QByteArray>
+ConnectionInfoListModel::roleNames() const
+{
+    using namespace ConnectionInfoList;
+    QHash<int, QByteArray> roles;
+#define X(role) roles[role] = #role;
+    CONNECTONINFO_ROLES
+#undef X
+    return roles;
+}
+
+void
+ConnectionInfoListModel::update()
+{
+    const auto accountId = lrcInstance_->get_currentAccountId();
+    if (accountId.isEmpty()) {
+        return;
+    }
+    aggregateData();
+}
+
+template<typename T>
+std::tuple<QVector<T>, QVector<T>>
+getSetDiff(QVector<T> u, QVector<T> v)
+{
+    using namespace std;
+    QVector<T> a, r;
+    set_difference(v.begin(), v.end(), u.begin(), u.end(), inserter(a, a.begin()));
+    set_difference(u.begin(), u.end(), v.begin(), v.end(), inserter(r, r.begin()));
+    return {a, r};
+}
+
+void
+ConnectionInfoListModel::aggregateData()
+{
+    const auto accountId = lrcInstance_->get_currentAccountId();
+    if (accountId.isEmpty()) {
+        return;
+    }
+
+    connectionInfoList_ = lrcInstance_->getConnectionList(accountId);
+
+    peerData_ = {};
+
+    QSet<QString> newPeerIds;
+
+    for (const auto& connectionInfo : connectionInfoList_) {
+        if (!connectionInfo["peer"].isEmpty()) {
+            newPeerIds.insert(connectionInfo["peer"]);
+        }
+        const auto channelInfoList = lrcInstance_->getChannelList(accountId, connectionInfo["id"]);
+        peerData_[connectionInfo["peer"]][connectionInfo["device"]] = {};
+        peerData_[connectionInfo["peer"]][connectionInfo["device"]]["status"]
+            = connectionInfo["status"];
+        peerData_[connectionInfo["peer"]][connectionInfo["device"]]["channels"] = channelInfoList
+                                                                                      .size();
+        peerData_[connectionInfo["peer"]][connectionInfo["device"]]["id"] = connectionInfo["id"];
+        peerData_[connectionInfo["peer"]][connectionInfo["device"]]["remoteAddress"]
+            = connectionInfo["remoteAddress"];
+    }
+
+    QVector<QString> oldVector;
+    for (const auto& peerId : peerIds_) {
+        oldVector << peerId;
+    }
+    QVector<QString> newVector;
+    for (const auto& peerId : newPeerIds) {
+        newVector << peerId;
+    }
+
+    std::sort(oldVector.begin(), oldVector.end());
+    std::sort(newVector.begin(), newVector.end());
+
+    QVector<QString> removed, added;
+    std::tie(added, removed) = getSetDiff(oldVector, newVector);
+    Q_FOREACH (const auto& key, added) {
+        auto index = std::distance(newVector.begin(),
+                                   std::find(newVector.begin(), newVector.end(), key));
+        beginInsertRows(QModelIndex(), index, index);
+        peerIds_.insert(index, key);
+        endInsertRows();
+    }
+    Q_FOREACH (const auto& key, removed) {
+        auto index = std::distance(oldVector.begin(),
+                                   std::find(oldVector.begin(), oldVector.end(), key));
+        beginRemoveRows(QModelIndex(), index, index);
+        if (peerIds_.size() > index) {
+            peerIds_.remove(index);
+        } else {
+            qWarning() << "ConnectionInfoListModel::aggregateData: index out of range";
+            qWarning() << "index: " << index;
+            qWarning() << "key: " << key;
+        }
+        endRemoveRows();
+    }
+
+    // HACK: loop through all the peerIds_ and update the data for each one.
+    // This is not efficient, but it works.
+    Q_FOREACH (const auto& peerId, peerIds_) {
+        auto index = std::distance(peerIds_.begin(),
+                                   std::find(peerIds_.begin(), peerIds_.end(), peerId));
+        Q_EMIT dataChanged(this->index(index), this->index(index));
+    }
+}
+
+void
+ConnectionInfoListModel::resetData()
+{
+    beginResetModel();
+    peerIds_.clear();
+    peerData_.clear();
+    endResetModel();
+}

src/app/connectioninfolistmodel.h

@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2023 Savoir-faire Linux Inc.
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "abstractlistmodelbase.h"
+
+#define CONNECTONINFO_ROLES \
+    X(ConnectionDatas) \
+    X(ChannelsMap) \
+    X(PeerName) \
+    X(PeerId) \
+    X(DeviceId) \
+    X(Status) \
+    X(Channels) \
+    X(RemoteAddress) \
+    X(Count) // this is the number of connections (convenience)
+
+namespace ConnectionInfoList {
+Q_NAMESPACE
+enum Role {
+    DummyRole = Qt::UserRole + 1,
+#define X(role) role,
+    CONNECTONINFO_ROLES
+#undef X
+};
+Q_ENUM_NS(Role)
+} // namespace ConnectionInfoList
+
+class ConnectionInfoListModel : public AbstractListModelBase
+{
+public:
+    explicit ConnectionInfoListModel(LRCInstance* instance, QObject* parent = nullptr);
+
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+    QHash<int, QByteArray> roleNames() const override;
+
+    Q_INVOKABLE void update();
+
+private:
+    using Role = ConnectionInfoList::Role;
+
+    VectorMapStringString connectionInfoList_;
+
+    QVector<QString> peerIds_;
+    QMap<QString, QMap<QString, QMap<QString, QVariant>>> peerData_;
+    void aggregateData();
+    void resetData();
+};

src/app/constant/JamiQmlUtils.qml

@@ -20,6 +20,7 @@
 pragma Singleton
 import QtQuick
 import net.jami.Adapters 1.1
+import net.jami.Enums 1.1
 
 Item {
     property string qmlFilePrefix: "file:/"
@@ -69,4 +70,13 @@ Item {
     function clamp(val, min, max) {
         return Math.min(Math.max(val, min), max);
     }
+
+    function isDonationBannerVisible() {
+        // The banner is visible if the current date is after the date set in the settings and before the end date
+        // And if the donation toggle is checked
+        var isDonationVisible = UtilsAdapter.getAppValue(Settings.Key.IsDonationVisible);
+        var endDonationDate = new Date(Date.parse(UtilsAdapter.getAppValue(Settings.Key.DonationEndDate)));
+        var donationVisibleDate = new Date(Date.parse(UtilsAdapter.getAppValue(Settings.Key.DonationVisibleDate)));
+        return new Date() < endDonationDate && new Date() > donationVisibleDate && isDonationVisible && false;
+    }
 }

src/app/constant/JamiStrings.qml

@@ -47,7 +47,7 @@ Item {
     // AboutPopUp
     property string version: qsTr("Version") + (AppVersionManager.isCurrentVersionBeta() ? " (Beta)" : "")
     property string declarationYear: "© 2015-2023"
-    property string slogan: "Világfa"
+    property string slogan: "Eleutheria"
     property string declaration: qsTr("Jami is a free universal communication software that respects the freedom and privacy of its users.")
 
     // AccountComboBox
@@ -83,6 +83,15 @@ Item {
     property string selectNewRingtone: qsTr("Select a new ringtone")
     property string certificateFile: qsTr("Certificate File (*.crt)")
     property string audioFile: qsTr("Audio File (*.wav *.ogg *.opus *.mp3 *.aiff *.wma)")
+    property string pushToTalk: qsTr("Push-to-talk")
+    property string enablePTT: qsTr("Enable push-to-talk")
+    property string keyboardShortcut: qsTr("Keyboard shortcut")
+    property string changeKeyboardShortcut: qsTr("Change keyboard shortcut")
+
+    // ChangePttKeyPopup
+    property string changeShortcut: qsTr("Change shortcut")
+    property string assignmentIndication: qsTr("Press the key to be assigned to push-to-talk shortcut")
+    property string assign: qsTr("Assign")
 
     // AdvancedChatSettings
     property string enableReadReceipts: qsTr("Enable read receipts")
@@ -436,7 +445,7 @@ Item {
 
     // LinkedDevices
     property string tipLinkNewDevice: qsTr("Link a new device to this account")
-    property string linkNewDevice: qsTr("Exporting account…")
+    property string linkDevice: qsTr("Exporting account…")
     property string removeDevice: qsTr("Remove Device")
     property string sureToRemoveDevice: qsTr("Are you sure you wish to remove this device?")
     property string yourPinIs: qsTr("Your PIN is:")
@@ -496,6 +505,7 @@ Item {
     // Context Menu
     property string saveFile: qsTr("Save file")
     property string openLocation: qsTr("Open location")
+    property string removeLocally: qsTr("Delete file from device")
 
     // Updates
     property string betaInstall: qsTr("Install beta version")
@@ -512,6 +522,8 @@ Item {
     property string updateDownloading: "Downloading"
     property string confirmBeta: qsTr("This will uninstall your current Release version and you can always download the latest Release version on our website")
     property string networkDisconnected: qsTr("Network disconnected")
+    property string accessError: qsTr("Content access error")
+    property string contentNotFoundError: qsTr("Content not found")
     property string genericError: qsTr("Something went wrong")
 
     //Troubleshoot Settings
@@ -574,13 +586,20 @@ Item {
     // LinkDevicesDialog
     property string pinTimerInfos: qsTr("The PIN and the account password should be entered in your device within 10 minutes.")
     property string close: qsTr("Close")
-    property string enterAccountPassword: qsTr("Enter account's password")
+    property string enterAccountPassword: qsTr("Enter account password")
+    property string enterPasswordPinCode: qsTr("This account is password encrypted, enter the password to generate a PIN code.")
     property string addDevice: qsTr("Add Device")
+    property string pinExpired: qsTr("PIN expired")
+    property string onAnotherDevice: qsTr("On another device")
+    property string onAnotherDeviceInstruction: qsTr("Install and launch Jami, select \"Import from another device\" and scan the QR code.")
+    property string linkNewDevice: qsTr("Link new device")
+    property string linkingInstructions: qsTr("In Jami, scan QR code or manually enter the PIN.")
+    property string pinValidity: qsTr("The PIN code is valid for: ")
 
     // PasswordDialog
-    property string enterPassword: qsTr("Enter the password")
+    property string enterPassword: qsTr("Enter password")
     property string enterCurrentPassword: qsTr("Enter current password")
-    property string confirmRemoval: qsTr("Enter this account's password to confirm the removal of this device")
+    property string confirmRemoval: qsTr("Enter account password to confirm the removal of this device")
     property string enterNewPassword: qsTr("Enter new password")
     property string confirmNewPassword: qsTr("Confirm new password")
     property string change: qsTr("Change")
@@ -720,7 +739,10 @@ Item {
     property string leaveAudioMessage: qsTr("Audio message")
     property string leaveVideoMessage: qsTr("Video message")
     property string showMore: qsTr("Show more")
+    property string showLess: qsTr("Show less")
 
+    property string showPreview: qsTr("Show preview")
+    property string continueEditing: qsTr("Continue editing")
     property string bold: qsTr("Bold")
     property string italic: qsTr("Italic")
     property string strikethrough: qsTr("Strikethrough")
@@ -824,4 +846,30 @@ Item {
     // Appearence
     property string theme: qsTr("Theme")
     property string zoomLevel: qsTr("Text zoom level")
+
+    //Donation campaign
+    property string donationTipBoxText: qsTr("Free and private sharing. <a href=\"https://jami.net/donate/\">Donate</a> to expand it.")
+    property string donation: qsTr("Donate")
+    property string donationText: qsTr("If you enjoy using Jami and believe in our mission, would you make a donation?")
+    property string notNow: qsTr("Not now")
+    property string enableDonation: qsTr("Enable donation campaign")
+
+    //Chat setting page
+    property string enter: qsTr("Enter")
+    property string shiftEnter: qsTr("Shift+Enter")
+    property string textFormattingDescription: qsTr("Enter or Shift+Enter to insert a new line")
+    property string textFormatting: qsTr("Text formatting")
+
+    //Connection monitoring
+    property string connected: qsTr("Connected")
+    property string connectingTLS: qsTr("Connecting TLS")
+    property string connectingICE: qsTr("Connecting ICE")
+    property string connecting: qsTr("Connecting")
+    property string waiting: qsTr("Waiting")
+    property string contact: qsTr("Contact")
+    property string connection: qsTr("Connection")
+    property string channels: qsTr("Channels")
+    property string copyAllData: qsTr("Copy all data")
+    property string remote: qsTr("Remote: ")
+    property string view: qsTr("View")
 }

src/app/constant/JamiTheme.qml

@@ -76,7 +76,7 @@ Item {
     property color greyBorderColor: "#333"
     property color selectionBlue: darkTheme ? "#0061a5" : "#109ede"
 
-    property color hoverColor: darkTheme ? "#4d4d4d" : "#c7c7c7"
+    property color hoverColor: darkTheme ? "#4d4d4d" : "#DEDEDE"
     property color pressColor: darkTheme ? "#777" : "#c0c0c0"
     property color selectedColor: darkTheme ? "#0e81c5" : "#e0e0e0"
     property color smartListHoveredColor: darkTheme ? "#4d4d4d" : "#dedede"
@@ -367,9 +367,9 @@ Item {
     property int avatarReadReceiptSize: 18
 
     property int menuItemsPreferredWidth: 220
-    property int menuItemsPreferredHeight: 48
+    property int menuItemsPreferredHeight: 36
     property int menuItemsCommonBorderWidth: 1
-    property int menuBorderPreferredHeight: 8
+    property int menuBorderPreferredHeight: 5
 
     property real maximumWidthSettingsView: 516
     property real settingsHeaderpreferredHeight: 64
@@ -436,10 +436,6 @@ Item {
     property real switchPreferredWidth: 40
     property real switchIndicatorPreferredWidth: 20
 
-    // Jami Identifier
-    property color mainColor: "#005699"
-    property real pushButtonSize: 22
-    property real pushButtonMargins: 10
 
     // Modal Popup
     property real modalPopupRadius: 20
@@ -492,6 +488,7 @@ Item {
 
     // MessageBar
     property int messageBarMarginSize: 10
+    property int messageBarMinimumWidth: 438
 
     // InvitationView
     property real invitationViewAvatarSize: 112
@@ -507,6 +504,11 @@ Item {
     property real jamiIdFontSize: calcSize(19)
     property real jamiIdSmallFontSize: calcSize(11)
     property color jamiIdColor: darkTheme ? blackColor : sysColor
+    property color mainColor: "#005699"
+    property real pushButtonSize: 22
+    property real pushButtonMargins: 10
+    property color jamiIdBackgroundColor: darkTheme ? "#333333" : "#F0EFEF"
+    property color redDotColor: "#CC0022"
 
     // MainView
     property color rectColor: darkTheme ? blackColor : "#e5eef5"
@@ -532,6 +534,7 @@ Item {
 
     // WizardView Welcome Page
     property real welcomeLabelPointSize: 30
+    property var welcomeLogo: darkTheme ? JamiResources.logo_jami_standard_coul_white_svg : JamiResources.logo_jami_standard_coul_svg
     property real welcomeLogoWidth: 100
     property real welcomeLogoHeight: 100
     property real wizardButtonWidth: 400
@@ -541,9 +544,9 @@ Item {
     property real welcomeRectTopMargin: 90
     property real welcomePageSpacing: 13
     property real welcomeGridWidth: 3 * JamiTheme.tipBoxWidth + 2 * JamiTheme.welcomePageSpacing
-    property real welcomeHalfGridWidth: (welcomeGridWidth - JamiTheme.welcomePageSpacing) / 2
+    property real welcomeThirdGridWidth: (welcomeGridWidth - JamiTheme.welcomePageSpacing) / 3
     property real welcomeShortGridWidth: 2 * JamiTheme.tipBoxWidth + JamiTheme.welcomePageSpacing
-    readonly property string welcomeBg: darkTheme ? JamiResources.bg_darkmode_id_jami_png : JamiResources.bg_lightmode_id_jami_png
+    readonly property string welcomeBg: darkTheme ? JamiResources.background_don_dark_jpg : JamiResources.background_don_white_jpg
     property color welcomeBlockColor: darkTheme ? "#4D000000" : "#4DFFFFFF"
 
     // WizardView Advanced Account Settings
@@ -643,6 +646,9 @@ Item {
     property int settingsMenuHeaderButtonHeight: 50
     property int settingsListViewsSpacing: 10
 
+    // Link Device
+    property color pinBackgroundColor: "#D6E4EF"
+
     // MaterialRadioButton
     property int radioImageSize: 30
     property color radioBackgroundColor: darkTheme ? "#303030" : "#F0EFEF"
@@ -654,7 +660,22 @@ Item {
     property color darkThemeCheckedColor: "#03B9E9"
     property color darkThemeBorderColor: "#03B9E9"
 
+    // Donation campaign
+    property color donationButtonTextColor: "#005699"
+    property color donationBackgroundColor: "#D5E4EF"
+    property string donationUrl: "https://jami.net/donate/"
+
+    //Connection monitoring
+    property color connectionMonitoringTableColor1: darkTheme ? "#4D4D4D" : "#f0efef"
+    property color connectionMonitoringTableColor2: darkTheme ? "#333333" : "#f6f5f5"
+    property color connectionMonitoringHeaderColor: darkTheme ? "#6F6F6F" : "#d1d1d1"
+
     function setTheme(dark) {
         darkTheme = dark;
     }
+
+    //Chat setting page
+    property color chatSettingButtonBackgroundColor: darkTheme ? "#303030" : "#F0EFEF"
+    property color chatSettingButtonBorderColor: darkTheme ? "#03B9E9" : "#005699"
+    property color chatSettingButtonTextColor: textColor
 }

src/app/contactadapter.cpp

@@ -21,10 +21,16 @@
 #include "contactadapter.h"
 
 #include "lrcinstance.h"
+#include "qmlregister.h"
 
 ContactAdapter::ContactAdapter(LRCInstance* instance, QObject* parent)
     : QmlAdapterBase(instance, parent)
+    , connectionInfoListModel_(new ConnectionInfoListModel(lrcInstance_, this))
 {
+    QML_REGISTERSINGLETONTYPE_POBJECT(NS_MODELS,
+                                      connectionInfoListModel_.get(),
+                                      "ConnectionInfoListModel");
+
     selectableProxyModel_.reset(new SelectableProxyModel(this));
     if (lrcInstance_) {
         connectSignals();
@@ -246,6 +252,12 @@ ContactAdapter::removeContact(const QString& peerUri, bool banContact)
     accInfo.contactModel->removeContact(peerUri, banContact);
 }
 
+void
+ContactAdapter::updateConnectionInfo()
+{
+    connectionInfoListModel_->update();
+}
+
 void
 ContactAdapter::connectSignals()
 {

src/app/contactadapter.h

@@ -21,6 +21,7 @@
 #include "qmladapterbase.h"
 #include "smartlistmodel.h"
 #include "conversationlistmodel.h"
+#include "connectioninfolistmodel.h"
 
 #include <QObject>
 #include <QSortFilterProxyModel>
@@ -90,6 +91,7 @@ public:
     Q_INVOKABLE void setSearchFilter(const QString& filter);
     Q_INVOKABLE void contactSelected(int index);
     Q_INVOKABLE void removeContact(const QString& peerUri, bool banContact);
+    Q_INVOKABLE void updateConnectionInfo();
 
     void connectSignals();
 
@@ -104,6 +106,7 @@ private:
     SmartListModel::Type listModeltype_;
     QScopedPointer<SmartListModel> smartListModel_;
     QScopedPointer<SelectableProxyModel> selectableProxyModel_;
+    QScopedPointer<ConnectionInfoListModel> connectionInfoListModel_;
 
     QStringList defaultModerators_;
 

src/app/imagedownloader.cpp

@@ -16,6 +16,7 @@
  */
 
 #include "imagedownloader.h"
+
 #include <QDir>
 #include <QLockFile>
 
@@ -38,29 +39,29 @@ ImageDownloader::downloadImage(const QUrl& url, const QString& localPath)
 void
 ImageDownloader::onDownloadImageFinished(const QByteArray& data, const QString& localPath)
 {
-    if (!data.isEmpty()) {
-        // Check if the parent folders exist create them if not
-        QString dirPath = localPath.left(localPath.lastIndexOf('/'));
-        QDir dir;
-        dir.mkpath(dirPath);
+    if (data.isEmpty()) {
+        Q_EMIT downloadImageFailed(localPath);
+        return;
+    }
 
-        QLockFile lf(localPath + ".lock");
-        QFile file(localPath);
-
-        if (!lf.lock()) {
-            qWarning().noquote() << "Can't lock file for writing: " << file.fileName();
-            return;
-        }
-        if (!file.open(QIODevice::WriteOnly)) {
-            qWarning().noquote() << "Can't open file for writing: " << file.fileName();
-            return;
-        }
+    // Make sure the parent folders exists.
+    const QString dirPath = localPath.left(localPath.lastIndexOf('/'));
+    const QDir dir;
+    if (!dir.mkpath(dirPath)) {
+        qWarning() << Q_FUNC_INFO << "Failed to create directory" << dirPath;
+        Q_EMIT downloadImageFailed(localPath);
+        return;
+    }
 
+    QLockFile lf(localPath + ".lock");
+    QFile file(localPath);
+    if (lf.lock() && file.open(QIODevice::WriteOnly)) {
         file.write(data);
         file.close();
-        qWarning() << Q_FUNC_INFO;
         Q_EMIT downloadImageSuccessful(localPath);
         return;
     }
+
+    qWarning() << Q_FUNC_INFO << "Failed to write image to" << localPath;
     Q_EMIT downloadImageFailed(localPath);
 }

src/app/lrcinstance.cpp

@@ -458,3 +458,15 @@ LRCInstance::set_selectedConvUid(QString selectedConvUid)
         Q_EMIT selectedConvUidChanged();
     }
 }
+
+VectorMapStringString
+LRCInstance::getConnectionList(const QString& accountId, const QString& uid)
+{
+    return Lrc::getConnectionList(accountId, uid);
+}
+
+VectorMapStringString
+LRCInstance::getChannelList(const QString& accountId, const QString& uid)
+{
+    return Lrc::getChannelList(accountId, uid);
+}

src/app/lrcinstance.h

@@ -135,6 +135,10 @@ public:
         return debugMode_;
     }
 
+    VectorMapStringString getConnectionList(const QString& accountId, const QString& uid = {});
+
+    VectorMapStringString getChannelList(const QString& accountId, const QString& uid = {});
+
 Q_SIGNALS:
     void accountListChanged();
     void selectedConvUidChanged();

src/app/mainapplication.cpp

@@ -106,6 +106,7 @@ ScreenInfo::onPhysicalDotsPerInchChanged()
 
 MainApplication::MainApplication(int& argc, char** argv)
     : QApplication(argc, argv)
+    , isCleanupped(false)
 {
     const char* qtVersion = qVersion();
     qInfo() << "Using Qt runtime version:" << qtVersion;
@@ -129,11 +130,12 @@ MainApplication::init()
     // This 2-phase initialisation prevents ephemeral instances from
     // performing unnecessary tasks, like initializing the webengine.
     engine_.reset(new QQmlApplicationEngine(this));
-    connectivityMonitor_.reset(new ConnectivityMonitor(this));
-    settingsManager_.reset(new AppSettingsManager(this));
-    systemTray_.reset(new SystemTray(settingsManager_.get(), this));
 
-    QObject::connect(settingsManager_.get(),
+    connectivityMonitor_ = new ConnectivityMonitor(this);
+    settingsManager_ = new AppSettingsManager(this);
+    systemTray_ = new SystemTray(settingsManager_, this);
+
+    QObject::connect(settingsManager_,
                      &AppSettingsManager::retranslate,
                      engine_.get(),
                      &QQmlApplicationEngine::retranslate);
@@ -146,7 +148,7 @@ MainApplication::init()
     setApplicationFont();
 
     initLrc(runOptions_[Option::UpdateUrl].toString(),
-            connectivityMonitor_.get(),
+            connectivityMonitor_,
             runOptions_[Option::Debug].toBool(),
             runOptions_[Option::MuteDaemon].toBool());
 
@@ -168,7 +170,7 @@ MainApplication::init()
     }
 #endif
 
-    connect(connectivityMonitor_.get(), &ConnectivityMonitor::connectivityChanged, this, [this] {
+    connect(connectivityMonitor_, &ConnectivityMonitor::connectivityChanged, this, [this] {
         QTimer::singleShot(500, this, [&]() { lrcInstance_->connectivityChanged(); });
     });
 
@@ -195,6 +197,12 @@ MainApplication::init()
     engine_.get()->rootContext()->setContextProperty("WITH_WEBENGINE", QVariant(false));
 #endif
 
+#ifdef APPSTORE
+    engine_.get()->rootContext()->setContextProperty("APPSTORE", QVariant(true));
+#else
+    engine_.get()->rootContext()->setContextProperty("APPSTORE", QVariant(false));
+#endif
+
     initQmlLayer();
 
     settingsManager_->setValue(Settings::Key::StartMinimized,
@@ -231,7 +239,6 @@ MainApplication::initLrc(const QString& downloadUrl,
                          bool debugMode,
                          bool muteDaemon)
 {
-    lrc::api::Lrc::cacheAvatars.store(false);
     /*
      * Init mainwindow and finish splash when mainwindow shows up.
      */
@@ -342,10 +349,10 @@ MainApplication::initQmlLayer()
 {
     // Expose custom types to the QML engine.
     Utils::registerTypes(engine_.get(),
-                         systemTray_.get(),
                          lrcInstance_.get(),
-                         settingsManager_.get(),
-                         connectivityMonitor_.get(),
+                         systemTray_,
+                         settingsManager_,
+                         connectivityMonitor_,
                          &screenInfo_,
                          this);
 
@@ -376,7 +383,7 @@ MainApplication::initSystray()
     QAction* restoreAction = new QAction(tr("&Show Jami"), this);
     connect(restoreAction, &QAction::triggered, this, &MainApplication::restoreApp);
 
-    connect(systemTray_.get(),
+    connect(systemTray_,
             &QSystemTrayIcon::activated,
             this,
             [this](QSystemTrayIcon::ActivationReason reason) {
@@ -402,13 +409,16 @@ MainApplication::initSystray()
 void
 MainApplication::cleanup()
 {
-    QApplication::exit(0);
+    // In Qt 6.5, QApplication::exit(0) will signal aboutToQuit, and aboutToQuit is connected to cleanup
+    // TODO: delete cleanup.
+    if (!isCleanupped) {
+        isCleanupped = true;
+        QApplication::exit(0);
+    }
 }
 
-#ifdef Q_OS_MACOS
 void
 MainApplication::setEventFilter()
 {
     installEventFilter(this);
 }
-#endif

src/app/mainapplication.h

@@ -20,7 +20,6 @@
 
 #pragma once
 
-#include "imagedownloader.h"
 #include "lrcinstance.h"
 #include "qtutils.h"
 
@@ -36,7 +35,6 @@
 class ConnectivityMonitor;
 class AppSettingsManager;
 class SystemTray;
-class CallAdapter;
 
 // Provides information about the screen the app is displayed on
 class ScreenInfo : public QObject
@@ -82,17 +80,20 @@ public:
         return runOptions_[opt];
     };
 
-#ifdef Q_OS_MACOS
     Q_INVOKABLE void setEventFilter();
 
     bool eventFilter(QObject* object, QEvent* event)
     {
+#ifdef Q_OS_MACOS
+
         if (event->type() == QEvent::ApplicationActivate) {
             restoreApp();
         }
+
+#endif // Q_OS_MACOS
+
         return QApplication::eventFilter(object, event);
     }
-#endif // Q_OS_MACOS
 
 Q_SIGNALS:
     void closeRequested();
@@ -112,13 +113,16 @@ private:
 private:
     std::map<Option, QVariant> runOptions_;
 
+    // We want to be explicit about the destruction order of these objects
     QScopedPointer<QQmlApplicationEngine> engine_;
     QScopedPointer<LRCInstance> lrcInstance_;
 
-    QScopedPointer<ConnectivityMonitor> connectivityMonitor_;
-    QScopedPointer<AppSettingsManager> settingsManager_;
-    QScopedPointer<SystemTray> systemTray_;
-    QScopedPointer<ImageDownloader> imageDownloader_;
+    // These are injected into the QML layer along with our LRCInstance
+    ConnectivityMonitor* connectivityMonitor_;
+    SystemTray* systemTray_;
+    AppSettingsManager* settingsManager_;
 
     ScreenInfo screenInfo_;
+
+    bool isCleanupped;
 };

src/app/mainview/components/AboutPopUp.qml

@@ -26,191 +26,169 @@ import "../../commoncomponents"
 
 BaseModalDialog {
     id: root
-
-    width: Math.min(parent.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.secondaryDialogDimension)
-    height: Math.min(parent.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.secondaryDialogDimension)
-
-    popupContentMargins: 14
-
-    PushButton {
-        id: btnClose
-
-        anchors.right: parent.right
-        anchors.top: parent.top
-        anchors.topMargin: JamiTheme.preferredMarginSize
-        anchors.rightMargin: JamiTheme.preferredMarginSize
-        imageColor: "grey"
-        normalColor: JamiTheme.transparentColor
-
-        source: JamiResources.round_close_24dp_svg
-
-        onClicked: {
-            close();
-        }
-    }
+    margins: JamiTheme.preferredMarginSize
 
     popupContent: JamiFlickable {
-        id: aboutPopUpScrollView
+            id: aboutPopUpScrollView
+            width: aboutPopUpContentRectColumnLayout.implicitWidth
+            height: JamiTheme.preferredDialogHeight
 
-        width: root.width
-        contentHeight: aboutPopUpContentRectColumnLayout.implicitHeight
+            contentHeight: aboutPopUpContentRectColumnLayout.implicitHeight
 
-        ColumnLayout {
-            id: aboutPopUpContentRectColumnLayout
+            ColumnLayout {
+                id: aboutPopUpContentRectColumnLayout
+                anchors.centerIn: parent
 
-            width: root.width
+                ResponsiveImage {
+                    id: aboutPopUPJamiLogoImage
 
-            ResponsiveImage {
-                id: aboutPopUPJamiLogoImage
+                    Layout.alignment: Qt.AlignCenter
+                    Layout.preferredWidth: JamiTheme.aboutLogoPreferredWidth
+                    Layout.preferredHeight: JamiTheme.aboutLogoPreferredHeight
 
-                Layout.alignment: Qt.AlignCenter
-                Layout.topMargin: JamiTheme.preferredMarginSize
-                Layout.preferredWidth: JamiTheme.aboutLogoPreferredWidth
-                Layout.preferredHeight: JamiTheme.aboutLogoPreferredHeight
-
-                source: JamiTheme.darkTheme ? JamiResources.logo_jami_standard_coul_white_svg : JamiResources.logo_jami_standard_coul_svg
-            }
-
-            TextEdit {
-                id: jamiSlogansText
-
-                Layout.alignment: Qt.AlignCenter
-                Layout.preferredWidth: aboutPopUpScrollView.width
-                Layout.topMargin: 26
-
-                wrapMode: Text.WordWrap
-                font.pixelSize: JamiTheme.bigFontSize
-
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-
-                text: textMetricsjamiSlogansText.text
-                selectByMouse: true
-                readOnly: true
-                color: JamiTheme.tintedBlue
-
-                TextMetrics {
-                    id: textMetricsjamiSlogansText
-                    font: jamiSlogansText.font
-                    text: JamiStrings.slogan
-                }
-            }
-
-            TextEdit {
-                id: jamiVersionText
-
-                Layout.alignment: Qt.AlignCenter
-                Layout.preferredWidth: aboutPopUpScrollView.width
-
-                font.pixelSize: JamiTheme.tinyCreditsTextSize
-
-                padding: 0
-
-                text: JamiStrings.version + ": " + UtilsAdapter.getVersionStr()
-                selectByMouse: true
-                readOnly: true
-                color: JamiTheme.textColor
-
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-            }
-
-            TextEdit {
-                id: jamiDeclarationText
-
-                Layout.alignment: Qt.AlignCenter
-                Layout.preferredWidth: aboutPopUpScrollView.width - JamiTheme.preferredMarginSize * 2
-                Layout.topMargin: 15
-
-                wrapMode: Text.WordWrap
-                font.pixelSize: JamiTheme.creditsTextSize
-                color: JamiTheme.textColor
-
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-
-                // TextMetrics does not work for multi-line.
-                text: JamiStrings.declaration
-                selectByMouse: true
-                readOnly: true
-            }
-
-            TextEdit {
-                id: jamiDeclarationHyperText
-
-                Layout.alignment: Qt.AlignCenter
-
-                // Strangely, hoveredLink works badly when width grows too large
-                Layout.preferredWidth: 50
-                Layout.topMargin: 15
-
-                color: JamiTheme.textColor
-
-                font.pixelSize: JamiTheme.creditsTextSize
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-
-                text: textMetricsjamiDeclarationHyperText.text
-                textFormat: TextEdit.RichText
-                selectByMouse: true
-                readOnly: true
-                onLinkActivated: Qt.openUrlExternally(link)
-
-                TextMetrics {
-                    id: textMetricsjamiDeclarationHyperText
-                    font: jamiDeclarationHyperText.font
-                    text: '<a href="https://jami.net" style="color: ' + JamiTheme.blueLinkColor + '">jami.net</a>'
+                    source: JamiTheme.darkTheme ? JamiResources.logo_jami_standard_coul_white_svg : JamiResources.logo_jami_standard_coul_svg
                 }
 
-                MouseArea {
-                    anchors.fill: parent
+                TextEdit {
+                    id: jamiSlogansText
 
-                    // We don't want to eat clicks on the Text.
-                    acceptedButtons: Qt.NoButton
-                    cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
-                }
-            }
+                    Layout.alignment: Qt.AlignCenter
+                    Layout.maximumWidth: JamiTheme.preferredDialogWidth - 2*JamiTheme.preferredMarginSize
+                    Layout.topMargin: 26
 
-            TextEdit {
-                id: jamiNoneWarrantyHyperText
+                    wrapMode: Text.WordWrap
+                    font.pixelSize: JamiTheme.bigFontSize
 
-                Layout.alignment: Qt.AlignCenter
-                Layout.preferredWidth: Math.min(390, root.width)
-                Layout.topMargin: 15
-                wrapMode: Text.WordWrap
-                font.pixelSize: JamiTheme.tinyCreditsTextSize
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignVCenter
 
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignTop
-                color: JamiTheme.textColor
+                    text: textMetricsjamiSlogansText.text
+                    selectByMouse: true
+                    readOnly: true
+                    color: JamiTheme.tintedBlue
 
-                text: textMetricsjamiNoneWarrantyHyperText.text
-                textFormat: TextEdit.RichText
-                selectByMouse: true
-                readOnly: true
-                onLinkActivated: Qt.openUrlExternally(link)
-
-                TextMetrics {
-                    id: textMetricsjamiNoneWarrantyHyperText
-                    font: jamiDeclarationHyperText.font
-                    text: JamiStrings.declarationYear + " " + '<a href="https://savoirfairelinux.com" style="color: ' + JamiTheme.blueLinkColor + '">Savoir-faire Linux Inc.</a><br>' + 'This program comes with absolutely no warranty. See the <a href="http://www.gnu.org/licenses/gpl-3.0.html" style="color: ' + JamiTheme.blueLinkColor + '">GNU General Public License</a>, version 3 or later for details.'
+                    TextMetrics {
+                        id: textMetricsjamiSlogansText
+                        font: jamiSlogansText.font
+                        text: JamiStrings.slogan
+                    }
                 }
 
-                MouseArea {
-                    anchors.fill: parent
-                    acceptedButtons: Qt.NoButton
-                    cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
-                }
-            }
+                TextEdit {
+                    id: jamiVersionText
 
-            ProjectCreditsScrollView {
-                id: projectCreditsScrollView
-                Layout.alignment: Qt.AlignCenter
-                Layout.preferredWidth: aboutPopUpScrollView.width - JamiTheme.preferredMarginSize * 2
-                Layout.preferredHeight: 100
-                Layout.topMargin: 25
-                Layout.margins: JamiTheme.preferredMarginSize
-            }
+                    Layout.alignment: Qt.AlignCenter
+                    Layout.maximumWidth: JamiTheme.preferredDialogWidth - 2*JamiTheme.preferredMarginSize
+
+                    font.pixelSize: JamiTheme.tinyCreditsTextSize
+
+                    padding: 0
+
+                    text: JamiStrings.version + ": " + UtilsAdapter.getVersionStr()
+                    selectByMouse: true
+                    readOnly: true
+                    color: JamiTheme.textColor
+
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignVCenter
+                }
+
+                TextEdit {
+                    id: jamiDeclarationText
+
+                    Layout.alignment: Qt.AlignCenter
+                    Layout.maximumWidth: JamiTheme.preferredDialogWidth - 2*JamiTheme.preferredMarginSize
+                    Layout.topMargin: 15
+
+                    wrapMode: Text.WordWrap
+                    font.pixelSize: JamiTheme.creditsTextSize
+                    color: JamiTheme.textColor
+
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignVCenter
+
+                    // TextMetrics does not work for multi-line.
+                    text: JamiStrings.declaration
+                    selectByMouse: true
+                    readOnly: true
+                }
+
+                TextEdit {
+                    id: jamiDeclarationHyperText
+
+                    Layout.alignment: Qt.AlignCenter
+
+                    // Strangely, hoveredLink works badly when width grows too large
+                    Layout.maximumWidth: JamiTheme.preferredDialogWidth - 2*JamiTheme.preferredMarginSize
+                    Layout.topMargin: 15
+
+                    color: JamiTheme.textColor
+
+                    font.pixelSize: JamiTheme.creditsTextSize
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignVCenter
+
+                    text: textMetricsjamiDeclarationHyperText.text
+                    textFormat: TextEdit.RichText
+                    selectByMouse: true
+                    readOnly: true
+                    onLinkActivated: Qt.openUrlExternally(link)
+
+                    TextMetrics {
+                        id: textMetricsjamiDeclarationHyperText
+                        font: jamiDeclarationHyperText.font
+                        text: '<a href="https://jami.net" style="color: ' + JamiTheme.blueLinkColor + '">jami.net</a>'
+                    }
+
+                    MouseArea {
+                        anchors.fill: parent
+
+                        // We don't want to eat clicks on the Text.
+                        acceptedButtons: Qt.NoButton
+                        cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
+                    }
+                }
+
+                TextEdit {
+                    id: jamiNoneWarrantyHyperText
+
+                    Layout.alignment: Qt.AlignCenter
+                    Layout.maximumWidth: JamiTheme.preferredDialogWidth - 2*JamiTheme.preferredMarginSize
+                    Layout.topMargin: 15
+                    wrapMode: Text.WordWrap
+                    font.pixelSize: JamiTheme.tinyCreditsTextSize
+
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignTop
+                    color: JamiTheme.textColor
+
+                    text: textMetricsjamiNoneWarrantyHyperText.text
+                    textFormat: TextEdit.RichText
+                    selectByMouse: true
+                    readOnly: true
+                    onLinkActivated: Qt.openUrlExternally(link)
+
+                    TextMetrics {
+                        id: textMetricsjamiNoneWarrantyHyperText
+                        font: jamiDeclarationHyperText.font
+                        text: JamiStrings.declarationYear + " " + '<a href="https://savoirfairelinux.com" style="color: ' + JamiTheme.blueLinkColor + '">Savoir-faire Linux Inc.</a><br>' + 'This program comes with absolutely no warranty. See the <a href="http://www.gnu.org/licenses/gpl-3.0.html" style="color: ' + JamiTheme.blueLinkColor + '">GNU General Public License</a>, version 3 or later for details.'
+                    }
+
+                    MouseArea {
+                        anchors.fill: parent
+                        acceptedButtons: Qt.NoButton
+                        cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
+                    }
+                }
+
+                ProjectCreditsScrollView {
+                    id: projectCreditsScrollView
+                    Layout.alignment: Qt.AlignCenter
+                    Layout.maximumWidth: JamiTheme.preferredDialogWidth - 2*JamiTheme.preferredMarginSize
+                    Layout.preferredHeight: 100
+                    Layout.topMargin: 25
+                    Layout.margins: JamiTheme.preferredMarginSize
+                }
         }
     }
 }

src/app/mainview/components/CachedImage.qml

@@ -42,7 +42,10 @@ Item {
         fillMode: imageFillMode
         smooth: true
         antialiasing: true
-        property bool isGif: getIsGif(this)
+        property bool isGif: {
+            // True only for local gifs.
+            UtilsAdapter.getMimeNameForUrl(source).startsWith("image/gif");
+        }
 
         source: defaultImage
         onStatusChanged: {
@@ -52,22 +55,11 @@ Item {
         }
     }
 
-    function getIsGif(img) {
-        if (img.source && img.source != "") {
-            var localPath = img.source.toString();
-            if (localPath.startsWith("file://")) {
-                localPath = localPath.substring(7);
-            }
-            return UtilsAdapter.getMimeName(localPath).startsWith("image/gif");
-        }
-        return false;
-    }
-
     Connections {
         target: ImageDownloader
         function onDownloadImageSuccessful(localPath) {
             if (localPath === cachedImage.localPath) {
-                image.source = "file://" + localPath;
+                image.source = UtilsAdapter.urlFromLocalPath(localPath);
             }
         }
     }
@@ -92,7 +84,7 @@ Item {
             if (!UtilsAdapter.fileExists(localPath)) {
                 ImageDownloader.downloadImage(downloadUrl, localPath);
             } else {
-                image.source = "file://" + localPath;
+                image.source = UtilsAdapter.urlFromLocalPath(localPath);
                 if (image.isGif) {
                     image.playing = true;
                 }

src/app/mainview/components/CallActionBar.qml

@@ -123,13 +123,13 @@ Control {
                         "Name": JamiStrings.shareScreen,
                         "IconSource": JamiResources.laptop_black_24dp_svg
                     });
-                if (Qt.platform.os.toString() !== "osx") {
+                if (Qt.platform.os.toString() !== "osx" && !UtilsAdapter.isWayland()) {
                     shareModel.append({
                             "Name": JamiStrings.shareWindow,
                             "IconSource": JamiResources.window_black_24dp_svg
                         });
                 }
-                if (Qt.platform.os.toString() !== "windows") {
+                if (Qt.platform.os.toString() !== "windows" && !UtilsAdapter.isWayland()) {
                     // temporarily disable for windows
                     shareModel.append({
                             "Name": JamiStrings.shareScreenArea,

src/app/mainview/components/CallButtonDelegate.qml

@@ -203,61 +203,70 @@ ItemDelegate {
                 anchors.fill: parent
                 color: menuItem.down ? "#c4aaaaaa" : menuItem.hovered ? "#c4777777" : "transparent"
             }
-            contentItem: ColumnLayout {
+            // After update to qt 6.4.3 the layout was broken, adding a Rectangle
+            // as top level in the contentIntem is a workaround which removal can be
+            // tested with newer qt versions
+            contentItem: Rectangle {
                 anchors.fill: parent
-                spacing: 0
-                RowLayout {
-                    Layout.fillWidth: true
-                    Layout.rightMargin: 15
-                    Layout.leftMargin: 20
-                    Layout.fillHeight: true
-                    Layout.alignment: {
-                        if (menuAction.popupMode !== CallActionBar.ActionPopupMode.LayoutOption || TopMargin && BottomMargin) {
-                            return Qt.AlignLeft | Qt.AlignVCenter;
-                        }
-                        if (TopMargin) {
-                            Layout.bottomMargin = 4;
-                            return Qt.AlignBottom;
-                        }
-                        Layout.topMargin = 4;
-                        return Qt.AlignTop;
-                    }
+                color: "transparent"
+                ColumnLayout {
+                    anchors.fill: parent
+                    spacing: 0
 
-                    spacing: 6
-                    ResponsiveImage {
-                        source: menuAction.popupMode === CallActionBar.ActionPopupMode.ListElement || menuAction.popupMode === CallActionBar.ActionPopupMode.LayoutOption ? IconSource : (menuItem.ListView.isCurrentItem ? JamiResources.check_box_24dp_svg : JamiResources.check_box_outline_blank_24dp_svg)
-                        color: "white"
-                        width: 20
-                        height: 20
-                    }
-                    Text {
-                        id: delegateText
+                    RowLayout {
                         Layout.fillWidth: true
-                        horizontalAlignment: Text.AlignLeft
-                        verticalAlignment: Text.AlignVCenter
-                        text: menuAction.popupMode === CallActionBar.ActionPopupMode.ListElement || menuAction.popupMode === CallActionBar.ActionPopupMode.LayoutOption ? Name : DeviceName
-                        elide: Text.ElideRight
-                        font.pointSize: JamiTheme.participantFontSize
-                        color: "white"
+                        Layout.fillHeight: true
+                        Layout.rightMargin: 15
+                        Layout.leftMargin: 20
+
+                        Layout.alignment: {
+                            if (menuAction.popupMode !== CallActionBar.ActionPopupMode.LayoutOption || TopMargin && BottomMargin) {
+                                return Qt.AlignLeft | Qt.AlignVCenter;
+                            }
+                            if (TopMargin) {
+                                Layout.bottomMargin = 4;
+                                return Qt.AlignBottom;
+                            }
+                            Layout.topMargin = 4;
+                            return Qt.AlignTop;
+                        }
+
+                        spacing: 6
+                        ResponsiveImage {
+                            source: menuAction.popupMode === CallActionBar.ActionPopupMode.ListElement || menuAction.popupMode === CallActionBar.ActionPopupMode.LayoutOption ? IconSource : (menuItem.ListView.isCurrentItem ? JamiResources.check_box_24dp_svg : JamiResources.check_box_outline_blank_24dp_svg)
+                            color: "white"
+                            width: 20
+                            height: 20
+                        }
+                        Text {
+                            id: delegateText
+                            Layout.fillWidth: true
+                            horizontalAlignment: Text.AlignLeft
+                            verticalAlignment: Text.AlignVCenter
+                            text: menuAction.popupMode === CallActionBar.ActionPopupMode.ListElement || menuAction.popupMode === CallActionBar.ActionPopupMode.LayoutOption ? Name : DeviceName
+                            elide: Text.ElideRight
+                            font.pointSize: JamiTheme.participantFontSize
+                            color: "white"
+                        }
+                        ResponsiveImage {
+                            source: JamiResources.check_black_24dp_svg
+                            color: "white"
+                            width: 20
+                            height: 20
+                            visible: menuAction.popupMode === CallActionBar.ActionPopupMode.LayoutOption ? ActiveSetting : false
+                        }
                     }
-                    ResponsiveImage {
-                        source: JamiResources.check_black_24dp_svg
-                        color: "white"
-                        width: 20
-                        height: 20
-                        visible: menuAction.popupMode === CallActionBar.ActionPopupMode.LayoutOption ? ActiveSetting : false
+                    Rectangle {
+                        id: buttonDiv
+                        visible: menuAction.popupMode === CallActionBar.ActionPopupMode.LayoutOption ? SectionEnd : false
+                        Layout.fillWidth: true
+                        height: 1
+                        opacity: 0.2
+                        border.width: 0
+                        color: JamiTheme.separationLine
+                        Layout.alignment: Qt.AlignBottom
                     }
                 }
-                Rectangle {
-                    id: buttonDiv
-                    visible: menuAction.popupMode === CallActionBar.ActionPopupMode.LayoutOption ? SectionEnd : false
-                    Layout.fillWidth: true
-                    height: 1
-                    opacity: 0.2
-                    border.width: 0
-                    color: JamiTheme.separationLine
-                    Layout.alignment: Qt.AlignBottom
-                }
             }
         }
 

src/app/mainview/components/CallStackView.qml

@@ -25,7 +25,6 @@ import "../../commoncomponents"
 
 Item {
     id: root
-
     property alias chatViewContainer: ongoingCallPage.chatViewContainer
     property alias contentView: callStackMainView
 
@@ -49,6 +48,16 @@ Item {
         }
     }
 
+    Connections {
+            target: CallOverlayModel
+            function onPttKeyPressed() {
+                CallAdapter.muteAudioToggle();
+            }
+            function onPttKeyReleased() {
+                CallAdapter.muteAudioToggle();
+            }
+    }
+
     // TODO: this should all be done by listening to
     // parent visibility change or parent `Component.onDestruction`
     function needToCloseInCallConversationAndPotentialWindow() {

src/app/mainview/components/CallViewContextMenu.qml

@@ -106,13 +106,18 @@ Popup {
                     height: Top || Bottom ? 10 : 45
 
                     background: Rectangle {
+                        radius: 5
                         visible: !Top && !Bottom
                         anchors.fill: parent
+                        anchors.leftMargin: 5
+                        anchors.rightMargin: 5
                         color: menuItem.down ? "#c4aaaaaa" : menuItem.hovered ? "#c4777777" : "transparent"
                     }
 
                     RowLayout {
                         anchors.fill: parent
+                        anchors.leftMargin: 5
+                        anchors.rightMargin: 5
                         visible: !Top && !Bottom
                         ResponsiveImage {
                             Layout.leftMargin: JamiTheme.preferredMarginSize

src/app/mainview/components/ChatView.qml

@@ -169,12 +169,6 @@ Rectangle {
             }
         }
 
-        GenericErrorsRow {
-            id: genericError
-            Layout.fillWidth: true
-            Layout.preferredHeight: JamiTheme.chatViewHeaderPreferredHeight
-        }
-
         ConversationErrorsRow {
             id: errorRect
             Layout.fillWidth: true

src/app/mainview/components/ChatViewFooter.qml

@@ -79,6 +79,8 @@ Rectangle {
                 var editedMessageBody = MessagesAdapter.dataForInteraction(MessagesAdapter.editId, MessageList.Body);
                 messageBar.textAreaObj.insertText(editedMessageBody);
                 messageBar.textAreaObj.forceActiveFocus();
+            } else {
+                messageBar.textAreaObj.clearText();
             }
         }
 
@@ -115,7 +117,6 @@ Rectangle {
 
         EditContainer {
             id: editContainer
-
             Layout.alignment: Qt.AlignHCenter
             Layout.preferredWidth: footerColumnLayout.width
             Layout.maximumWidth: JamiTheme.chatViewMaximumWidth
@@ -129,7 +130,7 @@ Rectangle {
 
             Layout.alignment: Qt.AlignHCenter
             Layout.preferredWidth: footerColumnLayout.width
-            Layout.leftMargin: marginSize
+            Layout.leftMargin: 0
             Layout.rightMargin: marginSize
             Layout.bottomMargin: marginSize
             Layout.preferredHeight: height

src/app/mainview/components/ChatViewHeader.qml

@@ -86,8 +86,7 @@ Rectangle {
             Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
             Layout.leftMargin: 8
 
-            preferredSize: 24
-
+            //preferredSize: 24
             mirror: UtilsAdapter.isRTL
 
             source: JamiResources.back_24dp_svg
@@ -155,12 +154,12 @@ Rectangle {
 
             Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
             Layout.preferredHeight: 30
-            Layout.preferredWidth: 40 + (isOpen? JamiTheme.searchbarSize : 0)
+            Layout.preferredWidth: 40 + (isOpen ? JamiTheme.searchbarSize : 0)
             colorSearchBar: JamiTheme.backgroundColor
 
             hoverButtonRadius: JamiTheme.chatViewHeaderButtonRadius
 
-            Behavior on Layout.preferredWidth {
+            Behavior on Layout.preferredWidth  {
                 NumberAnimation {
                     duration: 150
                 }
@@ -168,7 +167,7 @@ Rectangle {
 
             visible: root.swarmDetailsVisibility
 
-            onSearchBarTextChanged: function(text){
+            onSearchBarTextChanged: function (text) {
                 MessagesAdapter.searchbarPrompt = text;
             }
 

src/app/mainview/components/ContactPicker.qml

@@ -28,11 +28,6 @@ BaseModalDialog {
 
     property int type: ContactList.CONFERENCE
 
-    width: Math.min(appWindow.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogWidth)
-    height: Math.min(appWindow.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogHeight)
-
-    padding: 0
-
     title: {
         switch (type) {
         case ContactList.CONFERENCE:
@@ -48,6 +43,8 @@ BaseModalDialog {
 
     popupContent: ColumnLayout {
         id: contactPickerPopupRectColumnLayout
+        anchors.centerIn: parent
+        width: 400
 
         Searchbar {
             id: contactPickerContactSearchBar
@@ -81,8 +78,4 @@ BaseModalDialog {
             }
         }
     }
-
-    onAboutToShow: {
-        contactPickerListView.model = ContactAdapter.getContactSelectableModel(type);
-    }
 }

src/app/mainview/components/ConversationSmartListContextMenu.qml

@@ -104,7 +104,6 @@ ContextMenuAutoLoader {
             canTrigger: hasCall
             itemName: JamiStrings.endCall
             iconSource: JamiResources.ic_call_end_white_24dp_svg
-            addMenuSeparatorAfter: contactType !== Profile.Type.SIP && (contactType === Profile.Type.PENDING || !hasCall)
             onClicked: CallAdapter.hangUpACall(responsibleAccountId, responsibleConvUid)
         },
         GeneralMenuItem {
@@ -129,7 +128,6 @@ ContextMenuAutoLoader {
             canTrigger: !hasCall && contactType !== Profile.Type.SIP && !root.isBanned && isCoreDialog && root.idText !== CurrentAccount.uri
             itemName: JamiStrings.blockContact
             iconSource: JamiResources.block_black_24dp_svg
-            addMenuSeparatorAfter: canTrigger
             onClicked: {
                 var dlg = viewCoordinator.presentDialog(appWindow, "commoncomponents/ConfirmDialog.qml", {
                         "title": JamiStrings.confirmAction,
@@ -147,7 +145,6 @@ ContextMenuAutoLoader {
             canTrigger: root.isBanned
             itemName: JamiStrings.reinstateContact
             iconSource: JamiResources.round_remove_circle_24dp_svg
-            addMenuSeparatorAfter: canTrigger
             onClicked: MessagesAdapter.unbanConversation(responsibleConvUid)
         },
         GeneralMenuItem {

src/app/mainview/components/DevicesListPopup.qml

@@ -27,44 +27,26 @@ import "../../commoncomponents"
 BaseModalDialog {
     id: root
 
-    width: 488
-    height: 320
+    width: JamiTheme.secondaryDialogDimension
 
-    popupContent: Rectangle {
-        id: rect
+    title: JamiStrings.defaultCallHost
 
-        color: JamiTheme.transparentColor
-        width: root.width
-
-        PushButton {
-            id: btnCancel
-            imageColor: "grey"
-            normalColor: "transparent"
-            anchors.right: parent.right
-            anchors.top: parent.top
-            anchors.topMargin: 10
-            anchors.rightMargin: 10
-            source: JamiResources.round_close_24dp_svg
-            onClicked: {
-                close();
-            }
-        }
-
-        ColumnLayout {
+    popupContent: ColumnLayout {
             id: mainLayout
-            anchors.fill: parent
+
+            anchors.centerIn: parent
             anchors.margins: JamiTheme.preferredMarginSize
             spacing: JamiTheme.preferredMarginSize
 
+
             Label {
                 id: informativeLabel
 
                 Layout.alignment: Qt.AlignCenter
-                Layout.fillWidth: true
-                Layout.topMargin: 26
-                wrapMode: Text.WordWrap
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
+                Layout.topMargin: JamiTheme.preferredMarginSize
+                Layout.preferredWidth: root.width - 4*JamiTheme.preferredMarginSize
+
+                wrapMode: Text.Wrap
                 text: JamiStrings.chooseHoster
                 color: JamiTheme.primaryForegroundColor
             }
@@ -97,7 +79,7 @@ BaseModalDialog {
                     property bool isCurrent: DeviceName
 
                     implicitWidth: devicesListView.width
-                    width: devicesListView.width
+                    width: root.width - 4*JamiTheme.preferredMarginSize
                     height: 70
 
                     highlighted: ListView.isCurrentItem
@@ -136,7 +118,6 @@ BaseModalDialog {
                         ColumnLayout {
                             id: deviceInfoColumnLayout
 
-                            Layout.fillWidth: true
                             Layout.fillHeight: true
                             Layout.leftMargin: JamiTheme.preferredMarginSize
 
@@ -144,7 +125,6 @@ BaseModalDialog {
                                 id: labelDeviceName
 
                                 Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
-                                Layout.fillWidth: true
 
                                 elide: Text.ElideRight
                                 color: JamiTheme.textColor
@@ -155,7 +135,7 @@ BaseModalDialog {
                                 id: labelDeviceId
 
                                 Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
-                                Layout.fillWidth: true
+                                Layout.preferredWidth: root.width - 200
 
                                 elide: Text.ElideRight
                                 color: JamiTheme.textColor
@@ -175,9 +155,10 @@ BaseModalDialog {
                 }
             }
 
-            RowLayout {
+            ColumnLayout {
+                id: buttonLayout
                 spacing: JamiTheme.preferredMarginSize
-                Layout.preferredWidth: parent.width
+                Layout.preferredWidth: root.width - 240
 
                 MaterialButton {
                     id: chooseBtn
@@ -192,8 +173,8 @@ BaseModalDialog {
 
                     Layout.alignment: Qt.AlignCenter
                     Layout.fillWidth: true
+
                     primary: true
-                    preferredWidth: chooseBtnTextSize.width + 2 * JamiTheme.buttontextWizzardPadding
                     enabled: devicesListView.currentItem
 
                     text: JamiStrings.chooseThisDevice
@@ -220,7 +201,6 @@ BaseModalDialog {
                     Layout.alignment: Qt.AlignCenter
                     Layout.fillWidth: true
                     primary: true
-                    preferredWidth: rmDeviceBtnTextSize.width + 2 * JamiTheme.buttontextWizzardPadding
                     enabled: devicesListView.currentItem
 
                     text: JamiStrings.removeCurrentDevice
@@ -235,4 +215,4 @@ BaseModalDialog {
             }
         }
     }
-}
+