release 7.0.0.2

roznet · Jun 8, 2021 · 2d74563 · 2d74563
2 parents db2ca8b + 042783d
commit 2d74563
Show file tree

Hide file tree

Showing 165 changed files with 3,718 additions and 1,915 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,5 @@ xcuserdata
 python
 .#*
 ~$*
+t.json
 
diff --git a/ConnectStats.xcodeproj/project.pbxproj b/ConnectStats.xcodeproj/project.pbxproj
diff --git a/ConnectStats.xcodeproj/xcshareddata/xcschemes/ConnectStats.xcscheme b/ConnectStats.xcodeproj/xcshareddata/xcschemes/ConnectStats.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/ConnectStats.xcodeproj/xcshareddata/xcschemes/ConnectStatsTestApp.xcscheme b/ConnectStats.xcodeproj/xcshareddata/xcschemes/ConnectStatsTestApp.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/ConnectStats.xcodeproj/xcshareddata/xcschemes/FitFileExplorer.xcscheme b/ConnectStats.xcodeproj/xcshareddata/xcschemes/FitFileExplorer.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/ConnectStats.xcodeproj/xcshareddata/xcschemes/HealthStats.xcscheme b/ConnectStats.xcodeproj/xcshareddata/xcschemes/HealthStats.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/ConnectStats.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ConnectStats.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -96,17 +96,17 @@
         "repositoryURL": "https://github.com/roznet/rzexternal",
         "state": {
           "branch": null,
-          "revision": "13707fe878e88d0dec93bb2b654bca8cadd271bf",
-          "version": "1.0.2"
+          "revision": "8196de67f9481c7f2a1ba2d5bf7886fe89f63ce4",
+          "version": "1.0.3"
         }
       },
       {
         "package": "RZUtils",
         "repositoryURL": "https://github.com/roznet/rzutils.git",
         "state": {
           "branch": null,
-          "revision": "6bbd760c29ff2ba8c85736e0c4c3416bd52629a2",
-          "version": "1.0.12"
+          "revision": "2f4e7b1e052d39ff5ef6ca1499751aae7f9928a1",
+          "version": "1.0.14"
         }
       },
       {
@@ -123,8 +123,8 @@
         "repositoryURL": "https://github.com/roznet/rzutils-touch.git",
         "state": {
           "branch": null,
-          "revision": "8dfb8e43574e8340abfddf831583cbc5985017c1",
-          "version": "1.0.1"
+          "revision": "5a396243777c14257c4e0b23c9f2229fd25252ae",
+          "version": "1.0.2"
         }
       },
       {

diff --git a/ConnectStats/ConnectStats-Bridging-Header.h b/ConnectStats/ConnectStats-Bridging-Header.h
@@ -48,7 +48,10 @@
 #import "GCGarminActivityTrack13Request.h"
 #import "GCGarminRequestModernSearch.h"
 
-#import "GCHistoryFieldDataHolder.h"
+#import "GCHistoryFieldSummaryDataHolder.h"
 #import "GCHistoryFieldSummaryStats.h"
 
 #import "GCGarminLoginSSORequest.h"
+#import "GCConnectStatsRequest.h"
+#import "GCConnectStatsSearchJsonParser.h"
+#import "GCConnectStatsRequestFitFile.h"
diff --git a/ConnectStats/ConnectStats-Info.plist b/ConnectStats/ConnectStats-Info.plist
@@ -100,6 +100,10 @@
 			</array>
 		</dict>
 	</dict>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>remote-notification</string>
+	</array>
 	<key>UIFileSharingEnabled</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

diff --git a/ConnectStats/ConnectStats.entitlements b/ConnectStats/ConnectStats.entitlements
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>aps-environment</key>
+	<string>development</string>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
 		<string>applinks:connectstats.app</string>

diff --git a/ConnectStats/credentials.sample.json b/ConnectStats/credentials.sample.json
@@ -3,14 +3,6 @@
     "connectstats": "***",
     "healthstats": "***"
   },
-  "fitbit": {
-    "Request_token_url": "https://api.fitbit.com/oauth/request_token",
-    "access_token_url": "https://api.fitbit.com/oauth/access_token",
-    "authenticate_url": "https://api.fitbit.com/oauth/authorize",
-    "consumer_key": "***",
-    "consumer_secret": "***",
-    "oauth_callback": "http://www.ro-z.net/connectstats"
-  },
   "flurry": {
     "connectstats": "***",
     "healthstats": "***"
@@ -41,22 +33,11 @@
     "client_secret": "***",
     "redirect_url": "https://ro-z.net/oauth/strava"
   },
-  "withings": {
-    "access_token_method": "***",
-    "access_token_url": "https://oauth.withings.com/account/access_token",
-    "authenticate_url": "https://oauth.withings.com/account/authorize",
-    "consumer_key": "***",
-    "consumer_secret": "***",
-    "oauth_callback": "http://www.ro-z.net/connectstats",
-    "oauth_scope_param": "",
-    "request_token_method": "***",
-    "request_token_url": "https://oauth.withings.com/account/request_token"
-  },
   "withings_oauth2": {
     "access_token_url": "https://account.withings.com/oauth2/token",
     "authenticate_url": "https://account.withings.com/oauth2_user/authorize2",
     "client_id": "***",
     "client_secret": "***",
     "redirect_url": "https://ro-z.net/oauth/withings"
   }
-}
+}
diff --git a/ConnectStats/src/GCActivitiesOrganizer.h b/ConnectStats/src/GCActivitiesOrganizer.h
@@ -57,16 +57,30 @@ typedef BOOL (^gcActivityOrganizerMatchBlock)(GCActivity*);
 
 -(GCActivitiesOrganizer*)initWithDb:(FMDatabase*)aDb;
 -(GCActivitiesOrganizer*)initWithDb:(FMDatabase*)aDb andThread:(nullable dispatch_queue_t)thread NS_DESIGNATED_INITIALIZER;
--(GCActivitiesOrganizer*)initTestModeWithDb:(FMDatabase*)aDb NS_DESIGNATED_INITIALIZER;
+/**
+ * testmode will trigger load of database including all details on current thread in synchronous method and disable all notificaitons
+ */
+-(GCActivitiesOrganizer*)initTestModeWithDb:(FMDatabase*)aDb;
+/**
+ * testmode will trigger load of database on current thread in synchronous method and disable all notificaitons,
+ *  if loadDetails is false will only load summary else will load everything
+ */
+-(GCActivitiesOrganizer*)initTestModeWithDb:(FMDatabase*)aDb loadDetails:(BOOL)loadDetails NS_DESIGNATED_INITIALIZER;
+
+/**
+ * call this function when details should be loaded
+ * typically when the ui is ready, it can be called multiple time
+ * @return true if details already loaded, false if this actually triggered the load
+ */
+-(BOOL)ensureDetailsLoaded;
 
 -(BOOL)registerActivity:(GCActivity*)act forActivityId:(NSString*)aId;
 -(void)registerTemporaryActivity:(GCActivity*)act forActivityId:(NSString*)aId;
+-(void)registerActivity:(GCActivity*)act withTrackpoints:(nullable NSArray<GCTrackPoint*>*)aTrack andLaps:(nullable NSArray<GCLap*>*)laps;
+-(void)registerActivity:(GCActivity*)act withWeather:(nullable GCWeather *)aData;
 
 -(void)registerActivityTypes:(NSDictionary*)aData;
 
--(void)registerActivity:(NSString*)aId withTrackpoints:(nullable NSArray*)aTrack andLaps:(nullable NSArray*)laps;
--(void)registerActivity:(NSString*)aId withWeather:(nullable GCWeather *)aData;
-
 -(NSUInteger)countOfKnownDuplicates;
 -(nullable GCActivity*)findDuplicate:(GCActivity*)act;
 -(BOOL)isKnownDuplicate:(GCActivity*)act;
@@ -105,7 +119,7 @@ typedef BOOL (^gcActivityOrganizerMatchBlock)(GCActivity*);
  */
 -(nullable GCActivity*)compareActivity;
 -(void)setCurrentActivityId:(NSString*)aId;
--(NSArray<NSString*>*)listActivityTypes;
+-(NSArray<GCActivityType*>*)listActivityTypes;
 -(nullable NSString*)lastGarminLoginUsername;
 
 /**
@@ -119,6 +133,7 @@ typedef BOOL (^gcActivityOrganizerMatchBlock)(GCActivity*);
 
 -(BOOL)isQuickFilterApplicable;
 -(void)filterForSearchString:(nullable NSString*)str;
+-(void)filterMatching:(nullable GCActivityMatchBlock)matching;
 // Force refresh if something changed, for example location
 -(void)filterForLastSearchString;
 -(void)filterForQuickFilter;
@@ -142,7 +157,7 @@ typedef BOOL (^gcActivityOrganizerMatchBlock)(GCActivity*);
  @param  ignoreMode decide whether to apply on fitness or days activities
  @return NSDictionary with Keys for the values in fields (NSString or GCField) and GCStatsDataSerieWithUnit as value
  */
--(NSDictionary*)fieldsSeries:(NSArray*)fields matching:(nullable GCActivityMatchBlock)match useFiltered:(BOOL)useFilter ignoreMode:(gcIgnoreMode)ignoreMode;
+-(NSDictionary<GCField*,GCStatsDataSerieWithUnit*>*)fieldsSeries:(NSArray<GCField*>*)fields matching:(nullable GCActivityMatchBlock)match useFiltered:(BOOL)useFilter ignoreMode:(gcIgnoreMode)ignoreMode;// DEPRECATED_MSG_ATTRIBUTE( "Use modern");
 -(nullable GCStatsDataSerieFilter*)standardFilterForField:(GCField*)field;
 
 -(void)purgeCache;