VPN-5101: cleanup logs after they are exported for iOS and desktop (#…

…9231)

* VPN-5101 clean up iOS logs

* flush on other platforms

src/loghandler.cpp

@@ -449,15 +449,10 @@ bool LogHandler::viewLogs() {
   return ok;
 #endif
 
-  if (writeAndShowLogs(QStandardPaths::DesktopLocation)) {
-    return true;
-  }
-
-  if (writeAndShowLogs(QStandardPaths::HomeLocation)) {
-    return true;
-  }
-
-  if (writeAndShowLogs(QStandardPaths::TempLocation)) {
+  if (writeAndShowLogs(QStandardPaths::DesktopLocation) ||
+      writeAndShowLogs(QStandardPaths::HomeLocation) ||
+      writeAndShowLogs(QStandardPaths::TempLocation)) {
+    flushLogs();
     return true;
   }
 

src/platforms/ios/ioscommons.mm

@@ -5,6 +5,7 @@
 #include "ioscommons.h"
 #include "constants.h"
 #include "logger.h"
+#include "loghandler.h"
 #include "qmlengineholder.h"
 
 #include <QtGui/qpa/qplatformnativeinterface.h>
@@ -102,6 +103,15 @@ @interface StatusBarModifierViewController : UIViewController
     activityViewController.popoverPresentationController.sourceRect =
         CGRectMake(view.bounds.size.width / 2, view.bounds.size.height, 0, 0);
   }
+  activityViewController.completionWithItemsHandler =
+      ^(NSString* activityType, BOOL completed, NSArray* returnedItems, NSError* activityError) {
+        if (completed) {
+          logger.info() << "Clearing logs.";
+          LogHandler::instance()->flushLogs();
+        } else {
+          logger.info() << "No need to clear logs.";
+        }
+      };
   [qtController presentViewController:activityViewController animated:YES completion:nil];
   [activityViewController release];
 }