Skip to content

Fix clicking on notification does not restore activity #2979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ne0rrmatrix wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix clicking on notification does not restore activity #2979

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08a60f1
Fix clicking on notification does not restore activity
ne0rrmatrix Dec 1, 2025
da52de7
Merge branch 'main' into FixNotificationResume
ne0rrmatrix Dec 1, 2025
2f19f84
Merge branch 'main' into FixNotificationResume
ne0rrmatrix Dec 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion src/CommunityToolkit.Maui.MediaElement/Services/MediaControlsService.android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,12 @@ void StartForegroundServices()
{
NotificationManager ??= GetSystemService(NotificationService) as NotificationManager ?? throw new InvalidOperationException($"{nameof(NotificationManager)} cannot be null");
notificationBuilder ??= new NotificationCompat.Builder(Platform.AppContext, "1");

var pendingIntent = CreateActivityPendingIntent();
notificationBuilder.SetSmallIcon(Resource.Drawable.media3_notification_small_icon);
notificationBuilder.SetAutoCancel(false);
notificationBuilder.SetForegroundServiceBehavior(NotificationCompat.ForegroundServiceImmediate);
notificationBuilder.SetVisibility(NotificationCompat.VisibilityPublic);
notificationBuilder.SetContentIntent(pendingIntent);

CreateNotificationChannel(NotificationManager);

Expand All @@ -177,4 +178,17 @@ void StartForegroundServices()
StartForeground(1, notificationBuilder.Build());
}
}

static PendingIntent CreateActivityPendingIntent()
{
var packageName = Platform.AppContext.PackageName ?? throw new InvalidOperationException("PackageName cannot be null");
var packageManager = Platform.AppContext.PackageManager ?? throw new InvalidOperationException("PackageManager cannot be null");
var launchIntent = packageManager.GetLaunchIntentForPackage(packageName) ?? throw new InvalidOperationException("Launch intent cannot be null");

launchIntent.SetFlags(ActivityFlags.ClearTop | ActivityFlags.SingleTop);

var flags = PendingIntentFlags.UpdateCurrent | PendingIntentFlags.Immutable;
return PendingIntent.GetActivity(Platform.AppContext, 0, launchIntent, flags)
?? throw new InvalidOperationException("PendingIntent cannot be null");
}
}
Loading