From 21515b5a2e23acb57a6da420ab2a93f400b89d4e Mon Sep 17 00:00:00 2001
From: Danmei Chen <danmei.chen@belledonne-communications.com>
Date: Sun, 17 Jun 2018 17:24:09 +0200
Subject: [PATCH] delete text

---
 Classes/ChatConversationView.m          | 25 ++++++++++---------------
 linphoneExtension/ShareViewController.m |  3 +--
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m
index 91f2543e1..7368d9e07 100644
--- a/Classes/ChatConversationView.m
+++ b/Classes/ChatConversationView.m
@@ -209,12 +209,6 @@ static UICompositeViewDescription *compositeDescription = nil;
     [self shareFile];
 }
 
-- (void)sendContentText:(NSString *)text {
-    if(![text isEqualToString:@""]) {
-        [self sendMessage:text withExterlBodyUrl:nil withInternalURL:nil];
-    }
-}
-
 - (void)shareFile {
     NSUserDefaults *defaults = [[NSUserDefaults alloc] initWithSuiteName:groupName];
     
@@ -227,7 +221,6 @@ static UICompositeViewDescription *compositeDescription = nil;
         NSData *data = dict[@"nsData"];
         UIImage *image = [[UIImage alloc] initWithData:data];
         [self chooseImageQuality:image url:nil];
-        [self sendContentText:dict[@"name"]];
         [defaults removeObjectForKey:@"img"];
     } else if (dictWeb) {
         //share url, if local file, then upload file
@@ -236,21 +229,19 @@ static UICompositeViewDescription *compositeDescription = nil;
         if ([url hasPrefix:@"file"]) {
             //local file
             NSData *data = dictWeb[@"nsData"];
-            [self confirmShare:data url:fileUrl];
+            [self confirmShare:data url:fileUrl text:nil];
         } else {
-            [self sendMessage:url withExterlBodyUrl:nil withInternalURL:nil];
+            [self confirmShare:nil url:nil text:url];
         }
-        [self sendContentText:dictWeb[@"name"]];
         [defaults removeObjectForKey:@"web"];
     }else if (dictFile) {
         //share file
         NSData *data  = dictFile[@"nsData"];
-        [self confirmShare:data url:[NSURL fileURLWithPath:dictFile[@"url"]]];
-        [self sendContentText:dictFile[@"name"]];
+        [self confirmShare:data url:[NSURL fileURLWithPath:dictFile[@"url"]] text:nil];
         [defaults removeObjectForKey:@"mov"];
     }else if (dictText) {
         //share text
-        [self sendContentText:dictText[@"name"]];
+        [self confirmShare:nil url:nil text:dictText[@"name"]];
         [defaults removeObjectForKey:@"text"];
     }
 }
@@ -366,13 +357,17 @@ static UICompositeViewDescription *compositeDescription = nil;
 	});
 }
 
-- (void)confirmShare:(NSData *)data url:(NSURL *)url {
+- (void)confirmShare:(NSData *)data url:(NSURL *)url text:(NSString *)text {
     DTActionSheet *sheet = [[DTActionSheet alloc] initWithTitle:NSLocalizedString(@"", nil)];
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
        
             [sheet addButtonWithTitle:@"send to this friend"
                                 block:^() {
-                                     [self startFileUpload:data withUrl:url];
+                                    if(data && url)
+                                        [self startFileUpload:data withUrl:url];
+                                    else
+                                        [self sendMessage:text withExterlBodyUrl:nil withInternalURL:nil];
+                                     
                                 }];
      
         [sheet addCancelButtonWithTitle:NSLocalizedString(@"Cancel", nil) block:nil];
diff --git a/linphoneExtension/ShareViewController.m b/linphoneExtension/ShareViewController.m
index 3caa0bfde..80390ee38 100644
--- a/linphoneExtension/ShareViewController.m
+++ b/linphoneExtension/ShareViewController.m
@@ -56,8 +56,7 @@ static NSString* groupName = @"group.belledonne-communications.linphone";
             NSData *nsData = [NSData dataWithContentsOfURL:(NSURL*)item];
             if (nsData) {
                 NSDictionary *dict = @{@"nsData" : nsData,
-                                       @"url" : [(NSURL*)item absoluteString],
-                                       @"name" : self.contentText};
+                                       @"url" : [(NSURL*)item absoluteString]};
                 [defaults setObject:dict forKey:key];
             } else {
                 NSLog(@"NSExtensionItem Error, provider = %@", provider);