[MediaWiki-commits] [Gerrit] Article image appears when sharing items via mail, Facebook ... - change (apps...wikipedia)

[Mhurd (Code Review)]

Mhurd has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/135719

Change subject: Article image appears when sharing items via mail, Facebook etc.
......................................................................

Article image appears when sharing items via mail, Facebook etc.

Change-Id: Iac6307f19a79118ea0f9285fb8ced4abe878424a
---
M wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
1 file changed, 15 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia 
refs/changes/19/135719/1

diff --git a/wikipedia/View 
Controllers/Navigation/Bottom/BottomMenuViewController.m b/wikipedia/View 
Controllers/Navigation/Bottom/BottomMenuViewController.m
index 5ad353d..26df26f 100644
--- a/wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
+++ b/wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
@@ -16,6 +16,7 @@
 #import "NSString+Extras.h"
 #import "Article+Convenience.h"
 #import "ShareMenuSavePageActivity.h"
+#import "Article+Convenience.h"
 
 typedef NS_ENUM(NSInteger, BottomMenuItemTag) {
     BOTTOM_MENU_BUTTON_UNKNOWN = 0,
@@ -120,6 +121,7 @@
 {
     NSString *title = @"";
     NSURL *desktopURL = nil;
+    UIImage *image = nil;
 
     NSManagedObjectID *articleID =
     [articleDataContext_.mainContext getArticleIDForTitle: [SessionSingleton 
sharedInstance].currentArticleTitle
@@ -129,6 +131,7 @@
         if (article) {
             desktopURL = [article desktopURL];
             title = article.title;
+            image = [article 
getThumbnailUsingContext:articleDataContext_.mainContext];
         }
     }
     
@@ -138,11 +141,20 @@
     }
     
     ShareMenuSavePageActivity *shareMenuSavePageActivity = 
[[ShareMenuSavePageActivity alloc] init];
-    
+
+    NSMutableArray *activityItemsArray = @[title, desktopURL].mutableCopy;
+    if (image) {
+        [activityItemsArray addObject:image];
+    }
+
     UIActivityViewController *shareActivityVC =
-        [[UIActivityViewController alloc] initWithActivityItems: @[title, 
desktopURL]
+        [[UIActivityViewController alloc] initWithActivityItems: 
activityItemsArray
                                           applicationActivities: 
@[shareMenuSavePageActivity]];
-    NSMutableArray *exclusions = @[UIActivityTypeCopyToPasteboard].mutableCopy;
+    NSMutableArray *exclusions = @[
+        UIActivityTypePrint,
+        UIActivityTypeAssignToContact,
+        UIActivityTypeSaveToCameraRoll
+    ].mutableCopy;
     
     if (NSFoundationVersionNumber > NSFoundationVersionNumber_iOS_6_1) {
         [exclusions addObject:UIActivityTypeAirDrop];

-- 
To view, visit https://gerrit.wikimedia.org/r/135719
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac6307f19a79118ea0f9285fb8ced4abe878424a
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd <mh...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits