hooked up mecanism for update when notification received #91

roznet · Apr 11, 2021 · 6231e6f · 6231e6f
1 parent 442b5a4
commit 6231e6f
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 2 deletions.
diff --git a/ConnectStats/src/GCAppDelegate+Swift.m b/ConnectStats/src/GCAppDelegate+Swift.m
@@ -25,6 +25,8 @@
 
 #import "GCAppDelegate+Swift.h"
 #import "ConnectStats-Swift.h"
+#import "GCWebConnect+Requests.h"
+
 @import UserNotifications;
 
 #define GC_STARTING_FILE @"starting.log"
@@ -81,8 +83,23 @@ -(void)application:(UIApplication *)application didReceiveRemoteNotification:(NS
     }else{
         RZLog(RZLogInfo,@"remote notification %@", userInfo);
     }
-    application.applicationIconBadgeNumber = 1;
-    completionHandler(UIBackgroundFetchResultNewData);
+    //application.applicationIconBadgeNumber = 1;
+
+    self.web.notificationHandler = ^(gcWebNotification notification){
+        if( notification == gcWebNotificationError){
+            self.web.notificationHandler = nil;
+            completionHandler(UIBackgroundFetchResultFailed);
+        }
+        if( notification == gcWebNotificationEnd){
+            self.web.notificationHandler = nil;
+            completionHandler(UIBackgroundFetchResultNewData);
+        }
+    };
+
+    if( ! [self.web servicesBackgroundUpdate]){
+        self.web.notificationHandler = nil;
+        completionHandler(UIBackgroundFetchResultNoData);
+    }
 }
 
 

diff --git a/ConnectStats/src/GCAppDelegate.m b/ConnectStats/src/GCAppDelegate.m
@@ -216,6 +216,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     }
     [self registerForPushNotifications];
     [self remoteStatusCheck];
+
     return YES;
 }
 

diff --git a/ConnectStats/src/GCWebConnect+Requests.h b/ConnectStats/src/GCWebConnect+Requests.h
@@ -37,6 +37,9 @@
 /// Search all activities for all services
 -(void)servicesSearchAllActivities;
 
+/// Start background upgrade, return true if started, false if nothing was possible/required
+-(BOOL)servicesBackgroundUpdate;
+
 -(void)servicesResetLogin; // when profile switch
 -(void)servicesLogin; // add necessary login requests
 

diff --git a/ConnectStats/src/GCWebConnect+Requests.m b/ConnectStats/src/GCWebConnect+Requests.m
@@ -93,6 +93,20 @@ -(BOOL)downloadMissingActivityDetails:(NSUInteger)n{
     return rv;
 }
 
+-(BOOL)servicesBackgroundUpdate{
+    BOOL rv = false;
+    if( [[GCAppGlobal profile] configGetBool:CONFIG_CONNECTSTATS_ENABLE defaultValue:NO] &&
+       [[GCAppGlobal profile] serviceCompletedFull:gcServiceConnectStats] &&
+       [[GCAppGlobal profile] serviceSuccess:gcServiceConnectStats] ){
+        // Run on main queue as it accesses a navigation Controller
+        dispatch_async(dispatch_get_main_queue(), ^(){
+            [self addRequest:[GCConnectStatsRequestSearch requestWithStart:0 mode:false andNavigationController:[GCAppGlobal currentNavigationController]]];
+        });
+        rv = true;
+    }
+
+    return rv;
+}
 -(void)servicesSearch:(BOOL)reloadAll{
     if( ([[GCAppGlobal profile] configGetBool:CONFIG_CONNECTSTATS_ENABLE defaultValue:NO])){
         // Run on main queue as it accesses a navigation Controller

diff --git a/ConnectStats/src/GCWebConnect.h b/ConnectStats/src/GCWebConnect.h
@@ -30,7 +30,15 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+typedef NS_ENUM(NSUInteger,gcWebNotification){
+    gcWebNotificationEnd,
+    gcWebNotificationError,
+    gcWebNotificationNext,
+    gcWebNotificationChange
+};
+
 typedef BOOL (^GCWebValidateNextSearch)( NSDate * _Nullable , NSUInteger );
+typedef void (^GCWebNotificationHandler)( gcWebNotification);
 
 extern NSString * GCWebStatusDescription(GCWebStatus status);
 extern NSString * GCWebStatusShortDescription(GCWebStatus status);
@@ -41,6 +49,7 @@ extern NSString * GCWebStatusShortDescription(GCWebStatus status);
 @property (nullable,nonatomic,retain) NSError * lastError;
 @property (nullable,nonatomic,retain) dispatch_queue_t worker;
 @property (nullable,copy) GCWebValidateNextSearch validateNextSearch;
+@property (nullable,copy) GCWebNotificationHandler notificationHandler;
 
 
 

diff --git a/ConnectStats/src/GCWebConnect.m b/ConnectStats/src/GCWebConnect.m
@@ -206,6 +206,7 @@ -(void)dealloc{
     [_worker release];
 
     [_validateNextSearch release];
+    [_notificationHandler release];
 
     [super dealloc];
 }
@@ -484,6 +485,9 @@ -(void)next{
         [self executeCurrentRequest];
 
         [self notifyForString:NOTIFY_NEXT safeTries:5];
+        if( self.notificationHandler ){
+            self.notificationHandler(gcWebNotificationNext);
+        }
     }else{
         if (_requests.count == 0) {
             RZLog(RZLogInfo, @"end data=%@", [GCUnit formatBytes:[RZRemoteDownload totalDataUsage]]);
@@ -498,9 +502,17 @@ -(void)next{
             self.started = false;
             if (someError) {
                 [self notifyForString:NOTIFY_ERROR];
+                if( self.notificationHandler ){
+                    self.notificationHandler(gcWebNotificationError);
+                }
+
                 [self clearDoneRequests];
             }else{
                 [self notifyForString:NOTIFY_END];
+                if( self.notificationHandler ){
+                    self.notificationHandler(gcWebNotificationEnd);
+                }
+
                 [self clearDoneRequests];
             }
         }
@@ -554,6 +566,10 @@ -(void)downloadFailed:(RZRemoteDownload*)connection{
     }
 
     [self notifyForString:NOTIFY_ERROR];
+    if( self.notificationHandler ){
+        self.notificationHandler(gcWebNotificationError);
+    }
+
 }
 
 -(void)downloadDataSuccessful:(RZRemoteDownload *)connection data:(NSData *)data{
@@ -615,6 +631,9 @@ -(NSString*)httpUserAgent{
 
 -(void)processNewStage{
     [self notifyForString:NOTIFY_CHANGE];
+    if( self.notificationHandler ){
+        self.notificationHandler(gcWebNotificationChange);
+    }
 }
 
 -(BOOL)checkState{
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         [self registerForPushNotifications];
         [self remoteStatusCheck];
         return YES;
     }
@@ Expand Down @@