From aef2e0ac4f3adbfa0efcd8b2ef2cde4ab46ef16a Mon Sep 17 00:00:00 2001 From: Governikus Date: Thu, 27 Jul 2023 13:18:36 +0200 Subject: [PATCH] Add revision: v1.26.6 --- CMakeLists.txt | 2 +- LICENSE.officially.txt | 2 +- LICENSE.txt | 2 +- docs/releasenotes/1.26.6.rst | 13 +++++++++++++ docs/releasenotes/appcast.rst | 1 + docs/releasenotes/versions.rst | 1 + src/android/MainActivity.java | 2 +- 7 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 docs/releasenotes/1.26.6.rst diff --git a/CMakeLists.txt b/CMakeLists.txt index 91098986c..60501342b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,7 +60,7 @@ if(UNIX AND NOT IOS) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15 CACHE STRING "Required macOS version") endif() -project(AusweisApp2 VERSION 1.26.5 LANGUAGES ${LANGUAGES}) +project(AusweisApp2 VERSION 1.26.6 LANGUAGES ${LANGUAGES}) # Set TWEAK if not defined in PROJECT_VERSION above to # have a valid tweak version without propagating it diff --git a/LICENSE.officially.txt b/LICENSE.officially.txt index d81a69119..8d9ac7218 100644 --- a/LICENSE.officially.txt +++ b/LICENSE.officially.txt @@ -350,7 +350,7 @@ Die verwendeten Open-Source-Bibliotheken unterliegen den folgenden Nutzungsbedin OpenSSL Lizenz: Apache 2.0 - Version: 3.0.8 + Version: 3.0.9 Adresse: https://www.openssl.org/ Qt diff --git a/LICENSE.txt b/LICENSE.txt index 8bae541de..0da07e284 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -318,7 +318,7 @@ Die verwendeten Open-Source-Bibliotheken unterliegen den folgenden Nutzungsbedin OpenSSL Lizenz: Apache 2.0 - Version: 3.0.8 + Version: 3.0.9 Adresse: https://www.openssl.org/ Qt diff --git a/docs/releasenotes/1.26.6.rst b/docs/releasenotes/1.26.6.rst new file mode 100644 index 000000000..58ecd2cad --- /dev/null +++ b/docs/releasenotes/1.26.6.rst @@ -0,0 +1,13 @@ +AusweisApp2 1.26.6 +^^^^^^^^^^^^^^^^^^ + +**Releasedatum:** 27. Juli 2023 + + +Anwender +"""""""" +- Ein möglicher Absturz beim Start unter Android wurde behoben. + + +Entwickler +"""""""""" diff --git a/docs/releasenotes/appcast.rst b/docs/releasenotes/appcast.rst index 5aee3573d..c2f49f280 100644 --- a/docs/releasenotes/appcast.rst +++ b/docs/releasenotes/appcast.rst @@ -4,6 +4,7 @@ Release Notes .. toctree:: :maxdepth: 1 + 1.26.6 1.26.5 1.26.4 1.26.3 diff --git a/docs/releasenotes/versions.rst b/docs/releasenotes/versions.rst index 2eeb00038..ed4ca1cc0 100644 --- a/docs/releasenotes/versions.rst +++ b/docs/releasenotes/versions.rst @@ -6,6 +6,7 @@ Versionszweig 1.26 .. toctree:: :maxdepth: 1 + 1.26.6 1.26.5 1.26.4 1.26.3 diff --git a/src/android/MainActivity.java b/src/android/MainActivity.java index 4ad65b3e6..96051aaae 100644 --- a/src/android/MainActivity.java +++ b/src/android/MainActivity.java @@ -209,7 +209,7 @@ public static boolean isStartedByAuth() private void convertChromeOsIntent(Intent pIntent) { - if (pIntent != null && pIntent.getAction().equals("org.chromium.arc.intent.action.VIEW")) + if (pIntent != null && "org.chromium.arc.intent.action.VIEW".equals(pIntent.getAction())) { LogHandler.getLogger().info("Convert Intent action " + pIntent.getAction() + " to " + Intent.ACTION_VIEW); pIntent.setAction(Intent.ACTION_VIEW);