Fix problems with Android 12

Akaflieg-Freiburg · Nov 25, 2021 · 0613f2e · 0613f2e
1 parent 8ac2a2d
commit 0613f2e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ option(BUILD_DOC "Build developer documentation" OFF)
 # Project data
 #
 
-project(enroute VERSION 2.13.1)
+project(enroute VERSION 2.13.2)
 set(APP_ID de.akaflieg_freiburg.enroute)
 math(EXPR PROJECT_VERSION_CODE 10000*${PROJECT_VERSION_MAJOR}+100*${PROJECT_VERSION_MINOR}+${PROJECT_VERSION_PATCH})
 add_compile_definitions(PROJECT_VERSION="${PROJECT_VERSION}")

diff --git a/buildscript-android-debug.sh b/buildscript-android-debug.sh
@@ -48,8 +48,8 @@ cmake .. \
       -DANDROID_ABI:STRING=armeabi-v7a \
       -DANDROID_BUILD_ABI_arm64-v8a:BOOL=OFF \
       -DANDROID_BUILD_ABI_armeabi-v7a:BOOL=ON \
-      -DANDROID_BUILD_ABI_x86:BOOL=ON \
-      -DANDROID_BUILD_ABI_x86_64:BOOL=OFF \
+      -DANDROID_BUILD_ABI_x86:BOOL=OFF \
+      -DANDROID_BUILD_ABI_x86_64:BOOL=ON \
       -DANDROID_NATIVE_API_LEVEL:STRING=21 \
       -DANDROID_NDK:PATH=$ANDROID_NDK_ROOT \
       -DANDROID_SDK:PATH=$ANDROID_SDK_ROOT \

diff --git a/src/AndroidManifest.xml.in b/src/AndroidManifest.xml.in
@@ -30,6 +30,7 @@
                android:icon="@mipmap/ic_launcher"
 	       android:requestLegacyExternalStorage="true">
     <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density"
+	      android:exported="true"
 	      android:name="de.akaflieg_freiburg.enroute.MobileAdaptor"
               android:label="Enroute Flight Navigation"
               android:screenOrientation="unspecified"

diff --git a/src/android/src/de/akaflieg_freiburg/enroute/Notifier.java b/src/android/src/de/akaflieg_freiburg/enroute/Notifier.java
@@ -80,7 +80,7 @@ public static void showNotification(int id, String title, String text, String lo
 
         Intent notificationIntent = new Intent("de.akaflieg_freiburg.enroute.onNotificationClick");
 	notificationIntent.putExtra("NotificationID", id);
-	PendingIntent pendingIntent = PendingIntent.getBroadcast(QtNative.activity(), 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT) ;
+	PendingIntent pendingIntent = PendingIntent.getBroadcast(QtNative.activity(), 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT|PendingIntent.FLAG_IMMUTABLE) ;
 
 	m_builder.setContentIntent(pendingIntent);
 	m_builder.setColor(Color.rgb(00,0x80,0x80));