Merge v1.24.1 into community

Governikus · Sep 1, 2022 · f23dd3c · f23dd3c
2 parents ce004f6 + ca93fd5
commit f23dd3c
Show file tree

Hide file tree

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

diff --git a/cmake/Translation.cmake.in b/cmake/Translation.cmake.in
@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 3.1.0)
+
+foreach(file @TRANSLATION_FILES@)
+ message(STATUS "Adding DvcsAttributes to ${file}")
+ file(READ ${file} TR_FILE)
+ string(REPLACE "\">\n<context>" "\
+\">\n\
+<context>\n\
+ <name>DvcsAttributes</name>\n\
+ <message>\n\
+ <source>revision</source>\n\
+ <translation>@dvcs_revision@</translation>\n\
+ </message>\n\
+</context>\n\
+<context>" TR_FILE "${TR_FILE}")
+ file(WRITE ${file} "${TR_FILE}")
+endforeach()
diff --git a/docs/releasenotes/1.24.0.rst b/docs/releasenotes/1.24.0.rst
@@ -21,6 +21,8 @@ Anwender
 
 - Unterstützung von Windows 7 und Windows 8.1 wurde eingestellt.
 
+- Unterstützung von Windows 10 32-Bit-Version wurde eingestellt.
+
 - Unterstützung von macOS 10.13 und 10.14 wurde eingestellt.
 
 - Unterstützung von Android 5 und 6 und wurde eingestellt.

diff --git a/docs/releasenotes/1.24.1.rst b/docs/releasenotes/1.24.1.rst
@@ -0,0 +1,15 @@
+AusweisApp2 1.24.1
+^^^^^^^^^^^^^^^^^^
+
+**Releasedatum:** 31. August 2022
+
+
+Anwender
+""""""""
+- Die ukrainische und russische Sprache wurde eingeführt.
+
+
+Entwickler
+""""""""""
+
+- Fehlerkorrekturen bei der Verwendung von PersoSim.
diff --git a/docs/releasenotes/announce.rst b/docs/releasenotes/announce.rst
@@ -6,6 +6,7 @@ folgender Systeme und Funktionen eingestellt.
 
 - Windows 7
 - Windows 8.1
+- Windows 10 32-Bit-Version
 - Android 5.x und 6
 - macOS High Sierra 10.13
 - macOS Mojave 10.14

diff --git a/docs/releasenotes/appcast.rst b/docs/releasenotes/appcast.rst
@@ -4,6 +4,7 @@ Release Notes
 .. toctree::
  :maxdepth: 1
 
+ 1.24.1
  1.24.0
  announce
  issues
diff --git a/docs/releasenotes/versions.rst b/docs/releasenotes/versions.rst
@@ -6,6 +6,7 @@ Versionszweig 1.24
 .. toctree::
  :maxdepth: 1
 
+ 1.24.1
  1.24.0
 
 

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
@@ -112,7 +112,8 @@ if(NOT INTEGRATED_SDK)
  qt_create_translation(QM_FILES ${SRC_DIR} ${RESOURCES_DIR} ${TRANSLATION_FILES} OPTIONS ${LUPDATE_OPTIONS})
  endif()
 
- add_custom_target(update.translations DEPENDS ${QM_FILES})
+ configure_file("${CMAKE_DIR}/Translation.cmake.in" "${CMAKE_BINARY_DIR}/Translation.cmake" @ONLY)
+ add_custom_target(update.translations COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/Translation.cmake DEPENDS ${QM_FILES})
  message(WARNING "'make clean' will delete *.ts files!")
  else()
  qt_add_translation(QM_FILES ${TRANSLATION_FILES})

diff --git a/resources/ausweisapp.qrc b/resources/ausweisapp.qrc
@@ -64,6 +64,8 @@
  <file>images/phone_to_pc.svg</file>
  <file>images/location_flag_de.svg</file>
  <file>images/location_flag_en.svg</file>
+ <file>images/location_flag_ru.svg</file>
+ <file>images/location_flag_uk.svg</file>
  <file>images/siteWithLogo.png</file>
  <file>images/sandglass.svg</file>
  <file>images/trash_icon_all.svg</file>

diff --git a/resources/ausweisapp_mobile.qrc b/resources/ausweisapp_mobile.qrc
@@ -169,4 +169,58 @@
  <file>images/tutorial/reader_sac_no_nfc_devices.svg</file>
  <file>images/tutorial/reader_sac_no_nfc_provider.svg</file>
  </qresource>
+ <qresource prefix="/">
+ <file alias="images/tutorial/button_ru.png">images/tutorial/button_en.png</file>
+ <file alias="images/tutorial/phone_screen_ru.png">images/tutorial/phone_screen_en.png</file>
+ <file alias="images/tutorial/screenshot_cert_android_ru.png">images/tutorial/screenshot_cert_android_en.png</file>
+ <file alias="images/tutorial/screenshot_cert_ios_ru.png">images/tutorial/screenshot_cert_ios_en.png</file>
+ <file alias="images/tutorial/screenshot_check_id_card_android_ru.png">images/tutorial/screenshot_check_id_card_android_en.png</file>
+ <file alias="images/tutorial/screenshot_check_id_card_ios_ru.png">images/tutorial/screenshot_check_id_card_ios_en.png</file>
+ <file alias="images/tutorial/screenshot_choose_reader_android_ru.png">images/tutorial/screenshot_choose_reader_android_en.png</file>
+ <file alias="images/tutorial/screenshot_choose_reader_ios_ru.png">images/tutorial/screenshot_choose_reader_ios_en.png</file>
+ <file alias="images/tutorial/screenshot_pairing_ru.png">images/tutorial/screenshot_pairing_en.png</file>
+ <file alias="images/tutorial/screenshot_pin_management_menu_android_ru.png">images/tutorial/screenshot_pin_management_menu_android_en.png</file>
+ <file alias="images/tutorial/screenshot_pin_management_menu_ios_ru.png">images/tutorial/screenshot_pin_management_menu_ios_en.png</file>
+ <file alias="images/tutorial/screenshot_providerlist_android_ru.png">images/tutorial/screenshot_providerlist_android_en.png</file>
+ <file alias="images/tutorial/screenshot_providerlist_ios_ru.png">images/tutorial/screenshot_providerlist_ios_en.png</file>
+ <file alias="images/tutorial/screenshot_remoteservice_android_ru.png">images/tutorial/screenshot_remoteservice_android_en.png</file>
+ <file alias="images/tutorial/screenshot_remoteservice_ios_ru.png">images/tutorial/screenshot_remoteservice_ios_en.png</file>
+ <file alias="images/tutorial/screenshot_selfauthentication_android_ru.png">images/tutorial/screenshot_selfauthentication_android_en.png</file>
+ <file alias="images/tutorial/screenshot_selfauthentication_ios_ru.png">images/tutorial/screenshot_selfauthentication_ios_en.png</file>
+ <file alias="images/tutorial/screenshot_start_android_ru.png">images/tutorial/screenshot_start_android_en.png</file>
+ <file alias="images/tutorial/screenshot_start_ios_ru.png">images/tutorial/screenshot_start_ios_en.png</file>
+ <file alias="images/tutorial/reader_nfc_userdata_example_ru.svg">images/tutorial/reader_nfc_userdata_example_en.svg</file>
+ <file alias="images/tutorial/reader_sac_menu_android_ru.svg">images/tutorial/reader_sac_menu_android_en.svg</file>
+ <file alias="images/tutorial/reader_sac_menu_ios_ru.svg">images/tutorial/reader_sac_menu_ios_en.svg</file>
+ <file alias="images/tutorial/src/phone_screen_ru.svg">images/tutorial/src/phone_screen_en.svg</file>
+ <file alias="images/tutorial/where_identify_now_ru.svg">images/tutorial/where_identify_now_en.svg</file>
+ <file alias="images/tutorial/where_userdata_example_ru.svg">images/tutorial/where_userdata_example_en.svg</file>
+ </qresource>
+ <qresource prefix="/">
+ <file alias="images/tutorial/button_uk.png">images/tutorial/button_en.png</file>
+ <file alias="images/tutorial/phone_screen_uk.png">images/tutorial/phone_screen_en.png</file>
+ <file alias="images/tutorial/screenshot_cert_android_uk.png">images/tutorial/screenshot_cert_android_en.png</file>
+ <file alias="images/tutorial/screenshot_cert_ios_uk.png">images/tutorial/screenshot_cert_ios_en.png</file>
+ <file alias="images/tutorial/screenshot_check_id_card_android_uk.png">images/tutorial/screenshot_check_id_card_android_en.png</file>
+ <file alias="images/tutorial/screenshot_check_id_card_ios_uk.png">images/tutorial/screenshot_check_id_card_ios_en.png</file>
+ <file alias="images/tutorial/screenshot_choose_reader_android_uk.png">images/tutorial/screenshot_choose_reader_android_en.png</file>
+ <file alias="images/tutorial/screenshot_choose_reader_ios_uk.png">images/tutorial/screenshot_choose_reader_ios_en.png</file>
+ <file alias="images/tutorial/screenshot_pairing_uk.png">images/tutorial/screenshot_pairing_en.png</file>
+ <file alias="images/tutorial/screenshot_pin_management_menu_android_uk.png">images/tutorial/screenshot_pin_management_menu_android_en.png</file>
+ <file alias="images/tutorial/screenshot_pin_management_menu_ios_uk.png">images/tutorial/screenshot_pin_management_menu_ios_en.png</file>
+ <file alias="images/tutorial/screenshot_providerlist_android_uk.png">images/tutorial/screenshot_providerlist_android_en.png</file>
+ <file alias="images/tutorial/screenshot_providerlist_ios_uk.png">images/tutorial/screenshot_providerlist_ios_en.png</file>
+ <file alias="images/tutorial/screenshot_remoteservice_android_uk.png">images/tutorial/screenshot_remoteservice_android_en.png</file>
+ <file alias="images/tutorial/screenshot_remoteservice_ios_uk.png">images/tutorial/screenshot_remoteservice_ios_en.png</file>
+ <file alias="images/tutorial/screenshot_selfauthentication_android_uk.png">images/tutorial/screenshot_selfauthentication_android_en.png</file>
+ <file alias="images/tutorial/screenshot_selfauthentication_ios_uk.png">images/tutorial/screenshot_selfauthentication_ios_en.png</file>
+ <file alias="images/tutorial/screenshot_start_android_uk.png">images/tutorial/screenshot_start_android_en.png</file>
+ <file alias="images/tutorial/screenshot_start_ios_uk.png">images/tutorial/screenshot_start_ios_en.png</file>
+ <file alias="images/tutorial/reader_nfc_userdata_example_uk.svg">images/tutorial/reader_nfc_userdata_example_en.svg</file>
+ <file alias="images/tutorial/reader_sac_menu_android_uk.svg">images/tutorial/reader_sac_menu_android_en.svg</file>
+ <file alias="images/tutorial/reader_sac_menu_ios_uk.svg">images/tutorial/reader_sac_menu_ios_en.svg</file>
+ <file alias="images/tutorial/src/phone_screen_uk.svg">images/tutorial/src/phone_screen_en.svg</file>
+ <file alias="images/tutorial/where_identify_now_uk.svg">images/tutorial/where_identify_now_en.svg</file>
+ <file alias="images/tutorial/where_userdata_example_uk.svg">images/tutorial/where_userdata_example_en.svg</file>
+ </qresource>
 </RCC>
diff --git a/resources/images/location_flag_de.svg b/resources/images/location_flag_de.svg
diff --git a/resources/images/location_flag_en.svg b/resources/images/location_flag_en.svg
diff --git a/resources/images/location_flag_ru.svg b/resources/images/location_flag_ru.svg
diff --git a/resources/images/location_flag_uk.svg b/resources/images/location_flag_uk.svg
diff --git a/resources/jenkins/dsl/Releases/Release_iOS_Simulator_Framework.groovy b/resources/jenkins/dsl/Releases/Release_iOS_Simulator_Framework.groovy
@@ -15,7 +15,7 @@ j.with
  {
  shell('security unlock-keychain ${KEYCHAIN_CREDENTIALS} ${HOME}/Library/Keychains/login.keychain-db')
 
- shell('cd source; cmake --preset ci-ios-framework')
+ shell('cd source; cmake --preset ci-ios-framework-simulator')
 
  shell('cd build; xcodebuild -configuration MinSizeRel')
  shell('cmake -E tar cf AusweisApp2_BuildDir.tar.zstd --zstd build')

diff --git a/resources/qml/Governikus/AuthView/+desktop/SelfAuthenticationData.qml b/resources/qml/Governikus/AuthView/+desktop/SelfAuthenticationData.qml
@@ -122,6 +122,8 @@ SectionPage {
  GFileDialog {
  id: fileDialog
 
+ //: LABEL DESKTOP
+ title: qsTr("Save read self-authentication data")
  defaultSuffix: "pdf"
  //: LABEL DESKTOP
  nameFilters: qsTr("Portable Document Format (*.pdf)")

diff --git a/resources/qml/Governikus/EnterPasswordView/+desktop/EnterPasswordView.qml b/resources/qml/Governikus/EnterPasswordView/+desktop/EnterPasswordView.qml
@@ -40,7 +40,7 @@ SectionPage {
  }
 
  let wasNewPin = false;
- if (passwordType === PasswordType.PIN) {
+ if (passwordType === PasswordType.PIN || passwordType === PasswordType.SMART_PIN) {
  NumberModel.pin = numberField.number
  }
  else if (passwordType === PasswordType.CAN) {
@@ -49,7 +49,7 @@ SectionPage {
  else if (passwordType === PasswordType.PUK) {
  NumberModel.puk = numberField.number
  }
- else if (passwordType === PasswordType.NEW_PIN) {
+ else if (passwordType === PasswordType.NEW_PIN || passwordType === PasswordType.NEW_SMART_PIN) {
  if (numberField.inputConfirmation === "") {
  numberField.inputConfirmation = numberField.number
  } else {
@@ -85,7 +85,7 @@ SectionPage {
  StatusIcon {
  id: retryCounter
 
- visible: NumberModel.retryCounter >= 0 && passwordType === PasswordType.PIN
+ visible: NumberModel.retryCounter >= 0 && (passwordType === PasswordType.PIN || passwordType === PasswordType.SMART_PIN)
  height: Style.dimens.status_icon_small
  anchors.left: parent.left
  anchors.top: parent.top
@@ -140,6 +140,12 @@ SectionPage {
  //: LABEL DESKTOP
  : passwordType === PasswordType.TRANSPORT_PIN ? qsTr("Enter Transport PIN")
  //: LABEL DESKTOP
+ : passwordType === PasswordType.SMART_PIN ? qsTr("Enter Smart-eID PIN")
+ //: LABEL DESKTOP
+ : (passwordType === PasswordType.NEW_SMART_PIN && numberField.inputConfirmation === "")? qsTr("Enter new Smart-eID PIN")
+ //: LABEL DESKTOP
+ : (passwordType === PasswordType.NEW_SMART_PIN) ? qsTr("Confirm new Smart-eID PIN")
+ //: LABEL DESKTOP
  : qsTr("Enter ID card PIN")
  textStyle: Style.text.header
  horizontalAlignment: Text.AlignHCenter
@@ -161,8 +167,11 @@ SectionPage {
  textFormat: Text.StyledText
  text: {
  if (!numberField.confirmedInput) {
- //: INFO DESKTOP The changed ID card PIN was entered wrongfully during the confirmation process.
- return qsTr("The new ID card PIN and the confirmation do not match. Please correct your input.")
+ return passwordType === PasswordType.NEW_SMART_PIN
+ //: INFO DESKTOP The changed Smart-eID PIN was entered wrongfully during the confirmation process.
+ ? qsTr("The new Smart-eID PIN and the confirmation do not match. Please correct your input.")
+ //: INFO DESKTOP The changed ID card PIN was entered wrongfully during the confirmation process.
+ : qsTr("The new ID card PIN and the confirmation do not match. Please correct your input.")
  }
  if (passwordType === PasswordType.TRANSPORT_PIN) {
  //: INFO DESKTOP The AA2 expects the Transport PIN with five digits.
@@ -176,6 +185,18 @@ SectionPage {
  //: INFO DESKTOP The AA2 expects a ID card PIN with six digits in an authentication.
  : qsTr("Please enter your six-digit ID card PIN.")
  }
+ if (passwordType === PasswordType.SMART_PIN) {
+ if (NumberModel.retryCounter === 1) {
+ //: INFO DESKTOP The wrong Smart-eID PIN was entered twice on the Smart-eID
+ return qsTr("You have entered an incorrect, six-digit Smart-eID PIN twice. An incorrect third attempt will invalidate your Smart-eID and you will have to set it up again.")
+ }
+
+ return ApplicationModel.currentWorkflow === ApplicationModel.WORKFLOW_CHANGE_PIN
+ //: INFO DESKTOP The AA2 expects the current Smart-eID PIN with six digits in a PIN change.
+ ? qsTr("Please enter your current six-digit Smart-eID PIN.")
+ //: INFO DESKTOP The AA2 expects a Smart-eID PIN with six digits in an authentication.
+ : qsTr("Please enter your six-digit Smart-eID PIN.")
+ }
  if (passwordType === PasswordType.CAN) {
  return NumberModel.isCanAllowedMode
  //: INFO DESKTOP The user is required to enter the six-digit CAN in CAN-allowed authentication.
@@ -188,13 +209,18 @@ SectionPage {
  return qsTr("You have entered an incorrect, six-digit ID card PIN thrice, your ID card PIN is now blocked. To remove the block, the ten-digit PUK must be entered first.")
  }
  if (passwordType === PasswordType.NEW_PIN) {
- if (numberField.inputConfirmation === "") {
+ return numberField.inputConfirmation === ""
  //: INFO DESKTOP A new six-digit ID card PIN needs to be supplied.
- return qsTr("Please enter a new six-digit ID card PIN now.")
- } else {
+ ? qsTr("Please enter a new six-digit ID card PIN now.")
  //: INFO DESKTOP The new ID card PIN needs to be entered again for verification.
- return qsTr("Please confirm your new six-digit ID card PIN.")
- }
+ : qsTr("Please confirm your new six-digit ID card PIN.")
+ }
+ if (passwordType === PasswordType.NEW_SMART_PIN) {
+ return numberField.inputConfirmation === ""
+ //: INFO DESKTOP A new six-digit Smart-eID PIN needs to be supplied.
+ ? qsTr("Please enter a new six-digit Smart-eID PIN now.")
+ //: INFO DESKTOP The new Smart-eID PIN needs to be confirmed.
+ : qsTr("Please confirm your new six-digit Smart-eID PIN.")
  }
  if (passwordType === PasswordType.REMOTE_PIN) {
  //: INFO DESKTOP The pairing code needs to be supplied.

diff --git a/resources/qml/Governikus/EnterPasswordView/+desktop/PasswordInfoView.qml b/resources/qml/Governikus/EnterPasswordView/+desktop/PasswordInfoView.qml
@@ -38,8 +38,7 @@ SectionPage {
  showHelp: false
  }
 
- ColumnLayout {
-
+ GFlickableColumnLayout {
  anchors.fill: parent
  anchors.margins: Constants.pane_padding
 

diff --git a/resources/qml/Governikus/EnterPasswordView/+mobile/EnterPasswordView.qml b/resources/qml/Governikus/EnterPasswordView/+mobile/EnterPasswordView.qml
@@ -180,10 +180,10 @@ SectionPage {
  text: {
  if (!pinField.confirmedInput) {
  return passwordType === PasswordType.NEW_SMART_PIN
- //: INFO ANDROID IOS The changed Smart-eID PIN was entered wrongfully during confirmation.
- ? qsTr("The new Smart-eID PIN and the confirmation do not match. Please correct your input.")
- //: INFO ANDROID IOS The changed ID card PIN was entered wrongfully during confirmation.
- : qsTr("The new ID card PIN and the confirmation do not match. Please correct your input.")
+  //: INFO ANDROID IOS The changed Smart-eID PIN was entered wrongfully during confirmation.
+  ? qsTr("The new Smart-eID PIN and the confirmation do not match. Please correct your input.")
+  //: INFO ANDROID IOS The changed ID card PIN was entered wrongfully during confirmation.
+  : qsTr("The new ID card PIN and the confirmation do not match. Please correct your input.")
  }
  if (!!NumberModel.inputError) {
  return NumberModel.inputError
@@ -229,10 +229,10 @@ SectionPage {
 
  if (passwordType === PasswordType.SMART_PIN) {
  return ApplicationModel.currentWorkflow === ApplicationModel.WORKFLOW_CHANGE_PIN
- //: INFO ANDROID IOS The AA2 expects the current Smart-eID PIN with six digits in a PIN change.
- ? qsTr("Please enter your current six-digit Smart-eID PIN.")
- //: INFO ANDROID IOS The AA2 expects a Smart-eID PIN with six digits in an authentication.
- : qsTr("Please enter your six-digit Smart-eID PIN.")
+  //: INFO ANDROID IOS The AA2 expects the current Smart-eID PIN with six digits in a PIN change.
+  ? qsTr("Please enter your current six-digit Smart-eID PIN.")
+  //: INFO ANDROID IOS The AA2 expects a Smart-eID PIN with six digits in an authentication.
+  : qsTr("Please enter your six-digit Smart-eID PIN.")
  }
 
  return ApplicationModel.currentWorkflow === ApplicationModel.WORKFLOW_CHANGE_PIN

diff --git a/resources/qml/Governikus/EnterPasswordView/+mobile/PasswordInfoView.qml b/resources/qml/Governikus/EnterPasswordView/+mobile/PasswordInfoView.qml
@@ -47,7 +47,7 @@ SectionPage {
  fillHeight: false
 
  PasswordInfoImage {
- Layout.alignment: Qt.AlignHCenter
+ Layout.fillWidth: true
  Layout.topMargin: Constants.pane_padding
 
  passwordType: root.passwordType

diff --git a/resources/qml/Governikus/EnterPasswordView/PasswordInfoImage.qml b/resources/qml/Governikus/EnterPasswordView/PasswordInfoImage.qml
@@ -20,7 +20,7 @@ Item {
  visible: infoImage.source.toString() !== ""
 
  implicitHeight: infoImage.implicitHeight + (imageDescriptionText.visible ? (Constants.component_spacing + imageDescriptionText.implicitHeight) : 0)
- implicitWidth: Math.max(infoImageContainer.width, imageDescriptionText.implicitWidth)
+ implicitWidth: infoImageContainer.width
  height: root.implicitHeight
  width: root.implicitWidth
 
@@ -112,16 +112,19 @@ Item {
  id: imageDescriptionText
 
  visible: passwordType === PasswordType.PIN || passwordType === PasswordType.PUK
+ width: root.width
 
  anchors.horizontalCenter: parent.horizontalCenter
  anchors.bottom: parent.bottom
 
+ horizontalAlignment: Text.AlignHCenter
  textStyle: Style.text.normal
  text: (imageChangeTimer.alternativeLetter ?
  //: LABEL
  qsTr("ID card PIN/PUK on different pages") :
  //: LABEL
  qsTr("ID card PIN/PUK on the same page")
  )
+ wrapMode: Text.Wrap
  }
 }
diff --git a/resources/qml/Governikus/FeedbackView/+desktop/DetachedLogView.qml b/resources/qml/Governikus/FeedbackView/+desktop/DetachedLogView.qml
@@ -105,6 +105,8 @@ Item {
  GFileDialog {
  id: fileDialog
 
+ //: LABEL DESKTOP
+ title: qsTr("Save log")
  defaultSuffix: "log"
  //: LABEL DESKTOP
  nameFilters: qsTr("Logfiles (*.log)")

diff --git a/resources/qml/Governikus/FeedbackView/+desktop/LogView.qml b/resources/qml/Governikus/FeedbackView/+desktop/LogView.qml
@@ -70,6 +70,8 @@ SectionPage {
  GFileDialog {
  id: fileDialog
 
+ //: LABEL DESKTOP
+ title: qsTr("Save log")
  defaultSuffix: "log"
  //: LABEL DESKTOP
  nameFilters: qsTr("Logfiles (*.log)")