Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package linphoneqt for openSUSE:Factory checked in at 2022-06-16 18:20:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linphoneqt (Old) and /work/SRC/openSUSE:Factory/.linphoneqt.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linphoneqt" Thu Jun 16 18:20:07 2022 rev:8 rq:982691 version:4.4.5 Changes: -------- --- /work/SRC/openSUSE:Factory/linphoneqt/linphoneqt.changes 2022-05-15 19:00:24.294408960 +0200 +++ /work/SRC/openSUSE:Factory/.linphoneqt.new.1548/linphoneqt.changes 2022-06-16 18:20:27.556101049 +0200 @@ -1,0 +2,16 @@ +Wed Jun 8 03:08:22 UTC 2022 - Giacomo Comes <[email protected]> - 4.4.5 + +- Update to version 4.4.5: + * Chat rooms may be mark as read while hidden +- Update to version 4.4.4: + * Revert ordering messages from receiving time +- Update to version 4.4.3: + * Crash on searchs with special characters +- Update to version 4.4.2: + * Add Sanitizer build + * Add Sanitizer build + * Order messages from receiving time + * Fix H264 download URL + * Hide Admin status in One-to-one chats + +------------------------------------------------------------------- Old: ---- linphone-desktop-4.4.1.tar.bz2 New: ---- linphone-desktop-4.4.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linphoneqt.spec ++++++ --- /var/tmp/diff_new_pack.yArCjz/_old 2022-06-16 18:20:28.084101800 +0200 +++ /var/tmp/diff_new_pack.yArCjz/_new 2022-06-16 18:20:28.088101806 +0200 @@ -18,7 +18,7 @@ %define _name linphone Name: linphoneqt -Version: 4.4.1 +Version: 4.4.5 Release: 0 Summary: Qt interface for Linphone License: GPL-3.0-or-later ++++++ linphone-desktop-4.4.1.tar.bz2 -> linphone-desktop-4.4.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/CHANGELOG.md new/linphone-desktop-4.4.5/CHANGELOG.md --- old/linphone-desktop-4.4.1/CHANGELOG.md 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/CHANGELOG.md 2022-06-06 15:57:37.000000000 +0200 @@ -4,7 +4,47 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## 4.4.1 - [undefined] +## 4.5 - [undefined] + +### Added +- Video conference. + +### Fixed +- Crash on exit. +- Memory stability. + +## 4.4.5 - 2022-06-06 + +### Fixed +- Chat rooms may be mark as read while hidden. + +## 4.4.4 - 2022-06-01 + +### Fixed +- Revert ordering messages from receiving time. +- Some crashes on Wasapi. +- Update SDK to 5.1.41 + +## 4.4.3 - 2022-05-30 + +### Fixed +- Crash on searchs with special characters +- Update SDK to 5.1.38 + +## 4.4.2 - 2022-05-25 + +### Added +- Based on LinphoneSDK 5.1.36 +- Add Sanitizer build. +- Version types selection for version checker. + +### Fixed +- Order messages from receiving time. +- Fix H264 download URL on Linux. +- Hide Admin status in One-to-one chats. +- Encryption wasn't enabled after creating an account with lime url without having to restart the application. + +## 4.4.1 - 2022-04-06 ### Fixed - Fix codec downloading on Windows and popup progress bar. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/README.md new/linphone-desktop-4.4.5/README.md --- old/linphone-desktop-4.4.1/README.md 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/README.md 2022-06-06 15:57:37.000000000 +0200 @@ -40,6 +40,7 @@ - `git` For Desktop : you will need [Qt5](https://www.qt.io/download-thank-you) (_5.12 or newer_). `C++11` support is required! +Qt6 is not yet supported. ### Set your environment @@ -49,8 +50,8 @@ 2. You have to set the environment variable `Qt5_DIR` to point to the path containing the cmake folders of Qt5, and the `PATH` to the Qt5 `bin`. Example: - Qt5_DIR="~/Qt/5.12.5/gcc_64/lib/cmake" - PATH="~/Qt/5.12.5/gcc_64/bin/:$PATH" + Qt5_DIR="~/Qt/5.15.2/gcc_64/lib/cmake" + PATH="~/Qt/5.15.2/gcc_64/bin/:$PATH" Note: If you have the third party tool `qtchooser` installed : eval "$(qtchooser -print-env)" @@ -154,8 +155,8 @@ ## Specific instructions for the Windows platform -64-bit version is not fully supported at this moment by Linphone Desktop and wasn't tested. If a build for 64bits is needed, replace all `mingw32` by `mingw64`, `i686` by `x86_64`, `-A Win32` by `-A x64` or simply remove it. +The project support Visual Studio 2017 and 2019. 1. Install main tools: - `MinGW/MSYS2` : [download](https://www.msys2.org/) @@ -164,9 +165,9 @@ - `pacman -Sy --needed base-devel mingw-w64-i686-toolchain` - `pacman -S python3-pip` in `MSYS2 MSYS` console - `python3 -m pip install pystache six` in `cmd` - - In this order, add `C:\msys64\`, `C:\msys64\usr\bin` and `C:\msys64\mingw32\bin` in your PATH (the last one is needed by cmake to know where gcc is) to the PATH environement variable from windows advanced settings. + - In this order, add `C:\msys64\mingw32\bin`, `C:\msys64\usr\bin` and `C:\msys64\` to the PATH environement variable from windows advanced settings. -When building the SDK, it will install automatically from MSYS2 : `perl`, `yasm`, `gawk`, `bzip2`, `nasm, `sed`, `patch`, `pkg-config`, `gettext`, `glib2` and `intltool` (if needed) +When building the SDK, it will install automatically from MSYS2 : `perl`, `yasm`, `gawk`, `bzip2`, `nasm`, `sed`, `patch`, `pkg-config`, `gettext`, `glib2` and `intltool` (if needed) - `git` : use MSYS2 : `pacman -S git` or [download](https://git-scm.com/download/win) @@ -175,9 +176,9 @@ - Under "Installation details". Go to "Desktop C++ Development" and add "SDK Windows 8.1 and SDK UCRT" - Individual component: Windows 8.1 SDK -2. Ensure that you have downloaded the `Qt msvc2015 version` or `Qt msvc2017 version` (32-bit). +2. Ensure that you have downloaded the `Qt msvcXXXX version` where `XXXX` match your MSVC generator. -3. Or open a Command line with Visual Studio `Developer Command Prompt for VS 2017` and call qtenv2.bat that is in your qt binaries eg: `C:\Qt\<version>\msvc2017\bin\qtenv2.bat` +3. Or open a Command line with Visual Studio `Developer Command Prompt for VS 2017` (for 32-bits)/`x64 Native Tools Command Prompt VS 2017` (for 64-bits) and call qtenv2.bat that is in your qt binaries eg: `C:\Qt\<version>\msvcXXXX\bin\qtenv2.bat` 4. Build as usual with adding `-A Win32` to `cmake ..` (General Steps) : - `cmake .. -DCMAKE_BUILD_PARALLEL_LEVEL=10 -DCMAKE_BUILD_TYPE=RelWithDebInfo -A Win32` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/CMakeLists.txt new/linphone-desktop-4.4.5/linphone-app/CMakeLists.txt --- old/linphone-desktop-4.4.1/linphone-app/CMakeLists.txt 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/CMakeLists.txt 2022-06-06 15:57:37.000000000 +0200 @@ -92,6 +92,20 @@ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DQT_QML_DEBUG -DQT_DECLARATIVE_DEBUG") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -DQT_QML_DEBUG -DQT_DECLARATIVE_DEBUG" ) +############################# +#Sanitizer +if(ENABLE_SANITIZER) + set(sanitize_flags "-fsanitize=address,undefined -fno-omit-frame-pointer -fno-optimize-sibling-calls") + set(sanitize_linker_flags "-fsanitize=address,undefined") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${sanitize_flags}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${sanitize_flags}") + + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${sanitize_linker_flags}") + set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${sanitize_linker_flags}") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${sanitize_linker_flags}") +endif() +############################# + if( WIN32) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WINSOCKAPI_")#remove error from windows headers order endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/assets/languages/da.ts new/linphone-desktop-4.4.5/linphone-app/assets/languages/da.ts --- old/linphone-desktop-4.4.1/linphone-app/assets/languages/da.ts 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/assets/languages/da.ts 2022-06-06 15:57:37.000000000 +0200 @@ -2655,6 +2655,21 @@ <extracomment>'Show a minimal version of what to display in timeline.' :</extracomment> <translation type="unfinished"></translation> </message> + <message> + <source>versionCheckTypeRelease</source> + <extracomment>'Release' : Keyword for an option to check the release version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeCustom</source> + <extracomment>'Custom' : Keyword for an option to check the custom version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeNightly</source> + <extracomment>'Nightly' : Keyword for an option to check the nightly version</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SettingsVideo</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/assets/languages/de.ts new/linphone-desktop-4.4.5/linphone-app/assets/languages/de.ts --- old/linphone-desktop-4.4.1/linphone-app/assets/languages/de.ts 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/assets/languages/de.ts 2022-06-06 15:57:37.000000000 +0200 @@ -2655,6 +2655,21 @@ <extracomment>'Show a minimal version of what to display in timeline.' :</extracomment> <translation type="unfinished"></translation> </message> + <message> + <source>versionCheckTypeRelease</source> + <extracomment>'Release' : Keyword for an option to check the release version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeCustom</source> + <extracomment>'Custom' : Keyword for an option to check the custom version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeNightly</source> + <extracomment>'Nightly' : Keyword for an option to check the nightly version</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SettingsVideo</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/assets/languages/en.ts new/linphone-desktop-4.4.5/linphone-app/assets/languages/en.ts --- old/linphone-desktop-4.4.1/linphone-app/assets/languages/en.ts 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/assets/languages/en.ts 2022-06-06 15:57:37.000000000 +0200 @@ -2678,6 +2678,21 @@ <extracomment>'Show a minimal version of what to display in timeline.' :</extracomment> <translation>Show a minimal version of what to display in timeline.</translation> </message> + <message> + <source>versionCheckTypeRelease</source> + <extracomment>'Release' : Keyword for an option to check the release version</extracomment> + <translation>Release</translation> + </message> + <message> + <source>versionCheckTypeCustom</source> + <extracomment>'Custom' : Keyword for an option to check the custom version</extracomment> + <translation>Custom</translation> + </message> + <message> + <source>versionCheckTypeNightly</source> + <extracomment>'Nightly' : Keyword for an option to check the nightly version</extracomment> + <translation>Nightly</translation> + </message> </context> <context> <name>SettingsVideo</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/assets/languages/es.ts new/linphone-desktop-4.4.5/linphone-app/assets/languages/es.ts --- old/linphone-desktop-4.4.1/linphone-app/assets/languages/es.ts 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/assets/languages/es.ts 2022-06-06 15:57:37.000000000 +0200 @@ -2655,6 +2655,21 @@ <extracomment>'Show a minimal version of what to display in timeline.' :</extracomment> <translation type="unfinished"></translation> </message> + <message> + <source>versionCheckTypeRelease</source> + <extracomment>'Release' : Keyword for an option to check the release version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeCustom</source> + <extracomment>'Custom' : Keyword for an option to check the custom version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeNightly</source> + <extracomment>'Nightly' : Keyword for an option to check the nightly version</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SettingsVideo</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/assets/languages/fr_FR.ts new/linphone-desktop-4.4.5/linphone-app/assets/languages/fr_FR.ts --- old/linphone-desktop-4.4.1/linphone-app/assets/languages/fr_FR.ts 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/assets/languages/fr_FR.ts 2022-06-06 15:57:37.000000000 +0200 @@ -2655,6 +2655,21 @@ <extracomment>'Show a minimal version of what to display in timeline.' :</extracomment> <translation>Afficher une version minimaliste dans la zone de recherche des chronologies.</translation> </message> + <message> + <source>versionCheckTypeRelease</source> + <extracomment>'Release' : Keyword for an option to check the release version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeCustom</source> + <extracomment>'Custom' : Keyword for an option to check the custom version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeNightly</source> + <extracomment>'Nightly' : Keyword for an option to check the nightly version</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SettingsVideo</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/assets/languages/hu.ts new/linphone-desktop-4.4.5/linphone-app/assets/languages/hu.ts --- old/linphone-desktop-4.4.1/linphone-app/assets/languages/hu.ts 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/assets/languages/hu.ts 2022-06-06 15:57:37.000000000 +0200 @@ -2644,6 +2644,21 @@ <extracomment>'Show a minimal version of what to display in timeline.' :</extracomment> <translation type="unfinished"></translation> </message> + <message> + <source>versionCheckTypeRelease</source> + <extracomment>'Release' : Keyword for an option to check the release version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeCustom</source> + <extracomment>'Custom' : Keyword for an option to check the custom version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeNightly</source> + <extracomment>'Nightly' : Keyword for an option to check the nightly version</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SettingsVideo</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/assets/languages/it.ts new/linphone-desktop-4.4.5/linphone-app/assets/languages/it.ts --- old/linphone-desktop-4.4.1/linphone-app/assets/languages/it.ts 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/assets/languages/it.ts 2022-06-06 15:57:37.000000000 +0200 @@ -2655,6 +2655,21 @@ <extracomment>'Show a minimal version of what to display in timeline.' :</extracomment> <translation type="unfinished"></translation> </message> + <message> + <source>versionCheckTypeRelease</source> + <extracomment>'Release' : Keyword for an option to check the release version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeCustom</source> + <extracomment>'Custom' : Keyword for an option to check the custom version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeNightly</source> + <extracomment>'Nightly' : Keyword for an option to check the nightly version</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SettingsVideo</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/assets/languages/ja.ts new/linphone-desktop-4.4.5/linphone-app/assets/languages/ja.ts --- old/linphone-desktop-4.4.1/linphone-app/assets/languages/ja.ts 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/assets/languages/ja.ts 2022-06-06 15:57:37.000000000 +0200 @@ -2644,6 +2644,21 @@ <extracomment>'Show a minimal version of what to display in timeline.' :</extracomment> <translation type="unfinished"></translation> </message> + <message> + <source>versionCheckTypeRelease</source> + <extracomment>'Release' : Keyword for an option to check the release version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeCustom</source> + <extracomment>'Custom' : Keyword for an option to check the custom version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeNightly</source> + <extracomment>'Nightly' : Keyword for an option to check the nightly version</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SettingsVideo</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/assets/languages/lt.ts new/linphone-desktop-4.4.5/linphone-app/assets/languages/lt.ts --- old/linphone-desktop-4.4.1/linphone-app/assets/languages/lt.ts 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/assets/languages/lt.ts 2022-06-06 15:57:37.000000000 +0200 @@ -2666,6 +2666,21 @@ <extracomment>'Show a minimal version of what to display in timeline.' :</extracomment> <translation type="unfinished"></translation> </message> + <message> + <source>versionCheckTypeRelease</source> + <extracomment>'Release' : Keyword for an option to check the release version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeCustom</source> + <extracomment>'Custom' : Keyword for an option to check the custom version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeNightly</source> + <extracomment>'Nightly' : Keyword for an option to check the nightly version</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SettingsVideo</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/assets/languages/pt_BR.ts new/linphone-desktop-4.4.5/linphone-app/assets/languages/pt_BR.ts --- old/linphone-desktop-4.4.1/linphone-app/assets/languages/pt_BR.ts 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/assets/languages/pt_BR.ts 2022-06-06 15:57:37.000000000 +0200 @@ -2655,6 +2655,21 @@ <extracomment>'Show a minimal version of what to display in timeline.' :</extracomment> <translation type="unfinished"></translation> </message> + <message> + <source>versionCheckTypeRelease</source> + <extracomment>'Release' : Keyword for an option to check the release version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeCustom</source> + <extracomment>'Custom' : Keyword for an option to check the custom version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeNightly</source> + <extracomment>'Nightly' : Keyword for an option to check the nightly version</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SettingsVideo</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/assets/languages/ru.ts new/linphone-desktop-4.4.5/linphone-app/assets/languages/ru.ts --- old/linphone-desktop-4.4.1/linphone-app/assets/languages/ru.ts 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/assets/languages/ru.ts 2022-06-06 15:57:37.000000000 +0200 @@ -2666,6 +2666,21 @@ <extracomment>'Show a minimal version of what to display in timeline.' :</extracomment> <translation type="unfinished"></translation> </message> + <message> + <source>versionCheckTypeRelease</source> + <extracomment>'Release' : Keyword for an option to check the release version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeCustom</source> + <extracomment>'Custom' : Keyword for an option to check the custom version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeNightly</source> + <extracomment>'Nightly' : Keyword for an option to check the nightly version</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SettingsVideo</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/assets/languages/sv.ts new/linphone-desktop-4.4.5/linphone-app/assets/languages/sv.ts --- old/linphone-desktop-4.4.1/linphone-app/assets/languages/sv.ts 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/assets/languages/sv.ts 2022-06-06 15:57:37.000000000 +0200 @@ -2655,6 +2655,21 @@ <extracomment>'Show a minimal version of what to display in timeline.' :</extracomment> <translation type="unfinished"></translation> </message> + <message> + <source>versionCheckTypeRelease</source> + <extracomment>'Release' : Keyword for an option to check the release version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeCustom</source> + <extracomment>'Custom' : Keyword for an option to check the custom version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeNightly</source> + <extracomment>'Nightly' : Keyword for an option to check the nightly version</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SettingsVideo</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/assets/languages/tr.ts new/linphone-desktop-4.4.5/linphone-app/assets/languages/tr.ts --- old/linphone-desktop-4.4.1/linphone-app/assets/languages/tr.ts 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/assets/languages/tr.ts 2022-06-06 15:57:37.000000000 +0200 @@ -475,7 +475,6 @@ <extracomment>'%1 is typing...' indicate that someone is composing in chat</extracomment> <translation> <numerusform>%1 yaz??yor???</numerusform> - <numerusform>%1 yaz??yor???</numerusform> </translation> </message> <message> @@ -1040,7 +1039,6 @@ <extracomment>'%1 minute'</extracomment> <translation> <numerusform>%1 dakika</numerusform> - <numerusform>%1 dakika</numerusform> </translation> </message> <message numerus="yes"> @@ -1048,7 +1046,6 @@ <extracomment>'%1 hour'</extracomment> <translation> <numerusform>%1 saat</numerusform> - <numerusform>%1 saat</numerusform> </translation> </message> <message numerus="yes"> @@ -1056,7 +1053,6 @@ <extracomment>'%1 day'</extracomment> <translation> <numerusform>%1 g??n</numerusform> - <numerusform>%1 g??n</numerusform> </translation> </message> <message numerus="yes"> @@ -1064,7 +1060,6 @@ <extracomment>'%1 week'</extracomment> <translation> <numerusform>%1 hafta</numerusform> - <numerusform>%1 hafta</numerusform> </translation> </message> </context> @@ -1369,7 +1364,7 @@ </message> <message> <source>newChatRoom</source> - <extracomment>'Open Conference' : Tooltip to illustrate a button</extracomment> + <extracomment>'Start a chat room' : Tooltip to illustrate a button</extracomment> <translation>Konu??ma odas?? ba??lat</translation> </message> <message> @@ -1472,7 +1467,6 @@ <extracomment>'You need at least %1 participant.' : Tooltip to warn a user that there are not enough participants for the chat creation.</extracomment> <translation> <numerusform>En az %1 kat??l??mc??n??z olmal??.</numerusform> - <numerusform>En az %1 kat??l??mc??n??z olmal??.</numerusform> </translation> </message> <message> @@ -1601,7 +1595,6 @@ <extracomment>'%1 unread messages' : Little message to show on an event where unread messages begin.</extracomment> <translation> <numerusform>%1 okunmam???? ileti</numerusform> - <numerusform>%1 okunmam???? ileti</numerusform> </translation> </message> </context> @@ -2639,7 +2632,7 @@ <message> <source>mipmapTooltip2</source> <extracomment>'Mipmap filtering gives better visual quality when scaling down compared to smooth, but it may come at a performance cost (both when initializing the image and during rendering).' : Second line of a tooltip about Mipmap mode.</extracomment> - <translation type="unfinished"></translation> + <translation type="unfinished">Bu ??zellik, resmin ??l??eklenirken veya d??n????t??r??l??rken mipmap s??zgecini kullan??p kullanmayaca????n?? bar??nd??r??r. {2?}</translation> </message> <message> <source>minimalTimelineFilterLabel</source> @@ -2651,6 +2644,21 @@ <extracomment>'Show a minimal version of what to display in timeline.' :</extracomment> <translation>Zaman ??izelgesinde sunulacaklar??n k??sa s??r??m??n?? g??ster.</translation> </message> + <message> + <source>versionCheckTypeRelease</source> + <extracomment>'Release' : Keyword for an option to check the release version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeCustom</source> + <extracomment>'Custom' : Keyword for an option to check the custom version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeNightly</source> + <extracomment>'Nightly' : Keyword for an option to check the nightly version</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SettingsVideo</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/assets/languages/uk.ts new/linphone-desktop-4.4.5/linphone-app/assets/languages/uk.ts --- old/linphone-desktop-4.4.1/linphone-app/assets/languages/uk.ts 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/assets/languages/uk.ts 2022-06-06 15:57:37.000000000 +0200 @@ -2666,6 +2666,21 @@ <extracomment>'Show a minimal version of what to display in timeline.' :</extracomment> <translation type="unfinished"></translation> </message> + <message> + <source>versionCheckTypeRelease</source> + <extracomment>'Release' : Keyword for an option to check the release version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeCustom</source> + <extracomment>'Custom' : Keyword for an option to check the custom version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeNightly</source> + <extracomment>'Nightly' : Keyword for an option to check the nightly version</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SettingsVideo</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/assets/languages/zh_CN.ts new/linphone-desktop-4.4.5/linphone-app/assets/languages/zh_CN.ts --- old/linphone-desktop-4.4.1/linphone-app/assets/languages/zh_CN.ts 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/assets/languages/zh_CN.ts 2022-06-06 15:57:37.000000000 +0200 @@ -2644,6 +2644,21 @@ <extracomment>'Show a minimal version of what to display in timeline.' :</extracomment> <translation type="unfinished"></translation> </message> + <message> + <source>versionCheckTypeRelease</source> + <extracomment>'Release' : Keyword for an option to check the release version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeCustom</source> + <extracomment>'Custom' : Keyword for an option to check the custom version</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>versionCheckTypeNightly</source> + <extracomment>'Nightly' : Keyword for an option to check the nightly version</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SettingsVideo</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/src/components/assistant/AssistantModel.cpp new/linphone-desktop-4.4.5/linphone-app/src/components/assistant/AssistantModel.cpp --- old/linphone-desktop-4.4.1/linphone-app/src/components/assistant/AssistantModel.cpp 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/src/components/assistant/AssistantModel.cpp 2022-06-06 15:57:37.000000000 +0200 @@ -414,11 +414,11 @@ QString configPath = Utils::coreStringToAppString(Paths::getAssistantConfigDirPath()) + configFilename; qInfo() << QStringLiteral("Set config on assistant: `%1`.").arg(configPath); - - CoreManager::getInstance()->getCore()->getConfig()->loadFromXmlFile( + auto core = CoreManager::getInstance()->getCore(); + core->getConfig()->loadFromXmlFile( Utils::appStringToCoreString(configPath) ); - + core->enableLimeX3Dh(core->getLimeX3DhServerUrl() != ""); emit configFilenameChanged(configFilename); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/src/components/chat-events/ChatEvent.hpp new/linphone-desktop-4.4.5/linphone-app/src/components/chat-events/ChatEvent.hpp --- old/linphone-desktop-4.4.1/linphone-app/src/components/chat-events/ChatEvent.hpp 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/src/components/chat-events/ChatEvent.hpp 2022-06-06 15:57:37.000000000 +0200 @@ -34,7 +34,7 @@ ChatRoomModel::EntryType mType; virtual QDateTime getTimestamp() const; - virtual void setTimestamp(const QDateTime& timestamp); + virtual void setTimestamp(const QDateTime& timestamp = QDateTime::currentDateTime()); virtual void deleteEvent(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/src/components/chat-events/ChatMessageModel.cpp new/linphone-desktop-4.4.5/linphone-app/src/components/chat-events/ChatMessageModel.cpp --- old/linphone-desktop-4.4.1/linphone-app/src/components/chat-events/ChatMessageModel.cpp 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/src/components/chat-events/ChatMessageModel.cpp 2022-06-06 15:57:37.000000000 +0200 @@ -139,10 +139,10 @@ txt += content->getUtf8Text().c_str(); } mContent = txt; + + mTimestamp = QDateTime::fromMSecsSinceEpoch(chatMessage->getTime() * 1000); } mWasDownloaded = false; - - mTimestamp = QDateTime::fromMSecsSinceEpoch(chatMessage->getTime() * 1000); mContentListModel = std::make_shared<ContentListModel>(this); } @@ -266,6 +266,10 @@ } } +void ChatMessageModel::setTimestamp(const QDateTime& timestamp) { + mTimestamp = timestamp; +} + //----------------------------------------------------------------------------------------------------------------------- void ChatMessageModel::resendMessage (){ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/src/components/chat-events/ChatMessageModel.hpp new/linphone-desktop-4.4.5/linphone-app/src/components/chat-events/ChatMessageModel.hpp --- old/linphone-desktop-4.4.1/linphone-app/src/components/chat-events/ChatMessageModel.hpp 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/src/components/chat-events/ChatMessageModel.hpp 2022-06-06 15:57:37.000000000 +0200 @@ -149,12 +149,13 @@ //---------------------------------------------------------------------------- void setWasDownloaded(bool wasDownloaded); + virtual void setTimestamp(const QDateTime& timestamp = QDateTime::currentDateTime()) override; //---------------------------------------------------------------------------- Q_INVOKABLE void resendMessage (); - virtual void deleteEvent(); + virtual void deleteEvent() override; void updateFileTransferInformation(); // Linphone callbacks void onFileTransferRecv(const std::shared_ptr<linphone::ChatMessage> & message, const std::shared_ptr<linphone::Content> & content, const std::shared_ptr<const linphone::Buffer> & buffer) ; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/src/components/chat-room/ChatRoomModel.cpp new/linphone-desktop-4.4.5/linphone-app/src/components/chat-room/ChatRoomModel.cpp --- old/linphone-desktop-4.4.1/linphone-app/src/components/chat-room/ChatRoomModel.cpp 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/src/components/chat-room/ChatRoomModel.cpp 2022-06-06 15:57:37.000000000 +0200 @@ -1118,9 +1118,10 @@ } } -void ChatRoomModel::insertMessageAtEnd (const std::shared_ptr<linphone::ChatMessage> &message) { +std::shared_ptr<ChatMessageModel> ChatRoomModel::insertMessageAtEnd (const std::shared_ptr<linphone::ChatMessage> &message) { + std::shared_ptr<ChatMessageModel> model; if(mIsInitialized){ - std::shared_ptr<ChatMessageModel> model = ChatMessageModel::create(message, this); + model = ChatMessageModel::create(message, this); if(model){ setUnreadMessagesCount(mChatRoom->getUnreadMessagesCount()); int row = mEntries.count(); @@ -1129,6 +1130,7 @@ endInsertRows(); } } + return model; } void ChatRoomModel::insertMessages (const QList<std::shared_ptr<linphone::ChatMessage> > &messages) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/src/components/chat-room/ChatRoomModel.hpp new/linphone-desktop-4.4.5/linphone-app/src/components/chat-room/ChatRoomModel.hpp --- old/linphone-desktop-4.4.1/linphone-app/src/components/chat-room/ChatRoomModel.hpp 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/src/components/chat-room/ChatRoomModel.hpp 2022-06-06 15:57:37.000000000 +0200 @@ -252,7 +252,7 @@ void insertCall (const std::shared_ptr<linphone::CallLog> &callLog); void insertCalls (const QList<std::shared_ptr<linphone::CallLog> > &calls); - void insertMessageAtEnd (const std::shared_ptr<linphone::ChatMessage> &message); + std::shared_ptr<ChatMessageModel> insertMessageAtEnd (const std::shared_ptr<linphone::ChatMessage> &message); void insertMessages (const QList<std::shared_ptr<linphone::ChatMessage> > &messages); void insertNotice (const std::shared_ptr<linphone::EventLog> &enventLog); void insertNotices (const QList<std::shared_ptr<linphone::EventLog>> &eventLogs); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/src/components/content/ContentModel.cpp new/linphone-desktop-4.4.5/linphone-app/src/components/content/ContentModel.cpp --- old/linphone-desktop-4.4.1/linphone-app/src/components/content/ContentModel.cpp 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/src/components/content/ContentModel.cpp 2022-06-06 15:57:37.000000000 +0200 @@ -38,13 +38,13 @@ // ============================================================================= -ContentModel::ContentModel(ChatMessageModel* chatModel) : mAppData(""){ +ContentModel::ContentModel(ChatMessageModel* chatModel) : mAppData(chatModel ? QString::fromStdString(chatModel->getChatMessage()->getAppdata()) : ""){ App::getInstance()->getEngine()->setObjectOwnership(this, QQmlEngine::CppOwnership);// Avoid QML to destroy it when passing by Q_INVOKABLE mChatMessageModel = chatModel; mWasDownloaded = false; mFileOffset = 0; } -ContentModel::ContentModel(std::shared_ptr<linphone::Content> content, ChatMessageModel* chatModel) : mAppData(""){ +ContentModel::ContentModel(std::shared_ptr<linphone::Content> content, ChatMessageModel* chatModel) : mAppData(chatModel ? QString::fromStdString(chatModel->getChatMessage()->getAppdata()) : ""){ App::getInstance()->getEngine()->setObjectOwnership(this, QQmlEngine::CppOwnership);// Avoid QML to destroy it when passing by Q_INVOKABLE mChatMessageModel = chatModel; mWasDownloaded = false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/src/components/core/CoreManager.cpp new/linphone-desktop-4.4.5/linphone-app/src/components/core/CoreManager.cpp --- old/linphone-desktop-4.4.1/linphone-app/src/components/core/CoreManager.cpp 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/src/components/core/CoreManager.cpp 2022-06-06 15:57:37.000000000 +0200 @@ -17,6 +17,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ + + // VisualC++: Windows doesn't have to rewrite min max or else building std::max will fail +#define NOMINMAX #include <QCoreApplication> #include <QDir> @@ -374,6 +377,31 @@ int CoreManager::getMissedCallCountFromLocal( const QString &localAddress)const{ return mEventCountNotifier ? mEventCountNotifier->getMissedCallCountFromLocal(localAddress) : 0; } +int CoreManager::getUnreadChatMessage(const std::shared_ptr<const linphone::Address>& accountAddress)const{ +// Workaround : getUnreadMessagesCount(?? doesn't check the sate of chat room so they can be left and still count in unread message (for example because of a bug on ack timeout). Remove these counts from the unread count. + std::list<std::shared_ptr<linphone::ChatRoom>> allChatRooms = mCore->getChatRooms(); + std::list<std::shared_ptr<linphone::Account>> accountsList; + int unreadChatMessageCount; + if( accountAddress) + unreadChatMessageCount = mCore->getUnreadChatMessageCountFromLocal(accountAddress); + else { + accountsList = mCore->getAccountList(); + unreadChatMessageCount = mCore->getUnreadChatMessageCountFromActiveLocals(); + } + for(auto chatRoom : allChatRooms){ + auto account = accountsList.begin(); + if(!accountAddress){ + while(account != accountsList.end() && !(*account)->getParams()->getIdentityAddress()->weakEqual(chatRoom->getLocalAddress())) + ++account; + } + if( ((!accountAddress && account != accountsList.end()) || (accountAddress && accountAddress->weakEqual(chatRoom->getLocalAddress()) )) + && (chatRoom->getState() == linphone::ChatRoom::State::Terminated || chatRoom->getState() == linphone::ChatRoom::State::Deleted)) + unreadChatMessageCount -= chatRoom->getUnreadMessagesCount(); + } + unreadChatMessageCount = std::max(0,unreadChatMessageCount); + + return unreadChatMessageCount; +} // ----------------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/src/components/core/CoreManager.hpp new/linphone-desktop-4.4.5/linphone-app/src/components/core/CoreManager.hpp --- old/linphone-desktop-4.4.1/linphone-app/src/components/core/CoreManager.hpp 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/src/components/core/CoreManager.hpp 2022-06-06 15:57:37.000000000 +0200 @@ -172,6 +172,8 @@ int getMissedCallCount(const QString &peerAddress, const QString &localAddress) const;// Get missed call count from a chat (useful for showing bubbles on Timelines) int getMissedCallCountFromLocal(const QString &localAddress) const;// Get missed call count from a chat (useful for showing bubbles on Timelines) + int getUnreadChatMessage(const std::shared_ptr<const linphone::Address>& accountAddress = nullptr)const; + static bool isInstanciated(){return mInstance!=nullptr;} Q_INVOKABLE bool isLastRemoteProvisioningGood(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/src/components/core/event-count-notifier/AbstractEventCountNotifier.cpp new/linphone-desktop-4.4.5/linphone-app/src/components/core/event-count-notifier/AbstractEventCountNotifier.cpp --- old/linphone-desktop-4.4.1/linphone-app/src/components/core/event-count-notifier/AbstractEventCountNotifier.cpp 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/src/components/core/event-count-notifier/AbstractEventCountNotifier.cpp 2022-06-06 15:57:37.000000000 +0200 @@ -67,8 +67,9 @@ // ----------------------------------------------------------------------------- void AbstractEventCountNotifier::updateUnreadMessageCount () { - mUnreadMessageCount = CoreManager::getInstance()->getCore()->getUnreadChatMessageCountFromActiveLocals(); - internalnotifyEventCount(); + auto core = CoreManager::getInstance()->getCore(); + mUnreadMessageCount = CoreManager::getInstance()->getUnreadChatMessage(); + internalnotifyEventCount(); } void AbstractEventCountNotifier::internalnotifyEventCount () { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/src/components/settings/AccountSettingsModel.cpp new/linphone-desktop-4.4.5/linphone-app/src/components/settings/AccountSettingsModel.cpp --- old/linphone-desktop-4.4.1/linphone-app/src/components/settings/AccountSettingsModel.cpp 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/src/components/settings/AccountSettingsModel.cpp 2022-06-06 15:57:37.000000000 +0200 @@ -376,6 +376,7 @@ shared_ptr<linphone::Core> core = CoreManager::getInstance()->getCore(); qInfo() << QStringLiteral("Set config on assistant: `%1`.").arg(assistantFile); core->getConfig()->loadFromXmlFile(Paths::getAssistantConfigDirPath() + assistantFile.toStdString()); + core->enableLimeX3Dh(core->getLimeX3DhServerUrl() != ""); return core->createProxyConfig(); } @@ -477,9 +478,12 @@ if(CoreManager::getInstance()->getSettingsModel()->getShowLocalSipAccount()) { QVariantMap account; - account["sipAddress"] = Utils::coreStringToAppString(core->createPrimaryContactParsed()->asStringUriOnly()); - account["fullSipAddress"] = Utils::coreStringToAppString(core->createPrimaryContactParsed()->asString()); - account["unreadMessageCount"] = core->getUnreadChatMessageCountFromLocal(core->createPrimaryContactParsed()); + auto address = core->createPrimaryContactParsed(); + int unreadChatMessageCount = CoreManager::getInstance()->getUnreadChatMessage(address); + + account["sipAddress"] = Utils::coreStringToAppString(address->asStringUriOnly()); + account["fullSipAddress"] = Utils::coreStringToAppString(address->asString()); + account["unreadMessageCount"] = unreadChatMessageCount; account["missedCallCount"] = CoreManager::getInstance()->getMissedCallCountFromLocal(account["sipAddress"].toString()); account["proxyConfig"].setValue(nullptr); accounts << account; @@ -487,10 +491,13 @@ for (const auto &proxyConfig : core->getProxyConfigList()) { QVariantMap account; - account["sipAddress"] = Utils::coreStringToAppString(proxyConfig->getIdentityAddress()->asStringUriOnly()); - account["fullSipAddress"] = Utils::coreStringToAppString(proxyConfig->getIdentityAddress()->asString()); + + auto proxyAddress = proxyConfig->getIdentityAddress(); + int unreadChatMessageCount = CoreManager::getInstance()->getUnreadChatMessage(proxyAddress); + account["sipAddress"] = Utils::coreStringToAppString(proxyAddress->asStringUriOnly()); + account["fullSipAddress"] = Utils::coreStringToAppString(proxyAddress->asString()); account["proxyConfig"].setValue(proxyConfig); - account["unreadMessageCount"] = proxyConfig->getUnreadChatMessageCount(); + account["unreadMessageCount"] = unreadChatMessageCount; account["missedCallCount"] = CoreManager::getInstance()->getMissedCallCountFromLocal(account["sipAddress"].toString()); accounts << account; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/src/components/settings/SettingsModel.cpp new/linphone-desktop-4.4.5/linphone-app/src/components/settings/SettingsModel.cpp --- old/linphone-desktop-4.4.1/linphone-app/src/components/settings/SettingsModel.cpp 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/src/components/settings/SettingsModel.cpp 2022-06-06 15:57:37.000000000 +0200 @@ -1359,13 +1359,42 @@ } QString SettingsModel::getVersionCheckUrl() const{ - return Utils::coreStringToAppString(mConfig->getString("misc", "version_check_url_root", Constants::VersionCheckUrl)); + return Utils::coreStringToAppString(mConfig->getString("misc", "version_check_url_root", Constants::VersionCheckReleaseUrl)); } void SettingsModel::setVersionCheckUrl(const QString& url){ - mConfig->setString("misc", "version_check_url_root", Utils::appStringToCoreString(url)); - emit versionCheckUrlChanged(); + if( url != getVersionCheckUrl()){ + mConfig->setString("misc", "version_check_url_root", Utils::appStringToCoreString(url)); + if( url == Constants::VersionCheckReleaseUrl) + setVersionCheckType(VersionCheckType_Release); + else if( url == Constants::VersionCheckNightlyUrl) + setVersionCheckType(VersionCheckType_Nightly); + else + setVersionCheckType(VersionCheckType_Custom); + emit versionCheckUrlChanged(); + } } + +SettingsModel::VersionCheckType SettingsModel::getVersionCheckType() const{ + return (SettingsModel::VersionCheckType) mConfig->getInt(UiSection, "version_check_type", (int)VersionCheckType_Release); +} + +void SettingsModel::setVersionCheckType(const VersionCheckType& type){ + if( type != getVersionCheckType()){ + mConfig->setInt(UiSection, "version_check_type", (int)type); + switch(type){ + case VersionCheckType_Release : setVersionCheckUrl(Constants::VersionCheckReleaseUrl); break; + case VersionCheckType_Nightly : setVersionCheckUrl(Constants::VersionCheckNightlyUrl);break; + case VersionCheckType_Custom : break;// Do not override URL + } + emit versionCheckTypeChanged(); + } +} + +bool SettingsModel::haveVersionNightlyUrl()const{ + return QString(Constants::VersionCheckNightlyUrl) != ""; +} + // ----------------------------------------------------------------------------- bool SettingsModel::getShowLocalSipAccount()const{ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/src/components/settings/SettingsModel.hpp new/linphone-desktop-4.4.5/linphone-app/src/components/settings/SettingsModel.hpp --- old/linphone-desktop-4.4.1/linphone-app/src/components/settings/SettingsModel.hpp 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/src/components/settings/SettingsModel.hpp 2022-06-06 15:57:37.000000000 +0200 @@ -192,6 +192,7 @@ Q_PROPERTY(bool exitOnClose READ getExitOnClose WRITE setExitOnClose NOTIFY exitOnCloseChanged) Q_PROPERTY(bool checkForUpdateEnabled READ isCheckForUpdateEnabled WRITE setCheckForUpdateEnabled NOTIFY checkForUpdateEnabledChanged) Q_PROPERTY(QString versionCheckUrl READ getVersionCheckUrl WRITE setVersionCheckUrl NOTIFY versionCheckUrlChanged) + Q_PROPERTY(VersionCheckType versionCheckType READ getVersionCheckType WRITE setVersionCheckType NOTIFY versionCheckTypeChanged) Q_PROPERTY(bool showLocalSipAccount READ getShowLocalSipAccount CONSTANT) Q_PROPERTY(bool showStartChatButton READ getShowStartChatButton CONSTANT) @@ -220,6 +221,13 @@ }; Q_ENUM(MediaEncryption) + enum VersionCheckType { + VersionCheckType_Release, + VersionCheckType_Nightly, + VersionCheckType_Custom + }; + Q_ENUM(VersionCheckType); + SettingsModel (QObject *parent = Q_NULLPTR); virtual ~SettingsModel (); @@ -508,6 +516,10 @@ QString getVersionCheckUrl() const; void setVersionCheckUrl(const QString& url); + VersionCheckType getVersionCheckType() const; + void setVersionCheckType(const VersionCheckType& type); + Q_INVOKABLE bool haveVersionNightlyUrl()const; + Q_INVOKABLE bool getShowLocalSipAccount () const; Q_INVOKABLE bool getShowStartChatButton () const; @@ -705,6 +717,7 @@ void checkForUpdateEnabledChanged(); void versionCheckUrlChanged(); + void versionCheckTypeChanged(); // Advanced. ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/src/components/timeline/TimelineListModel.cpp new/linphone-desktop-4.4.5/linphone-app/src/components/timeline/TimelineListModel.cpp --- old/linphone-desktop-4.4.1/linphone-app/src/components/timeline/TimelineListModel.cpp 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/src/components/timeline/TimelineListModel.cpp 2022-06-06 15:57:37.000000000 +0200 @@ -244,10 +244,7 @@ // Clean terminated chat rooms. allChatRooms.remove_if([](std::shared_ptr<linphone::ChatRoom> chatRoom){ - bool toRemove = chatRoom->getState() == linphone::ChatRoom::State::Terminated || chatRoom->getState() == linphone::ChatRoom::State::Deleted; - if( toRemove) - chatRoom->markAsRead(); - return toRemove; + return chatRoom->getState() == linphone::ChatRoom::State::Terminated || chatRoom->getState() == linphone::ChatRoom::State::Deleted; }); //Remove no more chat rooms diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/src/utils/Constants.cpp new/linphone-desktop-4.4.5/linphone-app/src/utils/Constants.cpp --- old/linphone-desktop-4.4.1/linphone-app/src/utils/Constants.cpp 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/src/utils/Constants.cpp 2022-06-06 15:57:37.000000000 +0200 @@ -105,7 +105,8 @@ constexpr char Constants::DefaultContactParametersOnRemove[]; constexpr int Constants::DefaultExpires; constexpr char Constants::DownloadUrl[]; -constexpr char Constants::VersionCheckUrl[]; +constexpr char Constants::VersionCheckReleaseUrl[]; +constexpr char Constants::VersionCheckNightlyUrl[]; constexpr char Constants::PasswordRecoveryUrl[]; constexpr char Constants::CguUrl[]; constexpr char Constants::PrivatePolicyUrl[]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/src/utils/Constants.hpp new/linphone-desktop-4.4.5/linphone-app/src/utils/Constants.hpp --- old/linphone-desktop-4.4.1/linphone-app/src/utils/Constants.hpp 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/src/utils/Constants.hpp 2022-06-06 15:57:37.000000000 +0200 @@ -55,7 +55,8 @@ static constexpr char DefaultContactParametersOnRemove[] = "message-expires=0"; static constexpr int DefaultExpires = 3600; static constexpr char DownloadUrl[] = "https://www.linphone.org/technical-corner/linphone";; - static constexpr char VersionCheckUrl[] = "https://linphone.org/releases";; + static constexpr char VersionCheckReleaseUrl[] = "https://download.linphone.org/releases";; + static constexpr char VersionCheckNightlyUrl[] = "https://download.linphone.org/snapshots";; static constexpr char PasswordRecoveryUrl[] = "https://subscribe.linphone.org/login";; static constexpr char CguUrl[] = "https://www.linphone.org/general-terms";; static constexpr char PrivatePolicyUrl[] = "https://www.linphone.org/privacy-policy";; @@ -151,7 +152,7 @@ #ifdef Q_PROCESSOR_X86_64 static constexpr char PluginUrlH264[] = "http://ciscobinary.openh264.org/libopenh264-2.1.0-linux64.5.so.bz2";; #else - static constexpr char PluginUrlH264[] = "http://ciscobinary.openh264.org/libopenh264-2.1-0-linux32.5.so.bz2";; + static constexpr char PluginUrlH264[] = "http://ciscobinary.openh264.org/libopenh264-2.1.0-linux32.5.so.bz2";; #endif // ifdef Q_PROCESSOR_X86_64 #elif defined(Q_OS_WIN) static constexpr char LibraryExtension[] = "dll"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/ui/modules/Common/Form/ComboBox.qml new/linphone-desktop-4.4.5/linphone-app/ui/modules/Common/Form/ComboBox.qml --- old/linphone-desktop-4.4.1/linphone-app/ui/modules/Common/Form/ComboBox.qml 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/ui/modules/Common/Form/ComboBox.qml 2022-06-06 15:57:37.000000000 +0200 @@ -18,6 +18,8 @@ property bool haveBorder: true property bool haveMargin: true property color backgroundColor: ComboBoxStyle.background.color.normal + + property int fitWidth: contentItem.fitWidth + ComboBoxStyle.indicator.dropDown.iconSize // --------------------------------------------------------------------------- @@ -40,10 +42,12 @@ // --------------------------------------------------------------------------- contentItem: Item { + property int fitWidth: contentText.implicitWidth + ComboBoxStyle.contentItem.iconSize + contentLayout.anchors.leftMargin height: comboBox.height width: comboBox.width RowLayout { + id: contentLayout anchors { fill: parent leftMargin: comboBox.haveMargin ? ComboBoxStyle.contentItem.leftMargin : 0 @@ -59,6 +63,7 @@ } Text { + id: contentText Layout.fillWidth: true color: ComboBoxStyle.contentItem.text.color diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/ui/views/App/Main/Conversation.qml new/linphone-desktop-4.4.5/linphone-app/ui/views/App/Main/Conversation.qml --- old/linphone-desktop-4.4.1/linphone-app/ui/views/App/Main/Conversation.qml 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/ui/views/App/Main/Conversation.qml 2022-06-06 15:57:37.000000000 +0200 @@ -29,14 +29,14 @@ property ChatRoomModel chatRoomModel - property string peerAddress : chatRoomModel?chatRoomModel.getPeerAddress() : defaultPeerAddress + property string peerAddress : getPeerAddress() property string localAddress : chatRoomModel?chatRoomModel.getLocalAddress() : defaultLocalAddress - property string fullPeerAddress : chatRoomModel?chatRoomModel.getFullPeerAddress() : defaultFullPeerAddress + property string fullPeerAddress : getFullPeerAddress() property string fullLocalAddress : chatRoomModel?chatRoomModel.getFullLocalAddress() : defaultFullLocalAddress property int securityLevel : chatRoomModel ? chatRoomModel.securityLevel : 1 - readonly property var _sipAddressObserver: SipAddressesModel.getSipAddressObserver((fullPeerAddress?fullPeerAddress:peerAddress), (fullLocalAddress?fullLocalAddress:localAddress)) + property SipAddressObserver _sipAddressObserver: SipAddressesModel.getSipAddressObserver((fullPeerAddress?fullPeerAddress:peerAddress), (fullLocalAddress?fullLocalAddress:localAddress)) property bool haveMoreThanOneParticipants: chatRoomModel ? chatRoomModel.participants.count > 2 : false property bool haveLessThanMinParticipantsForCall: chatRoomModel ? chatRoomModel.participants.count <= 5 : false @@ -48,7 +48,18 @@ return chatRoomModel.sipAddress; } }else { - return conversation.fullPeerAddress || conversation.peerAddress || ''; + return defaultPeerAddress + } + } + function getFullPeerAddress() { + if(chatRoomModel) { + if(chatRoomModel.groupEnabled || chatRoomModel.isSecure()) { + return chatRoomModel.participants.addressesToString; + }else { + return chatRoomModel.sipAddress; + } + }else { + return defaultFullPeerAddress; } } @@ -125,7 +136,7 @@ Layout.topMargin: 15 Layout.preferredHeight: implicitHeight Layout.alignment: Qt.AlignBottom - visible:chatRoomModel.isMeAdmin && !usernameEdit.visible + visible:chatRoomModel.isMeAdmin && !usernameEdit.visible && !chatRoomModel.isOneToOne Icon{ id:adminIcon @@ -153,7 +164,7 @@ visible: !usernameEdit.visible contactDescriptionStyle: ConversationStyle.bar.contactDescription username: avatar.username - usernameClickable: chatRoomModel.isMeAdmin + usernameClickable: chatRoomModel.isMeAdmin && !chatRoomModel.isOneToOne participants: if(chatRoomModel) { if(chatRoomModel.groupEnabled) { return chatRoomModel.participants.displayNamesToString; @@ -187,7 +198,7 @@ Item{ Layout.fillHeight: true Layout.fillWidth: true - visible: chatRoomModel.isMeAdmin + visible: chatRoomModel.isMeAdmin && !chatRoomModel.isOneToOne } } Icon{ @@ -312,7 +323,7 @@ visible: SettingsModel.contactsEnabled && !conversation.chatRoomModel.groupEnabled onClicked: window.setView('ContactEdit', { - sipAddress: conversation.getPeerAddress() + sipAddress: conversation.getFullPeerAddress() }) tooltipText: Logic.getEditTooltipText() } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linphone-desktop-4.4.1/linphone-app/ui/views/App/Settings/SettingsUi.qml new/linphone-desktop-4.4.5/linphone-app/ui/views/App/Settings/SettingsUi.qml --- old/linphone-desktop-4.4.1/linphone-app/ui/views/App/Settings/SettingsUi.qml 2022-04-05 11:39:19.000000000 +0200 +++ new/linphone-desktop-4.4.5/linphone-app/ui/views/App/Settings/SettingsUi.qml 2022-06-06 15:57:37.000000000 +0200 @@ -242,7 +242,7 @@ FormGroup { //: 'Check for updates' : Label switch for enabling check for updates label: qsTr('checkForUpdateLabel') - + maxWidth: 3*parent.width/2 RowLayout{ Switch { checked: SettingsModel.checkForUpdateEnabled @@ -255,6 +255,23 @@ onEditingFinished: SettingsModel.versionCheckUrl = text } + ComboBox{ + Layout.preferredWidth: fitWidth + Layout.leftMargin: 10 + //: 'Release' : Keyword for an option to check the release version + model: [qsTr('versionCheckTypeRelease'), + //: 'Nightly' : Keyword for an option to check the nightly version + qsTr('versionCheckTypeNightly'), + //: 'Custom' : Keyword for an option to check the custom version + qsTr('versionCheckTypeCustom')] + visible: SettingsModel.haveVersionNightlyUrl() + currentIndex: SettingsModel.versionCheckType == SettingsModel.VersionCheckType_Release ? 0 + : SettingsModel.versionCheckType == SettingsModel.VersionCheckType_Nightly ? 1 + : 2 + onActivated: SettingsModel.versionCheckType = ( currentIndex == 0 ? SettingsModel.VersionCheckType_Release + : currentIndex == 1 ? SettingsModel.VersionCheckType_Nightly + : SettingsModel.VersionCheckType_Custom) + } } } }
