Fixed image and file sharing.

Author: cengiz-pz

ios/SharePlugin/active_view_controller.h

@@ -0,0 +1,12 @@
+//
+// © 2024-present https://github.com/cengiz-pz
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+@interface ActiveViewController : NSObject
+
++ (UIViewController*) getActiveViewController;
+
+@end

ios/SharePlugin/active_view_controller.m

@@ -0,0 +1,43 @@
+//
+// © 2024-present https://github.com/cengiz-pz
+//
+
+#import "active_view_controller.h"
+
+@implementation ActiveViewController : NSObject
+
++ (UIViewController*) getActiveViewController {
+	UIWindow *keyWindow = nil;
+	for (UIWindowScene *scene in UIApplication.sharedApplication.connectedScenes) {
+		if (scene.activationState == UISceneActivationStateForegroundActive) {
+			for (UIWindow *window in scene.windows) {
+				if (window.isKeyWindow) {
+					keyWindow = window;
+					break;
+				}
+			}
+		}
+	}
+	
+	if (!keyWindow) {
+		keyWindow = UIApplication.sharedApplication.windows.firstObject;
+	}
+	
+	UIViewController *activeVC = keyWindow.rootViewController;
+	while (activeVC.presentedViewController) {
+		activeVC = activeVC.presentedViewController;
+	}
+	
+	if ([activeVC isKindOfClass:[UINavigationController class]]) {
+		activeVC = [(UINavigationController *)activeVC topViewController];
+	} else if ([activeVC isKindOfClass:[UITabBarController class]]) {
+		activeVC = [(UITabBarController *)activeVC selectedViewController];
+		if ([activeVC isKindOfClass:[UINavigationController class]]) {
+			activeVC = [(UINavigationController *)activeVC topViewController];
+		}
+	}
+	
+	return activeVC;
+}
+
+@end

ios/SharePlugin/share_plugin_implementation.h

@@ -11,7 +11,8 @@
 extern String const DATA_KEY_TITLE;
 extern String const DATA_KEY_SUBJECT;
 extern String const DATA_KEY_CONTENT;
-extern String const DATA_KEY_IMAGE_PATH;
+extern String const DATA_KEY_FILE_PATH;
+extern String const DATA_KEY_MIME_TYPE;
 
 extern String const SIGNAL_NAME_SHARE_COMPLETED;
 

ios/SharePlugin/share_plugin_implementation.mm

@@ -8,11 +8,16 @@
 #include "core/config/project_settings.h"
 
 #import "share_plugin_implementation.h"
+#import "active_view_controller.h"
 
 String const DATA_KEY_TITLE = "title";
 String const DATA_KEY_SUBJECT = "subject";
 String const DATA_KEY_CONTENT = "content";
-String const DATA_KEY_IMAGE_PATH = "image_path";
+String const DATA_KEY_FILE_PATH = "file_path";
+String const DATA_KEY_MIME_TYPE = "mime_type";
+
+String const MIME_TYPE_TEXT = "text/plain";
+String const MIME_TYPE_IMAGE = "image/*";
 
 String const SIGNAL_NAME_SHARE_COMPLETED = "share_completed";
 
@@ -26,31 +31,83 @@
 Error SharePlugin::share(const Dictionary &sharedData) {
 	NSLog(@"SharePlugin::share");
 
-	UIViewController* rootController = [[UIApplication sharedApplication] delegate].window.rootViewController;
+	UIViewController *viewController = [ActiveViewController getActiveViewController];
+	if (!viewController) {
+		NSLog(@"No active view controller found");
+		return OK;
+	}
+
+	// Items to share
+	NSString *textToShare = toNsString(sharedData[DATA_KEY_CONTENT]);
+
+	UIImage *imageToShare;
+	NSURL *fileURL;
+
+	if (sharedData.has(DATA_KEY_FILE_PATH) && sharedData.has(DATA_KEY_MIME_TYPE)) {
+		NSString *mimeType = toNsString(sharedData[DATA_KEY_MIME_TYPE]);
+		if ([mimeType isEqualToString:toNsString(MIME_TYPE_IMAGE)]) {
+			imageToShare = [UIImage imageWithContentsOfFile: toNsString(sharedData[DATA_KEY_FILE_PATH])];
+		}
+		else {
+			fileURL = [NSURL fileURLWithPath: toNsString(sharedData[DATA_KEY_FILE_PATH])];
+		}
+	}
+	
+	// Array of items to share
+	NSMutableArray *itemsToShare = [NSMutableArray array];
 
-	NSArray* sharedItems = sharedData.has(DATA_KEY_IMAGE_PATH) ?
-				@[toNsString(sharedData[DATA_KEY_CONTENT]), [UIImage imageWithContentsOfFile: toNsString(sharedData[DATA_KEY_IMAGE_PATH])]] :
-				@[toNsString(sharedData[DATA_KEY_CONTENT])];
+	// Add text
+	if (textToShare) {
+		[itemsToShare addObject:textToShare];
+	}
 
-	UIActivityViewController* avc = [[UIActivityViewController alloc] initWithActivityItems: sharedItems applicationActivities: nil];
-	// if iPhone
-	if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
-		[rootController presentViewController: avc animated: YES completion: ^() {
-			emit_signal(SIGNAL_NAME_SHARE_COMPLETED);
-		}];
+	// Add image
+	if (imageToShare) {
+		[itemsToShare addObject:imageToShare];
 	}
-	// if iPad
-	else {
-		// Change Rect to position Popover
-		avc.modalPresentationStyle = UIModalPresentationPopover;
-		avc.popoverPresentationController.sourceView = rootController.view;
-		avc.popoverPresentationController.sourceRect = CGRectMake(CGRectGetMidX(rootController.view.bounds), CGRectGetMidY(rootController.view.bounds),0,0);
-		avc.popoverPresentationController.permittedArrowDirections = UIPopoverArrowDirection(0);
-		[rootController presentViewController: avc animated: YES completion: ^() {
-			emit_signal(SIGNAL_NAME_SHARE_COMPLETED);
-		}];
+	
+	// Add file
+	if (fileURL) {
+		[itemsToShare addObject:fileURL];
 	}
 
+	// Check if there are items to share
+	if (itemsToShare.count == 0) {
+		NSLog(@"No items to share");
+		return OK;
+	}
+
+	// Initialize UIActivityViewController
+	UIActivityViewController *activityVC = [[UIActivityViewController alloc] initWithActivityItems:itemsToShare applicationActivities:nil];
+	
+	// Exclude specific activity types (all available in iOS 14.3)
+	activityVC.excludedActivityTypes = @[
+		UIActivityTypePrint,
+		UIActivityTypeAssignToContact,
+		UIActivityTypeAddToReadingList,
+		UIActivityTypeMarkupAsPDF
+	];
+	
+	// For iPad: Configure popover presentation
+	if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) {
+		activityVC.popoverPresentationController.sourceView = viewController.view;
+		activityVC.popoverPresentationController.sourceRect = CGRectMake(viewController.view.bounds.size.width / 2.0, viewController.view.bounds.size.height / 2.0, 1.0, 1.0);
+	}
+	
+	// Present the share sheet on the main thread
+	dispatch_async(dispatch_get_main_queue(), ^{
+		[viewController presentViewController:activityVC animated:YES completion:nil];
+	});
+	
+	// Handle completion (optional)
+	activityVC.completionWithItemsHandler = ^(UIActivityType __nullable activityType, BOOL completed, NSArray * __nullable returnedItems, NSError * __nullable activityError) {
+		if (completed) {
+			NSLog(@"Share completed via %@", activityType);
+		} else {
+			NSLog(@"Share cancelled or failed with error: %@", activityError.localizedDescription);
+		}
+	};
+
 	return OK;
 }