chore: Merge develop into master

.github/workflows/network.yml

@@ -49,10 +49,10 @@ jobs:
         run: pod install --repo-update
       - name: Cache network info build
         id: cache-network-info-build
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ./dashsync/Example/build/NetworkInfo/Build/Products/Debug
-          key: ${{ runner.os }}-NetworkInfo-${{ hashFiles('NetworkInfo') }}
+          key: ${{ runner.os }}-NetworkInfo-${{ hashFiles('NetworkInfo/**') }}
           restore-keys: |
             ${{ runner.os }}-NetworkInfo-
       - name: Build

DashSync.podspec

@@ -35,7 +35,7 @@ Pod::Spec.new do |s|
   s.ios.framework = 'UIKit'
   s.macos.framework = 'Cocoa'
   s.compiler_flags = '-Wno-comma'
-  s.dependency 'DashSharedCore', '0.2.6'
+  s.dependency 'DashSharedCore', '0.2.8'
   s.dependency 'secp256k1_dash', '0.1.4-alpha.2'
   s.dependency 'bls-signatures-pod', '1.0.7'
   s.dependency 'CocoaLumberjack', '3.7.2'

DashSync/iOS/Categories/UIColor+DSStyle.m

@@ -37,15 +37,7 @@ + (UIColor *)ds_dashBlueColor {
 }
 
 + (UIColor *)ds_labelColorForMode:(DSAppearanceMode)appearanceMode {
-    if (@available(iOS 13.0, *)) {
-        return [UIColor labelColor];
-    } else {
-        if (appearanceMode == DSAppearanceMode_Dark) {
-            return [UIColor whiteColor];
-        } else {
-            return [UIColor blackColor];
-        }
-    }
+    return [UIColor labelColor];
 }
 
 + (UIColor *)ds_pinBackgroundColor {
@@ -61,15 +53,7 @@ + (UIColor *)ds_pinInputDotColor {
 }
 
 + (UIColor *)ds_passphraseBackgroundColorForMode:(DSAppearanceMode)appearanceMode {
-    if (@available(iOS 13.0, *)) {
-        return [UIColor systemBackgroundColor];
-    } else {
-        if (appearanceMode == DSAppearanceMode_Dark) {
-            return [UIColor blackColor];
-        } else {
-            return [UIColor whiteColor];
-        }
-    }
+    return [UIColor systemBackgroundColor];
 }
 
 @end

DashSync/iOS/Categories/UIWindow+DSUtils.h

@@ -11,6 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface UIWindow (DSUtils)
 
++ (nullable UIWindow *)keyWindow;
 - (UIViewController *)ds_presentingViewController;
 
 @end

DashSync/iOS/Categories/UIWindow+DSUtils.m

@@ -11,6 +11,40 @@
 
 @implementation UIWindow (DSUtils)
 
++ (nullable UIWindow *)keyWindow {
+    if (@available(iOS 15.0, *)) {
+        UIApplication *app = [UIApplication sharedApplication];
+        NSSet<UIScene *> *connectedScenes = app.connectedScenes;
+
+        for (UIScene *scene in connectedScenes) {
+            if ([scene isKindOfClass:UIWindowScene.class]) {
+                UIWindowScene *windowScene = (UIWindowScene *)scene;
+                UIWindow *window = windowScene.keyWindow;
+                if (window) return window;
+            }
+        }
+    } else if (@available(iOS 13.0, *)) {
+        UIApplication *app = [UIApplication sharedApplication];
+        NSSet<UIScene *> *connectedScenes = app.connectedScenes;
+
+        for (UIScene *scene in connectedScenes) {
+            if ([scene isKindOfClass:UIWindowScene.class]) {
+                UIWindowScene *windowScene = (UIWindowScene *)scene;
+                for (UIWindow *window in windowScene.windows) {
+                    if (window.keyWindow) return window;
+                }
+            }
+        }
+    } else {
+        #pragma clang diagnostic push
+        #pragma clang diagnostic ignored "-Wdeprecated-declarations"
+        return [[UIApplication sharedApplication] keyWindow];
+        #pragma clang diagnostic pop
+    }
+
+    return nil;
+}
+
 - (UIViewController *)ds_presentingViewController {
     UIViewController *controller = [self rootViewController];
     return [self ds_topViewControllerWithRootViewController:controller];

DashSync/shared/DashSync.m

@@ -66,29 +66,25 @@ - (void)registerBackgroundFetchOnce {
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         // use background fetch to stay synced with the blockchain
-        if (@available(iOS 13.0, *)) {
-            BGTaskScheduler *taskScheduler = [BGTaskScheduler sharedScheduler];
-            const BOOL registerSuccess =
-                [taskScheduler registerForTaskWithIdentifier:BG_TASK_REFRESH_IDENTIFIER
-                                                  usingQueue:nil
-                                               launchHandler:^(BGTask *task) {
-                                                   [self scheduleBackgroundFetch];
-
-                                                   [task setExpirationHandler:^{
-                                                       [self backgroundFetchTimedOut];
-                                                   }];
-
-                                                   [self performFetchWithCompletionHandler:^(UIBackgroundFetchResult backgroundFetchResult) {
-                                                       const BOOL success = backgroundFetchResult == UIBackgroundFetchResultNewData;
-                                                       [task setTaskCompletedWithSuccess:success];
-                                                   }];
-                                               }];
-
-            NSAssert(registerSuccess, @"Add background task identifier '%@' to the App's Info.plist",
-                BG_TASK_REFRESH_IDENTIFIER);
-        } else {
-            [[UIApplication sharedApplication] setMinimumBackgroundFetchInterval:UIApplicationBackgroundFetchIntervalMinimum];
-        }
+        BGTaskScheduler *taskScheduler = [BGTaskScheduler sharedScheduler];
+        const BOOL registerSuccess =
+        [taskScheduler registerForTaskWithIdentifier:BG_TASK_REFRESH_IDENTIFIER
+                                          usingQueue:nil
+                                       launchHandler:^(BGTask *task) {
+            [self scheduleBackgroundFetch];
+
+            [task setExpirationHandler:^{
+                [self backgroundFetchTimedOut];
+            }];
+
+            [self performFetchWithCompletionHandler:^(UIBackgroundFetchResult backgroundFetchResult) {
+                const BOOL success = backgroundFetchResult == UIBackgroundFetchResultNewData;
+                [task setTaskCompletedWithSuccess:success];
+            }];
+        }];
+
+        NSAssert(registerSuccess, @"Add background task identifier '%@' to the App's Info.plist",
+                 BG_TASK_REFRESH_IDENTIFIER);
     });
 }
 #endif
@@ -315,17 +311,15 @@ - (uint64_t)dbSize {
 
 #if TARGET_OS_IOS
 - (void)scheduleBackgroundFetch {
-    if (@available(iOS 13.0, *)) {
-        BGAppRefreshTaskRequest *request = [[BGAppRefreshTaskRequest alloc] initWithIdentifier:BG_TASK_REFRESH_IDENTIFIER];
-        // Fetch no earlier than 15 minutes from now
-        // Disabled as we'd like to be run asap
-        // request.earliestBeginDate = [NSDate dateWithTimeIntervalSinceNow:15.0 * 60.0];
-
-        NSError *error = nil;
-        [[BGTaskScheduler sharedScheduler] submitTaskRequest:request error:&error];
-        if (error) {
-            DSLog(@"Error scheduling background refresh");
-        }
+    BGAppRefreshTaskRequest *request = [[BGAppRefreshTaskRequest alloc] initWithIdentifier:BG_TASK_REFRESH_IDENTIFIER];
+    // Fetch no earlier than 15 minutes from now
+    // Disabled as we'd like to be run asap
+    // request.earliestBeginDate = [NSDate dateWithTimeIntervalSinceNow:15.0 * 60.0];
+
+    NSError *error = nil;
+    [[BGTaskScheduler sharedScheduler] submitTaskRequest:request error:&error];
+    if (error) {
+        DSLog(@"Error scheduling background refresh");
     }
 }
 
@@ -343,15 +337,6 @@ - (void)performFetchWithCompletionHandler:(void (^)(UIBackgroundFetchResult))com
 
     self.backgroundFetchCompletion = completionHandler;
 
-    if (@available(iOS 13.0, *)) { //!OCLINT
-
-    } else {
-        // timeout after 25 seconds
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 25 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
-            [self backgroundFetchTimedOut];
-        });
-    }
-
     NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
 
     self.protectedDataNotificationObserver =

DashSync/shared/Libraries/DSLogger.h

@@ -41,6 +41,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (NSArray<NSURL *> *)logFiles;
 
+/** @fn log:
+ *  @brief This method is identical to `DSLog` macro
+ *  @param message Final message to log
+ */
++ (void)log:(NSString *)message;
+
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
 

DashSync/shared/Libraries/DSLogger.m

@@ -63,6 +63,10 @@ - (instancetype)init {
     return [logFiles copy];
 }
 
++ (void)log:(NSString *)message {
+    DSLog(@"%@", message);
+}
+
 @end
 
 NS_ASSUME_NONNULL_END

DashSync/shared/Libraries/Networking/Blocks/HTTPLoaderOperation.m

@@ -17,7 +17,6 @@
 
 #import "HTTPLoaderOperation.h"
 
-#import "DSNetworkActivityIndicatorManager.h"
 #import "HTTPCancellationToken.h"
 #import "HTTPLoader.h"
 #import "HTTPLoaderDelegate.h"
@@ -69,8 +68,6 @@ - (void)performWithCompletion:(HTTPLoaderRawCompletionBlock)completion {
 
     self.cancellationToken = [self.httpLoader performRequest:self.httpRequest];
     NSAssert(self.cancellationToken, @"Performing request failed");
-
-    [DSNetworkActivityIndicatorManager increaseActivityCounter];
 }
 
 #pragma mark HTTPLoaderOperationProtocol
@@ -102,26 +99,20 @@ - (void)cancelByProducingResumeData:(void (^)(NSData *_Nullable resumeData))comp
 #pragma mark HTTPLoaderDelegate
 
 - (void)httpLoader:(HTTPLoader *)httpLoader didReceiveSuccessfulResponse:(HTTPResponse *)response {
-    [DSNetworkActivityIndicatorManager decreaseActivityCounter];
-
     if (self.completion) {
         self.completion(YES, NO, response);
     }
     self.completion = nil;
 }
 
 - (void)httpLoader:(HTTPLoader *)httpLoader didReceiveErrorResponse:(HTTPResponse *)response {
-    [DSNetworkActivityIndicatorManager decreaseActivityCounter];
-
     if (self.completion) {
         self.completion(NO, NO, response);
     }
     self.completion = nil;
 }
 
 - (void)httpLoader:(HTTPLoader *)httpLoader didCancelRequest:(HTTPRequest *)request {
-    [DSNetworkActivityIndicatorManager decreaseActivityCounter];
-
     if (self.completion) {
         self.completion(NO, YES, nil);
     }