From b17eec699033c183b33434fe1081e66a9b2e9cb3 Mon Sep 17 00:00:00 2001 From: VladiMihaylenko Date: Wed, 17 May 2017 11:46:35 +0300 Subject: [PATCH] fixed sharing bookmarks. --- iphone/Maps/Bookmarks/BookmarksVC.mm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/iphone/Maps/Bookmarks/BookmarksVC.mm b/iphone/Maps/Bookmarks/BookmarksVC.mm index d5a9149612..38077219de 100644 --- a/iphone/Maps/Bookmarks/BookmarksVC.mm +++ b/iphone/Maps/Bookmarks/BookmarksVC.mm @@ -22,6 +22,9 @@ #include "coding/zip_creator.hpp" #include "coding/internal/file_data.hpp" +#include +#include + #define PINDIAMETER 18 #define EMPTY_SECTION -666 @@ -409,11 +412,17 @@ extern NSString * const kBookmarkDeletedNotification = @"BookmarkDeletedNotifica { MWMMailViewController * mailVC = [[MWMMailViewController alloc] init]; mailVC.mailComposeDelegate = self; - NSError * err = nil; [mailVC setSubject:L(@"share_bookmarks_email_subject")]; - NSData * myData = [[NSData alloc] initWithContentsOfFile:filePath options:NSDataReadingMappedAlways error:&err]; - if (err) return; + std::ifstream ifs(filePath.UTF8String); + ifs.seekg(ifs.end); + auto const size = ifs.tellg(); + std::vector data(size); + ifs.seekg(ifs.beg); + ifs.read(data.data(), size); + ifs.close(); + + auto myData = [[NSData alloc] initWithBytes:data.data() length:size]; [mailVC addAttachmentData:myData mimeType:mimeType fileName:[NSString stringWithFormat:@"%@%@", catName, fileExtension]]; [mailVC setMessageBody:[NSString stringWithFormat:L(@"share_bookmarks_email_body"), catName] isHTML:NO]; [self presentViewController:mailVC animated:YES completion:nil];