fixed up workflow when kill switch triggered for garmin

roznet · Oct 4, 2023 · fdb372b · fdb372b
1 parent 5c42087
commit fdb372b
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 2 deletions.
diff --git a/ConnectStats/src/GCAppConstants.h b/ConnectStats/src/GCAppConstants.h
@@ -91,6 +91,7 @@ extern NSString * const  CONFIG_CONNECTSTATS_USE;
 extern NSString * const  CONFIG_CONNECTSTATS_FILLYEAR;
 extern NSString * const  CONFIG_CONNECTSTATS_CONFIG;
 extern NSString * const  CONFIG_GARMIN_ENABLE;
+extern NSString * const  CONFIG_GARMIN_KILL_SWITCH;
 extern NSString * const  CONFIG_GARMIN_LOGIN_METHOD;
 extern NSString * const  CONFIG_GARMIN_LAST_SOURCE;
 extern NSString * const  CONFIG_GARMIN_USE_MODERN;
@@ -113,6 +114,7 @@ extern NSString * const  CONFIG_CONNECTSTATS_USER_ID;
 extern NSString * const  CONFIG_GARMIN_FIT_DOWNLOAD;
 extern NSString * const  CONFIG_GARMIN_FIT_MERGE;
 
+
 extern NSString * const  CONFIG_ENABLE_DEBUG;
 extern NSString * const  CONFIG_ENABLE_DEBUG_ON;
 extern NSString * const  CONFIG_ENABLE_DEBUG_OFF;

diff --git a/ConnectStats/src/GCAppConstants.m b/ConnectStats/src/GCAppConstants.m
@@ -93,6 +93,7 @@
 NSString * const CONFIG_CONNECTSTATS_FILLYEAR    = @"config_connectstats_fillyear";
 NSString * const CONFIG_CONNECTSTATS_CONFIG      = @"config_connectstats_config";
 NSString * const CONFIG_GARMIN_ENABLE            = @"config_garmin_enable";
+NSString * const CONFIG_GARMIN_KILL_SWITCH       = @"config_garmin_kill_switch";
 NSString * const CONFIG_GARMIN_LOGIN_METHOD      = @"config_garmin_login_method";
 NSString * const CONFIG_GARMIN_LAST_SOURCE       = @"config_garmin_last_source";
 NSString * const CONFIG_GARMIN_USE_MODERN        = @"config_garmin_use_modern_v3";

diff --git a/ConnectStats/src/GCAppProfiles.m b/ConnectStats/src/GCAppProfiles.m
@@ -568,6 +568,9 @@ -(BOOL)serviceEnabled:(gcService)service{
     switch (service) {
         case gcServiceGarmin:
             rv = [self configGetBool:CONFIG_GARMIN_ENABLE defaultValue:NO];
+            if( [[GCAppGlobal profile] configGetBool:CONFIG_GARMIN_KILL_SWITCH defaultValue:true]){
+                rv = false;
+            }
             break;
         case gcServiceStrava:
             rv = [self configGetBool:CONFIG_STRAVA_ENABLE defaultValue:NO];

diff --git a/ConnectStats/src/GCGarminRequest.m b/ConnectStats/src/GCGarminRequest.m
@@ -35,7 +35,7 @@
 @implementation GCGarminReqBase
 
 +(BOOL)killSwitchTriggered{
-    return true;
+    return [[GCAppGlobal profile] configGetBool:CONFIG_GARMIN_KILL_SWITCH defaultValue:true];
 }
 
 -(BOOL)checkNoErrors{

diff --git a/ConnectStats/src/GCSettingsViewController.m b/ConnectStats/src/GCSettingsViewController.m
@@ -571,6 +571,11 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 
                 NSMutableArray * statuses = [NSMutableArray arrayWithCapacity:5];
                 NSString * status = nil;
+                status = [[GCService service:gcServiceConnectStats] statusDescription];
+                if( status.length > 0){
+                    [statuses addObject:status];
+                }
+
                 status = [[GCService service:gcServiceGarmin] statusDescription];
                 if (status.length>0) {
                     [statuses addObject:status];

diff --git a/ConnectStats/src/GCViewConfig.m b/ConnectStats/src/GCViewConfig.m
@@ -650,7 +650,11 @@ + (UIImage*)mergeImage:(UIImage*)first withImage:(UIImage*)second
 
 +(gcGarminDownloadSource)garminDownloadSource{
     if([[GCAppGlobal profile] configGetBool:CONFIG_GARMIN_ENABLE defaultValue:false] && [[GCAppGlobal profile] configGetBool:CONFIG_CONNECTSTATS_ENABLE defaultValue:false] ){
-        return gcGarminDownloadSourceBoth;
+        if( [[GCAppGlobal profile] configGetBool:CONFIG_GARMIN_KILL_SWITCH defaultValue:true]){
+            return gcGarminDownloadSourceConnectStats;
+        }else{
+            return gcGarminDownloadSourceBoth;
+        }
     }else if( [[GCAppGlobal profile] configGetBool:CONFIG_GARMIN_ENABLE defaultValue:false] ){
         return gcGarminDownloadSourceGarminWeb;
     }else if( [[GCAppGlobal profile] configGetBool:CONFIG_CONNECTSTATS_ENABLE defaultValue:false]){
@@ -688,6 +692,9 @@ +(void)setGarminDownloadSource:(gcGarminDownloadSource)source{
                 break;
             }
     }
+    if( [[GCAppGlobal profile] configGetBool:CONFIG_GARMIN_KILL_SWITCH defaultValue:true] ){
+        garminOn = true;
+    }
     [[GCAppGlobal profile] configSet:CONFIG_CONNECTSTATS_ENABLE boolVal:connectStatsOn];
     [[GCAppGlobal profile] configSet:CONFIG_GARMIN_ENABLE boolVal:garminOn];
 }