mirror/fdroidclient
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidclient.git synced 2026-04-20 06:47:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

[app] Mark all PendingIntents as FLAG_IMMUTABLE for now

Browse Source 
Some might need to be mutable, but we find this out later.
This commit is contained in:
Torsten Grote
2023-03-07 11:20:44 -03:00
parent 4dfa24ee14
commit cb12016992
5 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java
View File

@@ -615,7 +615,8 @@ public final class AppUpdateStatusManager {
PackageManager pm = context.getPackageManager();
Intent intentObject = pm.getLaunchIntentForPackage(entry.app.packageName);
if (intentObject != null) {
entry.intent = PendingIntent.getActivity(context, 0, intentObject, 0);
entry.intent = PendingIntent.getActivity(context, 0, intentObject,
PendingIntent.FLAG_IMMUTABLE);
} else {
entry.intent = getAppDetailsIntent(entry.apk);
}
@@ -636,7 +637,8 @@ public final class AppUpdateStatusManager {
return TaskStackBuilder.create(context)
.addParentStack(AppDetailsActivity.class)
.addNextIntent(notifyIntent)
.getPendingIntent(apk.packageName.hashCode(), PendingIntent.FLAG_UPDATE_CURRENT);
.getPendingIntent(apk.packageName.hashCode(), PendingIntent.FLAG_UPDATE_CURRENT |
PendingIntent.FLAG_IMMUTABLE);
}
private PendingIntent getAppErrorIntent(AppUpdateStatus entry) {
@@ -650,6 +652,6 @@ public final class AppUpdateStatusManager {
context,
0,
errorDialogIntent,
PendingIntent.FLAG_UPDATE_CURRENT);
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
}
}

18
app/src/main/java/org/fdroid/fdroid/NotificationHelper.java
View File

@@ -367,7 +367,8 @@ public class NotificationHelper {
Intent intentDeleted = new Intent(BROADCAST_NOTIFICATIONS_UPDATE_CLEARED);
intentDeleted.putExtra(DownloaderService.EXTRA_CANONICAL_URL, entry.getCanonicalUrl());
intentDeleted.setClass(context, NotificationBroadcastReceiver.class);
PendingIntent piDeleted = PendingIntent.getBroadcast(context, 0, intentDeleted, PendingIntent.FLAG_UPDATE_CURRENT);
PendingIntent piDeleted = PendingIntent.getBroadcast(context, 0, intentDeleted,
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
builder.setDeleteIntent(piDeleted);
loadLargeIconForEntry(entry, builder, NOTIFY_ID_UPDATES, entry.getCanonicalUrl());
return builder.build();
@@ -408,7 +409,8 @@ public class NotificationHelper {
// Intent to open main app list
Intent intentObject = new Intent(context, MainActivity.class);
intentObject.putExtra(MainActivity.EXTRA_VIEW_UPDATES, true);
PendingIntent piAction = PendingIntent.getActivity(context, 0, intentObject, PendingIntent.FLAG_UPDATE_CURRENT);
PendingIntent piAction = PendingIntent.getActivity(context, 0, intentObject,
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
NotificationCompat.Builder builder =
new NotificationCompat.Builder(context, CHANNEL_UPDATES)
@@ -429,7 +431,8 @@ public class NotificationHelper {
Intent intentDeleted = new Intent(BROADCAST_NOTIFICATIONS_ALL_UPDATES_CLEARED);
intentDeleted.setClass(context, NotificationBroadcastReceiver.class);
PendingIntent piDeleted = PendingIntent.getBroadcast(context, 0, intentDeleted, PendingIntent.FLAG_UPDATE_CURRENT);
PendingIntent piDeleted = PendingIntent.getBroadcast(context, 0, intentDeleted,
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
builder.setDeleteIntent(piDeleted);
return builder.build();
}
@@ -455,7 +458,8 @@ public class NotificationHelper {
Intent intentDeleted = new Intent(BROADCAST_NOTIFICATIONS_INSTALLED_CLEARED);
intentDeleted.putExtra(DownloaderService.EXTRA_CANONICAL_URL, entry.getCanonicalUrl());
intentDeleted.setClass(context, NotificationBroadcastReceiver.class);
PendingIntent piDeleted = PendingIntent.getBroadcast(context, 0, intentDeleted, PendingIntent.FLAG_UPDATE_CURRENT);
PendingIntent piDeleted = PendingIntent.getBroadcast(context, 0, intentDeleted,
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
builder.setDeleteIntent(piDeleted);
loadLargeIconForEntry(entry, builder, NOTIFY_ID_INSTALLED, entry.getCanonicalUrl());
@@ -487,7 +491,8 @@ public class NotificationHelper {
// Intent to open main app list
Intent intentObject = new Intent(context, MainActivity.class);
PendingIntent piAction = PendingIntent.getActivity(context, 0, intentObject, PendingIntent.FLAG_UPDATE_CURRENT);
PendingIntent piAction = PendingIntent.getActivity(context, 0, intentObject,
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
NotificationCompat.Builder builder =
new NotificationCompat.Builder(context, CHANNEL_INSTALLS)
@@ -505,7 +510,8 @@ public class NotificationHelper {
}
Intent intentDeleted = new Intent(BROADCAST_NOTIFICATIONS_ALL_INSTALLED_CLEARED);
intentDeleted.setClass(context, NotificationBroadcastReceiver.class);
PendingIntent piDeleted = PendingIntent.getBroadcast(context, 0, intentDeleted, PendingIntent.FLAG_UPDATE_CURRENT);
PendingIntent piDeleted = PendingIntent.getBroadcast(context, 0, intentDeleted,
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
builder.setDeleteIntent(piDeleted);
return builder.build();
}

4
app/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java
View File

@@ -60,7 +60,7 @@ public class DefaultInstaller extends Installer {
context.getApplicationContext(),
localApkUri.hashCode(),
installIntent,
PendingIntent.FLAG_UPDATE_CURRENT);
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
sendBroadcastInstall(canonicalUri, Installer.ACTION_INSTALL_USER_INTERACTION,
installPendingIntent);
@@ -76,7 +76,7 @@ public class DefaultInstaller extends Installer {
context.getApplicationContext(),
apk.packageName.hashCode(),
uninstallIntent,
PendingIntent.FLAG_UPDATE_CURRENT);
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
sendBroadcastUninstall(Installer.ACTION_UNINSTALL_USER_INTERACTION, uninstallPendingIntent);
}

4
app/src/main/java/org/fdroid/fdroid/installer/FileInstaller.java
View File

@@ -64,7 +64,7 @@ public class FileInstaller extends Installer {
context.getApplicationContext(),
localApkUri.hashCode(),
installIntent,
PendingIntent.FLAG_UPDATE_CURRENT);
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
sendBroadcastInstall(canonicalUri, Installer.ACTION_INSTALL_USER_INTERACTION,
installPendingIntent);
@@ -80,7 +80,7 @@ public class FileInstaller extends Installer {
context.getApplicationContext(),
apk.packageName.hashCode(),
uninstallIntent,
PendingIntent.FLAG_UPDATE_CURRENT);
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
sendBroadcastUninstall(Installer.ACTION_UNINSTALL_USER_INTERACTION, uninstallPendingIntent);
}

3
app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
View File

@@ -333,7 +333,8 @@ public class InstallManagerService extends Service {
Intent intentObject = new Intent(context, InstallManagerService.class);
intentObject.setAction(ACTION_CANCEL);
intentObject.setData(canonicalUri);
PendingIntent action = PendingIntent.getService(context, 0, intentObject, 0);
PendingIntent action =
PendingIntent.getService(context, 0, intentObject, PendingIntent.FLAG_IMMUTABLE);
appUpdateStatusManager.updateApk(canonicalUrl,
AppUpdateStatusManager.Status.Downloading, action);
break;