Merge v1.18.2 into community

Looks like some versions do not accept __RPC_CALLEE.
Otherwise the clang compiler for Windows will output a warning
like this:

src\core\SignalHandler.cpp(46,25):  error: cast between incompatible calling conventions 'cdecl' and 'stdcall'; calls through this pointer may abort at runtime [-Werror,-Wcast-calling-convention]
           SetConsoleCtrlHandler(PHANDLER_ROUTINE(ctrlHandler), true);

\src\core\SignalHandler.h(48,15):  note: consider defining 'ctrlHandler' with the 'stdcall' calling convention
               static BOOL ctrlHandler(DWORD pCtrlType);
                           ^
                           __RPC_CALLEE

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

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

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.

docs/releasenotes/versions.rst

@@ -6,6 +6,7 @@ Versionszweig 1.18
 .. toctree::
    :maxdepth: 1
 
+   1.18.2
    1.18.1
    1.18.0
 

resources/packaging/ios/MacOSXBundleInfo.plist.in

@@ -96,11 +96,6 @@
 	</array>
 	<key>NSHumanReadableCopyright</key>
 	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
-	<key>UIBackgroundModes</key>
-	<array>
-		<string>bluetooth-central</string>
-		<string>fetch</string>
-	</array>
 	<key>NSBluetoothAlwaysUsageDescription</key>
 	<string>AusweisApp2 needs Bluetooth to enable the required card reader.</string>
 	<key>NSBluetoothPeripheralUsageDescription</key>

resources/translations/ausweisapp2_de.ts

@@ -5081,6 +5081,13 @@ klicken.</translation>
         <translation>https://www.ausweisapp.bund.de/fragen-und-antworten/bewerten-sie-uns/</translation>
     </message>
 </context>
+<context>
+    <name>governikus::ApplicationModel</name>
+    <message>
+        <source>Please enable Wi-Fi in your system settings.</source>
+        <translation>Bitte aktivieren Sie WLAN in Ihren Systemeinstellungen.</translation>
+    </message>
+</context>
 <context>
     <name>governikus::CardInfo</name>
     <message>

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";
 }
 
 

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
 }