Add revision: v1.22.2

Governikus · Mar 31, 2021 · c84f7fd · c84f7fd
1 parent d9ab5b1
commit c84f7fd
Show file tree

Hide file tree

Showing 31 changed files with 210 additions and 98 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -52,7 +52,7 @@ if(UNIX AND NOT IOS)
 	set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13 CACHE STRING "Required macOS version")
 endif()
 
-project(AusweisApp2 VERSION 1.22.1 LANGUAGES ${LANGUAGES})
+project(AusweisApp2 VERSION 1.22.2 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
@@ -339,7 +339,7 @@ Die verwendeten Open-Source-Bibliotheken unterliegen den folgenden Nutzungsbedin
 
 OpenSSL
   Lizenz: OpenSSL license & SSLeay license
-  Version: 1.1.1j
+  Version: 1.1.1k
   Adresse: https://www.openssl.org/
 
 Qt

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

diff --git a/cmake/cmd.cmake b/cmake/cmd.cmake
@@ -67,6 +67,11 @@ function(DEPLOY_NEXUS)
 		message(FATAL_ERROR "Please provide environment variable NEXUS_USERNAME and NEXUS_PSW")
 	endif()
 
+	set(GNUPG_KEY 699BF3055B0A49224EFDE7C72D7479A531451088)
+	if(DEFINED ENV${GNUPG_KEY})
+		set(GNUPG_KEY ENV${GNUPG_KEY})
+	endif()
+
 	find_program(MVN_BIN mvn)
 	if(NOT MVN_BIN)
 		message(FATAL_ERROR "Cannot find mvn")
@@ -79,18 +84,50 @@ function(DEPLOY_NEXUS)
 				</server></servers></settings>")
 	file(WRITE settings.xml "${SETTINGS_XML}")
 
-	file(GLOB FILE_AAR RELATIVE ${CMAKE_BINARY_DIR} *.aar)
-	file(GLOB FILE_POM RELATIVE ${CMAKE_BINARY_DIR} *.pom)
-	file(GLOB FILE_JAR RELATIVE ${CMAKE_BINARY_DIR} *-sources.jar)
+	function(get_file _suffix _out_var)
+		file(GLOB file RELATIVE ${CMAKE_BINARY_DIR} ${_suffix})
+
+		list(LENGTH file list_length)
+		if(list_length GREATER 1)
+			message(FATAL_ERROR "Found more than one entry: ${file}")
+		elseif(asc_length EQUAL 0)
+			message(FATAL_ERROR "File ${file} not found. Maybe signature is missing?: gpg -a -u ${GNUPG_KEY} --detach-sig")
+		endif()
+
+		set(${_out_var} ${file} PARENT_SCOPE)
+	endfunction()
+
+	get_file("*.aar" FILE_AAR)
+	get_file("*.pom" FILE_POM)
+	get_file("*-sources.jar" FILE_JAR)
 
 	file(STRINGS "${FILE_POM}" is_snapshot REGEX "<version>.+-SNAPSHOT</version>")
 	if(is_snapshot)
 		set(NEXUS_URL https://repo.govkg.de/repository/ausweisapp-snapshots)
 	else()
-		set(NEXUS_URL https://repo.govkg.de/repository/ausweisapp-releases)
+		if(PUBLIC)
+			set(NEXUS_URL https://s01.oss.sonatype.org/service/local/staging/deploy/maven2)
+		else()
+			set(NEXUS_URL https://repo.govkg.de/repository/ausweisapp-releases)
+		endif()
 	endif()
 
 	execute_process(COMMAND ${MVN_BIN} deploy:deploy-file -Dfile=${FILE_AAR} -DpomFile=${FILE_POM} -Dsources=${FILE_JAR} -DrepositoryId=nexus -Durl=${NEXUS_URL} --settings settings.xml)
+
+	if(PUBLIC)
+		get_file("*.aar.asc" FILE_AAR_ASC)
+		get_file("*.pom.asc" FILE_POM_ASC)
+		get_file("*-sources.jar.asc" FILE_SOURCES_ASC)
+
+		function(mvn_upload _file _packaging _classifier)
+			execute_process(COMMAND ${MVN_BIN} deploy:deploy-file -Dfile=${_file} -Dpackaging=${_packaging} -Dclassifier=${_classifier} -DpomFile=${FILE_POM} -DrepositoryId=nexus -Durl=${NEXUS_URL} --settings settings.xml)
+		endfunction()
+
+		mvn_upload("${FILE_AAR_ASC}" "aar.asc" "")
+		mvn_upload("${FILE_POM_ASC}" "pom.asc" "")
+		mvn_upload("${FILE_SOURCES_ASC}" "jar.asc" "sources")
+	endif()
+
 	file(REMOVE settings.xml)
 endfunction()
 

diff --git a/docs/releasenotes/1.22.2.rst b/docs/releasenotes/1.22.2.rst
@@ -0,0 +1,29 @@
+AusweisApp2 1.22.2
+^^^^^^^^^^^^^^^^^^
+
+**Releasedatum:** 31. März 2021
+
+
+Anwender
+""""""""
+- Der cyberJack Basisleser funktioniert nun auch wieder
+  unter Windows.
+
+- Der automatische Start des Einrichtungsassistenten
+  beim Erststart der AusweisApp2 auf Desktop-Systemen
+  funktioniert nun wieder.
+
+- Ein Fehler am Ende der Selbstauskunft, der auch zu einem
+  Absturz führen konnte, wurde behoben.
+
+- Einige Abstürze wurden behoben.
+
+
+Entwickler
+""""""""""
+- Das Android SDK wird nun auch auf Maven Central
+  zur Verfügung gestellt, da das JCenter abgekündigt wurde.
+
+- Unterstützung von Berechtigungszertifikaten mit PIN-Management.
+
+- Aktualisierung von OpenSSL auf die Version 1.1.1k.
diff --git a/docs/releasenotes/appcast.rst b/docs/releasenotes/appcast.rst
@@ -4,6 +4,7 @@ Release Notes
 .. toctree::
    :maxdepth: 1
 
+   1.22.2
    1.22.1
    1.22.0
    announce

diff --git a/docs/releasenotes/support.rst b/docs/releasenotes/support.rst
@@ -50,15 +50,15 @@ und sollte daher mit allen marktüblichen Browsern verwendet werden können.
 Im Rahmen der Qualitätssicherung werden die folgenden Browserversionen
 getestet.
 
-- Firefox 86
+- Firefox 87
 
-- Chrome 88
+- Chrome 89
 
 - Internet Explorer 11
 
 - Safari 14.0.3
 
-- Edge 88
+- Edge 89
 
 
 
@@ -116,9 +116,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 88 (iOS/Android)
+- Chrome 89 (iOS/Android)
 
-- Firefox 86 (iOS/Android)
+- Firefox 87 (iOS/Android)
 
 - Safari 14.0.3 (iOS)
 

diff --git a/docs/releasenotes/versions.rst b/docs/releasenotes/versions.rst
@@ -6,6 +6,7 @@ Versionszweig 1.22
 .. toctree::
    :maxdepth: 1
 
+   1.22.2
    1.22.1
    1.22.0
 

diff --git a/docs/sdk/android.rst b/docs/sdk/android.rst
@@ -17,7 +17,7 @@ has manually installed the AusweisApp2 like any other app to connect to the
 external variant.
 
 .. important::
-   The integrated variant is available in jcenter for free.
+   The integrated variant is available in maven central for free.
    If you need enterprise support feel free to contact us.
 
 .. important::
@@ -36,13 +36,13 @@ Integrated
 The integrated SDK is distributed as an AAR package that contains
 native **arm64-v8a** libraries only.
 The AAR package is available in the default repository of Android.
-The following listing shows the required **jcenter** in **build.gradle**.
+The following listing shows the required **mavenCentral** in **build.gradle**.
 
 .. code-block:: groovy
 
   buildscript {
       repositories {
-          jcenter()
+          mavenCentral()
       }
   }
 
@@ -59,6 +59,10 @@ It is recommended to always use the latest version (|version|) of AusweisApp2.
 
 
 
+.. note::
+  All artifacts are signed with the following key (available on all public
+  key servers): 0x699BF3055B0A49224EFDE7C72D7479A531451088
+
 .. seealso::
   The AAR package provides an **AndroidManifest.xml** to register required
   permissions and the background service. If your own AndroidManifest has

diff --git a/docs/sdk/commands.rst b/docs/sdk/commands.rst
@@ -148,7 +148,7 @@ if needed.
     - **sessionSucceeded**: Shown if communication was stopped successfully.
 
     - **sessionInProgress**: Shown if communication is in progress. This message
-                             will be appended with current percentage level.
+      will be appended with current percentage level.
 
 .. code-block:: json
 
@@ -209,7 +209,7 @@ This dialog will be stopped by default (true) after an :ref:`enter_pin`, :ref:`e
     - **sessionSucceeded**: Shown if communication was stopped successfully.
 
     - **sessionInProgress**: Shown if communication is in progress. This message
-                             will be appended with current percentage level.
+      will be appended with current percentage level.
 
 .. code-block:: json
 

diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
@@ -92,8 +92,8 @@ endif()
 set(QT 5.15.2)
 set(QT_HASH 3a530d1b243b5dec00bc54937455471aaa3e56849d2593edb8ded07228202240)
 
-set(OPENSSL 1.1.1j)
-set(OPENSSL_HASH aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf)
+set(OPENSSL 1.1.1k)
+set(OPENSSL_HASH 892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5)
 
 ################################## Files
 set(QT_FILE qt-everywhere-src-${QT}.tar.xz)

diff --git a/resources/packaging/android/pom.xml.in b/resources/packaging/android/pom.xml.in
@@ -6,11 +6,25 @@
   <version>@PROJECT_VERSION@@POM_SNAPSHOT@</version>
   <packaging>aar</packaging>
   <name>Governikus AusweisApp2</name>
+  <description>The AusweisApp2 is a software, that you can use to identify yourself online with your electronic residence permit or your eID card.</description>
   <url>https://github.com/Governikus/AusweisApp2/</url>
   <licenses>
     <license>
       <name>EUPL-v1.2</name>
       <url>https://eupl.eu/1.2/en/</url>
     </license>
   </licenses>
+
+  <developers>
+    <developer>
+      <email>support@ausweisapp.de</email>
+      <organization>Governikus</organization>
+      <organizationUrl>https://www.governikus.de/</organizationUrl>
+      <timezone>Europe/Berlin</timezone>
+    </developer>
+  </developers>
+
+  <scm>
+    <url>https://github.com/Governikus/AusweisApp2</url>
+  </scm>
 </project>
diff --git a/resources/qml/+desktop/main.qml b/resources/qml/+desktop/main.qml
@@ -235,7 +235,7 @@ ApplicationWindow {
 					}
 					break
 				case UiModule.CURRENT:
-					if (SettingsModel.startupModule === UiModule.TUTORIAL) {
+					if (SettingsModel.startupModule == UiModule.TUTORIAL) {
 						d.activeView = UiModule.TUTORIAL
 					}
 					break

diff --git a/resources/qml/+mobile/main.qml b/resources/qml/+mobile/main.qml
@@ -52,7 +52,7 @@ ApplicationWindow {
 		close.accepted = false
 
 		if (contentArea.visibleItem) {
-			if (contentArea.activeModule === UiModule.DEFAULT || SettingsModel.startupModule === UiModule.TUTORIAL) {
+			if (contentArea.activeModule === UiModule.DEFAULT || SettingsModel.startupModule == UiModule.TUTORIAL) {
 				var currentTime = new Date().getTime();
 				if (currentTime - d.lastCloseInvocation < 1000) {
 					plugin.fireQuitApplicationRequest()

diff --git a/resources/qml/Governikus/UpdateView/+desktop/UpdateView.qml b/resources/qml/Governikus/UpdateView/+desktop/UpdateView.qml
@@ -181,9 +181,9 @@ SectionPage {
 		//: INFO DESKTOP_QML Header of the popup that is shown when the requested update is not compatible with the OS.
 		title: qsTr("Warning - Your operating system is no longer supported")
 		//: INFO DESKTOP_QML Text of the popup that is shown when the requested update is not compatible with the OS.
-		text: qsTr("Your operating system is no longer officially supported with version %1 of the %2.").arg(root.update.version).arg(Qt.application.name)
+		text: qsTr("Troubleshooting and user support for the %1 is no longer available for your current operating system. Version %2 has not been tested with your current operating system, use is at your own risk.").arg(Qt.application.name).arg(root.update.version)
 		//: LABEL DESKTOP_QML
-		okButtonText: qsTr("Start anyway")
+		okButtonText: qsTr("Update anyway")
 
 		onConfirmed: {
 			load()

diff --git a/resources/translations/ausweisapp2_de.ts b/resources/translations/ausweisapp2_de.ts
@@ -4764,14 +4764,14 @@ LABEL ALL_PLATFORMS</extracomment>
         <translation>Warnung - Ihr Betriebssystem wird nicht mehr unterstützt</translation>
     </message>
     <message>
-        <source>Your operating system is no longer officially supported with version %1 of the %2.</source>
+        <source>Troubleshooting and user support for the %1 is no longer available for your current operating system. Version %2 has not been tested with your current operating system, use is at your own risk.</source>
         <extracomment>INFO DESKTOP_QML Text of the popup that is shown when the requested update is not compatible with the OS.</extracomment>
-        <translation>Die offizielle Unterstützung für Ihr Betriebssystem ist mit der Version %1 der %2 nicht mehr gegeben.</translation>
+        <translation>Für das verwendete Betriebssystem ist keine Fehlerbehebung und kein Nutzersupport für die %1 mehr erhältlich. Die Version %2 wurde mit dem verwendeten Betriebssystem nicht getestet, eine Nutzung erfolgt auf eigene Gefahr.</translation>
     </message>
     <message>
-        <source>Start anyway</source>
+        <source>Update anyway</source>
         <extracomment>LABEL DESKTOP_QML</extracomment>
-        <translation>Trotzdem starten</translation>
+        <translation>Trotzdem updaten</translation>
     </message>
     <message>
         <source>Warning - Update failed</source>
@@ -4942,11 +4942,6 @@ LABEL ALL_PLATFORMS</extracomment>
 </context>
 <context>
     <name>governikus::AccessRoleAndRightsUtil</name>
-    <message>
-        <source>WRITE_DG21</source>
-        <extracomment>LABEL ALL_PLATFORMS</extracomment>
-        <translation>WRITE_DG21</translation>
-    </message>
     <message>
         <source>Optional data</source>
         <extracomment>LABEL ALL_PLATFORMS</extracomment>
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ Release Notes @@
     .. toctree::
        :maxdepth: 1
+.22.2
 .22.1
 .22.0
        announce
@@ Expand Down @@