narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

make launch conversation and launch tor pending intents immutable

Browse source
This commit is contained in:
Daniel Gultsch 2022-08-11 14:31:27 +02:00
parent 5a8d70a1f0
commit 150f8313a0
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/eu/siacs/conversations/services/NotificationService.java
View file

@ -1524,7 +1524,9 @@ public class NotificationService {
mXmppConnectionService, mXmppConnectionService,
0, 0,
new Intent(mXmppConnectionService, ConversationsActivity.class), new Intent(mXmppConnectionService, ConversationsActivity.class),
0); s()
? PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT
: PendingIntent.FLAG_UPDATE_CURRENT);
} catch (RuntimeException e) { } catch (RuntimeException e) {
return null; return null;
} }
@ -1573,13 +1575,25 @@ public class NotificationService {
R.drawable.ic_play_circle_filled_white_48dp, R.drawable.ic_play_circle_filled_white_48dp,
mXmppConnectionService.getString(R.string.start_orbot), mXmppConnectionService.getString(R.string.start_orbot),
PendingIntent.getActivity( PendingIntent.getActivity(
mXmppConnectionService, 147, TorServiceUtils.LAUNCH_INTENT, 0)); mXmppConnectionService,
147,
TorServiceUtils.LAUNCH_INTENT,
s()
? PendingIntent.FLAG_IMMUTABLE
| PendingIntent.FLAG_UPDATE_CURRENT
: PendingIntent.FLAG_UPDATE_CURRENT));
} else { } else {
mBuilder.addAction( mBuilder.addAction(
R.drawable.ic_file_download_white_24dp, R.drawable.ic_file_download_white_24dp,
mXmppConnectionService.getString(R.string.install_orbot), mXmppConnectionService.getString(R.string.install_orbot),
PendingIntent.getActivity( PendingIntent.getActivity(
mXmppConnectionService, 146, TorServiceUtils.INSTALL_INTENT, 0)); mXmppConnectionService,
146,
TorServiceUtils.INSTALL_INTENT,
s()
? PendingIntent.FLAG_IMMUTABLE
| PendingIntent.FLAG_UPDATE_CURRENT
: PendingIntent.FLAG_UPDATE_CURRENT));
} }
} }
mBuilder.setDeleteIntent(createDismissErrorIntent()); mBuilder.setDeleteIntent(createDismissErrorIntent());