diff --git a/ConnectStats.xcodeproj/project.pbxproj b/ConnectStats.xcodeproj/project.pbxproj index 421feaad..ad6549ca 100644 --- a/ConnectStats.xcodeproj/project.pbxproj +++ b/ConnectStats.xcodeproj/project.pbxproj @@ -6660,7 +6660,7 @@ CODE_SIGN_ENTITLEMENTS = ConnectStats/ConnectStats.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 55; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = M7QSSF3624; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -6683,7 +6683,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 8.0.1; + MARKETING_VERSION = 8.0.2; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = ( @@ -6717,7 +6717,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 55; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = M7QSSF3624; ENABLE_TESTABILITY = NO; @@ -6740,7 +6740,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 8.0.1; + MARKETING_VERSION = 8.0.2; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/ConnectStats/src/GCConnectStatsRequest.m b/ConnectStats/src/GCConnectStatsRequest.m index d4a17443..39f97e39 100644 --- a/ConnectStats/src/GCConnectStatsRequest.m +++ b/ConnectStats/src/GCConnectStatsRequest.m @@ -83,10 +83,13 @@ -(void)checkToken{ self.tokenId = [[GCAppGlobal profile] configGetInt:CONFIG_CONNECTSTATS_TOKEN_ID defaultValue:0]; if ((self.oauthTokenSecret).length==0) { + RZLog(RZLogInfo,@"missing oauthTokenSecret %@", [self debugDescription]); self.oauthTokenSecret = nil; self.oauthToken = nil; self.userId = 0; self.tokenId = 0; + }else{ + RZLog(RZLogInfo,@"valid oauthTokenSecret %@", [self debugDescription]); } } @@ -216,7 +219,7 @@ -(void)signInConnectStatsStep{ -(void)buildOAuthController{ if( self.oauth1Controller == nil){ - RZLog(RZLogInfo,@"building oauth controller"); + RZLog(RZLogInfo,@"building oauth controller %@", [self debugDescription]); NSError * error = nil; NSData * credentials = [NSData dataWithContentsOfFile:[RZFileOrganizer bundleFilePath:@"credentials.json"] options:0 error:&error]; if( ! credentials ){ @@ -242,7 +245,7 @@ -(void)buildOAuthController{ } -(void)signInGarminStep{ - RZLog(RZLogInfo,@"Starting garmin step"); + RZLog(RZLogInfo,@"starting garmin step %@", [self debugDescription]); UIViewController * webCont = [[UIViewController alloc] initWithNibName:nil bundle:nil]; WKWebView * webView = [[WKWebView alloc] initWithFrame:self.navigationController.view.frame]; // keep hold so we can clear the delegate. @@ -295,7 +298,7 @@ -(NSURLRequest*)preparedUrlRequest:(NSString*)path params:(NSDictionary*)paramet if( self.oauth1Controller){ RZLog(RZLogInfo, @"Built oauth1Controller to prepare url %@", path); }else{ - RZLog(RZLogError, @"Failed to build oauth1Controller to prepare url %@", path); + RZLog(RZLogError, @"%@ Failed to build oauth1Controller to prepare url %@", self, path); } }else{ RZLog(RZLogError, @"no oauth1Controller built and not navigation controller to prepare url %@", path); diff --git a/ConnectStats/src/GCSettingsBugReport.m b/ConnectStats/src/GCSettingsBugReport.m index eaff52e1..54994766 100644 --- a/ConnectStats/src/GCSettingsBugReport.m +++ b/ConnectStats/src/GCSettingsBugReport.m @@ -88,7 +88,10 @@ -(void)configCheck{ NSString * ckey = [GCAppGlobal credentialsForService:@"garmin" andKey:@"consumer_key"]; NSString * cid = [GCAppGlobal credentialsForService:@"strava" andKey:@"client_id"]; - RZLog(RZLogInfo, @"consumer_key=%@, client_id=%@", ckey, cid); + NSString * token = [[GCAppGlobal profile] currentPasswordForService:gcServiceConnectStats]; + NSString * csStatus = token.length != 0 ? @"Has CS Token" : @"Missing CS Token"; + + RZLog(RZLogInfo, @"consumer_key=%@, client_id=%@, %@", ckey, cid, csStatus); }