Compare commits
28 Commits
Author | SHA1 | Date |
---|---|---|
Governikus | 684e3a1f06 | |
Governikus | 53fc9bb552 | |
Governikus | 9ba662c3bb | |
André Klitzing | ebe1437537 | |
Christian Grasser | dab96eb2bd | |
André Klitzing | 806a4dc6d7 | |
André Klitzing | 84d957f9a8 | |
Governikus | c9adf39cdc | |
John Paul Adrian Glaubitz | 5914a27069 | |
John Paul Adrian Glaubitz | 5b8016c407 | |
Christian Grasser | 7dd727820c | |
Stephan Linz | 06836ad54b | |
Governikus | 3d08ce3e5f | |
Governikus | e626090014 | |
Governikus | b4c1fbe7a9 | |
André Klitzing | 8fe1abdaf5 | |
André Klitzing | ee73f4b147 | |
André Klitzing | 19b093efcd | |
Christian Grasser | 73d816c247 | |
Governikus | fd71d19839 | |
André Klitzing | a5b97b53eb | |
André Klitzing | 4c82591b8e | |
Governikus | b41ed2ead7 | |
André Klitzing | 38c4245d1c | |
Governikus | 8fce07113d | |
Sebastian Janzen | 2c9ceb430c | |
André Klitzing | 3b90861aa4 | |
André Klitzing | 7a463a2a06 |
|
@ -37,7 +37,7 @@ ELSE()
|
||||||
ENDIF()
|
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
|
# Set TWEAK if not defined in PROJECT_VERSION above to
|
||||||
# have a valid tweak version without propagating it
|
# have a valid tweak version without propagating it
|
||||||
|
|
|
@ -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 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 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} -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 256x256 npa_beta.svg iOS/appIcons/beta/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 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/Images.xcassets/LaunchImage.imageset/launchImage@3x.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)
|
WORKING_DIRECTORY ${RESOURCES_DIR}/images)
|
||||||
|
|
||||||
ADD_CUSTOM_TARGET(npaicons.ios
|
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/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/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/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/beta/Images.xcassets/LaunchImage.imageset/launchImage.png -- iOS/appIcons/beta/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/beta/Images.xcassets/LaunchImage.imageset/launchImage@2x.png -- iOS/appIcons/beta/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@3x.png -- iOS/appIcons/beta/Images.xcassets/LaunchImage.imageset/launchImage@3x.png
|
||||||
WORKING_DIRECTORY ${RESOURCES_DIR}/images)
|
WORKING_DIRECTORY ${RESOURCES_DIR}/images)
|
||||||
|
|
||||||
ADD_CUSTOM_TARGET(pngquant.ios
|
ADD_CUSTOM_TARGET(pngquant.ios
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
AusweisApp2 1.18.2
|
||||||
|
^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
**Releasedatum:** 26. September 2019
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Anwender
|
||||||
|
""""""""
|
||||||
|
- Kleinere Fehlerbehebungen.
|
||||||
|
|
||||||
|
|
||||||
|
Entwickler
|
||||||
|
""""""""""
|
||||||
|
- Anpassungen an der Info.plist.
|
|
@ -6,6 +6,7 @@ Versionszweig 1.18
|
||||||
.. toctree::
|
.. toctree::
|
||||||
:maxdepth: 1
|
:maxdepth: 1
|
||||||
|
|
||||||
|
1.18.2
|
||||||
1.18.1
|
1.18.1
|
||||||
1.18.0
|
1.18.0
|
||||||
|
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 5.8 KiB |
Binary file not shown.
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 11 KiB |
Binary file not shown.
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 16 KiB |
|
@ -96,11 +96,6 @@
|
||||||
</array>
|
</array>
|
||||||
<key>NSHumanReadableCopyright</key>
|
<key>NSHumanReadableCopyright</key>
|
||||||
<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
|
<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
|
||||||
<key>UIBackgroundModes</key>
|
|
||||||
<array>
|
|
||||||
<string>bluetooth-central</string>
|
|
||||||
<string>fetch</string>
|
|
||||||
</array>
|
|
||||||
<key>NSBluetoothAlwaysUsageDescription</key>
|
<key>NSBluetoothAlwaysUsageDescription</key>
|
||||||
<string>AusweisApp2 needs Bluetooth to enable the required card reader.</string>
|
<string>AusweisApp2 needs Bluetooth to enable the required card reader.</string>
|
||||||
<key>NSBluetoothPeripheralUsageDescription</key>
|
<key>NSBluetoothPeripheralUsageDescription</key>
|
||||||
|
|
|
@ -5081,6 +5081,13 @@ klicken.</translation>
|
||||||
<translation>https://www.ausweisapp.bund.de/fragen-und-antworten/bewerten-sie-uns/</translation>
|
<translation>https://www.ausweisapp.bund.de/fragen-und-antworten/bewerten-sie-uns/</translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</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>
|
<context>
|
||||||
<name>governikus::CardInfo</name>
|
<name>governikus::CardInfo</name>
|
||||||
<message>
|
<message>
|
||||||
|
|
|
@ -47,17 +47,8 @@ bool WifiInfo::getCurrentWifiEnabled()
|
||||||
|
|
||||||
void WifiInfo::enableWifi()
|
void WifiInfo::enableWifi()
|
||||||
{
|
{
|
||||||
NSArray* urlStrings = @[@"prefs:root=WIFI", @"App-Prefs:root=WIFI"];
|
// While it is possible to do this programmatically using private APIs, Apple will reject apps that do this.
|
||||||
for (NSString* urlString in urlStrings)
|
qCWarning(qml) << "NOT IMPLEMENTED";
|
||||||
{
|
|
||||||
NSURL* url = [NSURL URLWithString:urlString];
|
|
||||||
if ([[UIApplication sharedApplication] canOpenURL:url])
|
|
||||||
{
|
|
||||||
[[UIApplication sharedApplication] openURL:url options:@{}
|
|
||||||
completionHandler:nil];
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -530,7 +530,11 @@ void ApplicationModel::onWifiEnabledChanged()
|
||||||
|
|
||||||
void ApplicationModel::enableWifi()
|
void ApplicationModel::enableWifi()
|
||||||
{
|
{
|
||||||
|
#ifdef Q_OS_IOS
|
||||||
|
showFeedback(tr("Please enable Wi-Fi in your system settings."));
|
||||||
|
#else
|
||||||
mWifiInfo.enableWifi();
|
mWifiInfo.enableWifi();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue