Merge pull request #1236 from xamarin/develop

1.5.3.1
xamarin · Apr 22, 2020 · 27e41c8 · 27e41c8
2 parents d7ba066 + e7dc92a
commit 27e41c8
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/Xamarin.Essentials/Email/Email.android.cs b/Xamarin.Essentials/Email/Email.android.cs
@@ -34,10 +34,18 @@ static Task PlatformComposeAsync(EmailMessage message)
 
         static Intent CreateIntent(EmailMessage message)
         {
-            var action = message?.Attachments?.Count > 1 ? Intent.ActionSendMultiple : Intent.ActionSend;
+            var action = (message?.Attachments?.Count ?? 0) switch
+            {
+                0 => Intent.ActionSendto,
+                1 => Intent.ActionSend,
+                _ => Intent.ActionSendMultiple
+            };
             var intent = new Intent(action);
-            intent.SetType("message/rfc822");
-            intent.SetData(Uri.Parse("mailto:")); // only email apps should handle this
+
+            if (action == Intent.ActionSendto)
+                intent.SetData(Uri.Parse("mailto:"));
+            else
+                intent.SetType("message/rfc822");
 
             if (!string.IsNullOrEmpty(message?.Body))
             {