From 7c1a954e4d897387dfc333a6f0242979996deca5 Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Wed, 27 Dec 2023 17:45:28 +0100
Subject: [PATCH] Stop using deprecated startActivityAndCollapse(Intent)

---
 .../aegis/services/LaunchAppTileService.java        | 13 +++++++++++--
 .../aegis/services/LaunchScannerTileService.java    | 13 +++++++++++--
 .../aegis/services/NotificationService.java         |  3 ++-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/beemdevelopment/aegis/services/LaunchAppTileService.java b/app/src/main/java/com/beemdevelopment/aegis/services/LaunchAppTileService.java
index 6fac0647..036c2c14 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/services/LaunchAppTileService.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/services/LaunchAppTileService.java
@@ -1,5 +1,7 @@
 package com.beemdevelopment.aegis.services;
 
+import android.annotation.SuppressLint;
+import android.app.PendingIntent;
 import android.content.Intent;
 import android.os.Build;
 import android.service.quicksettings.Tile;
@@ -22,6 +24,7 @@ public class LaunchAppTileService extends TileService {
         }
     }
 
+    @SuppressLint("StartActivityAndCollapseDeprecated")
     @Override
     public void onClick() {
         super.onClick();
@@ -30,6 +33,12 @@ public class LaunchAppTileService extends TileService {
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
         intent.setAction(Intent.ACTION_MAIN);
 
-        startActivityAndCollapse(intent);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            int flags = PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE;
+            PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, flags);
+            startActivityAndCollapse(pendingIntent);
+        } else {
+            startActivityAndCollapse(intent);
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/services/LaunchScannerTileService.java b/app/src/main/java/com/beemdevelopment/aegis/services/LaunchScannerTileService.java
index cb215a19..d0268566 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/services/LaunchScannerTileService.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/services/LaunchScannerTileService.java
@@ -1,5 +1,7 @@
 package com.beemdevelopment.aegis.services;
 
+import android.annotation.SuppressLint;
+import android.app.PendingIntent;
 import android.content.Intent;
 import android.os.Build;
 import android.service.quicksettings.Tile;
@@ -22,6 +24,7 @@ public class LaunchScannerTileService extends TileService {
         }
     }
 
+    @SuppressLint("StartActivityAndCollapseDeprecated")
     @Override
     public void onClick() {
         super.onClick();
@@ -31,6 +34,12 @@ public class LaunchScannerTileService extends TileService {
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
         intent.setAction(Intent.ACTION_MAIN);
 
-        startActivityAndCollapse(intent);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            int flags = PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE;
+            PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, flags);
+            startActivityAndCollapse(pendingIntent);
+        } else {
+            startActivityAndCollapse(intent);
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/beemdevelopment/aegis/services/NotificationService.java b/app/src/main/java/com/beemdevelopment/aegis/services/NotificationService.java
index 97ccc4a0..0e03c44c 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/services/NotificationService.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/services/NotificationService.java
@@ -47,7 +47,8 @@ public class NotificationService extends Service {
                 .setOngoing(true)
                 .setContentIntent(pendingIntent);
 
-        startForeground(NOTIFICATION_VAULT_UNLOCKED, builder.build());
+        // NOTE: Disabled for now. See issue: #1047
+        //startForeground(NOTIFICATION_VAULT_UNLOCKED, builder.build());
     }
 
     @Override