From 0eb7a1d357d089c69bc8fd92660201d26c32a258 Mon Sep 17 00:00:00 2001 From: Mihai Parparita Date: Mon, 21 Dec 2015 10:43:26 -0800 Subject: [PATCH] Fix Mail action in "Send to" from the original story view not including the URL. After 1bbb0fc7e04b90c02305335db00d3ffc7fcf0905 the original URL is no longer included as a separate activity item, so we need to include it in the mail body directly. Mailing from the story view directly not affected, there we include the URL in the text (done by NewsBlurAppDelegate's showSendTo:withUrl:authorName:text: title:feedTitle:images) --- clients/ios/Classes/NBActivityItemProvider.m | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/clients/ios/Classes/NBActivityItemProvider.m b/clients/ios/Classes/NBActivityItemProvider.m index 4e193529e..425fed90c 100644 --- a/clients/ios/Classes/NBActivityItemProvider.m +++ b/clients/ios/Classes/NBActivityItemProvider.m @@ -46,9 +46,10 @@ } -(id)activityViewController:(UIActivityViewController *)activityViewController itemForActivityType:(NSString *)activityType { - if ([activityType isEqualToString:UIActivityTypeMail] || - [activityType isEqualToString:@"com.evernote.iPhone.Evernote.EvernoteShare"]) { - return @{@"body": text ?: @"", @"subject": title}; + if ([activityType isEqualToString:UIActivityTypeMail]) { + return text ?: (url ?: @""); + } else if ([activityType isEqualToString:@"com.evernote.iPhone.Evernote.EvernoteShare"]) { + return @{@"body": text ?: (url ?: @""), @"subject": title}; } else if ([activityType isEqualToString:UIActivityTypePostToTwitter] || [activityType isEqualToString:UIActivityTypePostToFacebook] || [activityType isEqualToString:UIActivityTypePostToWeibo]) {