PendingIntent.FLAG_IMMUTABLE needed for sdk level 31+

zworkb · zworkb · commit 20221aa433e9 · 2024-01-14T13:24:33.000+01:00
diff --git a/pythonforandroid/bootstraps/common/build/jni/application/src/start.c b/pythonforandroid/bootstraps/common/build/jni/application/src/start.c
@@ -406,45 +406,6 @@ JNIEXPORT int JNICALL Java_org_kivy_android_PythonService_nativeStart(
 }
 
 #if defined(BOOTSTRAP_NAME_SERVICELIBRARY)
-// JNIEXPORT void JNICALL Java_org_kivy_android_PythonWorker_nativeStart(
-//     JNIEnv *env,
-//     jobject thiz,
-//     jstring j_android_private,
-//     jstring j_android_argument,
-//     jstring j_worker_entrypoint,
-//     jstring j_python_name,
-//     jstring j_python_home,
-//     jstring j_python_path) {
-//   jboolean iscopy;
-//   const char *android_private =
-//       (*env)->GetStringUTFChars(env, j_android_private, &iscopy);
-//   const char *android_argument =
-//       (*env)->GetStringUTFChars(env, j_android_argument, &iscopy);
-//   const char *worker_entrypoint =
-//       (*env)->GetStringUTFChars(env, j_worker_entrypoint, &iscopy);
-//   const char *python_name =
-//       (*env)->GetStringUTFChars(env, j_python_name, &iscopy);
-//   const char *python_home =
-//       (*env)->GetStringUTFChars(env, j_python_home, &iscopy);
-//   const char *python_path =
-//       (*env)->GetStringUTFChars(env, j_python_path, &iscopy);
-
-//   setenv("ANDROID_PRIVATE", android_private, 1);
-//   setenv("ANDROID_ARGUMENT", android_argument, 1);
-//   setenv("ANDROID_APP_PATH", android_argument, 1);
-//   setenv("ANDROID_ENTRYPOINT", worker_entrypoint, 1);
-//   setenv("PYTHONOPTIMIZE", "2", 1);
-//   setenv("PYTHON_NAME", python_name, 1);
-//   setenv("PYTHONHOME", python_home, 1);
-//   setenv("PYTHONPATH", python_path, 1);
-//   setenv("P4A_BOOTSTRAP", bootstrap_name, 1);
-
-//   char *argv[] = {"."};
-//   /* ANDROID_ARGUMENT points to service subdir,
-//    * so main() will run main.py from this dir
-//    */
-//   main_(1, argv, 0);
-// }
 
 JNIEXPORT int JNICALL Java_org_kivy_android_PythonWorker_nativeStart(
     JNIEnv *env,
diff --git a/pythonforandroid/bootstraps/service_library/build/src/main/java/org/kivy/android/PythonBoundService.java b/pythonforandroid/bootstraps/service_library/build/src/main/java/org/kivy/android/PythonBoundService.java
@@ -143,10 +143,8 @@ public void doStartForeground(String serviceTitle, String serviceDescription) {
         Notification notification;
         Context context = getApplicationContext();
         Intent contextIntent = new Intent(context, PythonActivity.class);
-        // PendingIntent pIntent = PendingIntent.getActivity(context, 0, contextIntent,
-        //     PendingIntent.FLAG_UPDATE_CURRENT);
         PendingIntent pIntent = PendingIntent.getActivity(context, 0, contextIntent,
-        134217728 | 67108864);
+            PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
 
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
             notification = new Notification(
