diff --git a/CMakeLists.txt b/CMakeLists.txt
index c69034f..88a64d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,7 @@ ELSE()
ENDIF()
-PROJECT(AusweisApp2 VERSION 1.18.1 LANGUAGES ${LANGUAGES})
+PROJECT(AusweisApp2 VERSION 1.18.2 LANGUAGES ${LANGUAGES})
# Set TWEAK if not defined in PROJECT_VERSION above to
# have a valid tweak version without propagating it
diff --git a/cmake/Tools.cmake b/cmake/Tools.cmake
index 7d5be15..cf77720 100644
--- a/cmake/Tools.cmake
+++ b/cmake/Tools.cmake
@@ -228,9 +228,9 @@ IF(CONVERT)
COMMAND ${CONVERT} -alpha off -background '${BACKGROUND_COLOR}' -resize 152x152 iOS/appIcons/npa_beta.svg iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/icon76@2x.png
COMMAND ${CONVERT} -alpha off -background '${BACKGROUND_COLOR}' -resize 167x167 iOS/appIcons/npa_beta.svg iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/icon83.5@2x.png
COMMAND ${CONVERT} -alpha off -background '${BACKGROUND_COLOR}' -resize 1024x1024 iOS/appIcons/npa_beta.svg iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/icon1024.png
- COMMAND ${CONVERT} -background none -resize 256x256 npa_beta.svg iOS/appIcons/Images.xcassets/LaunchImage.imageset/launchImage.png
- COMMAND ${CONVERT} -background none -resize 512x512 npa_beta.svg iOS/appIcons/Images.xcassets/LaunchImage.imageset/launchImage@2x.png
- COMMAND ${CONVERT} -background none -resize 768x768 npa_beta.svg iOS/appIcons/Images.xcassets/LaunchImage.imageset/launchImage@3x.png
+ COMMAND ${CONVERT} -background none -resize 256x256 npa_beta.svg iOS/appIcons/beta/Images.xcassets/LaunchImage.imageset/launchImage.png
+ COMMAND ${CONVERT} -background none -resize 512x512 npa_beta.svg iOS/appIcons/beta/Images.xcassets/LaunchImage.imageset/launchImage@2x.png
+ COMMAND ${CONVERT} -background none -resize 768x768 npa_beta.svg iOS/appIcons/beta/Images.xcassets/LaunchImage.imageset/launchImage@3x.png
WORKING_DIRECTORY ${RESOURCES_DIR}/images)
ADD_CUSTOM_TARGET(npaicons.ios
@@ -281,9 +281,9 @@ IF(PNGQUANT)
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/icon76@2x.png -- iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/icon76@2x.png
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/icon83.5@2x.png -- iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/icon83.5@2x.png
COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/icon1024.png -- iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset/icon1024.png
- COMMAND ${PNGQUANT_CMD} iOS/appIcons/Images.xcassets/LaunchImage.imageset/launchImage.png -- iOS/appIcons/Images.xcassets/LaunchImage.imageset/launchImage.png
- COMMAND ${PNGQUANT_CMD} iOS/appIcons/Images.xcassets/LaunchImage.imageset/launchImage@2x.png -- iOS/appIcons/Images.xcassets/LaunchImage.imageset/launchImage@2x.png
- COMMAND ${PNGQUANT_CMD} iOS/appIcons/Images.xcassets/LaunchImage.imageset/launchImage@3x.png -- iOS/appIcons/Images.xcassets/LaunchImage.imageset/launchImage@3x.png
+ COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/Images.xcassets/LaunchImage.imageset/launchImage.png -- iOS/appIcons/beta/Images.xcassets/LaunchImage.imageset/launchImage.png
+ COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/Images.xcassets/LaunchImage.imageset/launchImage@2x.png -- iOS/appIcons/beta/Images.xcassets/LaunchImage.imageset/launchImage@2x.png
+ COMMAND ${PNGQUANT_CMD} iOS/appIcons/beta/Images.xcassets/LaunchImage.imageset/launchImage@3x.png -- iOS/appIcons/beta/Images.xcassets/LaunchImage.imageset/launchImage@3x.png
WORKING_DIRECTORY ${RESOURCES_DIR}/images)
ADD_CUSTOM_TARGET(pngquant.ios
diff --git a/docs/releasenotes/1.18.2.rst b/docs/releasenotes/1.18.2.rst
new file mode 100644
index 0000000..2f6b2af
--- /dev/null
+++ b/docs/releasenotes/1.18.2.rst
@@ -0,0 +1,15 @@
+AusweisApp2 1.18.2
+^^^^^^^^^^^^^^^^^^
+
+**Releasedatum:** 26. September 2019
+
+
+
+Anwender
+""""""""
+ - Kleinere Fehlerbehebungen.
+
+
+Entwickler
+""""""""""
+ - Anpassungen an der Info.plist.
diff --git a/docs/releasenotes/versions.rst b/docs/releasenotes/versions.rst
index d546bbe..86a478a 100644
--- a/docs/releasenotes/versions.rst
+++ b/docs/releasenotes/versions.rst
@@ -6,6 +6,7 @@ Versionszweig 1.18
.. toctree::
:maxdepth: 1
+ 1.18.2
1.18.1
1.18.0
diff --git a/resources/images/iOS/appIcons/Images.xcassets/LaunchImage.imageset/launchImage.png b/resources/images/iOS/appIcons/Images.xcassets/LaunchImage.imageset/launchImage.png
index d07feca..c5b1abe 100644
Binary files a/resources/images/iOS/appIcons/Images.xcassets/LaunchImage.imageset/launchImage.png and b/resources/images/iOS/appIcons/Images.xcassets/LaunchImage.imageset/launchImage.png differ
diff --git a/resources/images/iOS/appIcons/Images.xcassets/LaunchImage.imageset/launchImage@2x.png b/resources/images/iOS/appIcons/Images.xcassets/LaunchImage.imageset/launchImage@2x.png
index 6430d2c..ed6119b 100644
Binary files a/resources/images/iOS/appIcons/Images.xcassets/LaunchImage.imageset/launchImage@2x.png and b/resources/images/iOS/appIcons/Images.xcassets/LaunchImage.imageset/launchImage@2x.png differ
diff --git a/resources/images/iOS/appIcons/Images.xcassets/LaunchImage.imageset/launchImage@3x.png b/resources/images/iOS/appIcons/Images.xcassets/LaunchImage.imageset/launchImage@3x.png
index fa3982d..b93479b 100644
Binary files a/resources/images/iOS/appIcons/Images.xcassets/LaunchImage.imageset/launchImage@3x.png and b/resources/images/iOS/appIcons/Images.xcassets/LaunchImage.imageset/launchImage@3x.png differ
diff --git a/resources/packaging/ios/MacOSXBundleInfo.plist.in b/resources/packaging/ios/MacOSXBundleInfo.plist.in
index eab365c..568b316 100644
--- a/resources/packaging/ios/MacOSXBundleInfo.plist.in
+++ b/resources/packaging/ios/MacOSXBundleInfo.plist.in
@@ -96,11 +96,6 @@
NSHumanReadableCopyright
${MACOSX_BUNDLE_COPYRIGHT}
- UIBackgroundModes
-
- bluetooth-central
- fetch
-
NSBluetoothAlwaysUsageDescription
AusweisApp2 needs Bluetooth to enable the required card reader.
NSBluetoothPeripheralUsageDescription
diff --git a/resources/translations/ausweisapp2_de.ts b/resources/translations/ausweisapp2_de.ts
index 5bce47b..5f77e23 100644
--- a/resources/translations/ausweisapp2_de.ts
+++ b/resources/translations/ausweisapp2_de.ts
@@ -5081,6 +5081,13 @@ klicken.
https://www.ausweisapp.bund.de/fragen-und-antworten/bewerten-sie-uns/
+
+ governikus::ApplicationModel
+
+
+ Bitte aktivieren Sie WLAN in Ihren Systemeinstellungen.
+
+
governikus::CardInfo
diff --git a/src/network/WifiInfo_ios.mm b/src/network/WifiInfo_ios.mm
index 37ae769..d911d77 100644
--- a/src/network/WifiInfo_ios.mm
+++ b/src/network/WifiInfo_ios.mm
@@ -47,17 +47,8 @@ bool WifiInfo::getCurrentWifiEnabled()
void WifiInfo::enableWifi()
{
- NSArray* urlStrings = @[@"prefs:root=WIFI", @"App-Prefs:root=WIFI"];
- for (NSString* urlString in urlStrings)
- {
- NSURL* url = [NSURL URLWithString:urlString];
- if ([[UIApplication sharedApplication] canOpenURL:url])
- {
- [[UIApplication sharedApplication] openURL:url options:@{}
- completionHandler:nil];
- break;
- }
- }
+ // While it is possible to do this programmatically using private APIs, Apple will reject apps that do this.
+ qCWarning(qml) << "NOT IMPLEMENTED";
}
diff --git a/src/ui/qml/ApplicationModel.cpp b/src/ui/qml/ApplicationModel.cpp
index 2100385..69dcb22 100644
--- a/src/ui/qml/ApplicationModel.cpp
+++ b/src/ui/qml/ApplicationModel.cpp
@@ -530,7 +530,11 @@ void ApplicationModel::onWifiEnabledChanged()
void ApplicationModel::enableWifi()
{
+#ifdef Q_OS_IOS
+ showFeedback(tr("Please enable Wi-Fi in your system settings."));
+#else
mWifiInfo.enableWifi();
+#endif
}