Skip to content

Fix register for activity result #581

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

Merged
pavel-leonenko merged 1 commit into from
Nov 3, 2025
Merged

Fix register for activity result #581

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 13 additions & 7 deletions Softeq.XToolkit.WhiteLabel.Essentials.Droid/ImagePicker/DroidImagePickerService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,28 @@
// Developed by Softeq Development Corporation
// http://www.softeq.com

using System;
using System.Threading.Tasks;
using Android.Content;
using Android.Graphics;
using Android.Net;
using AndroidX.Activity.Result;
using AndroidX.Activity.Result.Contract;
using AndroidX.AppCompat.App;
using Softeq.XToolkit.Permissions;
using Softeq.XToolkit.WhiteLabel.Droid.Providers;
using Softeq.XToolkit.WhiteLabel.Essentials.ImagePicker;
using CameraPermission = Microsoft.Maui.ApplicationModel.Permissions.Camera;
using PermissionStatus = Softeq.XToolkit.Permissions.PermissionStatus;
using Uri = Android.Net.Uri;

namespace Softeq.XToolkit.WhiteLabel.Essentials.Droid.ImagePicker
{
public class DroidImagePickerService : Java.Lang.Object, IImagePickerService, IActivityResultCallback
public interface IDroidImagePickerActivity
{
ActivityResultLauncher? ActivityResultLauncher { get; }
void SetActivityResultCallback(Action<Java.Lang.Object> callback);
}

public class DroidImagePickerService : Java.Lang.Object, IImagePickerService
{
private readonly IPermissionsManager _permissionsManager;
private readonly IContextProvider _contextProvider;
Expand All @@ -32,10 +38,10 @@ public DroidImagePickerService(
_permissionsManager = permissionsManager;
_contextProvider = contextProvider;
if (ActivityResultContracts.PickVisualMedia.InvokeIsPhotoPickerAvailable(_contextProvider.CurrentActivity)
&& _contextProvider.CurrentActivity is AppCompatActivity appCompatActivity)
&& _contextProvider.CurrentActivity is IDroidImagePickerActivity droidImagePickerActivity)
{
_activityResultLauncher = appCompatActivity.RegisterForActivityResult(
new ActivityResultContracts.PickVisualMedia(), this);
droidImagePickerActivity.SetActivityResultCallback(OnActivityResult);
_activityResultLauncher = droidImagePickerActivity.ActivityResultLauncher;
}
}

Expand Down Expand Up @@ -106,7 +112,7 @@ private void OnImagePicked(object? sender, Bitmap? e)
_bitmapTaskCompletionSource!.SetResult(e);
}

void IActivityResultCallback.OnActivityResult(Java.Lang.Object? result)
private void OnActivityResult(Java.Lang.Object? result)
{
var uri = result as Uri;
_pickPhotoFileUriCompletionSource!.TrySetResult(uri);
Expand Down