Skip to content

Commit c1ac15f

Browse files
committed
don't stack activities on top of each other.
1 parent 1cc465b commit c1ac15f

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

base/src/main/java/com/windscribe/vpn/backend/utils/WindNotificationBuilder.kt

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import android.app.NotificationChannel
1010
import android.app.NotificationManager
1111
import android.app.PendingIntent
1212
import android.content.Intent
13+
import android.os.Build
1314
import android.os.Build.VERSION
1415
import android.os.Build.VERSION_CODES
1516
import androidx.annotation.RequiresApi
@@ -130,12 +131,16 @@ class WindNotificationBuilder @Inject constructor(
130131
notificationBuilder.addAction(action)
131132
// Launch App on Notification click.
132133
val contentIntent = Windscribe.appContext.applicationInterface.splashIntent
133-
contentIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
134-
val pendingIntent = PendingIntent
135-
.getActivity(
136-
Windscribe.appContext, 0, contentIntent,
137-
if (VERSION.SDK_INT >= VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0
138-
)
134+
contentIntent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
135+
val pendingIntent = PendingIntent.getActivity(
136+
Windscribe.appContext,
137+
0,
138+
contentIntent,
139+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
140+
PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
141+
else
142+
PendingIntent.FLAG_UPDATE_CURRENT
143+
)
139144
notificationBuilder.setContentIntent(pendingIntent)
140145
}
141146

0 commit comments

Comments
 (0)