diff -Nru ausweisapp2-1.22.3/cmake/android.toolchain.cmake ausweisapp2-1.22.4/cmake/android.toolchain.cmake
--- ausweisapp2-1.22.3/cmake/android.toolchain.cmake	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/cmake/android.toolchain.cmake	2022-02-16 13:07:30.000000000 +0000
@@ -52,7 +52,7 @@
 endif()
 
 READ_REVISION(ANDROID_NDK_REVISION ".*Revision = ([0-9|\\.]+)" "${CMAKE_ANDROID_NDK}/source.properties")
-READ_REVISION(ANDROID_SDK_REVISION ".*Revision=([0-9|\\.]+)" "${ANDROID_SDK}/tools/source.properties;${ANDROID_SDK}/cmdline-tools/latest/source.properties")
+READ_REVISION(ANDROID_SDK_REVISION ".*Revision=([0-9|\\.]+)" "${ANDROID_SDK}/cmdline-tools/latest/source.properties;${ANDROID_SDK}/tools/source.properties")
 
 set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION clang)
 set(CMAKE_SYSTEM_NAME Android)
diff -Nru ausweisapp2-1.22.3/cmake/CompilerFlags.cmake ausweisapp2-1.22.4/cmake/CompilerFlags.cmake
--- ausweisapp2-1.22.3/cmake/CompilerFlags.cmake	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/cmake/CompilerFlags.cmake	2022-02-16 13:07:30.000000000 +0000
@@ -82,6 +82,10 @@
 		ADD_FLAG(-Wl,--dynamicbase VAR CMAKE_EXE_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS USE_SAME_FOR_LINKER)
 		ADD_FLAG(-Wl,--nxcompat VAR CMAKE_EXE_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS USE_SAME_FOR_LINKER)
 		ADD_FLAG(-Wl,--high-entropy-va VAR CMAKE_EXE_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS USE_SAME_FOR_LINKER)
+	else()
+		ADD_FLAG(-fstack-protector-strong -fstack-protector)
+		ADD_FLAG(-fcf-protection)
+		ADD_FLAG(-fstack-clash-protection)
 	endif()
 
 	if(NOT CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")
@@ -89,9 +93,6 @@
 	endif()
 
 	ADD_FLAG(-fno-exceptions)
-	ADD_FLAG(-fstack-protector-strong -fstack-protector)
-	ADD_FLAG(-fcf-protection)
-	ADD_FLAG(-fstack-clash-protection)
 
 	ADD_FLAG(-Wold-style-cast)
 	ADD_FLAG(-Wcast-align=strict -Wcast-align)
diff -Nru ausweisapp2-1.22.3/cmake/Helper.cmake ausweisapp2-1.22.4/cmake/Helper.cmake
--- ausweisapp2-1.22.3/cmake/Helper.cmake	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/cmake/Helper.cmake	2022-02-16 13:07:30.000000000 +0000
@@ -71,7 +71,11 @@
 				elseif(_PARAM_NOQUOTES)
 					set(${var} ${${var}} ${flag} PARENT_SCOPE)
 				else()
-					set(${var} "${${var}} ${flag}" PARENT_SCOPE)
+					if (${var})
+						set(${var} "${${var}} ${flag}" PARENT_SCOPE)
+					else()
+						set(${var} "${flag}" PARENT_SCOPE)
+					endif()
 				endif()
 			endforeach()
 
diff -Nru ausweisapp2-1.22.3/CMakeLists.txt ausweisapp2-1.22.4/CMakeLists.txt
--- ausweisapp2-1.22.3/CMakeLists.txt	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/CMakeLists.txt	2022-02-16 13:07:30.000000000 +0000
@@ -56,7 +56,7 @@
 	set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13 CACHE STRING "Required macOS version")
 endif()
 
-project(AusweisApp2 VERSION 1.22.3 LANGUAGES ${LANGUAGES})
+project(AusweisApp2 VERSION 1.22.4 LANGUAGES ${LANGUAGES})
 
 # Set TWEAK if not defined in PROJECT_VERSION above to
 # have a valid tweak version without propagating it
diff -Nru ausweisapp2-1.22.3/debian/changelog ausweisapp2-1.22.4/debian/changelog
--- ausweisapp2-1.22.3/debian/changelog	2022-01-20 09:14:21.000000000 +0000
+++ ausweisapp2-1.22.4/debian/changelog	2022-02-18 06:10:36.000000000 +0000
@@ -1,3 +1,9 @@
+ausweisapp2 (1.22.4-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>  Fri, 18 Feb 2022 07:10:36 +0100
+
 ausweisapp2 (1.22.3-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru ausweisapp2-1.22.3/docs/releasenotes/1.22.4.rst ausweisapp2-1.22.4/docs/releasenotes/1.22.4.rst
--- ausweisapp2-1.22.3/docs/releasenotes/1.22.4.rst	1970-01-01 00:00:00.000000000 +0000
+++ ausweisapp2-1.22.4/docs/releasenotes/1.22.4.rst	2022-02-16 13:07:30.000000000 +0000
@@ -0,0 +1,33 @@
+AusweisApp2 1.22.4
+^^^^^^^^^^^^^^^^^^
+
+**Releasedatum:** 16. Februar 2022
+
+
+Anwender
+""""""""
+- Ein seltener Absturz beim Start unter Windows wurde behoben.
+
+- Die Erinnerung zum Ändern der Transport-PIN wird nun beim
+  PIN-Rücksetzdienst bzw. Vor-Ort-Auslesen nicht mehr angezeigt.
+
+- Die Funktion "Melden Sie einen Fehler" wurde für Android 12
+  korrigiert.
+
+- Es wurde ein Problem behoben, bei dem der NFC-Dialog von iOS
+  länger als notwendig angezeigt wurde.
+
+- Es war unter bestimmten Voraussetzungen möglich, dass
+  ein Workflow nicht gestartet werden konnte, da ein
+  vorheriger Workflow nicht beendet wurde.
+
+- Kleinere Fehlerbehebungen und Optimierungen.
+
+
+Entwickler
+""""""""""
+- Wenn die AusweisApp2 nur als SDK unter Windows gestartet wurde,
+  wurde trotzdem der Pfad des AutoStart-Eintrags in der Registry
+  umgeschrieben. Dies wurde behoben.
+
+- Die Bibliotheken können nun mit MSVC 2022 gebaut werden.
diff -Nru ausweisapp2-1.22.3/docs/releasenotes/appcast.rst ausweisapp2-1.22.4/docs/releasenotes/appcast.rst
--- ausweisapp2-1.22.3/docs/releasenotes/appcast.rst	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/docs/releasenotes/appcast.rst	2022-02-16 13:07:30.000000000 +0000
@@ -4,6 +4,7 @@
 .. toctree::
    :maxdepth: 1
 
+   1.22.4
    1.22.3
    1.22.2
    1.22.1
diff -Nru ausweisapp2-1.22.3/docs/releasenotes/issues.rst ausweisapp2-1.22.4/docs/releasenotes/issues.rst
--- ausweisapp2-1.22.3/docs/releasenotes/issues.rst	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/docs/releasenotes/issues.rst	2022-02-16 13:07:30.000000000 +0000
@@ -57,6 +57,13 @@
   einer Version der AusweisApp2 älter als Version 1.22.0 auf eine aktuelle
   Version nicht automatisch übernommen.
 
+- Vereinzelt kann es bei Problemen mit dem Grafikkartentreiber, insbesondere
+  bei der Verwendung einer virtuellen Maschine, zu Darstellungsfehlern in
+  der Anwendung kommen. Unter Umständen wird kein Fensterinhalt dargestellt.
+  Dies kann durch das Setzen einer Umgebungsvariablen umgangen werden.
+  Hierfür muss QT_QUICK_BACKEND=software gesetzt und die AusweisApp2
+  neugestartet werden.
+
 Android / iOS
 """""""""""""
 
diff -Nru ausweisapp2-1.22.3/docs/releasenotes/support.rst ausweisapp2-1.22.4/docs/releasenotes/support.rst
--- ausweisapp2-1.22.3/docs/releasenotes/support.rst	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/docs/releasenotes/support.rst	2022-02-16 13:07:30.000000000 +0000
@@ -52,9 +52,9 @@
 Im Rahmen der Qualitätssicherung werden die folgenden Browserversionen
 getestet.
 
-- Chrome 97
+- Chrome 98
 
-- Firefox 96
+- Firefox 97
 
 - Internet Explorer 11
 
@@ -118,9 +118,9 @@
 Anbieter umgesetzten Aktivierung. Daher empfehlen wir einen der
 folgenden Browser zu verwenden.
 
-- Chrome 97 (iOS/Android)
+- Chrome 98 (iOS/Android)
 
-- Firefox 96 (iOS/Android)
+- Firefox 97 (iOS/Android)
 
 - Safari 15.2 (iOS)
 
diff -Nru ausweisapp2-1.22.3/docs/releasenotes/versions.rst ausweisapp2-1.22.4/docs/releasenotes/versions.rst
--- ausweisapp2-1.22.3/docs/releasenotes/versions.rst	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/docs/releasenotes/versions.rst	2022-02-16 13:07:30.000000000 +0000
@@ -6,6 +6,7 @@
 .. toctree::
    :maxdepth: 1
 
+   1.22.4
    1.22.3
    1.22.2
    1.22.1
diff -Nru ausweisapp2-1.22.3/libs/CMakeLists.txt ausweisapp2-1.22.4/libs/CMakeLists.txt
--- ausweisapp2-1.22.3/libs/CMakeLists.txt	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/libs/CMakeLists.txt	2022-02-16 13:07:30.000000000 +0000
@@ -145,12 +145,12 @@
 	ADD_FLAG(-Os NOQUOTES VAR OPENSSL_COMPILER_FLAGS)
 endif()
 
-ADD_FLAG(-fstack-protector-strong -fstack-protector NOQUOTES VAR OPENSSL_COMPILER_FLAGS)
-
 if(WIN32)
-	ADD_FLAG(-Wl,--dynamicbase VAR OPENSSL_COMPILER_FLAGS USE_SAME_FOR_LINKER)
-	ADD_FLAG(-Wl,--nxcompat VAR OPENSSL_COMPILER_FLAGS USE_SAME_FOR_LINKER)
-	ADD_FLAG(-Wl,--high-entropy-va VAR OPENSSL_COMPILER_FLAGS USE_SAME_FOR_LINKER)
+	ADD_FLAG(-Wl,--dynamicbase NOQUOTES VAR OPENSSL_COMPILER_FLAGS USE_SAME_FOR_LINKER)
+	ADD_FLAG(-Wl,--nxcompat NOQUOTES VAR OPENSSL_COMPILER_FLAGS USE_SAME_FOR_LINKER)
+	ADD_FLAG(-Wl,--high-entropy-va NOQUOTES VAR OPENSSL_COMPILER_FLAGS USE_SAME_FOR_LINKER)
+else()
+	ADD_FLAG(-fstack-protector-strong -fstack-protector NOQUOTES VAR OPENSSL_COMPILER_FLAGS)
 endif()
 
 if(IOS)
@@ -336,8 +336,10 @@
 			set(QT_PLATFORM win32-msvc2017)
 		elseif(MSVC_TOOLSET_VERSION STREQUAL "142")
 			set(QT_PLATFORM win32-msvc2019)
+		elseif(MSVC_TOOLSET_VERSION STREQUAL "143")
+			set(QT_PLATFORM win32-msvc)
 		else()
-			message(FATAL_ERROR "Version of MSVC not supported")
+			message(FATAL_ERROR "Version of MSVC not supported: ${MSVC_TOOLSET_VERSION}")
 		endif()
 
 		set(QT_OPENSSL OPENSSL_LIBS=-llibcrypto\ -llibssl)
diff -Nru ausweisapp2-1.22.3/libs/README.rst ausweisapp2-1.22.4/libs/README.rst
--- ausweisapp2-1.22.3/libs/README.rst	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/libs/README.rst	2022-02-16 13:07:30.000000000 +0000
@@ -109,7 +109,7 @@
 
 - https://sourceforge.net/projects/msys2/files/Base/x86_64/
 
-  - Getestet: msys2-base-x86_64-20210228.tar.xz
+  - Getestet: msys2-base-x86_64-20220118.tar.xz
 
 
 Windows SDK
diff -Nru ausweisapp2-1.22.3/LICENSE.officially.txt ausweisapp2-1.22.4/LICENSE.officially.txt
--- ausweisapp2-1.22.3/LICENSE.officially.txt	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/LICENSE.officially.txt	2022-02-16 13:07:30.000000000 +0000
@@ -352,7 +352,7 @@
 
 OpenSSL
   Lizenz: OpenSSL license & SSLeay license
-  Version: 1.1.1l
+  Version: 1.1.1m
   Adresse: https://www.openssl.org/
 
 Qt
diff -Nru ausweisapp2-1.22.3/LICENSE.txt ausweisapp2-1.22.4/LICENSE.txt
--- ausweisapp2-1.22.3/LICENSE.txt	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/LICENSE.txt	2022-02-16 13:07:30.000000000 +0000
@@ -320,7 +320,7 @@
 
 OpenSSL
   Lizenz: OpenSSL license & SSLeay license
-  Version: 1.1.1l
+  Version: 1.1.1m
   Adresse: https://www.openssl.org/
 
 Qt
diff -Nru ausweisapp2-1.22.3/resources/jenkins/dsl/Builds/Build_Win32_GNU.groovy ausweisapp2-1.22.4/resources/jenkins/dsl/Builds/Build_Win32_GNU.groovy
--- ausweisapp2-1.22.3/resources/jenkins/dsl/Builds/Build_Win32_GNU.groovy	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/jenkins/dsl/Builds/Build_Win32_GNU.groovy	2022-02-16 13:07:30.000000000 +0000
@@ -12,6 +12,14 @@
 
 j.with
 {
+	wrappers
+	{
+		environmentVariables
+		{
+			env('PATH', '${COMPILER_${MERCURIAL_REVISION_BRANCH}};$PATH')
+		}
+	}
+
 	steps
 	{
 		batchFile(strip("""\
diff -Nru ausweisapp2-1.22.3/resources/jenkins/dsl/Builds/Build_Win32_GNU_MSI_dev.groovy ausweisapp2-1.22.4/resources/jenkins/dsl/Builds/Build_Win32_GNU_MSI_dev.groovy
--- ausweisapp2-1.22.3/resources/jenkins/dsl/Builds/Build_Win32_GNU_MSI_dev.groovy	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/jenkins/dsl/Builds/Build_Win32_GNU_MSI_dev.groovy	2022-02-16 13:07:30.000000000 +0000
@@ -12,6 +12,14 @@
 
 j.with
 {
+	wrappers
+	{
+		environmentVariables
+		{
+			env('PATH', '${COMPILER_${MERCURIAL_REVISION_BRANCH}};$PATH')
+		}
+	}
+
 	steps
 	{
 		batchFile(strip("""\
diff -Nru ausweisapp2-1.22.3/resources/jenkins/dsl/Builds/Build_Win32_GNU_MSI.groovy ausweisapp2-1.22.4/resources/jenkins/dsl/Builds/Build_Win32_GNU_MSI.groovy
--- ausweisapp2-1.22.3/resources/jenkins/dsl/Builds/Build_Win32_GNU_MSI.groovy	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/jenkins/dsl/Builds/Build_Win32_GNU_MSI.groovy	2022-02-16 13:07:30.000000000 +0000
@@ -12,6 +12,14 @@
 
 j.with
 {
+	wrappers
+	{
+		environmentVariables
+		{
+			env('PATH', '${COMPILER_${MERCURIAL_REVISION_BRANCH}};$PATH')
+		}
+	}
+
 	steps
 	{
 		batchFile(strip("""\
diff -Nru ausweisapp2-1.22.3/resources/jenkins/dsl/Libraries/Libs_Win32_GNU_dev.groovy ausweisapp2-1.22.4/resources/jenkins/dsl/Libraries/Libs_Win32_GNU_dev.groovy
--- ausweisapp2-1.22.3/resources/jenkins/dsl/Libraries/Libs_Win32_GNU_dev.groovy	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/jenkins/dsl/Libraries/Libs_Win32_GNU_dev.groovy	2022-02-16 13:07:30.000000000 +0000
@@ -14,6 +14,7 @@
 		environmentVariables
 		{
 			env('MSYS2_PATH_TYPE', 'inherit')
+			env('PATH', '${COMPILER_${MERCURIAL_REVISION_BRANCH}};$PATH')
 		}
 	}
 
diff -Nru ausweisapp2-1.22.3/resources/jenkins/dsl/Libraries/Libs_Win32_GNU.groovy ausweisapp2-1.22.4/resources/jenkins/dsl/Libraries/Libs_Win32_GNU.groovy
--- ausweisapp2-1.22.3/resources/jenkins/dsl/Libraries/Libs_Win32_GNU.groovy	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/jenkins/dsl/Libraries/Libs_Win32_GNU.groovy	2022-02-16 13:07:30.000000000 +0000
@@ -14,6 +14,7 @@
 		environmentVariables
 		{
 			env('MSYS2_PATH_TYPE', 'inherit')
+			env('PATH', '${COMPILER_${MERCURIAL_REVISION_BRANCH}};$PATH')
 		}
 	}
 
diff -Nru ausweisapp2-1.22.3/resources/jenkins/dsl/Releases/Release_Win32_GNU.groovy ausweisapp2-1.22.4/resources/jenkins/dsl/Releases/Release_Win32_GNU.groovy
--- ausweisapp2-1.22.3/resources/jenkins/dsl/Releases/Release_Win32_GNU.groovy	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/jenkins/dsl/Releases/Release_Win32_GNU.groovy	2022-02-16 13:07:30.000000000 +0000
@@ -12,6 +12,14 @@
 
 j.with
 {
+	wrappers
+	{
+		environmentVariables
+		{
+			env('PATH', '${COMPILER_${MERCURIAL_REVISION_BRANCH}};$PATH')
+		}
+	}
+
 	steps
 	{
 		batchFile(strip("""\
diff -Nru ausweisapp2-1.22.3/resources/jenkins/dsl/Reviews/Review_Libs_Win32_GNU.groovy ausweisapp2-1.22.4/resources/jenkins/dsl/Reviews/Review_Libs_Win32_GNU.groovy
--- ausweisapp2-1.22.3/resources/jenkins/dsl/Reviews/Review_Libs_Win32_GNU.groovy	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/jenkins/dsl/Reviews/Review_Libs_Win32_GNU.groovy	2022-02-16 13:07:30.000000000 +0000
@@ -14,6 +14,7 @@
 		environmentVariables
 		{
 			env('MSYS2_PATH_TYPE', 'inherit')
+			env('PATH', '${COMPILER_${MERCURIAL_REVISION_BRANCH}};$PATH')
 		}
 	}
 
diff -Nru ausweisapp2-1.22.3/resources/jenkins/dsl/Reviews/Review_Win32_GNU.groovy ausweisapp2-1.22.4/resources/jenkins/dsl/Reviews/Review_Win32_GNU.groovy
--- ausweisapp2-1.22.3/resources/jenkins/dsl/Reviews/Review_Win32_GNU.groovy	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/jenkins/dsl/Reviews/Review_Win32_GNU.groovy	2022-02-16 13:07:30.000000000 +0000
@@ -14,6 +14,14 @@
 
 j.with
 {
+	wrappers
+	{
+		environmentVariables
+		{
+			env('PATH', '${COMPILER_${MERCURIAL_REVISION_BRANCH}};$PATH')
+		}
+	}
+
 	steps
 	{
 		batchFile('cd source & cmake -DCMD=IMPORT_PATCH -P cmake/cmd.cmake')
diff -Nru ausweisapp2-1.22.3/resources/jenkins/dsl/Reviews/Review_Win32_GNU_MSI.groovy ausweisapp2-1.22.4/resources/jenkins/dsl/Reviews/Review_Win32_GNU_MSI.groovy
--- ausweisapp2-1.22.3/resources/jenkins/dsl/Reviews/Review_Win32_GNU_MSI.groovy	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/jenkins/dsl/Reviews/Review_Win32_GNU_MSI.groovy	2022-02-16 13:07:30.000000000 +0000
@@ -12,6 +12,14 @@
 
 j.with
 {
+	wrappers
+	{
+		environmentVariables
+		{
+			env('PATH', '${COMPILER_${MERCURIAL_REVISION_BRANCH}};$PATH')
+		}
+	}
+
 	steps
 	{
 		batchFile('cd source & cmake -DCMD=IMPORT_PATCH -P cmake/cmd.cmake')
diff -Nru ausweisapp2-1.22.3/resources/packaging/android/AndroidManifest.xml.apk.in ausweisapp2-1.22.4/resources/packaging/android/AndroidManifest.xml.apk.in
--- ausweisapp2-1.22.3/resources/packaging/android/AndroidManifest.xml.apk.in	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/packaging/android/AndroidManifest.xml.apk.in	2022-02-16 13:07:30.000000000 +0000
@@ -15,6 +15,13 @@
     <uses-permission android:name="android.permission.NFC"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
 
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.SEND" />
+            <data android:mimeType="text/plain" />
+        </intent>
+    </queries>
+
     <!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
          Remove the comment if you do not require these default features. -->
     <!-- %%INSERT_FEATURES -->
diff -Nru ausweisapp2-1.22.3/resources/packaging/android/build.gradle.append ausweisapp2-1.22.4/resources/packaging/android/build.gradle.append
--- ausweisapp2-1.22.3/resources/packaging/android/build.gradle.append	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/packaging/android/build.gradle.append	2022-02-16 13:07:30.000000000 +0000
@@ -5,7 +5,7 @@
 }
 
 dependencies {
-    implementation "androidx.appcompat:appcompat:1.1.0"
+    implementation "androidx.appcompat:appcompat:1.2.0"
 }
 
 allprojects {
diff -Nru ausweisapp2-1.22.3/resources/packaging/android/lint.aar.xml ausweisapp2-1.22.4/resources/packaging/android/lint.aar.xml
--- ausweisapp2-1.22.3/resources/packaging/android/lint.aar.xml	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/packaging/android/lint.aar.xml	2022-02-16 13:07:30.000000000 +0000
@@ -27,6 +27,21 @@
         <ignore path="build.gradle" />
     </issue>
 
+    <!-- Obsolete custom lint check
+
+        Lint can be extended with custom checks: additional checks implemented by developers and libraries to for example
+        enforce specific API usages required by a library or a company coding style guideline.
+        The Lint APIs are not yet stable, so these checks may either cause a performance degradation, or stop working,
+        or provide wrong results.
+        This warning flags custom lint checks that are found to be using obsolete APIs and will need to be updated
+        to run in the current lint environment.
+        It may also flag issues found to be using a **newer** version of the API, meaning that you need to use a newer
+        version of lint (or Android Studio or Gradle plugin etc) to work with these checks.
+    -->
+    <issue id="ObsoleteLintCustomCheck">
+        <ignore path="**/appcompat-1.**/**/lint.jar" />
+    </issue>
+
     <!-- Unused resources.
 
         Unused resources make applications larger and slow down builds.
diff -Nru ausweisapp2-1.22.3/resources/packaging/android/lint.apk.xml ausweisapp2-1.22.4/resources/packaging/android/lint.apk.xml
--- ausweisapp2-1.22.3/resources/packaging/android/lint.apk.xml	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/packaging/android/lint.apk.xml	2022-02-16 13:07:30.000000000 +0000
@@ -27,6 +27,21 @@
         <ignore path="build.gradle" />
     </issue>
 
+    <!-- Obsolete custom lint check
+
+        Lint can be extended with custom checks: additional checks implemented by developers and libraries to for example
+        enforce specific API usages required by a library or a company coding style guideline.
+        The Lint APIs are not yet stable, so these checks may either cause a performance degradation, or stop working,
+        or provide wrong results.
+        This warning flags custom lint checks that are found to be using obsolete APIs and will need to be updated
+        to run in the current lint environment.
+        It may also flag issues found to be using a **newer** version of the API, meaning that you need to use a newer
+        version of lint (or Android Studio or Gradle plugin etc) to work with these checks.
+    -->
+    <issue id="ObsoleteLintCustomCheck">
+        <ignore path="**/appcompat-1.**/**/lint.jar" />
+    </issue>
+
     <!-- Unused resources.
 
         Unused resources make applications larger and slow down builds.
diff -Nru ausweisapp2-1.22.3/resources/qml/Governikus/ChangePinView/+mobile/ChangePinView.qml ausweisapp2-1.22.4/resources/qml/Governikus/ChangePinView/+mobile/ChangePinView.qml
--- ausweisapp2-1.22.3/resources/qml/Governikus/ChangePinView/+mobile/ChangePinView.qml	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/qml/Governikus/ChangePinView/+mobile/ChangePinView.qml	2022-02-16 13:07:30.000000000 +0000
@@ -81,11 +81,10 @@
 		title: qsTr("No PIN known")
 		resultType: ResultView.Type.IsInfo
 		buttonText: ""
-		text: PinResetInformationModel.pinUnknownText + "\n\n" + PinResetInformationModel.pinUnknownHint
-		contentButton.text: PinResetInformationModel.pinResetActionText
-		contentButton.icon.source: "qrc:///images/material_open_in_new.svg"
-
-		onContentButtonClicked: Qt.openUrlExternally(PinResetInformationModel.pinResetUrl)
+		text: PinResetInformationModel.pinUnknownText
+		hintText: PinResetInformationModel.pinUnknownHint
+		hintButtonText: PinResetInformationModel.pinResetActionText
+		onHintClicked: Qt.openUrlExternally(PinResetInformationModel.pinResetUrl)
 	}
 
 	PasswordInfoView {
diff -Nru ausweisapp2-1.22.3/resources/qml/Governikus/CheckIDCardView/+mobile/CheckIDCardSuggestionView.qml ausweisapp2-1.22.4/resources/qml/Governikus/CheckIDCardView/+mobile/CheckIDCardSuggestionView.qml
--- ausweisapp2-1.22.3/resources/qml/Governikus/CheckIDCardView/+mobile/CheckIDCardSuggestionView.qml	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/qml/Governikus/CheckIDCardView/+mobile/CheckIDCardSuggestionView.qml	2022-02-16 13:07:30.000000000 +0000
@@ -151,7 +151,7 @@
 		//: LABEL ANDROID IOS
 		readonly property string title: qsTr("Online identification feature disabled")
 
-		readonly property string text: PinResetInformationModel.activateOnlineFunctionDescriptionAndHint
+		readonly property string text: PinResetInformationModel.activateOnlineFunctionDescription
 
 		//: LABEL ANDROID IOS
 		readonly property string buttonTitle: qsTr("OK")
@@ -161,9 +161,9 @@
 			navigationAction.clicked()
 		}
 
-		readonly property string contentButtonTitle: PinResetInformationModel.pinResetActionText
-		readonly property string contentButtonIcon: "qrc:///images/material_open_in_new.svg"
-		readonly property string contentUrl: PinResetInformationModel.pinResetUrl
+		readonly property string hintText: PinResetInformationModel.activateOnlineFunctionHint
+		readonly property string hintButtonText: PinResetInformationModel.pinResetActionText
+		readonly property string hintUrl: PinResetInformationModel.pinResetUrl
 	}
 
 	QtObject {
diff -Nru ausweisapp2-1.22.3/resources/qml/Governikus/IdentifyView/+desktop/CertificateDescriptionPage.qml ausweisapp2-1.22.4/resources/qml/Governikus/IdentifyView/+desktop/CertificateDescriptionPage.qml
--- ausweisapp2-1.22.3/resources/qml/Governikus/IdentifyView/+desktop/CertificateDescriptionPage.qml	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/qml/Governikus/IdentifyView/+desktop/CertificateDescriptionPage.qml	2022-02-16 13:07:30.000000000 +0000
@@ -15,7 +15,7 @@
 {
 	signal exit()
 
-	Accessible.name: qsTr("Self-Authentication data view")
+	Accessible.name: qsTr("Self-authentication data view")
 	Accessible.description: qsTr("This is the self-authentication data view of the AusweisApp2.")
 
 	titleBarAction: TitleBarAction {
diff -Nru ausweisapp2-1.22.3/resources/qml/Governikus/IdentifyView/+desktop/IdentifyController.qml ausweisapp2-1.22.4/resources/qml/Governikus/IdentifyView/+desktop/IdentifyController.qml
--- ausweisapp2-1.22.3/resources/qml/Governikus/IdentifyView/+desktop/IdentifyController.qml	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/qml/Governikus/IdentifyView/+desktop/IdentifyController.qml	2022-02-16 13:07:30.000000000 +0000
@@ -31,21 +31,13 @@
 
 	states: [
 		State {
-			when: AuthModel.currentState === "StateGetTcToken" && SettingsModel.transportPinReminder
-			StateChangeScript {
-				script: controller.nextView(IdentifyView.SubViews.TransportPinReminder)
-			}
-		},
-		State {
-			// "State when" seems weired with Qt 5.14, so add !SettingsModel.transportPinReminder
-			when: AuthModel.currentState === "StateGetTcToken" && !ConnectivityManager.networkInterfaceActive && !SettingsModel.transportPinReminder
+			when: AuthModel.currentState === "StateGetTcToken" && !ConnectivityManager.networkInterfaceActive
 			StateChangeScript {
 				script: controller.nextView(IdentifyView.SubViews.Connectivity)
 			}
 		},
 		State {
-			// "State when" seems weired with Qt 5.14, so add !SettingsModel.transportPinReminder
-			when: AuthModel.currentState === "StateGetTcToken" && ConnectivityManager.networkInterfaceActive && !SettingsModel.transportPinReminder
+			when: AuthModel.currentState === "StateGetTcToken" && ConnectivityManager.networkInterfaceActive
 			StateChangeScript {
 				script: {
 					controller.nextView(IdentifyView.SubViews.Progress)
@@ -80,10 +72,18 @@
 	function processStateChange() {
 		switch (AuthModel.currentState) {
 			case "Initial":
-				break;
+				break
 			case "StateGetTcToken":
 				controller.workflowState = IdentifyController.WorkflowStates.Initial
 				break
+			case "StatePreVerification":
+				if (!NumberModel.isCanAllowedMode && SettingsModel.transportPinReminder) {
+					SettingsModel.transportPinReminder = false
+					controller.nextView(IdentifyView.SubViews.TransportPinReminder)
+				} else {
+					AuthModel.continueWorkflow()
+				}
+				break
 			case "StateEditAccessRights":
 				if (NumberModel.isCanAllowedMode && SettingsModel.skipRightsOnCanAllowed) {
 					ChatModel.transferAccessRights()
diff -Nru ausweisapp2-1.22.3/resources/qml/Governikus/IdentifyView/+desktop/IdentifyView.qml ausweisapp2-1.22.4/resources/qml/Governikus/IdentifyView/+desktop/IdentifyView.qml
--- ausweisapp2-1.22.3/resources/qml/Governikus/IdentifyView/+desktop/IdentifyView.qml	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/qml/Governikus/IdentifyView/+desktop/IdentifyView.qml	2022-02-16 13:07:30.000000000 +0000
@@ -120,7 +120,11 @@
 
 		onNextView: {
 			if (pName === IdentifyView.SubViews.ReturnToMain) {
-				identifyView.nextView(UiModule.DEFAULT)
+				if (AuthModel.showChangePinView) {
+					identifyView.nextView(UiModule.PINMANAGEMENT)
+				} else {
+					identifyView.nextView(UiModule.DEFAULT)
+				}
 				return;
 			}
 
@@ -135,12 +139,11 @@
 		questionSubText: "%1<br><br><a href=\"#\">%2</a>".arg(qsTr("The personal, six-digit PIN is mandatory to use the online identification function.")).arg(qsTr("More information"))
 
 		onSubTextLinkActivated: showPasswordInfo()
-		onDisagree: {
-			SettingsModel.transportPinReminder = false
-			AuthModel.cancelWorkflowToChangePin()
-			identifyView.nextView(UiModule.PINMANAGEMENT)
+		onDisagree: AuthModel.cancelWorkflowToChangePin()
+		onAgree: {
+			d.view = IdentifyView.SubViews.Progress
+			AuthModel.continueWorkflow()
 		}
-		onAgree: SettingsModel.transportPinReminder = false // causes fall-through to next state in IdentifyController
 	}
 
 	ProgressView {
diff -Nru ausweisapp2-1.22.3/resources/qml/Governikus/IdentifyView/+desktop/SelfAuthenticationData.qml ausweisapp2-1.22.4/resources/qml/Governikus/IdentifyView/+desktop/SelfAuthenticationData.qml
--- ausweisapp2-1.22.3/resources/qml/Governikus/IdentifyView/+desktop/SelfAuthenticationData.qml	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/qml/Governikus/IdentifyView/+desktop/SelfAuthenticationData.qml	2022-02-16 13:07:30.000000000 +0000
@@ -19,7 +19,7 @@
 {
 	id: baseItem
 
-	Accessible.name: qsTr("Self-Authentication result data view")
+	Accessible.name: qsTr("Self-authentication result data view")
 	Accessible.description: qsTr("This is the self-authentication result data view of the AusweisApp2.")
 	Keys.onReturnPressed: okButton.onClicked()
 	Keys.onEnterPressed: okButton.onClicked()
diff -Nru ausweisapp2-1.22.3/resources/qml/Governikus/IdentifyView/+mobile/IdentifyController.qml ausweisapp2-1.22.4/resources/qml/Governikus/IdentifyView/+mobile/IdentifyController.qml
--- ausweisapp2-1.22.3/resources/qml/Governikus/IdentifyView/+mobile/IdentifyController.qml	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/qml/Governikus/IdentifyView/+mobile/IdentifyController.qml	2022-02-16 13:07:30.000000000 +0000
@@ -39,19 +39,13 @@
 
 	states: [
 		State {
-			when: AuthModel.currentState === "StateGetTcToken" && SettingsModel.transportPinReminder
-			StateChangeScript {
-				script: firePush(transportPinReminder)
-			}
-		},
-		State {
-			when: AuthModel.currentState === "StateGetTcToken" && !ConnectivityManager.networkInterfaceActive && !SettingsModel.transportPinReminder
+			when: AuthModel.currentState === "StateGetTcToken" && !ConnectivityManager.networkInterfaceActive
 			StateChangeScript {
 				script: firePush(checkConnectivityView)
 			}
 		},
 		State {
-			when: AuthModel.currentState === "StateGetTcToken" && ConnectivityManager.networkInterfaceActive && !SettingsModel.transportPinReminder
+			when: AuthModel.currentState === "StateGetTcToken" && ConnectivityManager.networkInterfaceActive
 			StateChangeScript {
 				script: {
 					firePush(identifyProgressView)
@@ -88,12 +82,20 @@
 		switch (AuthModel.currentState) {
 			case "Initial":
 				firePopAll()
-				break;
+				break
 			case "StateGetTcToken":
 				enterPinView.state = "INITIAL"
 				controller.workflowState = IdentifyController.WorkflowStates.Initial
 				navBar.show(UiModule.IDENTIFY, true)
 				break
+			case "StatePreVerification":
+				if (!NumberModel.isCanAllowedMode && SettingsModel.transportPinReminder) {
+					SettingsModel.transportPinReminder = false
+					firePush(transportPinReminder)
+				} else {
+					AuthModel.continueWorkflow()
+				}
+				break
 			case "StateEditAccessRights":
 				if (NumberModel.isCanAllowedMode && SettingsModel.skipRightsOnCanAllowed) {
 					ChatModel.transferAccessRights()
@@ -161,7 +163,11 @@
 				break
 			case "FinalState":
 				navBar.lockedAndHidden = true
-				if (AuthModel.error && !AuthModel.hasNextWorkflowPending && !AuthModel.shouldSkipResultView()) {
+				if (AuthModel.showChangePinView) {
+					AuthModel.continueWorkflow()
+					firePopAll()
+					navBar.show(UiModule.PINMANAGEMENT, false)
+				} else if (AuthModel.error && !AuthModel.hasNextWorkflowPending && !AuthModel.shouldSkipResultView()) {
 					showRemoveCardFeedback()
 					firePush(identifyResult)
 				} else {
diff -Nru ausweisapp2-1.22.3/resources/qml/Governikus/IdentifyView/+mobile/IdentifyView.qml ausweisapp2-1.22.4/resources/qml/Governikus/IdentifyView/+mobile/IdentifyView.qml
--- ausweisapp2-1.22.3/resources/qml/Governikus/IdentifyView/+mobile/IdentifyView.qml	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/qml/Governikus/IdentifyView/+mobile/IdentifyView.qml	2022-02-16 13:07:30.000000000 +0000
@@ -21,6 +21,7 @@
 import Governikus.Type.LogModel 1.0
 import Governikus.Type.NumberModel 1.0
 import Governikus.Type.SettingsModel 1.0
+import Governikus.Type.UiModule 1.0
 
 
 SectionPage
@@ -81,7 +82,22 @@
 	Component {
 		id: transportPinReminder
 
-		TransportPinReminderView {}
+		TransportPinReminderView {
+			onCancel: {
+				firePop()
+				AuthModel.cancelWorkflow()
+			}
+
+			onPinUnknown: {
+				firePop()
+				AuthModel.cancelWorkflowToChangePin()
+			}
+
+			onPinKnown: {
+				firePop()
+				AuthModel.continueWorkflow()
+			}
+		}
 	}
 
 	EnterPasswordView {
diff -Nru ausweisapp2-1.22.3/resources/qml/Governikus/IdentifyView/+mobile/TransportPinReminderView.qml ausweisapp2-1.22.4/resources/qml/Governikus/IdentifyView/+mobile/TransportPinReminderView.qml
--- ausweisapp2-1.22.3/resources/qml/Governikus/IdentifyView/+mobile/TransportPinReminderView.qml	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/qml/Governikus/IdentifyView/+mobile/TransportPinReminderView.qml	2022-02-16 13:07:30.000000000 +0000
@@ -7,20 +7,18 @@
 
 import Governikus.Global 1.0
 import Governikus.Style 1.0
-import Governikus.View 1.0
 import Governikus.TitleBar 1.0
+import Governikus.View 1.0
 
-import Governikus.Type.ApplicationModel 1.0
-import Governikus.Type.AuthModel 1.0
-import Governikus.Type.ChangePinModel 1.0
-import Governikus.Type.NumberModel 1.0
-import Governikus.Type.SettingsModel 1.0
-import Governikus.Type.UiModule 1.0
 
 SectionPage {
 	id: root
 
-	navigationAction: NavigationAction { state: "cancel"; onClicked: { firePop(); AuthModel.cancelWorkflow() } }
+	signal cancel()
+	signal pinUnknown()
+	signal pinKnown()
+
+	navigationAction: NavigationAction { state: "cancel"; onClicked: cancel() }
 
 	//: LABEL ANDROID IOS
 	title: qsTr("Identify")
@@ -93,13 +91,7 @@
 				//: LABEL ANDROID IOS
 				text: qsTr("No")
 
-				onClicked: {
-					firePopAll()
-					SettingsModel.transportPinReminder = false
-					AuthModel.cancelWorkflowToChangePin()
-
-					navBar.show(UiModule.PINMANAGEMENT)
-				}
+				onClicked: pinUnknown()
 			}
 
 			GButton {
@@ -111,10 +103,7 @@
 				//: LABEL ANDROID IOS
 				text: qsTr("Yes")
 
-				onClicked: {
-					firePop()
-					SettingsModel.transportPinReminder = false // causes fall-through to next state in IdentifyController
-				}
+				onClicked: pinKnown()
 			}
 		}
 	}
diff -Nru ausweisapp2-1.22.3/resources/qml/Governikus/Navigation/+mobile/Navigation.qml ausweisapp2-1.22.4/resources/qml/Governikus/Navigation/+mobile/Navigation.qml
--- ausweisapp2-1.22.3/resources/qml/Governikus/Navigation/+mobile/Navigation.qml	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/qml/Governikus/Navigation/+mobile/Navigation.qml	2022-02-16 13:07:30.000000000 +0000
@@ -22,9 +22,7 @@
 		if (d.activeModule !== pModule) {
 			d.activeModule = pModule
 
-			if (pModule !== UiModule.TUTORIAL) {
-				SettingsModel.startupModule = pModule === UiModule.REMOTE_SERVICE ? UiModule.REMOTE_SERVICE : UiModule.DEFAULT
-			}
+			SettingsModel.startupModule = pModule === UiModule.REMOTE_SERVICE ? UiModule.REMOTE_SERVICE : UiModule.DEFAULT
 		}
 	}
 
@@ -44,7 +42,7 @@
 
 		property int activeModule
 		readonly property int startupModule: SettingsModel.startupModule
-		readonly property bool initialLockedAndHidden: startupModule === UiModule.TUTORIAL || startupModule === UiModule.IDENTIFY
+		readonly property bool initialLockedAndHidden: startupModule === UiModule.IDENTIFY
 
 		Component.onCompleted: show(startupModule, initialLockedAndHidden)
 	}
diff -Nru ausweisapp2-1.22.3/resources/qml/Governikus/SelfAuthenticationView/+desktop/SelfAuthenticationView.qml ausweisapp2-1.22.4/resources/qml/Governikus/SelfAuthenticationView/+desktop/SelfAuthenticationView.qml
--- ausweisapp2-1.22.3/resources/qml/Governikus/SelfAuthenticationView/+desktop/SelfAuthenticationView.qml	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/qml/Governikus/SelfAuthenticationView/+desktop/SelfAuthenticationView.qml	2022-02-16 13:07:30.000000000 +0000
@@ -20,7 +20,7 @@
 	}
 
 	//: LABEL DESKTOP
-	Accessible.name: qsTr("Self-Authentication.")
+	Accessible.name: qsTr("Self-authentication.")
 	Accessible.description: qsTr("This is the self-authentication view of the AusweisApp2.")
 	Keys.onReturnPressed: startWorkflowButton.onClicked()
 	Keys.onEnterPressed: startWorkflowButton.onClicked()
diff -Nru ausweisapp2-1.22.3/resources/qml/Governikus/TutorialView/+mobile/TutorialImportant.qml ausweisapp2-1.22.4/resources/qml/Governikus/TutorialView/+mobile/TutorialImportant.qml
--- ausweisapp2-1.22.3/resources/qml/Governikus/TutorialView/+mobile/TutorialImportant.qml	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/qml/Governikus/TutorialView/+mobile/TutorialImportant.qml	2022-02-16 13:07:30.000000000 +0000
@@ -160,7 +160,6 @@
 			text: qsTr("Change my (Transport) PIN")
 			onClicked: {
 				SettingsModel.transportPinReminder = false
-				SettingsModel.startupModule = UiModule.DEFAULT
 				navBar.show(UiModule.PINMANAGEMENT)
 			}
 		}
diff -Nru ausweisapp2-1.22.3/resources/qml/Governikus/TutorialView/+mobile/TutorialWhere.qml ausweisapp2-1.22.4/resources/qml/Governikus/TutorialView/+mobile/TutorialWhere.qml
--- ausweisapp2-1.22.3/resources/qml/Governikus/TutorialView/+mobile/TutorialWhere.qml	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/qml/Governikus/TutorialView/+mobile/TutorialWhere.qml	2022-02-16 13:07:30.000000000 +0000
@@ -101,7 +101,7 @@
 		Accessible.onScrollUpAction: baseItem.Accessible.scrollUpAction()
 
 		//: LABEL ANDROID IOS
-		text: qsTr("The <b>integrated self-disclosure</b> is a special service to view the data saved on your ID card.")
+		text: qsTr("The <b>integrated self-authentication</b> is a special service to view the data saved on your ID card.")
 		textStyle: Style.text.tutorial_header
 		horizontalAlignment: Text.AlignHCenter
 	}
diff -Nru ausweisapp2-1.22.3/resources/qml/Governikus/View/+mobile/ContentArea.qml ausweisapp2-1.22.4/resources/qml/Governikus/View/+mobile/ContentArea.qml
--- ausweisapp2-1.22.3/resources/qml/Governikus/View/+mobile/ContentArea.qml	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/qml/Governikus/View/+mobile/ContentArea.qml	2022-02-16 13:07:30.000000000 +0000
@@ -39,7 +39,6 @@
 		startupModule === UiModule.REMOTE_SERVICE ? remoteView :
 		startupModule === UiModule.SETTINGS ? settingsView :
 		startupModule === UiModule.HELP ? helpView :
-		startupModule === UiModule.TUTORIAL ? tutorialView :
 		mainView
 
 	ContentAreaLoader {
@@ -160,24 +159,5 @@
 			}
 		}
 	}
-
-	ContentAreaLoader {
-		id: tutorialView
-
-		contentArea: baseItem
-		module:  UiModule.TUTORIAL
-
-		active: contentArea.activeModule === module || startupModule === module
-		sourceComponent: Component {
-			TabBarView {
-				sourceComponent: TutorialView {
-					onLeave: {
-						navBar.show(UiModule.DEFAULT)
-						SettingsModel.startupModule = UiModule.DEFAULT
-					}
-				}
-			}
-		}
-	}
 
 }
diff -Nru ausweisapp2-1.22.3/resources/qml/+mobile/main.qml ausweisapp2-1.22.4/resources/qml/+mobile/main.qml
--- ausweisapp2-1.22.3/resources/qml/+mobile/main.qml	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/qml/+mobile/main.qml	2022-02-16 13:07:30.000000000 +0000
@@ -52,7 +52,7 @@
 		close.accepted = false
 
 		if (contentArea.visibleItem) {
-			if (contentArea.activeModule === UiModule.DEFAULT || SettingsModel.startupModule == UiModule.TUTORIAL) {
+			if (contentArea.activeModule === UiModule.DEFAULT) {
 				var currentTime = new Date().getTime();
 				if (currentTime - d.lastCloseInvocation < 1000) {
 					plugin.fireQuitApplicationRequest()
diff -Nru ausweisapp2-1.22.3/resources/translations/ausweisapp2_de.ts ausweisapp2-1.22.4/resources/translations/ausweisapp2_de.ts
--- ausweisapp2-1.22.3/resources/translations/ausweisapp2_de.ts	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/translations/ausweisapp2_de.ts	2022-02-16 13:07:30.000000000 +0000
@@ -209,7 +209,7 @@
         <translation>Schließen</translation>
     </message>
     <message>
-        <source>Self-Authentication data view</source>
+        <source>Self-authentication data view</source>
         <translation>Datenansicht der Selbstauskunft</translation>
     </message>
     <message>
@@ -3375,7 +3375,7 @@
         <translation>Ausgelesene Daten</translation>
     </message>
     <message>
-        <source>Self-Authentication result data view</source>
+        <source>Self-authentication result data view</source>
         <translation>Darstellung der Ergebnisse der Selbstauskunft</translation>
     </message>
     <message>
@@ -3432,7 +3432,7 @@
         <translation>Dies ist die Darstellung der Selbstauskunft der AusweisApp2.</translation>
     </message>
     <message>
-        <source>Self-Authentication.</source>
+        <source>Self-authentication.</source>
         <extracomment>LABEL DESKTOP</extracomment>
         <translation>Selbstauskunft.</translation>
     </message>
@@ -4710,7 +4710,7 @@
         <translation>Übrigens, viele Dienste finden Sie direkt in der &lt;b&gt;Anbieterliste&lt;/b&gt; der AusweisApp2.</translation>
     </message>
     <message>
-        <source>The &lt;b&gt;integrated self-disclosure&lt;/b&gt; is a special service to view the data saved on your ID card.</source>
+        <source>The &lt;b&gt;integrated self-authentication&lt;/b&gt; is a special service to view the data saved on your ID card.</source>
         <extracomment>LABEL ANDROID IOS</extracomment>
         <translation>Die &lt;b&gt;integrierte Selbstauskunft&lt;/b&gt; ist ein spezieller Dienst, um Daten einzusehen, die auf Ihrem Ausweis gespeichert sind.</translation>
     </message>
@@ -6189,11 +6189,12 @@
         <translation>Mithilfe des PIN-Rücksetzdienstes können Sie eine neue PIN anfordern.</translation>
     </message>
     <message>
-        <source>If this is the case please turn to the competent authority and set a new PIN there.</source>
-        <translation>Wenden Sie sich in diesem Fall bitte an die zuständige Behörde und legen Sie dort eine neue PIN fest.</translation>
+        <source>If this is the case please turn to the competent authority and set a new PIN there.&lt;br/&gt;&lt;br/&gt;For further information, please visit the ID card portal.</source>
+        <extracomment>LABEL ALL_PLATFORMS Text in Hint when PRS is not available and the (Transport) PIN is unknown to the user on the Change PIN startpage</extracomment>
+        <translation>Wenden Sie sich in diesem Fall bitte an die zuständige Behörde und legen Sie dort eine neue PIN fest.&lt;br/&gt;&lt;br/&gt;Weitere Informationen erhalten Sie auf dem Personalausweisportal.</translation>
     </message>
     <message>
-        <source>If you forgot your PIN or do not have access to the PUK, you may request a new PIN here.</source>
+        <source>If you have forgotten your PIN or do not have access to the PUK, you may request a new PIN here.</source>
         <extracomment>LABEL ALL_PLATFORMS Hint text for requested PUK but both, PUK and PIN are not known.</extracomment>
         <translation>Sollten Sie Ihre PIN vergessen haben oder Ihnen die PUK nicht vorliegen, können Sie hier eine neue PIN anfordern.</translation>
     </message>
@@ -6208,13 +6209,14 @@
         <translation>Wenn Sie Ihre PIN vergessen haben, können Sie hier eine neue PIN anfordern.</translation>
     </message>
     <message>
-        <source>If you cannot recall your six-digit PIN or cannot find your PIN letter, may request a new PIN using the PIN Reset Service.</source>
+        <source>If you cannot recall your six-digit PIN or cannot find your PIN letter, you may request a new PIN using the PIN Reset Service.</source>
         <extracomment>LABEL ANDROID IOS</extracomment>
         <translation>Falls Sie sich nicht an Ihre sechsstellige PIN erinnern oder den PIN-Brief nicht finden können, können Sie eine neue PIN mithilfe des PIN-Rücksetzdienstes beantragen.</translation>
     </message>
     <message>
-        <source>You can always set a new PIN at the issuing authority if the (Transport) PIN is not known.</source>
-        <translation>Ist Ihnen die (Transport-)PIN nicht bekannt, können Sie in der zuständigen Behörde jederzeit eine neue PIN setzen.</translation>
+        <source>You can always set a new PIN at the competent authority if the (Transport) PIN is not known.&lt;br/&gt;&lt;br/&gt;For further information, please visit the ID card portal.</source>
+        <extracomment>LABEL ANDROID IOS</extracomment>
+        <translation>Ist Ihnen die (Transport-)PIN nicht bekannt, können Sie in der zuständigen Behörde jederzeit eine neue PIN setzen.&lt;br/&gt;&lt;br/&gt;Weitere Informationen erhalten Sie auf dem Personalausweisportal.</translation>
     </message>
     <message>
         <source>You may request a new PIN here.</source>
@@ -6232,9 +6234,38 @@
         <translation>Zum Anbieter</translation>
     </message>
     <message>
-        <source>The online identification function of your ID card is not yet activated.</source>
-        <extracomment>LABEL ANDROID IOS</extracomment>
-        <translation>Die Online-Ausweisfunktion Ihres Ausweises ist noch nicht aktiviert.</translation>
+        <source>Please contact the competent authority to activate the online identification function.&lt;br/&gt;&lt;br/&gt;For further information, please visit the ID card portal.</source>
+        <extracomment>LABEL ALL_PLATFORMS Hint when a workflow failed because the online identification funtion was not activated</extracomment>
+        <translation>Bitte wenden Sie sich an die zuständige Behörde, um die Online-Ausweisfunktion zu aktivieren.&lt;br/&gt;&lt;br/&gt;Weitere Informationen erhalten Sie auf dem Personalausweisportal.</translation>
+    </message>
+    <message>
+        <source>If you have forgotten your PIN or do not have access to the PUK, you may turn to the competent authority and set a new PIN there.&lt;br/&gt;&lt;br/&gt;For further information, please visit the ID card portal.</source>
+        <extracomment>LABEL ALL_PLATFORMS Hint text for requested PUK but both, PUK and PIN are not known.</extracomment>
+        <translation>Sollten Sie Ihre PIN vergessen haben oder Ihnen die PUK nicht vorliegen, können Sie sich an die zuständige Behörde wenden und dort eine neue PIN festlegen.&lt;br/&gt;&lt;br/&gt;Weitere Informationen erhalten Sie auf dem Personalausweisportal.</translation>
+    </message>
+    <message>
+        <source>https://www.personalausweisportal.de/EN</source>
+        <translation>https://www.personalausweisportal.de/DE</translation>
+    </message>
+    <message>
+        <source>Open website</source>
+        <extracomment>LABEL ALL_PLATFORMS</extracomment>
+        <translation>Öffne Webseite</translation>
+    </message>
+    <message>
+        <source>If you know neither your Transport PIN nor your PIN, you may turn to the competent authority and set a new PIN there.&lt;br/&gt;&lt;br/&gt;For further information, please visit the ID card portal.</source>
+        <extracomment>LABEL ALL_PLATFORMS Hint text for requested Transport PIN but both, Transport PIN and PIN are not known.</extracomment>
+        <translation>Ist Ihnen weder Ihre Transport-PIN noch Ihre PIN bekannt, können Sie sich an die zuständige Behörde wenden und dort eine neue PIN festlegen.&lt;br/&gt;&lt;br/&gt;Weitere Informationen erhalten Sie auf dem Personalausweisportal.</translation>
+    </message>
+    <message>
+        <source>If you cannot recall your PIN, you may turn to the competent authority and set a new PIN there.&lt;br/&gt;&lt;br/&gt;For further information, please visit the ID card portal.</source>
+        <extracomment>LABEL ALL_PLATFORMS Hint text for PIN but it is unknown.</extracomment>
+        <translation>Wenn Sie Ihre PIN vergessen haben, können Sie sich an die zuständige Behörde wenden und dort eine neue PIN festlegen.&lt;br/&gt;&lt;br/&gt;Weitere Informationen erhalten Sie auf dem Personalausweisportal.</translation>
+    </message>
+    <message>
+        <source>You may turn to the competent authority and set a new PIN there.&lt;br/&gt;&lt;br/&gt;For further information, please visit the ID card portal.</source>
+        <extracomment>LABEL ALL_PLATFORMS Hint when a workflow failed because of a blocked PUK</extracomment>
+        <translation>Sie können sich an die zuständige Behörde wenden und dort eine neue PIN festlegen.&lt;br/&gt;&lt;br/&gt;Weitere Informationen erhalten Sie auf dem Personalausweisportal.</translation>
     </message>
 </context>
 <context>
diff -Nru ausweisapp2-1.22.3/resources/updatable-files/supported-providers.json ausweisapp2-1.22.4/resources/updatable-files/supported-providers.json
--- ausweisapp2-1.22.3/resources/updatable-files/supported-providers.json	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/resources/updatable-files/supported-providers.json	2022-02-16 13:07:30.000000000 +0000
@@ -553,17 +553,6 @@
 			"icon": "hamburg_serviceportal_icon.png"
 		},
 		{
-			"shortName": {"" : "Identitätsprüfungen nach der eIDAS und dem Geldwäschegesetz"},
-			"longDescription": {"": "Die identity Trust Management AG bietet Unternehmen die Möglichkeit, ihre Kunden schnell und sicher mit der Online-Ausweisfunktion zu identifizieren. <br/>Kunden der Kooperationspartner der identity Trust Management AG können die Identitätsprüfung nach dem Signaturgesetz und dem Geldwäschegesetz auch direkt über die Internetseite der identity Trust Management AG vornehmen."},
-			"address": "https://www.identity.tm",
-			"homepage": "https://www.identity.tm",
-			"phone": "+49 211 68 77 3 0",
-			"email": "kontakt@identity.tm",
-			"postalAddress": "identity Trust Management AG<br/>Lierenfelder Straße 51<br/>40231 Düsseldorf",
-			"category": "other",
-			"subjectUrlInfo": "Generic service provider. Order number required to start authentication."
-		},
-		{
 			"shortName": {"" : "Landesportal Brandenburg"},
 			"homepage": "https://www.brandenburg.de",
 			"address": "https://www.brandenburg.de",
@@ -786,17 +775,6 @@
 			"subjectUrls": ["https://mv.buergerserviceportal.de"]
 		},
 		{
-			"shortName": {"" : "LVM Versicherung - Kundenportal Meine LVM"},
-			"longDescription": {"": "Mit der Online-Ausweisfunktion im Personalausweis können Sie sich nach der Registrierung durch Ihre LVM-Agentur sicher am Kundenportal ,Meine LVM' anmelden. Ihre Versicherung können Sie nun selbst verwalten und beispielsweise sämtliche Vertragsdaten online einsehen. Darüber hinaus ist es möglich über das Portal Versicherungsbescheinigungen anzufordern sowie schnell und einfach Ihre persönlichen Daten wie Adresse oder Bankverbindung zu ändern."},
-			"address": "https://www.lvm.de/personalausweis",
-			"homepage": "https://www.lvm.de",
-			"phone": "+49 251 702 0",
-			"email": "info@lvm.de",
-			"postalAddress": "LVM Versicherung<br/>48126 Münster",
-			"category": "insurance",
-			"subjectUrls": ["https://www.lvm.de"]
-		},
-		{
 			"shortName": {"" : "DATEV"},
 			"longName": {"": "DATEV - Arbeitnehmer online"},
 			"shortDescription": {"": "Arbeitnehmer online ist ein Angebot Ihres Arbeitgebers, um mit Ihnen digital zusammenzuarbeiten. Im Portal stellt er Ihnen persönliche Daten bereit, wie zum Beispiel Ihre Lohn- und Gehaltsdokumente."},
@@ -919,9 +897,11 @@
 			"subjectUrls": ["https://pgp.governikus-eid.de"]
 		},
 		{
-			"shortName": {"" : "Selbstauskunft - 'Meine Daten einsehen'"},
-			"longDescription": {"": "Die AusweisApp2 verfügt über die Funktion 'Meine Daten einsehen'. Mit dieser Funktion können die auf dem Personalausweis bzw. dem elektronischen Aufenthaltstitel gespeicherten Daten ausgelesen und angezeigt werden. Hierbei sprechen wir auch von einer sogenannten Selbstauskunft.<br/><br/>Sobald Sie die AusweisApp2 gestartet und ein geeigneter Kartenleser installiert bzw. ein Android-Smartphone verbunden haben, können Sie diese Funktion unter dem Menüpunkt 'Ausweisen' aufrufen. (Auf Mobilgeräten finden Sie die Ausweis-Auskunft übrigens auch direkt auf der Startseite sowie im Menüeintrag 'Ausweisen'.)<br/><br/>Nach Ihrer PIN-Eingabe und erfolgreicher Datenübertragung werden die Daten in der AusweisApp2 dargestellt.<br/><br/>Bei der Selbstauskunft handelt es sich um einen reinen Demonstrationsdienst. Die ausgelesenen Daten werden lediglich zur Anzeige gebracht und nicht weitergegeben.<br/><br/>Bitte beachten Sie, dass Sie auch für diesen Vorgang eine Internetverbindung benötigen. Dies hat folgenden Hintergrund: Der Zugriff auf die Daten des Personalausweises bzw. des elektronischen Aufenthaltstitels ist nur möglich, wenn derjenige, der auf die Daten zugreifen möchte sich selbst zunächst eindeutig identifiziert. Dies geschieht über das sog. Berechtigungszertifikat. Es wird Ihnen immer angezeigt, wer auf Ihre Daten zugreifen möchte. Die Erlaubnis, ein Berechtigungszertifikat zu erhalten, wird einen Anbieter auf Antrag und nach Prüfung bei der Vergabestelle für Berechtigungszertifikate beim Bundesverwaltungsamt erteilt. Um das technische Berechtigungszertifikat anzuzeigen und darüber hinaus eine Gültigkeitsprüfung des Ausweisdokuments durchführen zu können, ist eine Internetverbindung zwingend erforderlich. Aus diesem Grund spricht man auch von der Online-Ausweisfunktion."},
-			"address": "https://www.ausweisapp.bund.de/online-ausweisen/meine-daten-auslesen",
+			"shortName": {"" : "Selbstauskunft"},
+			"longName": {"" : "Selbstauskunft/ 'Meine Daten einsehen'"},
+			"shortDescription": {"": "Selbstauskunft/ 'Meine Daten einsehen'"},
+			"longDescription": {"": "Die AusweisApp2 verfügt über die Funktion 'Meine Daten einsehen'. Mit dieser Funktion können Sie eine Test-Authentisierung durchführen und die auf dem Personalausweis, elektronischen Aufenthaltstitel oder der eID-Karte gespeicherten Daten auslesen. Sie können also eine Selbstauskunft durchführen.<br/><br/>Der App-Hersteller, die Governikus GmbH & Co. KG, bietet diesen Dienst an und erscheint daher als Anbieter, bei dem Sie sich ausweisen möchten. Nach Eingabe Ihrer PIN und erfolgreicher Datenübertragung werden Ihnen Ihre persönlichen Ausweis-Daten in der AusweisApp2 angezeigt. Hierbei handelt es sich um einen reinen Demonstrationsdienst, d.h. die ausgelesenen Daten werden lediglich zur Anzeige gebracht und weder gespeichert noch weitergegeben."},
+			"address": "https://www.ausweisapp.bund.de/download",
 			"homepage": "https://www.ausweisapp.bund.de",
 			"phone": "+49 421 204 95 995",
 			"email": "support@ausweisapp.de",
@@ -974,6 +954,20 @@
 			"subjectUrls": ["https://fms.mv-regierung.de"]
 		},
 		{
+			"shortName": {"" : "nEHS-Register"},
+			"longName": {"" : "Register des nationalen Brennstoffemissionshandels (BEHG)"},
+			"longDescription": {"": "Im nEHS-Register können sich natürliche Personen mit der Online-Ausweisfunktion ihres Personalausweises authentisieren und müssen dadurch keine weiteren Nachweisedokumente zu ihrer Identität vorlegen."},
+			"address": "https://nehs-register.dehst.de",
+			"homepage": "https://www.dehst.de",
+			"phone": "+49 30 8903 5080",
+			"email": "nationaler-emissionshandel@dehst.de",
+			"postalAddress": "Deutsche Emissionshandelsstelle (DEHSt) im Umweltbundesamt (UBA) City Campus - Haus 3, Eingang 3A<br/>Buchholzweg 8<br/>13627 Berlin",
+			"image": "nEHS-Register_image.jpg",
+			"icon": "nEHS-Register_icon.png",
+			"category": "citizen",
+			"subjectUrlInfo": "Using service from ELSTER (https://www.elster.de)."
+		},
+		{
 			"shortName": {"" : "Service-Portal Berlin"},
 			"address": "https://service.berlin.de/onlineverfahren-onlinedienstleistungen",
 			"homepage": "https://service.berlin.de",
diff -Nru ausweisapp2-1.22.3/src/card/ios/IosCard.h ausweisapp2-1.22.4/src/card/ios/IosCard.h
--- ausweisapp2-1.22.3/src/card/ios/IosCard.h	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/src/card/ios/IosCard.h	2022-02-16 13:07:30.000000000 +0000
@@ -22,7 +22,7 @@
 		IosCardPointer* const mCard;
 		bool mConnected;
 
-		void waitForRequestCompleted(const bool& pCondition) const;
+		void waitForRequestCompleted(const bool& pCondition);
 
 	public:
 		explicit IosCard(IosCardPointer* pTag);
diff -Nru ausweisapp2-1.22.3/src/card/ios/IosCard.mm ausweisapp2-1.22.4/src/card/ios/IosCard.mm
--- ausweisapp2-1.22.3/src/card/ios/IosCard.mm	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/src/card/ios/IosCard.mm	2022-02-16 13:07:30.000000000 +0000
@@ -35,7 +35,7 @@
 }
 
 
-void IosCard::waitForRequestCompleted(const bool& pCondition) const
+void IosCard::waitForRequestCompleted(const bool& pCondition)
 {
 	QElapsedTimer timer;
 	timer.start();
@@ -43,12 +43,14 @@
 	{
 		if (pCondition)
 		{
-			break;
+			return;
 		}
 
 		QCoreApplication::processEvents(QEventLoop::WaitForMoreEvents, 1);
 	}
 	while (timer.elapsed() <= 500);
+
+	invalidateTarget();
 }
 
 
@@ -56,7 +58,7 @@
 {
 	if (@available(iOS 13, *))
 	{
-		return mCard->mNfcTag && (!mConnected || mCard->mNfcTag.available);
+		return mCard->mNfcTag;
 	}
 
 	return false;
diff -Nru ausweisapp2-1.22.3/src/card/nfc/NfcReader.cpp ausweisapp2-1.22.4/src/card/nfc/NfcReader.cpp
--- ausweisapp2-1.22.3/src/card/nfc/NfcReader.cpp	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/src/card/nfc/NfcReader.cpp	2022-02-16 13:07:30.000000000 +0000
@@ -25,14 +25,6 @@
 }
 
 
-void NfcReader::resetCard()
-{
-	mCard.reset();
-	mReaderInfo.setCardInfo(CardInfo(CardType::NONE));
-	Q_EMIT fireCardRemoved(mReaderInfo);
-}
-
-
 void NfcReader::adapterStateChanged(QNearFieldManager::AdapterState pState)
 {
 	Q_EMIT fireNfcAdapterStateChanged(pState == QNearFieldManager::AdapterState::Online);
@@ -77,6 +69,10 @@
 	{
 		Q_EMIT fireCardInserted(mReaderInfo);
 	}
+	else
+	{
+		mReaderInfo.setCardInfo(CardInfo(CardType::NONE));
+	}
 }
 
 
@@ -85,7 +81,9 @@
 	qCDebug(card_nfc) << "targetLost";
 	if (pTarget != nullptr && mCard && mCard->invalidateTarget(pTarget))
 	{
-		resetCard();
+		mCard.reset();
+		mReaderInfo.setCardInfo(CardInfo(CardType::NONE));
+		Q_EMIT fireCardRemoved(mReaderInfo);
 	}
 }
 
@@ -199,5 +197,4 @@
 #else
 	Q_UNUSED(pError)
 #endif
-	resetCard();
 }
diff -Nru ausweisapp2-1.22.3/src/card/nfc/NfcReader.h ausweisapp2-1.22.4/src/card/nfc/NfcReader.h
--- ausweisapp2-1.22.3/src/card/nfc/NfcReader.h	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/src/card/nfc/NfcReader.h	2022-02-16 13:07:30.000000000 +0000
@@ -25,7 +25,6 @@
 		QScopedPointer<NfcCard, QScopedPointerDeleteLater> mCard;
 
 		CardEvent updateCard() override;
-		void resetCard();
 
 	Q_SIGNALS:
 		void fireNfcAdapterStateChanged(bool pEnabled);
diff -Nru ausweisapp2-1.22.3/src/global/VersionNumber.cpp ausweisapp2-1.22.4/src/global/VersionNumber.cpp
--- ausweisapp2-1.22.3/src/global/VersionNumber.cpp	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/src/global/VersionNumber.cpp	2022-02-16 13:07:30.000000000 +0000
@@ -20,7 +20,7 @@
 	int idx = 0;
 	mVersionNumber = QVersionNumber::fromString(pVersion, &idx);
 #ifdef Q_CC_GNU
-	__sync_synchronize(); // a gcc bug: https://bugs.alpinelinux.org/issues/7584
+	__sync_synchronize(); // QTBUG-62185
 #endif
 	mSuffix = pVersion.mid(idx).trimmed();
 }
diff -Nru ausweisapp2-1.22.3/src/settings/AbstractSettings.cpp ausweisapp2-1.22.4/src/settings/AbstractSettings.cpp
--- ausweisapp2-1.22.3/src/settings/AbstractSettings.cpp	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/src/settings/AbstractSettings.cpp	2022-02-16 13:07:30.000000000 +0000
@@ -24,7 +24,7 @@
 }
 
 
-QSharedPointer<QSettings> AbstractSettings::getStore()
+QSharedPointer<QSettings> AbstractSettings::getStore(const QString& pFilename, QSettings::Format pFormat)
 {
 #ifndef QT_NO_DEBUG
 	if (QCoreApplication::applicationName().startsWith(QLatin1String("Test")))
@@ -38,5 +38,7 @@
 		return QSharedPointer<QSettings>::create(QSettings::IniFormat, QSettings::UserScope, QCoreApplication::organizationName(), QCoreApplication::applicationName());
 	}
 #endif
-	return QSharedPointer<QSettings>::create();
+
+	Q_ASSERT(pFilename.isEmpty() == (pFormat == QSettings::InvalidFormat));
+	return pFilename.isEmpty() ? QSharedPointer<QSettings>::create() : QSharedPointer<QSettings>::create(pFilename, pFormat);
 }
diff -Nru ausweisapp2-1.22.3/src/settings/AbstractSettings.h ausweisapp2-1.22.4/src/settings/AbstractSettings.h
--- ausweisapp2-1.22.3/src/settings/AbstractSettings.h	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/src/settings/AbstractSettings.h	2022-02-16 13:07:30.000000000 +0000
@@ -35,7 +35,7 @@
 		static QSharedPointer<QTemporaryDir> mTestDir;
 #endif
 
-		static QSharedPointer<QSettings> getStore();
+		static QSharedPointer<QSettings> getStore(const QString& pFilename = QString(), QSettings::Format pFormat = QSettings::InvalidFormat);
 
 		virtual void save() = 0;
 
diff -Nru ausweisapp2-1.22.3/src/settings/AutoStart.cpp ausweisapp2-1.22.4/src/settings/AutoStart.cpp
--- ausweisapp2-1.22.3/src/settings/AutoStart.cpp	1970-01-01 00:00:00.000000000 +0000
+++ ausweisapp2-1.22.4/src/settings/AutoStart.cpp	2022-02-16 13:07:30.000000000 +0000
@@ -0,0 +1,21 @@
+/*!
+ * \copyright Copyright (c) 2022 Governikus GmbH & Co. KG, Germany
+ */
+
+#include "AutoStart.h"
+
+#include "VolatileSettings.h"
+
+
+using namespace governikus;
+
+
+bool AutoStart::set(bool pEnabled)
+{
+	if (Env::getSingleton<VolatileSettings>()->isUsedAsSDK())
+	{
+		return false;
+	}
+
+	return setInternal(pEnabled);
+}
diff -Nru ausweisapp2-1.22.3/src/settings/AutoStart_generic.cpp ausweisapp2-1.22.4/src/settings/AutoStart_generic.cpp
--- ausweisapp2-1.22.3/src/settings/AutoStart_generic.cpp	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/src/settings/AutoStart_generic.cpp	2022-02-16 13:07:30.000000000 +0000
@@ -23,10 +23,12 @@
 }
 
 
-void AutoStart::set(bool pEnabled)
+bool AutoStart::setInternal(bool pEnabled)
 {
 	if (pEnabled)
 	{
 		qCDebug(settings) << "Autostart not supported on this system";
 	}
+
+	return false;
 }
diff -Nru ausweisapp2-1.22.3/src/settings/AutoStart.h ausweisapp2-1.22.4/src/settings/AutoStart.h
--- ausweisapp2-1.22.3/src/settings/AutoStart.h	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/src/settings/AutoStart.h	2022-02-16 13:07:30.000000000 +0000
@@ -4,16 +4,33 @@
 
 #pragma once
 
+#include <QString>
+
+#ifdef Q_OS_WIN
+#include <QSettings>
+#include <QSharedPointer>
+#endif
+
+class test_GeneralSettings;
 
 namespace governikus
 {
 
 class AutoStart
 {
+	friend class ::test_GeneralSettings;
+
+	private:
+#ifdef Q_OS_WIN
+		static QString appPath();
+		static QSharedPointer<QSettings> getRegistryStore();
+#endif
+		static bool setInternal(bool pEnabled);
+
 	public:
 		static bool enabled();
 		static bool isSetByAdmin();
-		static void set(bool pEnabled);
+		static bool set(bool pEnabled);
 };
 
 
diff -Nru ausweisapp2-1.22.3/src/settings/AutoStart_osx.mm ausweisapp2-1.22.4/src/settings/AutoStart_osx.mm
--- ausweisapp2-1.22.3/src/settings/AutoStart_osx.mm	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/src/settings/AutoStart_osx.mm	2022-02-16 13:07:30.000000000 +0000
@@ -51,14 +51,14 @@
 }
 
 
-void AutoStart::set(bool pEnabled)
+bool AutoStart::setInternal(bool pEnabled)
 {
 	if (SMLoginItemSetEnabled(static_cast<CFStringRef>(autostartBundleIdentifier), pEnabled))
 	{
 		qCDebug(settings) << "Setting autostart to" << pEnabled << "succeeded";
+		return true;
 	}
-	else
-	{
-		qCCritical(settings) << "Setting autostart failed";
-	}
+
+	qCCritical(settings) << "Setting autostart failed";
+	return false;
 }
diff -Nru ausweisapp2-1.22.3/src/settings/AutoStart_win.cpp ausweisapp2-1.22.4/src/settings/AutoStart_win.cpp
--- ausweisapp2-1.22.3/src/settings/AutoStart_win.cpp	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/src/settings/AutoStart_win.cpp	2022-02-16 13:07:30.000000000 +0000
@@ -4,16 +4,16 @@
 
 #include "AutoStart.h"
 
+#include "AbstractSettings.h"
+#include "Env.h"
+#include "VolatileSettings.h"
+
 #include <QCoreApplication>
-#include <QSettings>
-#include <QString>
 
 using namespace governikus;
 
-namespace
-{
 
-static QString appPath()
+QString AutoStart::appPath()
 {
 	QString applicationFilePath = QCoreApplication::applicationFilePath();
 	applicationFilePath.replace(QLatin1Char('/'), QLatin1Char('\\'));
@@ -22,14 +22,12 @@
 }
 
 
-static QString registryPath()
+QSharedPointer<QSettings> AutoStart::getRegistryStore()
 {
-	return QStringLiteral("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run");
+	return AbstractSettings::getStore(QStringLiteral("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run"), QSettings::NativeFormat);
 }
 
 
-} // namespace
-
 bool AutoStart::enabled()
 {
 	if (isSetByAdmin())
@@ -37,40 +35,32 @@
 		return true;
 	}
 
-	QSettings windowsBootUpSettings(registryPath(), QSettings::NativeFormat);
-	if (!windowsBootUpSettings.contains(QCoreApplication::applicationName()))
-	{
-		return false;
-	}
-
-	if (windowsBootUpSettings.value(QCoreApplication::applicationName(), QString()).toString() != appPath())
-	{
-		// Update entries from previous versions, e.g.
-		// C:\Program Files (x86)\AusweisApp2 1.13.0 -> C:\Program Files (x86)\AusweisApp2 1.14.0
-		set(true);
-	}
-
-	return true;
+	const auto& windowsBootUpSettings = getRegistryStore();
+	return windowsBootUpSettings->contains(QCoreApplication::applicationName())
+		   && windowsBootUpSettings->value(QCoreApplication::applicationName(), QString()).toString() == appPath();
 }
 
 
 bool AutoStart::isSetByAdmin()
 {
 	QSettings settings(QStringLiteral("HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows\\CurrentVersion\\Run"), QSettings::NativeFormat);
+
 	return settings.contains(QCoreApplication::applicationName());
 }
 
 
-void AutoStart::set(bool pEnabled)
+bool AutoStart::setInternal(bool pEnabled)
 {
-	QSettings windowsBootUpSettings(registryPath(), QSettings::NativeFormat);
+	const auto& windowsBootUpSettings = getRegistryStore();
 
 	if (isSetByAdmin() || !pEnabled)
 	{
-		windowsBootUpSettings.remove(QCoreApplication::applicationName());
+		windowsBootUpSettings->remove(QCoreApplication::applicationName());
 	}
 	else
 	{
-		windowsBootUpSettings.setValue(QCoreApplication::applicationName(), appPath());
+		windowsBootUpSettings->setValue(QCoreApplication::applicationName(), appPath());
 	}
+
+	return true;
 }
diff -Nru ausweisapp2-1.22.3/src/settings/GeneralSettings.cpp ausweisapp2-1.22.4/src/settings/GeneralSettings.cpp
--- ausweisapp2-1.22.3/src/settings/GeneralSettings.cpp	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/src/settings/GeneralSettings.cpp	2022-02-16 13:07:30.000000000 +0000
@@ -179,10 +179,12 @@
 	if (pAutoStart != mAutoStart)
 	{
 #ifdef QT_NO_DEBUG
-		AutoStart::set(pAutoStart);
+		if (AutoStart::set(pAutoStart))
 #endif
-		mAutoStart = pAutoStart;
-		Q_EMIT fireSettingsChanged();
+		{
+			mAutoStart = pAutoStart;
+			Q_EMIT fireSettingsChanged();
+		}
 	}
 }
 
diff -Nru ausweisapp2-1.22.3/src/ui/base/UIPlugIn.h ausweisapp2-1.22.4/src/ui/base/UIPlugIn.h
--- ausweisapp2-1.22.3/src/ui/base/UIPlugIn.h	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/src/ui/base/UIPlugIn.h	2022-02-16 13:07:30.000000000 +0000
@@ -25,13 +25,13 @@
 		IDENTIFY,
 		SETTINGS,
 		PINMANAGEMENT,
-		TUTORIAL,
 		HISTORY,
 		HELP,
 		PROVIDER,
 		SELF_AUTHENTICATION,
 
 		// Desktop only
+		TUTORIAL,
 		UPDATEINFORMATION,
 
 		// Mobile only
diff -Nru ausweisapp2-1.22.3/src/ui/qml/AuthModel.cpp ausweisapp2-1.22.4/src/ui/qml/AuthModel.cpp
--- ausweisapp2-1.22.3/src/ui/qml/AuthModel.cpp	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/src/ui/qml/AuthModel.cpp	2022-02-16 13:07:30.000000000 +0000
@@ -23,6 +23,7 @@
 
 	if (mContext)
 	{
+		connect(mContext.data(), &AuthContext::fireShowChangePinViewChanged, this, &AuthModel::fireShowChangePinViewChanged);
 		connect(mContext.data(), &AuthContext::fireDidAuthenticateEac1Changed, this, &AuthModel::onDidAuthenticateEac1Changed);
 		connect(mContext.data(), &AuthContext::fireProgressChanged, this, &AuthModel::fireProgressChanged);
 	}
@@ -34,6 +35,7 @@
 		Q_EMIT fireTransactionInfoChanged();
 	}
 
+	Q_EMIT fireShowChangePinViewChanged();
 	Q_EMIT fireProgressChanged();
 }
 
@@ -66,6 +68,17 @@
 }
 
 
+bool AuthModel::getShowChangePinView() const
+{
+	if (mContext)
+	{
+		return mContext->showChangePinView();
+	}
+
+	return false;
+}
+
+
 QString AuthModel::getErrorHeader() const
 {
 	if (!mContext || mContext->getTcTokenUrl().isEmpty())
@@ -103,6 +116,17 @@
 }
 
 
+void AuthModel::cancelWorkflowToChangePin()
+{
+	if (mContext)
+	{
+		mContext->requestChangePinView();
+		mContext->setStatus(GlobalStatus::Code::Workflow_Cancellation_By_User);
+		Q_EMIT mContext->fireCancelWorkflow();
+	}
+}
+
+
 void AuthModel::requestTransportPinChange()
 {
 	if (mContext)
diff -Nru ausweisapp2-1.22.3/src/ui/qml/AuthModel.h ausweisapp2-1.22.4/src/ui/qml/AuthModel.h
--- ausweisapp2-1.22.3/src/ui/qml/AuthModel.h	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/src/ui/qml/AuthModel.h	2022-02-16 13:07:30.000000000 +0000
@@ -27,6 +27,7 @@
 	Q_PROPERTY(QString transactionInfo READ getTransactionInfo NOTIFY fireTransactionInfoChanged)
 	Q_PROPERTY(int progressValue READ getProgressValue NOTIFY fireProgressChanged)
 	Q_PROPERTY(QString progressMessage READ getProgressMessage NOTIFY fireProgressChanged)
+	Q_PROPERTY(bool showChangePinView READ getShowChangePinView NOTIFY fireShowChangePinViewChanged)
 	Q_PROPERTY(QString errorHeader READ getErrorHeader NOTIFY fireResultChanged)
 	Q_PROPERTY(QString errorText READ getErrorText NOTIFY fireResultChanged)
 	Q_PROPERTY(QString statusCodeString READ getStatusCodeString NOTIFY fireResultChanged)
@@ -44,16 +45,19 @@
 		const QString& getTransactionInfo() const;
 		int getProgressValue() const;
 		QString getProgressMessage() const;
+		bool getShowChangePinView() const;
 		QString getErrorHeader() const;
 		QString getErrorText() const;
 		QString getStatusCodeString() const;
 
+		Q_INVOKABLE void cancelWorkflowToChangePin();
 		Q_INVOKABLE void requestTransportPinChange();
 
 	private Q_SLOTS:
 		void onDidAuthenticateEac1Changed();
 
 	Q_SIGNALS:
+		void fireShowChangePinViewChanged();
 		void fireTransactionInfoChanged();
 		void fireProgressChanged();
 };
diff -Nru ausweisapp2-1.22.3/src/ui/qml/PinResetInformationModel.cpp ausweisapp2-1.22.4/src/ui/qml/PinResetInformationModel.cpp
--- ausweisapp2-1.22.3/src/ui/qml/PinResetInformationModel.cpp	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/src/ui/qml/PinResetInformationModel.cpp	2022-02-16 13:07:30.000000000 +0000
@@ -20,16 +20,26 @@
 }
 
 
-bool PinResetInformationModel::hasPinResetUrl() const
+bool PinResetInformationModel::hasPinResetService() const
 {
-	return !getPinResetUrl().isEmpty();
+	const auto& config = Env::getSingleton<ProviderConfiguration>();
+	const auto& info = config->getProviderInfo(QStringLiteral("pinResetService"));
+	return !info.getHomepage().isEmpty();
 }
 
 
 QUrl PinResetInformationModel::getPinResetUrl() const
 {
-	const auto& info = Env::getSingleton<ProviderConfiguration>()->getProviderInfo(QStringLiteral("pinResetService"));
-	return info.getHomepage();
+	const auto& config = Env::getSingleton<ProviderConfiguration>();
+	const auto& info = config->getProviderInfo(QStringLiteral("pinResetService"));
+	const auto& homepage = info.getHomepage();
+
+	if (homepage.isEmpty())
+	{
+		return tr("https://www.personalausweisportal.de/EN");
+	}
+
+	return homepage;
 }
 
 
@@ -42,89 +52,87 @@
 
 QString PinResetInformationModel::getPinUnknownHint() const
 {
-	return hasPinResetUrl()
+	return hasPinResetService() ?
 	       //: LABEL ALL_PLATFORMS Text in Hint to PRS if the (Transport) PIN is unknown to the user on the Change PIN startpage
-			? tr("By using the PIN Reset Service you may request a new PIN.")
+		   tr("By using the PIN Reset Service you may request a new PIN.") :
 	       //: LABEL ALL_PLATFORMS Text in Hint when PRS is not available and the (Transport) PIN is unknown to the user on the Change PIN startpage
-			: tr("If this is the case please turn to the competent authority and set a new PIN there.");
+		   tr("If this is the case please turn to the competent authority and set a new PIN there.<br/><br/>For further information, please visit the ID card portal.");
 }
 
 
 QString PinResetInformationModel::getNoPinAndNoPukHint() const
 {
-	return hasPinResetUrl()
+	return hasPinResetService() ?
 	       //: LABEL ALL_PLATFORMS Hint text for requested PUK but both, PUK and PIN are not known.
-			? tr("If you forgot your PIN or do not have access to the PUK, you may request a new PIN here.")
-			: QString();
+		   tr("If you have forgotten your PIN or do not have access to the PUK, you may request a new PIN here.") :
+	       //: LABEL ALL_PLATFORMS Hint text for requested PUK but both, PUK and PIN are not known.
+		   tr("If you have forgotten your PIN or do not have access to the PUK, you may turn to the competent authority and set a new PIN there.<br/><br/>For further information, please visit the ID card portal.");
 }
 
 
 QString PinResetInformationModel::getNoPinAndNoTransportPinHint() const
 {
-	return hasPinResetUrl()
+	return hasPinResetService() ?
+	       //: LABEL ALL_PLATFORMS Hint text for requested Transport PIN but both, Transport PIN and PIN are not known.
+		   tr("If you know neither your Transport PIN nor your PIN, you may request a new PIN here.") :
 	       //: LABEL ALL_PLATFORMS Hint text for requested Transport PIN but both, Transport PIN and PIN are not known.
-			? tr("If you know neither your Transport PIN nor your PIN, you may request a new PIN here.")
-			: QString();
+		   tr("If you know neither your Transport PIN nor your PIN, you may turn to the competent authority and set a new PIN there.<br/><br/>For further information, please visit the ID card portal.");
 }
 
 
 QString PinResetInformationModel::getPinForgottenHint() const
 {
-	return hasPinResetUrl()
+	return hasPinResetService() ?
+	       //: LABEL ALL_PLATFORMS Hint text for PIN but it is unknown.
+		   tr("If you cannot recall your PIN, you may request a new PIN here.") :
 	       //: LABEL ALL_PLATFORMS Hint text for PIN but it is unknown.
-			? tr("If you cannot recall your PIN, you may request a new PIN here.")
-			: QString();
+		   tr("If you cannot recall your PIN, you may turn to the competent authority and set a new PIN there.<br/><br/>For further information, please visit the ID card portal.");
 }
 
 
 QString PinResetInformationModel::getPinForgottenTutorialHint() const
 {
-	return hasPinResetUrl()
+	return hasPinResetService() ?
 	       //: LABEL ANDROID IOS
-			? tr("If you cannot recall your six-digit PIN or cannot find your PIN letter, may request a new PIN using the PIN Reset Service.")
+		   tr("If you cannot recall your six-digit PIN or cannot find your PIN letter, you may request a new PIN using the PIN Reset Service.") :
 	       //: LABEL ANDROID IOS
-			: tr("You can always set a new PIN at the issuing authority if the (Transport) PIN is not known.");
+		   tr("You can always set a new PIN at the competent authority if the (Transport) PIN is not known.<br/><br/>For further information, please visit the ID card portal.");
 }
 
 
 QString PinResetInformationModel::getRequestNewPinHint() const
 {
-	return hasPinResetUrl()
+	return hasPinResetService() ?
 	       //: LABEL ALL_PLATFORMS Hint when a workflow failed because of a blocked PUK
-			? tr("You may request a new PIN here.")
-			: QString();
+		   tr("You may request a new PIN here.") :
+	       //: LABEL ALL_PLATFORMS Hint when a workflow failed because of a blocked PUK
+		   tr("You may turn to the competent authority and set a new PIN there.<br/><br/>For further information, please visit the ID card portal.");
 }
 
 
 QString PinResetInformationModel::getActivateOnlineFunctionHint() const
 {
-	return hasPinResetUrl()
+	return hasPinResetService() ?
+	       //: LABEL ALL_PLATFORMS Hint when a workflow failed because the online identification funtion was not activated
+		   tr("You can request activation of the online identification function here.") :
 	       //: LABEL ALL_PLATFORMS Hint when a workflow failed because the online identification funtion was not activated
-			? tr("You can request activation of the online identification function here.")
-			: QString();
+		   tr("Please contact the competent authority to activate the online identification function.<br/><br/>For further information, please visit the ID card portal.");
 }
 
 
-QString PinResetInformationModel::getActivateOnlineFunctionDescriptionAndHint() const
+QString PinResetInformationModel::getActivateOnlineFunctionDescription() const
 {
-	//: LABEL ANDROID IOS
-	const auto& description = tr("The online identification function of your ID card is not yet activated.");
-
-	if (!hasPinResetUrl())
-	{
-		return description;
-	}
-
-	return description + QStringLiteral("<br><br>") + getActivateOnlineFunctionHint();
+	return GlobalStatus(GlobalStatus::Code::Card_Pin_Deactivated).toErrorDescription();
 }
 
 
 QString PinResetInformationModel::getPinResetActionText() const
 {
-	return hasPinResetUrl()
+	return hasPinResetService() ?
+	       //: LABEL ALL_PLATFORMS
+		   tr("To provider") :
 	       //: LABEL ALL_PLATFORMS
-			? tr("To provider")
-			: QString();
+		   tr("Open website");
 }
 
 
diff -Nru ausweisapp2-1.22.3/src/ui/qml/PinResetInformationModel.h ausweisapp2-1.22.4/src/ui/qml/PinResetInformationModel.h
--- ausweisapp2-1.22.3/src/ui/qml/PinResetInformationModel.h	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/src/ui/qml/PinResetInformationModel.h	2022-02-16 13:07:30.000000000 +0000
@@ -23,11 +23,11 @@
 	Q_PROPERTY(QString pinForgottenTutorialHint READ getPinForgottenTutorialHint NOTIFY fireUpdated)
 	Q_PROPERTY(QString requestNewPinHint READ getRequestNewPinHint NOTIFY fireUpdated)
 	Q_PROPERTY(QString activateOnlineFunctionHint READ getActivateOnlineFunctionHint NOTIFY fireUpdated)
-	Q_PROPERTY(QString activateOnlineFunctionDescriptionAndHint READ getActivateOnlineFunctionDescriptionAndHint NOTIFY fireUpdated)
+	Q_PROPERTY(QString activateOnlineFunctionDescription READ getActivateOnlineFunctionDescription NOTIFY fireUpdated)
 	Q_PROPERTY(QString pinResetActionText READ getPinResetActionText NOTIFY fireUpdated)
 
 	private:
-		bool hasPinResetUrl() const;
+		bool hasPinResetService() const;
 
 	public:
 		PinResetInformationModel();
@@ -41,7 +41,7 @@
 		QString getPinForgottenTutorialHint() const;
 		QString getRequestNewPinHint() const;
 		QString getActivateOnlineFunctionHint() const;
-		QString getActivateOnlineFunctionDescriptionAndHint() const;
+		QString getActivateOnlineFunctionDescription() const;
 		QString getPinResetActionText() const;
 
 	public Q_SLOTS:
diff -Nru ausweisapp2-1.22.3/src/ui/qml/SettingsModel.cpp ausweisapp2-1.22.4/src/ui/qml/SettingsModel.cpp
--- ausweisapp2-1.22.3/src/ui/qml/SettingsModel.cpp	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/src/ui/qml/SettingsModel.cpp	2022-02-16 13:07:30.000000000 +0000
@@ -294,7 +294,13 @@
 	}
 
 	const auto& generalSettings = Env::getSingleton<AppSettings>()->getGeneralSettings();
+#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
+	return Enum<UiModule>::fromString(generalSettings.getStartupModule(), UiModule::DEFAULT);
+
+#else
 	return Enum<UiModule>::fromString(generalSettings.getStartupModule(), UiModule::TUTORIAL);
+
+#endif
 }
 
 
diff -Nru ausweisapp2-1.22.3/src/ui/qml/UIPlugInQml.cpp ausweisapp2-1.22.4/src/ui/qml/UIPlugInQml.cpp
--- ausweisapp2-1.22.3/src/ui/qml/UIPlugInQml.cpp	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/src/ui/qml/UIPlugInQml.cpp	2022-02-16 13:07:30.000000000 +0000
@@ -380,7 +380,7 @@
 		Env::getSingleton<ChangePinModel>()->resetChangePinContext();
 	}
 
-	if (pContext.objectCast<AuthContext>())
+	if (const auto& context = pContext.objectCast<AuthContext>())
 	{
 		Env::getSingleton<ConnectivityManager>()->stopWatching();
 		Env::getSingleton<AuthModel>()->resetAuthContext();
@@ -392,7 +392,7 @@
 		// Only hide the UI if we don't need to show the update information view. This behaviour ensures that
 		// the user is (aggressively) notified about a pending update if the AA2 is only shown for authentication
 		// workflows and never manually brought to foreground in between.
-		if (!pContext.objectCast<SelfAuthContext>() && !pContext->hasNextWorkflowPending() && generalSettings.isAutoCloseWindowAfterAuthentication() && !showUpdateInformationIfPending())
+		if (!pContext.objectCast<SelfAuthContext>() && !pContext->hasNextWorkflowPending() && generalSettings.isAutoCloseWindowAfterAuthentication() && !showUpdateInformationIfPending() && !context->showChangePinView())
 		{
 			onHideUi();
 		}
diff -Nru ausweisapp2-1.22.3/src/ui/qml/WorkflowModel.cpp ausweisapp2-1.22.4/src/ui/qml/WorkflowModel.cpp
--- ausweisapp2-1.22.3/src/ui/qml/WorkflowModel.cpp	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/src/ui/qml/WorkflowModel.cpp	2022-02-16 13:07:30.000000000 +0000
@@ -134,16 +134,6 @@
 }
 
 
-void WorkflowModel::cancelWorkflowToChangePin()
-{
-	if (mContext)
-	{
-		mContext->setStatus(GlobalStatus::Code::Workflow_Cancellation_By_User);
-		Q_EMIT mContext->fireCancelWorkflow();
-	}
-}
-
-
 bool WorkflowModel::isBasicReader() const
 {
 	if (mContext && mContext->getCardConnection())
diff -Nru ausweisapp2-1.22.3/src/ui/qml/WorkflowModel.h ausweisapp2-1.22.4/src/ui/qml/WorkflowModel.h
--- ausweisapp2-1.22.3/src/ui/qml/WorkflowModel.h	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/src/ui/qml/WorkflowModel.h	2022-02-16 13:07:30.000000000 +0000
@@ -66,7 +66,6 @@
 
 		Q_INVOKABLE void cancelWorkflow();
 		Q_INVOKABLE void startScanIfNecessary();
-		Q_INVOKABLE void cancelWorkflowToChangePin();
 		Q_INVOKABLE void continueWorkflow();
 		Q_INVOKABLE void setInitialPluginType();
 		Q_INVOKABLE bool selectedReaderHasCard() const;
diff -Nru ausweisapp2-1.22.3/src/workflows/base/context/AuthContext.cpp ausweisapp2-1.22.4/src/workflows/base/context/AuthContext.cpp
--- ausweisapp2-1.22.3/src/workflows/base/context/AuthContext.cpp	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/src/workflows/base/context/AuthContext.cpp	2022-02-16 13:07:30.000000000 +0000
@@ -21,6 +21,7 @@
 	, mTcTokenNotFound(true)
 	, mErrorReportedToServer(false)
 	, mSkipRedirect(false)
+	, mShowChangePinView(false)
 	, mActivationContext(pActivationContext)
 	, mTcTokenUrl()
 	, mTcToken()
@@ -73,6 +74,19 @@
 }
 
 
+void AuthContext::requestChangePinView()
+{
+	if (mShowChangePinView)
+	{
+		return;
+	}
+
+	mSkipRedirect = true;
+	mShowChangePinView = true;
+	Q_EMIT fireShowChangePinViewChanged();
+}
+
+
 void AuthContext::initAccessRightManager(const QSharedPointer<const CVCertificate>& pTerminalCvc)
 {
 	mAccessRightManager.reset(new AccessRightManager(mDIDAuthenticateEAC1, pTerminalCvc));
diff -Nru ausweisapp2-1.22.3/src/workflows/base/context/AuthContext.h ausweisapp2-1.22.4/src/workflows/base/context/AuthContext.h
--- ausweisapp2-1.22.3/src/workflows/base/context/AuthContext.h	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/src/workflows/base/context/AuthContext.h	2022-02-16 13:07:30.000000000 +0000
@@ -61,6 +61,7 @@
 		bool mTcTokenNotFound;
 		bool mErrorReportedToServer;
 		bool mSkipRedirect;
+		bool mShowChangePinView;
 
 		QSharedPointer<ActivationContext> mActivationContext;
 		QUrl mTcTokenUrl;
@@ -91,6 +92,7 @@
 
 	Q_SIGNALS:
 		void fireProgressChanged();
+		void fireShowChangePinViewChanged();
 		void fireDidAuthenticateEac1Changed();
 		void fireAccessRightManagerCreated(QSharedPointer<AccessRightManager> pAccessRightManager);
 
@@ -124,6 +126,15 @@
 		void setProgress(int pValue, const QString& pMessage);
 
 
+		[[nodiscard]] bool showChangePinView() const
+		{
+			return mShowChangePinView;
+		}
+
+
+		void requestChangePinView();
+
+
 		[[nodiscard]] bool isTcTokenNotFound() const
 		{
 			return mTcTokenNotFound;
diff -Nru ausweisapp2-1.22.3/src/workflows/base/context/WorkflowContext.cpp ausweisapp2-1.22.4/src/workflows/base/context/WorkflowContext.cpp
--- ausweisapp2-1.22.3/src/workflows/base/context/WorkflowContext.cpp	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/src/workflows/base/context/WorkflowContext.cpp	2022-02-16 13:07:30.000000000 +0000
@@ -99,7 +99,7 @@
 {
 	qWarning() << "Killing the current workflow.";
 	mWorkflowKilled = true;
-	mStatus = GlobalStatus::Code::Card_Cancellation_By_User;
+	mStatus = GlobalStatus::Code::Workflow_Cancellation_By_User;
 	if (!mStateApproved)
 	{
 		setStateApproved(true);
diff -Nru ausweisapp2-1.22.3/test/qt/configuration/test_ProviderConfiguration.cpp ausweisapp2-1.22.4/test/qt/configuration/test_ProviderConfiguration.cpp
--- ausweisapp2-1.22.3/test/qt/configuration/test_ProviderConfiguration.cpp	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/test/qt/configuration/test_ProviderConfiguration.cpp	2022-02-16 13:07:30.000000000 +0000
@@ -310,7 +310,7 @@
 				}
 			}
 
-			QCOMPARE(attachedEidCounter, 20);
+			QCOMPARE(attachedEidCounter, 19);
 		}
 
 
diff -Nru ausweisapp2-1.22.3/test/qt/configuration/test_ProviderConfigurationParser.cpp ausweisapp2-1.22.4/test/qt/configuration/test_ProviderConfigurationParser.cpp
--- ausweisapp2-1.22.3/test/qt/configuration/test_ProviderConfigurationParser.cpp	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/test/qt/configuration/test_ProviderConfigurationParser.cpp	2022-02-16 13:07:30.000000000 +0000
@@ -222,8 +222,8 @@
 			QTest::addColumn<int>("majorVersion");
 			QTest::addColumn<int>("count");
 
-			const int all = 92;
-			const int withEidSupport = 68;
+			const int all = 91;
+			const int withEidSupport = 67;
 			QTest::newRow("win") << QOperatingSystemVersion::Windows << -1 << all;
 			QTest::newRow("mac") << QOperatingSystemVersion::MacOS << -1 << all;
 			QTest::newRow("linux") << QOperatingSystemVersion::Unknown << -1 << all;
diff -Nru ausweisapp2-1.22.3/test/qt/settings/test_GeneralSettings.cpp ausweisapp2-1.22.4/test/qt/settings/test_GeneralSettings.cpp
--- ausweisapp2-1.22.3/test/qt/settings/test_GeneralSettings.cpp	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/test/qt/settings/test_GeneralSettings.cpp	2022-02-16 13:07:30.000000000 +0000
@@ -7,6 +7,7 @@
 #include "GeneralSettings.h"
 
 #include "AppSettings.h"
+#include "AutoStart.h"
 #include "Env.h"
 #include "VolatileSettings.h"
 
@@ -135,6 +136,40 @@
 		}
 
 
+#ifdef Q_OS_WIN
+		void testInstallationPathOfAutoStart_data()
+		{
+			QTest::addColumn<bool>("useSdkMode");
+			QTest::newRow("SdkModeEnabled") << true;
+			QTest::newRow("SdkModeDisabled") << false;
+		}
+
+
+		void testInstallationPathOfAutoStart()
+		{
+
+			QFETCH(bool, useSdkMode);
+
+			SDK_MODE(useSdkMode);
+
+			// change path to trigger rewrite of AutoStart entry
+			const auto& windowsBootUpSettings = AutoStart::getRegistryStore();
+			windowsBootUpSettings->setValue(QCoreApplication::applicationName(), QStringLiteral("dummy"));
+
+			QCOMPARE(windowsBootUpSettings->value(QCoreApplication::applicationName(), QString()).toString(), QString("dummy"));
+
+			QVERIFY(!AutoStart::enabled());
+			QCOMPARE(windowsBootUpSettings->value(QCoreApplication::applicationName(), QString()).toString(), QString("dummy"));
+
+			AutoStart::set(true);
+			QCOMPARE(AutoStart::enabled(), !useSdkMode);
+			const auto& expectedPath = useSdkMode ? QString("dummy") : AutoStart::appPath();
+			QCOMPARE(windowsBootUpSettings->value(QCoreApplication::applicationName(), QString()).toString(), expectedPath);
+		}
+
+
+#endif
+
 		void testUseScreenKeyboard()
 		{
 			auto& settings = Env::getSingleton<AppSettings>()->getGeneralSettings();
diff -Nru ausweisapp2-1.22.3/test/qt/ui/qml/test_PinResetInformationModel.cpp ausweisapp2-1.22.4/test/qt/ui/qml/test_PinResetInformationModel.cpp
--- ausweisapp2-1.22.3/test/qt/ui/qml/test_PinResetInformationModel.cpp	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/test/qt/ui/qml/test_PinResetInformationModel.cpp	2022-02-16 13:07:30.000000000 +0000
@@ -23,7 +23,7 @@
 	private Q_SLOTS:
 		void test_PinResetUrl()
 		{
-			QVERIFY(Env::getSingleton<PinResetInformationModel>()->getPinResetUrl().isEmpty());
+			QVERIFY(!Env::getSingleton<PinResetInformationModel>()->getPinResetUrl().isEmpty());
 		}
 
 
diff -Nru ausweisapp2-1.22.3/test/qt/ui/qml/test_ProviderNameFilterModel.cpp ausweisapp2-1.22.4/test/qt/ui/qml/test_ProviderNameFilterModel.cpp
--- ausweisapp2-1.22.3/test/qt/ui/qml/test_ProviderNameFilterModel.cpp	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/test/qt/ui/qml/test_ProviderNameFilterModel.cpp	2022-02-16 13:07:30.000000000 +0000
@@ -51,11 +51,11 @@
 			HistoryModel model;
 			mModel->setSourceModel(&model);
 
-			HistoryInfo historyInfo1("SubjectName", QString("https://www.ausweisapp.bund.de/online-ausweisen/meine-daten-auslesen"), "Usage", QDateTime::currentDateTime(), "TermOfUsage", {"RequestedData"});
+			HistoryInfo historyInfo1("SubjectName", QString("https://www.ausweisapp.bund.de/download"), "Usage", QDateTime::currentDateTime(), "TermOfUsage", {"RequestedData"});
 			HistoryInfo historyInfo2("SubjectName", QString("https://test.de"), "Usage", QDateTime::currentDateTime(), "TermOfUsage", {"RequestedData"});
 			Env::getSingleton<AppSettings>()->getHistorySettings().addHistoryInfo(historyInfo1);
 			Env::getSingleton<AppSettings>()->getHistorySettings().addHistoryInfo(historyInfo2);
-			const QString providerAddress("https://www.ausweisapp.bund.de/online-ausweisen/meine-daten-auslesen");
+			const QString providerAddress("https://www.ausweisapp.bund.de/download");
 			mModel->setProviderAddress(providerAddress);
 
 			QVERIFY(!mModel->filterAcceptsRow(0, QModelIndex()));
@@ -70,7 +70,7 @@
 			mModel->setProviderAddress(invalidProviderAddress);
 			QCOMPARE(mModel->mProvider.getAddress(), QString());
 
-			const QString validProviderAddress("https://www.ausweisapp.bund.de/online-ausweisen/meine-daten-auslesen");
+			const QString validProviderAddress("https://www.ausweisapp.bund.de/download");
 			mModel->setProviderAddress(validProviderAddress);
 			QCOMPARE(mModel->mProvider.getAddress(), validProviderAddress);
 		}
diff -Nru ausweisapp2-1.22.3/test/qt/workflows/context/test_WorkflowContext.cpp ausweisapp2-1.22.4/test/qt/workflows/context/test_WorkflowContext.cpp
--- ausweisapp2-1.22.3/test/qt/workflows/context/test_WorkflowContext.cpp	2022-01-19 12:20:47.000000000 +0000
+++ ausweisapp2-1.22.4/test/qt/workflows/context/test_WorkflowContext.cpp	2022-02-16 13:07:30.000000000 +0000
@@ -227,7 +227,7 @@
 			QTest::ignoreMessage(QtWarningMsg, "Killing the current workflow.");
 			mContext->killWorkflow();
 			QVERIFY(mContext->isWorkflowKilled());
-			QCOMPARE(mContext->getStatus().getStatusCode(), GlobalStatus::Code::Card_Cancellation_By_User);
+			QCOMPARE(mContext->getStatus().getStatusCode(), GlobalStatus::Code::Workflow_Cancellation_By_User);
 			QVERIFY(mContext->isStateApproved());
 			QCOMPARE(spy.count(), 1);
 		}