Merge pull request #653 from amnezia-vpn/fix/config-from-tg

Fix adding config from bot (iOS)

client/main.cpp

@@ -48,10 +48,6 @@ int main(int argc, char *argv[])
     AllowSetForegroundWindow(0);
 #endif
 
-#if defined(Q_OS_IOS)
-    QtAppDelegateInitialize();
-#endif
-
     app.registerTypes();
 
     app.setApplicationName(APPLICATION_NAME);

client/platforms/ios/QtAppDelegate.h

@@ -1,4 +1,7 @@
 #import <UIKit/UIKit.h>
 
-@interface QtAppDelegate : UIResponder <UIApplicationDelegate>
+@interface QIOSApplicationDelegate
+@end
+
+@interface QIOSApplicationDelegate (AmneziaVPNDelegate)
 @end

client/platforms/ios/QtAppDelegate.mm

@@ -3,25 +3,15 @@
 
 #include <QFile>
 
-@implementation QtAppDelegate {
+UIView *_screen;
-    UIView *_screen;
-}
-
-+(QtAppDelegate *)sharedQtAppDelegate {
-    static dispatch_once_t pred;
-    static QtAppDelegate *shared = nil;
-    dispatch_once(&pred, ^{
-        shared = [[super alloc] init];
-    });
-    return shared;
-}
 
+@implementation QIOSApplicationDelegate (AmneziaVPNDelegate)
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     [application setMinimumBackgroundFetchInterval: UIApplicationBackgroundFetchIntervalMinimum];
     // Override point for customization after application launch.
-    NSLog(@"Did this launch option happen");
+    NSLog(@"Application didFinishLaunchingWithOptions");
     return YES;
 }
 
@@ -70,31 +60,27 @@
 - (BOOL)application:(UIApplication *)app
             openURL:(NSURL *)url
             options:(NSDictionary<UIApplicationOpenURLOptionsKey, id> *)options {
-    
-    NSLog(@"Application openURL: %@", url);
     if (url.fileURL) {
         QString filePath(url.path.UTF8String);
         if (filePath.isEmpty()) return NO;
 
-        if (filePath.contains("backup")) {
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 1 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
-            IosController::Instance()->importBackupFromOutside(filePath);
+            NSLog(@"Application openURL: %@", url);
-        } else {
+
-            QFile file(filePath);
+            if (filePath.contains("backup")) {
-            bool isOpenFile = file.open(QIODevice::ReadOnly);
+                IosController::Instance()->importBackupFromOutside(filePath);
-            QByteArray data = file.readAll();
+            } else {
-            
+                QFile file(filePath);
-            IosController::Instance()->importConfigFromOutside(QString(data));
+                bool isOpenFile = file.open(QIODevice::ReadOnly);
-        }
+                QByteArray data = file.readAll();
+
+                IosController::Instance()->importConfigFromOutside(QString(data));
+            }
+        });
+
         return YES;
     }
     return NO;
 }
 
-
-void QtAppDelegateInitialize()
-{
-    [[UIApplication sharedApplication] setDelegate: [QtAppDelegate sharedQtAppDelegate]];
-    NSLog(@"Created a new AppDelegate");
-}
-
 @end