feat: DataTransferManager support on Android

unoplatform · Jan 29, 2021 · 4c2e6dd · 4c2e6dd
1 parent bfe6ec9
commit 4c2e6dd
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 29 deletions.
diff --git a/src/Uno.UWP/ApplicationModel/DataTransfer/DataPackageView.cs b/src/Uno.UWP/ApplicationModel/DataTransfer/DataPackageView.cs
@@ -32,6 +32,8 @@ public partial class DataPackageView
 			RequestedOperation = requestedOperation;
 		}
 
+		public DataPackagePropertySetView Properties { get; } = new DataPackagePropertySetView();
+
 		public DataPackageOperation RequestedOperation { get; }
 
 		public IReadOnlyList<string> AvailableFormats => _data.Keys.Where(k => !k.StartsWith(DataPackage.UnoPrivateDataPrefix)).ToArray();

diff --git a/src/Uno.UWP/ApplicationModel/DataTransfer/DataTransferManager.Android.cs b/src/Uno.UWP/ApplicationModel/DataTransfer/DataTransferManager.Android.cs
@@ -0,0 +1,62 @@
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Android.Content;
+using Microsoft.Extensions.Logging;
+using Uno.Extensions;
+using Uno.UI;
+
+namespace Windows.ApplicationModel.DataTransfer
+{
+	public partial class DataTransferManager
+	{
+		public static bool IsSupported() => true;
+
+		private static async Task<bool> ShowShareUIAsync(ShareUIOptions options, DataPackage dataPackage)
+		{
+			var context = ContextHelper.Current;
+			if (context == null)
+			{
+				if (_instance.Value.Log().IsEnabled(LogLevel.Error))
+				{
+					_instance.Value.Log().LogError("The Share API was called too early in the application lifecycle");
+				}
+				return false;
+			}
+
+			var dataPackageView = dataPackage.GetView();
+			var items = new List<string>();
+
+			if (dataPackageView.Contains(StandardDataFormats.Text))
+			{
+				var text = await dataPackageView.GetTextAsync();
+				items.Add(text);
+			}
+
+			var uri = await GetSharedUriAsync(dataPackageView);
+			if (uri != null)
+			{
+				items.Add(uri.ToString());
+			}
+
+			var intent = new Intent(Intent.ActionSend);
+			intent.SetType("text/plain");
+			intent.PutExtra(Intent.ExtraText, string.Join(Environment.NewLine, items));
+
+			var title = dataPackage.Properties.Title;
+			if (!string.IsNullOrWhiteSpace(title))
+			{
+				intent.PutExtra(Intent.ExtraSubject, title);
+			}
+
+			var chooserIntent = Intent.CreateChooser(intent, title ?? string.Empty);
+			var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
+			chooserIntent?.SetFlags(flags);
+			ContextHelper.Current.StartActivity(chooserIntent);
+
+			return true;
+		}
+	}
+}
diff --git a/src/Uno.UWP/ApplicationModel/DataTransfer/DataTransferManager.cs b/src/Uno.UWP/ApplicationModel/DataTransfer/DataTransferManager.cs
@@ -1,6 +1,6 @@
 #nullable enable
 
-#if __WASM__ || __IOS__
+#if __WASM__ || __IOS__ || __ANDROID__
 using System;
 using Windows.Foundation;
 using Uno.Logging;
@@ -35,14 +35,23 @@ public static async void ShowShareUI(ShareUIOptions options)
 				// Because showing the Share UI is a fire-and-forget operation
 				// and retrieving data from DataPackage requires async-await,
 				// this method must be async void.
-				await ShowShareUIAsync(options, dataPackage);
+				var result = await ShowShareUIAsync(options, dataPackage);
+				if (result)
+				{
+					dataPackage.OnShareCompleted();
+				}
+				else
+				{
+					dataPackage.OnShareCanceled();
+				}
 			}
 			catch (Exception ex)
 			{
 				if (dataTransferManager.Log().IsEnabled(LogLevel.Error))
 				{
 					dataTransferManager.Log().LogError($"Exception occurred trying to show share UI: {ex}");
 				}
+				dataPackage.OnShareCanceled();
 			}
 		}
 

diff --git a/src/Uno.UWP/ApplicationModel/DataTransfer/DataTransferManager.iOS.cs b/src/Uno.UWP/ApplicationModel/DataTransfer/DataTransferManager.iOS.cs
@@ -18,7 +18,7 @@ public partial class DataTransferManager
 	{
 		public static bool IsSupported() => true;
 
-		private static async Task ShowShareUIAsync(ShareUIOptions options, DataPackage dataPackage)
+		private static async Task<bool> ShowShareUIAsync(ShareUIOptions options, DataPackage dataPackage)
 		{
 			var rootViewController = UIApplication.SharedApplication?.KeyWindow?.RootViewController;
 			if (rootViewController == null)
@@ -27,7 +27,7 @@ private static async Task ShowShareUIAsync(ShareUIOptions options, DataPackage d
 				{
 					_instance.Value.Log().LogError("The Share API was called too early in the application lifecycle");
 				}
-				return;
+				return false;
 			}
 
 			var dataPackageView = dataPackage.GetView();
@@ -84,16 +84,7 @@ private static async Task ShowShareUIAsync(ShareUIOptions options, DataPackage d
 
 			await rootViewController.PresentViewControllerAsync(activityViewController, true);
 
-			var result = await completionSource.Task;
-
-			if (result)
-			{
-				dataPackage.OnShareCompleted();
-			}
-			else
-			{
-				dataPackage.OnShareCanceled();
-			}
+			return await completionSource.Task;
 		}
 
 		internal class DataActivityItemSource : UIActivityItemSource

diff --git a/src/Uno.UWP/ApplicationModel/DataTransfer/DataTransferManager.other.cs b/src/Uno.UWP/ApplicationModel/DataTransfer/DataTransferManager.other.cs
@@ -1,4 +1,4 @@
-#if !__WASM__ && !__IOS__
+#if !__WASM__ && !__IOS__ && !__ANDROID__
 
 namespace Windows.ApplicationModel.DataTransfer
 {

diff --git a/src/Uno.UWP/ApplicationModel/DataTransfer/DataTransferManager.wasm.cs b/src/Uno.UWP/ApplicationModel/DataTransfer/DataTransferManager.wasm.cs
@@ -12,7 +12,7 @@ public partial class DataTransferManager
 
 		public static bool IsSupported() => bool.TryParse(WebAssemblyRuntime.InvokeJS($"{JsType}.isSupported()"), out var result) && result;
 
-		private static async Task ShowShareUIAsync(ShareUIOptions options, DataPackage dataPackage)
+		private static async Task<bool> ShowShareUIAsync(ShareUIOptions options, DataPackage dataPackage)
 		{
 			var dataPackageView = dataPackage.GetView();
 
@@ -34,14 +34,7 @@ private static async Task ShowShareUIAsync(ShareUIOptions options, DataPackage d
 			var uriText = uri != null ? $"\"{WebAssemblyRuntime.EscapeJs(uri.ToString())}\"" : null;
 
 			var result = await WebAssemblyRuntime.InvokeAsync($"{JsType}.showShareUI({title ?? "null"},{text ?? "null"},{uriText ?? "null"})");
-			if (bool.TryParse(result, out var boolResult) && boolResult)
-			{
-				dataPackage.OnShareCompleted();
-			}
-			else
-			{
-				dataPackage.OnShareCanceled();
-			}
+			return bool.TryParse(result, out var boolResult) && boolResult;
 		}
 	}
 }
diff --git a/src/Uno.UWP/Generated/3.0.0.0/Windows.ApplicationModel.DataTransfer/DataPackageView.cs b/src/Uno.UWP/Generated/3.0.0.0/Windows.ApplicationModel.DataTransfer/DataPackageView.cs
@@ -17,7 +17,7 @@ public  partial class DataPackageView
 			}
 		}
 		#endif
-		#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
+		#if false || false || false || false || false || false || false
 		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "NET461", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
 		public  global::Windows.ApplicationModel.DataTransfer.DataPackagePropertySetView Properties
 		{

diff --git a/src/Uno.UWP/Generated/3.0.0.0/Windows.ApplicationModel.DataTransfer/DataTransferManager.cs b/src/Uno.UWP/Generated/3.0.0.0/Windows.ApplicationModel.DataTransfer/DataTransferManager.cs
@@ -13,8 +13,8 @@ public  partial class DataTransferManager
 		// Forced skipping of method Windows.ApplicationModel.DataTransfer.DataTransferManager.TargetApplicationChosen.remove
 		// Forced skipping of method Windows.ApplicationModel.DataTransfer.DataTransferManager.ShareProvidersRequested.add
 		// Forced skipping of method Windows.ApplicationModel.DataTransfer.DataTransferManager.ShareProvidersRequested.remove
-		#if __ANDROID__ || false || NET461 || false || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
-		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "NET461", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
+		#if false || false || NET461 || false || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
+		[global::Uno.NotImplemented("NET461", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
 		public static void ShowShareUI( global::Windows.ApplicationModel.DataTransfer.ShareUIOptions options)
 		{
 			global::Windows.Foundation.Metadata.ApiInformation.TryRaiseNotImplemented("Windows.ApplicationModel.DataTransfer.DataTransferManager", "void DataTransferManager.ShowShareUI(ShareUIOptions options)");
@@ -27,8 +27,8 @@ public static bool IsSupported()
 			throw new global::System.NotImplementedException("The member bool DataTransferManager.IsSupported() is not implemented in Uno.");
 		}
 		#endif
-		#if __ANDROID__ || false || NET461 || false || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
-		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "NET461", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
+		#if false || false || NET461 || false || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
+		[global::Uno.NotImplemented("NET461", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
 		public static void ShowShareUI()
 		{
 			global::Windows.Foundation.Metadata.ApiInformation.TryRaiseNotImplemented("Windows.ApplicationModel.DataTransfer.DataTransferManager", "void DataTransferManager.ShowShareUI()");