Browse Source

don't check if intent is declared by app before launch (#17571)

release/11.2.2
Emmanuel Hansen 1 year ago
committed by Max Katz
parent
commit
a37079596f
  1. 8
      src/Android/Avalonia.Android/Platform/AndroidLauncher.cs

8
src/Android/Avalonia.Android/Platform/AndroidLauncher.cs

@ -1,6 +1,7 @@
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using Android.Content; using Android.Content;
using Android.OS;
using Avalonia.Android.Platform.Storage; using Avalonia.Android.Platform.Storage;
using Avalonia.Platform.Storage; using Avalonia.Platform.Storage;
using AndroidUri = Android.Net.Uri; using AndroidUri = Android.Net.Uri;
@ -15,20 +16,23 @@ internal class AndroidLauncher : ILauncher
{ {
_context = context; _context = context;
} }
public Task<bool> LaunchUriAsync(Uri uri) public Task<bool> LaunchUriAsync(Uri uri)
{ {
_ = uri ?? throw new ArgumentNullException(nameof(uri)); _ = uri ?? throw new ArgumentNullException(nameof(uri));
if (uri.IsAbsoluteUri && _context.PackageManager is { } packageManager) if (uri.IsAbsoluteUri && _context.PackageManager is { } packageManager)
{ {
var intent = new Intent(Intent.ActionView, AndroidUri.Parse(uri.OriginalString)); var intent = new Intent(Intent.ActionView, AndroidUri.Parse(uri.OriginalString));
if (intent.ResolveActivity(packageManager) is not null)
try
{ {
var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask; var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
intent.SetFlags(flags); intent.SetFlags(flags);
_context.StartActivity(intent); _context.StartActivity(intent);
return Task.FromResult(true); return Task.FromResult(true);
} }
catch (ActivityNotFoundException) { }
catch (FileUriExposedException) { }
} }
return Task.FromResult(false); return Task.FromResult(false);
} }

Loading…
Cancel
Save