Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 00:29:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reopen properly when we select launcher icon.

Browse Source 
* Reopen properly when we select launcher icon.

* Reduce noise
This commit is contained in:
Alex Hart
2020-12-19 16:54:00 -04:00
committed by Alan Evans
parent 6bab6c2454
commit b7477d287b
20 changed files with 72 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/service/ApplicationMigrationService.java
View File

@@ -136,7 +136,7 @@ public class ApplicationMigrationService extends Service
builder.setOngoing(true);
builder.setProgress(100, 0, false);
// TODO [greyson] Navigation
builder.setContentIntent(PendingIntent.getActivity(this, 0, new Intent(this, MainActivity.class), 0));
builder.setContentIntent(PendingIntent.getActivity(this, 0, MainActivity.clearTop(this), 0));
stopForeground(true);
startForeground(NotificationIds.APPLICATION_MIGRATION, builder.build());
@@ -188,7 +188,7 @@ public class ApplicationMigrationService extends Service
builder.setContentTitle(context.getString(R.string.ApplicationMigrationService_import_complete));
builder.setContentText(context.getString(R.string.ApplicationMigrationService_system_database_import_is_complete));
// TODO [greyson] Navigation
builder.setContentIntent(PendingIntent.getActivity(context, 0, new Intent(context, MainActivity.class), 0));
builder.setContentIntent(PendingIntent.getActivity(context, 0, MainActivity.clearTop(context), 0));
builder.setWhen(System.currentTimeMillis());
builder.setDefaults(Notification.DEFAULT_VIBRATE);
builder.setAutoCancel(true);

2
app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java
View File

@@ -108,7 +108,7 @@ public final class GenericForegroundService extends Service {
.setSmallIcon(active.iconRes)
.setContentTitle(active.title)
.setProgress(active.progressMax, active.progress, active.indeterminate)
.setContentIntent(PendingIntent.getActivity(this, 0, new Intent(this, MainActivity.class), 0))
.setContentIntent(PendingIntent.getActivity(this, 0, MainActivity.clearTop(this), 0))
.build());
}

4
app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java
View File

@@ -287,9 +287,7 @@ public class KeyCachingService extends Service {
private PendingIntent buildLaunchIntent() {
// TODO [greyson] Navigation
Intent intent = new Intent(this, MainActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
return PendingIntent.getActivity(getApplicationContext(), 0, intent, 0);
return PendingIntent.getActivity(getApplicationContext(), 0, MainActivity.clearTop(this), 0);
}
private static PendingIntent buildExpirationPendingIntent(@NonNull Context context) {