Add revision: v1.22.6

Governikus · May 19, 2022 · 6ed0917 · 6ed0917
1 parent 43d236b
commit 6ed0917
Show file tree

Hide file tree

Showing 38 changed files with 401 additions and 157 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -56,7 +56,7 @@ if(UNIX AND NOT IOS)
 	set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13 CACHE STRING "Required macOS version")
 endif()
 
-project(AusweisApp2 VERSION 1.22.5 LANGUAGES ${LANGUAGES})
+project(AusweisApp2 VERSION 1.22.6 LANGUAGES ${LANGUAGES})
 
 # Set TWEAK if not defined in PROJECT_VERSION above to
 # have a valid tweak version without propagating it

diff --git a/LICENSE.officially.txt b/LICENSE.officially.txt
@@ -352,7 +352,7 @@ Die verwendeten Open-Source-Bibliotheken unterliegen den folgenden Nutzungsbedin
 
 OpenSSL
   Lizenz: OpenSSL license & SSLeay license
-  Version: 1.1.1n
+  Version: 1.1.1o
   Adresse: https://www.openssl.org/
 
 Qt

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -320,7 +320,7 @@ Die verwendeten Open-Source-Bibliotheken unterliegen den folgenden Nutzungsbedin
 
 OpenSSL
   Lizenz: OpenSSL license & SSLeay license
-  Version: 1.1.1n
+  Version: 1.1.1o
   Adresse: https://www.openssl.org/
 
 Qt

diff --git a/cmake/Libraries.cmake b/cmake/Libraries.cmake
@@ -116,6 +116,7 @@ elseif(MAC)
 	find_path(PCSC_INCLUDE_DIRS WinSCard.h)
 	find_library(PCSC_LIBRARIES NAMES PCSC WinSCard)
 
+	find_library(OSX_USERNOTIFICATIONS UserNotifications)
 	find_library(OSX_APPKIT AppKit)
 	find_library(IOKIT NAMES IOKit)
 	find_library(OSX_SECURITY Security)

diff --git a/docs/releasenotes/1.22.6.rst b/docs/releasenotes/1.22.6.rst
@@ -0,0 +1,31 @@
+AusweisApp2 1.22.6
+^^^^^^^^^^^^^^^^^^
+
+**Releasedatum:** 19. Mai 2022
+
+
+Anwender
+""""""""
+- Probleme mit der Kartenkommunikation bei der Funktion
+  "Smartphone als Kartenleser" im Komfortmodus wurden
+  behoben.
+
+- Ab macOS 10.14 werden nun die Systembenachrichtigungen
+  verwendet.
+
+- Unter macOS ist das Tray-Icon jetzt standardmäßig
+  deaktiviert. Dies kann in den Einstellungen wieder
+  aktiviert werden.
+
+- Unter iOS war unter bestimmten Umständen ein
+  neuer NFC-Scan nicht möglich. Dies wurde behoben.
+
+- Beim Abbrechen einer Authentisierung kam es unter
+  iOS teilweise zum Absturz. Dies wurde behoben.
+
+- Kleinere Fehlerbehebungen und Optimierungen.
+
+
+Entwickler
+""""""""""
+- Aktualisierung von OpenSSL auf die Version 1.1.1o.
diff --git a/docs/releasenotes/appcast.rst b/docs/releasenotes/appcast.rst
@@ -4,6 +4,7 @@ Release Notes
 .. toctree::
    :maxdepth: 1
 
+   1.22.6
    1.22.5
    1.22.4
    1.22.3

diff --git a/docs/releasenotes/versions.rst b/docs/releasenotes/versions.rst
@@ -6,6 +6,7 @@ Versionszweig 1.22
 .. toctree::
    :maxdepth: 1
 
+   1.22.6
    1.22.5
    1.22.4
    1.22.3

diff --git a/docs/sdk/android.rst b/docs/sdk/android.rst
@@ -78,11 +78,11 @@ App Bundle
 The integrated AusweisApp2 uses native libraries which need to be extracted when
 used in an App Bundle, otherwise the SDK will not work correctly.
 
-Add the following statement to your app's gradle.properties file:
+Add the following statement to your app's build.gradle file:
 
 .. code-block:: groovy
 
-    android.bundle.enableUncompressedNativeLibs=false
+    android { packagingOptions { jniLibs { useLegacyPackaging = true } } }
 
 
 Logging

diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
@@ -96,8 +96,8 @@ endif()
 set(QT 5.15.2)
 set(QT_HASH 3a530d1b243b5dec00bc54937455471aaa3e56849d2593edb8ded07228202240)
 
-set(OPENSSL 1.1.1n)
-set(OPENSSL_HASH 40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a)
+set(OPENSSL 1.1.1o)
+set(OPENSSL_HASH 9384a2b0570dd80358841464677115df785edb941c71211f75076d72fe6b438f)
 
 ################################## Files
 set(QT_FILE qt-everywhere-src-${QT}.tar.xz)

diff --git a/resources/packaging/linux/com.governikus.ausweisapp2.desktop.in b/resources/packaging/linux/com.governikus.ausweisapp2.desktop.in
@@ -9,3 +9,4 @@ Categories=System;Security;
 GenericName=Authentication App
 Keywords=nPA,eID,eAT,Personalausweis,Aufenthaltstitel,Identity,Card
 Name=AusweisApp2
+StartupWMClass=AusweisApp2
diff --git a/resources/packaging/win/WIX.Texts.de-DE.wxl b/resources/packaging/win/WIX.Texts.de-DE.wxl
@@ -38,7 +38,7 @@
 	<String Id="PackageKeywords" Overridable="yes">Ausweis, Authentisierung</String>
 	<String Id="PackageComments" Overridable="yes">Installationspaket für die AusweisApp2</String>
 	<String Id="ArpComment" Overridable="yes">Offizieller eID-Client des Bundes</String>
-	<String Id="ArpHelp" Overridable="yes">https://www.ausweisapp.bund.de/fragen-und-antworten/support</String>
+	<String Id="ArpHelp" Overridable="yes">https://www.ausweisapp.bund.de/hilfe-und-support</String>
 	<String Id="ArpAbout" Overridable="yes">https://www.ausweisapp.bund.de</String>
 	<String Id="ArpUpdate" Overridable="yes">https://www.ausweisapp.bund.de/download</String>
 	<String Id="DowngradeErrorMessage" Overridable="yes">Eine aktuellere Version der [ProductName] ist bereits installiert. Die Installation wird nun beendet.</String>

diff --git a/resources/qml/+desktop/main.qml b/resources/qml/+desktop/main.qml
@@ -69,6 +69,11 @@ ApplicationWindow {
 			return
 		}
 
+		if (Qt.platform.os === "osx" && !SettingsModel.autoStartApp) {
+			close.accepted = true
+			return
+		}
+
 		if (SettingsModel.remindUserToClose) {
 			closeWarning.open()
 			close.accepted = false
@@ -218,6 +223,8 @@ ApplicationWindow {
 			d.showMainWindow()
 			d.closeOpenDialogs()
 			switch (pModule) {
+				case UiModule.CURRENT:
+					break
 				case UiModule.IDENTIFY:
 					if (ApplicationModel.currentWorkflow === "") {
 						d.activeView = UiModule.SELF_AUTHENTICATION
@@ -231,11 +238,6 @@ ApplicationWindow {
 						d.activeView = UiModule.PINMANAGEMENT
 					}
 					break
-				case UiModule.CURRENT:
-					if (SettingsModel.startupModule == UiModule.TUTORIAL) {
-						d.activeView = UiModule.TUTORIAL
-					}
-					break
 				case UiModule.UPDATEINFORMATION:
 					if (ApplicationModel.currentWorkflow === "" && d.activeView === UiModule.DEFAULT) {
 						d.activeView = UiModule.UPDATEINFORMATION

diff --git a/resources/qml/Governikus/Global/GCheckBox.qml b/resources/qml/Governikus/Global/GCheckBox.qml
@@ -14,6 +14,7 @@ CheckBox {
 	id: control
 
 	property alias textStyle: description.textStyle
+	property alias maximumLineCount: description.maximumLineCount
 
 	padding: 0
 

diff --git a/resources/qml/Governikus/SettingsView/+desktop/ConnectSacView.qml b/resources/qml/Governikus/SettingsView/+desktop/ConnectSacView.qml
@@ -57,7 +57,7 @@ SectionPage {
 		visible: d.view !== ConnectSacView.SubView.PairingInfo || !d.externalMoreInformation
 		//: LABEL DESKTOP
 		text: qsTr("Pairing")
-		helpTopic: "readerDeviceTab"
+		helpTopic: "settingsRemoteReader"
 		rootEnabled: false
 		customSubAction: CancelAction {
 			visible: true

diff --git a/resources/qml/Governikus/SettingsView/+desktop/GeneralSettings.qml b/resources/qml/Governikus/SettingsView/+desktop/GeneralSettings.qml
@@ -11,6 +11,7 @@ import Governikus.View 1.0
 import Governikus.Type.SettingsModel 1.0
 
 ColumnLayout {
+	readonly property string helpTopic: "settingsGeneral"
 
 	spacing: Constants.component_spacing
 
@@ -66,10 +67,16 @@ ColumnLayout {
 	}
 
 	ToggleableOption {
+		Layout.fillWidth: true
+
 		activeFocusOnTab: true
 
-		//: LABEL DESKTOP
-		text: qsTr("Auto start AusweisApp2 after boot")
+		text: Qt.platform.os === "osx"
+			  //: LABEL MACOS Text for auto-start option
+			  ? qsTr("Auto-start %1 after boot and add to menu bar").arg(Qt.application.name)
+			  //: LABEL WINDOWS Text for auto-start option
+			  : qsTr("Auto-start %1 after boot").arg(Qt.application.name)
+		maximumLineCount: 2
 		checked: SettingsModel.autoStartApp
 		enabled: !SettingsModel.autoStartSetByAdmin && SettingsModel.autoStartAvailable
 		onCheckedChanged: SettingsModel.autoStartApp = checked

diff --git a/resources/qml/Governikus/TutorialView/+desktop/SetupAssistantView.qml b/resources/qml/Governikus/TutorialView/+desktop/SetupAssistantView.qml
@@ -22,6 +22,7 @@ SectionPage {
 
 	enum SubViews {
 		Welcome = 0,
+		AutoStartSetting,
 		HistorySetting,
 		CardReaderInfo,
 		CardReader,
@@ -69,7 +70,44 @@ SectionPage {
 		agreeText: ""
 		agreeButton.iconSource: "qrc:///images/desktop/material_arrow_forward.svg"
 
-		onAgree: d.activeView = SetupAssistantView.SubViews.HistorySetting
+		onAgree: d.activeView = SettingsModel.autoStartAvailable ? SetupAssistantView.SubViews.AutoStartSetting : SetupAssistantView.SubViews.HistorySetting
+	}
+
+	DecisionView {
+		visible: d.activeView === SetupAssistantView.SubViews.AutoStartSetting
+
+		Accessible.name: qsTr("Auto-start setup step")
+
+		mainIconSource: "qrc:///images/status_info.svg"
+		//: INFO DESKTOP Question if the App shall be started automatically after boot
+		questionText: qsTr("Do you want to automatically start the %1 after boot?").arg(Qt.application.name)
+		//: INFO DESKTOP Information text why autostart of the App is advisable
+		questionSubText: {
+			let subText = qsTr("In order to successfully use the online identification function, %1 has to be running. It is therefore advisable to activate the auto-start after system startup.").arg(Qt.application.name)
+			if (Qt.platform.os === "osx") {
+				//: INFO MACOS Additional information that macOS auto-start add a symbol to the menu bar
+				subText += " " + qsTr("The launch will add an icon to the menu bar.")
+			}
+			return subText
+		}
+
+		titleBarAction: TitleBarAction {
+			//: LABEL DESKTOP
+			text: qsTr("Auto-start Setting")
+			rootEnabled: d.allowNavigation
+			showSettings: false
+			helpTopic: "setupAssistant"
+		}
+
+		onAgree: {
+			SettingsModel.autoStartApp = true
+			d.activeView = SetupAssistantView.SubViews.HistorySetting
+		}
+
+		onDisagree: {
+			SettingsModel.autoStartApp = false
+			d.activeView = SetupAssistantView.SubViews.HistorySetting
+		}
 	}
 
 	DecisionView {

diff --git a/resources/translations/ausweisapp2_de.ts b/resources/translations/ausweisapp2_de.ts
@@ -1156,11 +1156,6 @@ LABEL ANDROID IOS Button to start a change of the Transport PIN.</extracomment>
         <extracomment>LABEL DESKTOP</extracomment>
         <translation>Verhalten</translation>
     </message>
-    <message>
-        <source>Auto start AusweisApp2 after boot</source>
-        <extracomment>LABEL DESKTOP</extracomment>
-        <translation>AusweisApp2 automatisch beim Hochfahren starten</translation>
-    </message>
     <message>
         <source>Close after authentication</source>
         <extracomment>LABEL DESKTOP</extracomment>
@@ -1186,6 +1181,16 @@ LABEL ANDROID IOS Button to start a change of the Transport PIN.</extracomment>
         <extracomment>LABEL DESKTOP</extracomment>
         <translation>Benutze den bei der Installation angegebenen Proxy (%1).</translation>
     </message>
+    <message>
+        <source>Auto-start %1 after boot and add to menu bar</source>
+        <extracomment>LABEL MACOS Text for auto-start option</extracomment>
+        <translation>%1 automatisch beim Hochfahren starten und als Eintrag der Menüleiste hinzufügen</translation>
+    </message>
+    <message>
+        <source>Auto-start %1 after boot</source>
+        <extracomment>LABEL WINDOWS Text for auto-start option</extracomment>
+        <translation>%1 automatisch beim Hochfahren starten</translation>
+    </message>
 </context>
 <context>
     <name>GeneralWorkflow</name>
@@ -3746,6 +3751,30 @@ LABEL ALL_PLATFORMS</extracomment>
         <extracomment>LABEL DESKTOP</extracomment>
         <translation>Kartenleser</translation>
     </message>
+    <message>
+        <source>Do you want to automatically start the %1 after boot?</source>
+        <extracomment>INFO DESKTOP Question if the App shall be started automatically after boot</extracomment>
+        <translation>Wollen Sie die %1 automatisch nach dem Hochfahren starten?</translation>
+    </message>
+    <message>
+        <source>Auto-start Setting</source>
+        <extracomment>LABEL DESKTOP</extracomment>
+        <translation>Autostart-Einstellung</translation>
+    </message>
+    <message>
+        <source>Auto-start setup step</source>
+        <translation>Einrichtungsschritt zum Autostart</translation>
+    </message>
+    <message>
+        <source>In order to successfully use the online identification function, %1 has to be running. It is therefore advisable to activate the auto-start after system startup.</source>
+        <extracomment>INFO DESKTOP Information text why autostart of the App is advisable</extracomment>
+        <translation>Um die Online-Ausweisfunktion erfolgreich nutzen zu können, muss die %1 gestartet sein. Daher ist es ratsam, dies beim Systemstart zuzulassen.</translation>
+    </message>
+    <message>
+        <source>The launch will add an icon to the menu bar.</source>
+        <extracomment>INFO MACOS Additional information that macOS auto-start add a symbol to the menu bar</extracomment>
+        <translation>Der Start erfolgt hierbei als Eintrag in der Menüleiste.</translation>
+    </message>
 </context>
 <context>
     <name>ShareButton</name>

diff --git a/resources/updatable-files/reader/img_Cherry_secure_board.png b/resources/updatable-files/reader/img_Cherry_secure_board.png
diff --git a/resources/updatable-files/reader/img_Cherry_secure_board_mit_ausweis.png b/resources/updatable-files/reader/img_Cherry_secure_board_mit_ausweis.png
diff --git a/resources/updatable-files/supported-providers.json b/resources/updatable-files/supported-providers.json
@@ -681,10 +681,6 @@
 			}
 		},
 		{
-			"exclude": [
-				"ios"
-			],
-			"eidSupport": false,
 			"shortName": {
 				"": "Bürgerservice-Portal Wiesbaden"
 			},
@@ -1399,6 +1395,26 @@
 			"category": "citizen",
 			"subjectUrlInfo": "Using service from Servicekonto Nordrhein-Westfalen (https://servicekonto.nrw)."
 		},
+		{
+			"shortName": {
+				"": "Online Services der Stadt Bad Oeynhausen"
+			},
+			"longName": {
+				"": "Online Services der Stadt Bad Oeynhausen"
+			},
+			"longDescription": {
+				"": "Wir stellen Online-Dienstleistungen aus Bad Oeynhausen, dem Kreis Minden-Lübbecke, dem Land NRW und den Bundesbehörden zur Verfügung.<br/><br/>Sie können unseren Service ohne Anmeldung oder mit einer Anmeldung über das Servicekonto.NRW nutzen. Für die Nutzung von ePayment ist eine Anmeldung mit dem Servicekonto Voraussetzung."
+			},
+			"address": "https://portal.kommunale.it/bad-oeynhausen/login",
+			"homepage": "https://portal.kommunale.it/bad-oeynhausen/services",
+			"phone": "+49 5731 14 0",
+			"email": "egov@badoeynhausen.de",
+			"postalAddress": "Stadt Bad Oeynhausen<br/>Der Bürgermeister<br/>Ostkorso 8<br/>32545 Bad Oeynhausen",
+			"image": "StadtBadOeynhausen_image.jpg",
+			"icon": "StadtBadOeynhausen_icon.png",
+			"category": "citizen",
+			"subjectUrlInfo": "Using service from Servicekonto Nordrhein-Westfalen (https://servicekonto.nrw)."
+		},
 		{
 			"shortName": {
 				"": "Online-Service der Stadt Bonn"