Add revision: v1.24.3

Governikus · Oct 26, 2022 · 967818e · 967818e
1 parent 489b799
commit 967818e
Show file tree

Hide file tree

Showing 134 changed files with 1,057 additions and 720 deletions.
diff --git a/.codespellrc b/.codespellrc
@@ -0,0 +1,2 @@
+[codespell]
+skip = ./docs/releasenotes/*,*.pdf,*.ts,*.wxl,*.svg,./src/external/*,.git,.hg,LICENSE*,CMakeLists.txt.user,patch.py,README.rst,README.de.rst,supported-readers.json,supported-providers.json,./test/fixture/logfiles/*
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -56,7 +56,7 @@ if(UNIX AND NOT IOS)
  set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15 CACHE STRING "Required macOS version")
 endif()
 
-project(AusweisApp2 VERSION 1.24.2 LANGUAGES ${LANGUAGES})
+project(AusweisApp2 VERSION 1.24.3 LANGUAGES ${LANGUAGES})
 
 # Set TWEAK if not defined in PROJECT_VERSION above to
 # have a valid tweak version without propagating it
@@ -87,7 +87,7 @@ if(NOT VENDOR)
  if(EXISTS "${CMAKE_DIR}/Vendor.internal.cmake")
  include(Vendor.internal)
  elseif(LINUX OR BSD)
- set(VENDOR "") # Qt uses Organization for pathes
+ set(VENDOR "") # Qt uses Organization for paths
  else()
  set(VENDOR AusweisApp2_CE) # CommunityEdition
  endif()

diff --git a/cmake/CompilerFlags.cmake b/cmake/CompilerFlags.cmake
@@ -15,7 +15,7 @@ add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:QT_NO_CAST_FROM_ASCII>)
 
 if(QT_VENDOR STREQUAL "Governikus")
  add_definitions(-DGOVERNIKUS_QT)
- add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x051500)
+ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060301)
 endif()
 
 

diff --git a/cmake/Install.cmake b/cmake/Install.cmake
@@ -273,9 +273,6 @@ elseif(ANDROID)
  set(QML_ROOT_PATH [\"${RESOURCES_DIR}/qml\"])
  set(ANDROID_ROOT_LOGGER "")
  configure_file(${PACKAGING_DIR}/android/fileprovider.xml ${ANDROID_PACKAGE_SRC_DIR}/res/xml/fileprovider.xml COPYONLY)
-
- configure_file(${PACKAGING_DIR}/android/backup_rules.xml ${ANDROID_PACKAGE_SRC_DIR}/res/xml/backup_rules.xml COPYONLY)
- configure_file(${PACKAGING_DIR}/android/backup_rules_legacy.xml ${ANDROID_PACKAGE_SRC_DIR}/res/xml/backup_rules_legacy.xml COPYONLY)
  endif()
 
  set(ANDROID_SO_NAME libAusweisApp2_${CMAKE_ANDROID_ARCH_ABI}.so)

diff --git a/cmake/Libraries.cmake b/cmake/Libraries.cmake
@@ -144,7 +144,7 @@ elseif(MAC)
  find_library(OSX_FOUNDATION Foundation)
  find_library(OSX_SERVICEMANAGEMENT ServiceManagement)
 elseif(UNIX)
- if(LINUX)
+ if(LINUX OR BSD)
  find_package(PkgConfig REQUIRED)
  pkg_check_modules(UDEV IMPORTED_TARGET libudev)
  if(NOT TARGET PkgConfig::UDEV)

diff --git a/cmake/Tools.cmake b/cmake/Tools.cmake
@@ -559,19 +559,11 @@ if(INKSCAPE AND APPLE AND NOT IOS)
  endif()
 endif()
 
-if(NOT JAVA_EXECUTABLE)
- find_package(Java COMPONENTS Runtime)
- if(Java_JAVA_EXECUTABLE)
- set(JAVA_EXECUTABLE "${Java_JAVA_EXECUTABLE}")
- endif()
-endif()
-if(JAVA_EXECUTABLE)
- find_file(PLANTUML plantuml.jar PATHS ENV HOME NO_DEFAULT_PATH)
- if(PLANTUML)
- message(STATUS "Target uml.statemachines is available using: ${PLANTUML}")
- configure_file(${RESOURCES_DIR}/statemachine.sh.in ${PROJECT_BINARY_DIR}/statemachine.sh @ONLY)
- add_custom_target(uml.statemachines COMMAND ./statemachine.sh WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
- endif()
+find_program(PLANTUML plantuml)
+if(PLANTUML)
+ message(STATUS "Target uml.statemachines is available using: ${PLANTUML}")
+ configure_file(${RESOURCES_DIR}/statemachine.sh.in ${PROJECT_BINARY_DIR}/statemachine.sh @ONLY)
+ add_custom_target(uml.statemachines COMMAND ./statemachine.sh WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
 endif()
 
 find_program(DOT dot CMAKE_FIND_ROOT_PATH_BOTH)

diff --git a/cmake/iOS.toolchain.cmake b/cmake/iOS.toolchain.cmake
@@ -14,7 +14,6 @@ set(IOS True)
 
 set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
 
-set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
 set(CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC "YES")
 
 set(CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} CACHE STRING "iOS find search path root")

diff --git a/docs/releasenotes/1.24.0.rst b/docs/releasenotes/1.24.0.rst
@@ -21,6 +21,8 @@ Anwender
 
 - Unterstützung von Windows 7 und Windows 8.1 wurde eingestellt.
 
+- Unterstützung von Windows 10 (älter als Version 1809) wurde eingestellt.
+
 - Unterstützung von Windows 10 32-Bit-Version wurde eingestellt.
 
 - Unterstützung von macOS 10.13 und 10.14 wurde eingestellt.

diff --git a/docs/releasenotes/1.24.3.rst b/docs/releasenotes/1.24.3.rst
@@ -0,0 +1,22 @@
+AusweisApp2 1.24.3
+^^^^^^^^^^^^^^^^^^
+
+**Releasedatum:** 26. Oktober 2022
+
+
+Anwender
+""""""""
+- Behebung von Abstürzen unter Android.
+
+- Deaktivierung des (Cloud) Backups unter Android und iOS.
+
+- Korrektur der A11y-Darstellung des SaK-Kopplungscodes auf Android und iOS.
+
+- Verhinderung der Installation auf nicht mehr unterstützten Versionen von Windows 10.
+
+
+Entwickler
+""""""""""
+- Kompatibilität zu Qt 6.4 korrigiert.
+
+- Aktivierung des Simulators im Android- und iOS-SDK.
diff --git a/docs/releasenotes/announce.rst b/docs/releasenotes/announce.rst
@@ -6,6 +6,7 @@ folgender Systeme und Funktionen eingestellt.
 
 - Windows 7
 - Windows 8.1
+- Windows 10 älter als Version 1809
 - Windows 10 32-Bit-Version
 - Android 5.x und 6
 - macOS High Sierra 10.13

diff --git a/docs/releasenotes/appcast.rst b/docs/releasenotes/appcast.rst
@@ -4,6 +4,7 @@ Release Notes
 .. toctree::
  :maxdepth: 1
 
+ 1.24.3
  1.24.2
  1.24.1
  1.24.0

diff --git a/docs/releasenotes/support.rst b/docs/releasenotes/support.rst
@@ -14,7 +14,7 @@ Betriebssysteme
 
 - macOS 12.0
 
-- Windows 10
+- Windows 10 (64 Bit) ab Version 1809
 
 - Windows 11
 
@@ -46,13 +46,13 @@ und sollte daher mit allen marktüblichen Browsern verwendet werden können.
 Im Rahmen der Qualitätssicherung werden die folgenden Browserversionen
 getestet.
 
-- Chrome 104
+- Chrome 107
 
-- Firefox 103
+- Firefox 106
 
 - Safari 15.6
 
-- Edge 104
+- Edge 105
 
 
 
@@ -110,9 +110,9 @@ Im mobilen Umfeld ist die Funktionalität jedoch abhängig von der vom
 Anbieter umgesetzten Aktivierung. Daher empfehlen wir einen der
 folgenden Browser zu verwenden.
 
-- Chrome 104 (iOS/Android)
+- Chrome 107 (iOS/Android)
 
-- Firefox 103 (iOS/Android)
+- Firefox 106 (iOS/Android)
 
 - Samsung Internet 18 (Android)
 

diff --git a/docs/releasenotes/versions.rst b/docs/releasenotes/versions.rst
@@ -6,6 +6,7 @@ Versionszweig 1.24
 .. toctree::
  :maxdepth: 1
 
+ 1.24.3
  1.24.2
  1.24.1
  1.24.0

diff --git a/libs/patches/qt-base-0016-Darwin-Replace-deprecated-symbol-kIOMasterPortDefaul.patch b/libs/patches/qt-base-0016-Darwin-Replace-deprecated-symbol-kIOMasterPortDefaul.patch
@@ -0,0 +1,39 @@
+From a9b2c0ec9d8e0454c6489ef90e60846c69c9e158 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <[email protected]>
+Date: Tue, 5 Jul 2022 15:38:33 +0200
+Subject: Darwin: Replace deprecated symbol kIOMasterPortDefault with
+ equivalent
+
+We can't use the replacement kIOMainPortDefault yet, as it's not
+available in operating system versions we still support, but the
+kIOMasterPortDefault documentation explicitly says that passing
+NULL as a port argument indicates "use the default".
+
+As the underlying type of a mach_port_t is potentially either
+a pointer or an unsigned int, we initialize the default to 0.
+
+Pick-to: 6.2 6.3 6.4 5.15
+Change-Id: I288aa94b8f2fbda47fd1cbaf329799db7ab988a0
+Reviewed-by: Alexandru Croitor <[email protected]>
+(cherry picked from commit 337f28c9abb12f28538cfe2f49e5afc460578b32)
+---
+ src/corelib/global/qglobal.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git x/qtbase/src/corelib/global/qglobal.cpp y/qtbase/src/corelib/global/qglobal.cpp
+index ae7efe5454..4724ceaff8 100644
+--- x/qtbase/src/corelib/global/qglobal.cpp
++++ y/qtbase/src/corelib/global/qglobal.cpp
+@@ -3015,7 +3015,8 @@ QByteArray QSysInfo::machineUniqueId()
+ {
+ #if defined(Q_OS_DARWIN) && __has_include(<IOKit/IOKitLib.h>)
+ char uuid[UuidStringLen + 1];
+- io_service_t service = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("IOPlatformExpertDevice"));
++ static const mach_port_t defaultPort = 0; // Effectively kIOMasterPortDefault/kIOMainPortDefault
++ io_service_t service = IOServiceGetMatchingService(defaultPort, IOServiceMatching("IOPlatformExpertDevice"));
+ QCFString stringRef = (CFStringRef)IORegistryEntryCreateCFProperty(service, CFSTR(kIOPlatformUUIDKey), kCFAllocatorDefault, 0);
+ CFStringGetCString(stringRef, uuid, sizeof(uuid), kCFStringEncodingMacRoman);
+ return QByteArray(uuid);
+-- 
+2.38.0
+
diff --git a/libs/patches/qt-base-0017-iOS-Explicitly-link-to-IOKit.patch b/libs/patches/qt-base-0017-iOS-Explicitly-link-to-IOKit.patch
@@ -0,0 +1,39 @@
+From 4554f8d7761e79700c3d07c6ac81fb80d3881a88 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <[email protected]>
+Date: Tue, 5 Jul 2022 15:59:05 +0200
+Subject: iOS: Explicitly link to IOKit
+
+We use it to implement QSysInfo::machineUniqueId()
+
+Pick-to: 6.2 6.3 6.4
+Change-Id: I9303001cbc3e5e6716ee57ce9ae785dba08ba88f
+Reviewed-by: Alexandru Croitor <[email protected]>
+(cherry picked from commit b692d7b268948d9af0a9c0e9e188074e2347eecb)
+---
+ src/corelib/CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git x/qtbase/src/corelib/CMakeLists.txt y/qtbase/src/corelib/CMakeLists.txt
+index 403654d0fc..4296500ac5 100644
+--- x/qtbase/src/corelib/CMakeLists.txt
++++ y/qtbase/src/corelib/CMakeLists.txt
+@@ -530,6 +530,8 @@ qt_internal_extend_target(Core CONDITION APPLE
+ LIBRARIES
+ ${FWCoreFoundation}
+ ${FWFoundation}
++ PUBLIC_LIBRARIES
++ ${FWIOKit}
+ )
+
+ qt_internal_extend_target(Core CONDITION MACOS
+@@ -540,7 +542,6 @@ qt_internal_extend_target(Core CONDITION MACOS
+ ${FWSecurity}
+ PUBLIC_LIBRARIES
+ ${FWDiskArbitration}
+- ${FWIOKit}
+ )
+
+ qt_internal_extend_target(Core CONDITION INTEGRITY
+-- 
+2.38.0
+
diff --git a/resources/jenkins/docker/android/Dockerfile b/resources/jenkins/docker/android/Dockerfile
@@ -22,7 +22,7 @@ RUN wget https://github.com/Kitware/CMake/releases/download/v$CMAKE/cmake-$CMAKE
 
 RUN mkdir -p /tmp/dl && cd /tmp/dl && wget -O sdk.zip https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_CMDLINE_TOOLS}_latest.zip && \
  unzip sdk.zip && \
- yes | /tmp/dl/cmdline-tools/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "cmdline-tools;6.0" "build-tools;30.0.3" "platforms;android-30" "platforms;android-31" "ndk;${ANDROID_NDK_VERSION}" && \
+ yes | /tmp/dl/cmdline-tools/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "cmdline-tools;6.0" "build-tools;30.0.3" "platforms;android-31" "platforms;android-33" "ndk;${ANDROID_NDK_VERSION}" && \
  rm -rf /tmp/dl
 
 USER governikus

diff --git a/resources/json-schemas/supported-providers.json b/resources/json-schemas/supported-providers.json
@@ -82,9 +82,6 @@
  "description": "Complete name of the provider",
  "$ref": "#/definitions/languageString"
  },
- "shortDescription": {
- "$ref": "#/definitions/languageString"
- },
  "longDescription": {
  "$ref": "#/definitions/languageString"
  },

diff --git a/resources/packaging/android/AndroidManifest.xml.apk.in b/resources/packaging/android/AndroidManifest.xml.apk.in
@@ -36,11 +36,9 @@
 
  <application
  android:name="org.qtproject.qt.android.bindings.QtApplication"
- android:allowBackup="true"
+ android:allowBackup="false"
  android:allowNativeHeapPointerTagging="false"
- android:dataExtractionRules="@xml/backup_rules"
  android:extractNativeLibs="true"
- android:fullBackupContent="@xml/backup_rules_legacy"
  android:hardwareAccelerated="true"
  android:icon="@mipmap/npa"
  android:label="@string/app_name"

diff --git a/resources/packaging/android/backup_rules.xml b/resources/packaging/android/backup_rules.xml
diff --git a/resources/packaging/android/backup_rules_legacy.xml b/resources/packaging/android/backup_rules_legacy.xml
diff --git a/resources/packaging/android/lint.aar.xml b/resources/packaging/android/lint.aar.xml
@@ -52,7 +52,6 @@
  -->
  <issue id="UnusedResources">
  <ignore path="**/dist/src/android/java/res/layout/splash.xml" />
- <ignore path="**/backup_rules.xml" />
  <ignore path="**/libs.xml" />
  <ignore path="**/strings.xml" />
  </issue>

diff --git a/resources/packaging/ios/Info.plist.in b/resources/packaging/ios/Info.plist.in
@@ -59,9 +59,11 @@
  <key>CFBundleURLTypes</key>
  <array>
  <dict>
+ <key>CFBundleTypeRole</key>
+ <string>Viewer</string>
  <key>CFBundleURLSchemes</key>
  <array>
- <string>eID</string>
+ <string>eid</string>
  </array>
  <key>CFBundleURLName</key>
  <string>com.governikus.url-scheme.eid</string>

diff --git a/resources/packaging/ios/launchscreen.storyboard b/resources/packaging/ios/launchscreen.storyboard
@@ -16,7 +16,7 @@
  <subviews>
  <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rgD-m7-y4I" userLabel="StatusBar">
  <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
- <color key="backgroundColor" red="0.30196078431372547" green="0.47843137254901957" blue="0.64313725490196072" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <color key="backgroundColor" red="0.086274509803921567" green="0.29019607843137252" blue="0.5490196078431373" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  </view>
  <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="all-Dr-5Kl">
  <rect key="frame" x="93.666666666666671" y="312.33333333333331" width="187.66666666666663" height="187.33333333333331"/>
@@ -26,7 +26,7 @@
  <viewLayoutGuide key="safeArea" id="2Jn-Ml-7zj"/>
  </imageView>
  </subviews>
- <color key="backgroundColor" red="0.86274509803921573" green="0.92156862745098034" blue="0.96470588235294119" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <color key="backgroundColor" red="0.92156862745098034" green="0.95294117647058818" blue="0.99215686274509807" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  <constraints>
  <constraint firstItem="all-Dr-5Kl" firstAttribute="height" relation="lessThanOrEqual" secondItem="Bcu-3y-fUS" secondAttribute="height" multiplier="0.5" id="6YF-3i-nvd"/>
  <constraint firstItem="rgD-m7-y4I" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="FOK-xM-heA"/>

diff --git a/resources/packaging/win/WIX.Texts.de-DE.wxl b/resources/packaging/win/WIX.Texts.de-DE.wxl
@@ -43,7 +43,7 @@
  <String Id="ArpUpdate" Overridable="yes">https://www.ausweisapp.bund.de/de/aa2/download</String>
  <String Id="DowngradeErrorMessage" Overridable="yes">Eine aktuellere Version der [ProductName] ist bereits installiert. Die Installation wird nun beendet.</String>
  <String Id="WindowsServerNotSupported" Overridable="yes">Die [ProductName] unterstützt keine Windows Server.</String>
- <String Id="Windows10Required" Overridable="yes">Ihr Betriebssystem erfüllt leider nicht die Mindestvoraussetzungen für die AusweisApp2. Sie benötigen eine 64-Bit-Version von Windows 10 oder höher.</String>
+ <String Id="Windows10Required" Overridable="yes">Ihr Betriebssystem erfüllt leider nicht die Mindestvoraussetzungen für die AusweisApp2. Sie benötigen eine 64-Bit-Version von Windows 10 Version 1809 oder neuer.</String>
  <String Id="ProgramDescription" Overridable="yes">AusweisApp2, der eID-Client der Governikus KG</String>
  <String Id="CustomInstallDirDlg_Title" Overridable="yes">Installationsoptionen</String>
  <String Id="CustomInstallDirDlg_Description" Overridable="yes"></String>

diff --git a/resources/packaging/win/WIX.Texts.en-US.wxl b/resources/packaging/win/WIX.Texts.en-US.wxl
@@ -3,7 +3,7 @@
  <String Id="LANG" Overridable="yes">1033</String><!-- see http:https://wix.tramontana.co.hu/tutorial/user-interface/do-you-speak-english -->
  <String Id="DowngradeErrorMessage" Overridable="yes">A later version of [ProductName] is already installed. Setup will now exit.</String>
  <String Id="WindowsServerNotSupported" Overridable="yes">[ProductName] does not support Windows Server.</String>
- <String Id="Windows10Required" Overridable="yes">Your operating system does not meet the minimum requirements for AusweisApp2. You need a 64-bit version of Windows 10 or higher.</String>
+ <String Id="Windows10Required" Overridable="yes">Your operating system does not meet the minimum requirements for AusweisApp2. You need a 64-bit version of Windows 10 version 1809 or newer.</String>
  <String Id="ProgramDescription" Overridable="yes">AusweisApp2, the eID-Client of Governikus KG</String>
  <String Id="CustomInstallDirDlg_Title" Overridable="yes">Installation options</String>
  <String Id="CustomInstallDirDlg_Description" Overridable="yes"></String>

diff --git a/resources/packaging/win/WIX.template.in b/resources/packaging/win/WIX.template.in
@@ -42,7 +42,7 @@
 
  <Property Id="WIN10FOUND" Secure="yes">
  <DirectorySearch Id="searchSystem" Path="[SystemFolder]" Depth="0">
- <FileSearch Id="searchFile" Name="advapi32.dll" MinVersion="6.3.10000.0"/>
+  <FileSearch Id="searchFile" Name="advapi32.dll" MinVersion="6.3.10000.0"/>
  </DirectorySearch>
  </Property>
 
@@ -51,6 +51,15 @@
  </Condition>
 
 
+ <Property Id="WIN10RELEASEID">
+ <RegistrySearch Id="searchId" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion" Name="ReleaseId" Type="raw" />
+ </Property>
+
+ <Condition Message="!(loc.Windows10Required)">
+ <![CDATA[Installed OR NOT (WIN10RELEASEID) OR (WIN10RELEASEID >= 1809)]]>
+ </Condition>
+
+
  <WixVariable Id="WixUILicenseRtf" Value="$(var.CPACK_WIX_LICENSE_RTF)"/>
 
  <WixVariable Id="CompanyRootKey" Value="Software\$(var.CPACK_PACKAGE_VENDOR)\$(var.CPACK_PACKAGE_NAME)"/>

diff --git a/resources/qml/Governikus/AuthView/+desktop/EditRights.qml b/resources/qml/Governikus/AuthView/+desktop/EditRights.qml
@@ -29,9 +29,9 @@ SectionPage {
  updateTitleBarActions()
  }
 
- Keys.onReturnPressed: d.onKeyboardConfirmPressed(event)
- Keys.onEnterPressed: d.onKeyboardConfirmPressed(event)
- Keys.onEscapePressed: {
+ Keys.onReturnPressed: event => d.onKeyboardConfirmPressed(event)
+ Keys.onEnterPressed: event => d.onKeyboardConfirmPressed(event)
+ Keys.onEscapePressed: event => {
  if (!detailView) {
  event.accepted = false
  return