Added the AppGroup Capability to the new complication widgetkit exten…

…sion. Complication should get updates now.
nightscout · Apr 7, 2023 · a00a299 · a00a299
1 parent 12e18c9
commit a00a299
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 47 deletions.
diff --git a/nightguard ComplicationExtension.entitlements b/nightguard ComplicationExtension.entitlements
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-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>com.apple.security.application-groups</key>
+	<array>
+		<string>group.de.my-wan.dhe.nightguard</string>
+	</array>
+</dict>
+</plist>
diff --git a/nightguard WatchKit App/Info.plist b/nightguard WatchKit App/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>808</string>
+	<string>809</string>
 	<key>CLKComplicationPrincipalClass</key>
 	<string>$(PRODUCT_MODULE_NAME).ComplicationController</string>
 	<key>NSAppTransportSecurity</key>

diff --git a/nightguard WatchKit Extension/ExtensionDelegate.swift b/nightguard WatchKit Extension/ExtensionDelegate.swift
@@ -226,9 +226,6 @@ extension ExtensionDelegate {
             BackgroundRefreshLogger.info("📱Rejected nightscout data (>1hr old!)")
             return false
         }
-
-//        let updateComplication = message["updateComplication"] as? Bool ?? false
-        BackgroundRefreshLogger.info("📱Updating nightscout data (update complication: \(String(describing: updateComplication)))")
 
         let updateResult = updateNightscoutData(nightscoutData, updateComplication: true) // always update complication!
         BackgroundRefreshLogger.nightscoutDataReceived(nightscoutData, updateResult: updateResult, updateSource: .phoneApp)
@@ -251,28 +248,6 @@ extension ExtensionDelegate {
         BackgroundRefreshScheduler.instance.schedule()
     }
 
-//    @available(watchOSApplicationExtension 3.0, *)
-//    fileprivate func scheduleSnapshotRefresh() {
-//
-//        let scheduleTime = Date(timeIntervalSinceNow: 10) // do it now!
-//        WKApplication.shared().scheduleSnapshotRefresh(withPreferredDate: scheduleTime, userInfo: nil) { (error: Error?) in
-//
-//            BackgroundRefreshLogger.info("Scheduled next snapshot refresh (NOW!)")
-//
-//            if let error = error {
-//                BackgroundRefreshLogger.info("Error occurred while scheduling snapshot refresh: \(error.localizedDescription)")
-//            }
-//        }
-//    }
-
-    fileprivate func updateComplication() {
-
-        let complicationServer = CLKComplicationServer.sharedInstance()
-        for complication in complicationServer.activeComplications ?? [] {
-            complicationServer.reloadTimeline(for: complication)
-        }
-    }
-
     enum UpdateSource {
 
         // the update was initiated by phone app
@@ -325,10 +300,6 @@ extension ExtensionDelegate {
 //            scheduleSnapshotRefresh()
 //        }
 
-        if updateComplication {
-            self.updateComplication()
-        }
-
         return .updated
     }
 

diff --git a/nightguard Widget Extension/NightguardTimelineProvider.swift b/nightguard Widget Extension/NightguardTimelineProvider.swift
@@ -17,7 +17,6 @@ struct NightguardTimelineProvider: IntentTimelineProvider {
         ]
     }
 
-
     func placeholder(in context: Context) -> NightscoutDataEntry {
 
         NightscoutDataEntry(configuration: ConfigurationIntent())
@@ -39,11 +38,12 @@ struct NightguardTimelineProvider: IntentTimelineProvider {
     }
 
     private func getTimelineData(configuration: ConfigurationIntent) -> NightscoutDataEntry {
+
         let data = NightscoutDataRepository.singleton.loadCurrentNightscoutData()
 
         let entry = NightscoutDataEntry(
             date: Date(timeIntervalSince1970: data.time.doubleValue / 1000),
-            sgv: data.sgv,
+            sgv: "200",
             bgdeltaString: data.bgdeltaString,
             bgdeltaArrow: data.bgdeltaArrow,
             bgdelta: data.bgdelta,

diff --git a/nightguard.xcodeproj/project.pbxproj b/nightguard.xcodeproj/project.pbxproj
@@ -226,6 +226,8 @@
 		439FCEB81FD5E97F009D18FD /* BackgroundUrlSessionWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439FCEB71FD5E97F009D18FD /* BackgroundUrlSessionWrapper.swift */; };
 		439FCEB91FD5EC2F009D18FD /* BackgroundUrlSessionWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439FCEB71FD5E97F009D18FD /* BackgroundUrlSessionWrapper.swift */; };
 		43A0476B24D2023C0040D853 /* WKInterfaceLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43A0476A24D2023C0040D853 /* WKInterfaceLabel.swift */; };
+		43AE645929E0172A000BEC95 /* NightguardTimelineProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43D005E429DC9CBF003BCE92 /* NightguardTimelineProvider.swift */; };
+		43AE645A29E0173D000BEC95 /* NightscoutDataEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43D005E529DC9CBF003BCE92 /* NightscoutDataEntry.swift */; };
 		43B16087200D37560058198B /* BackgroundUrlSessionWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 439FCEB71FD5E97F009D18FD /* BackgroundUrlSessionWrapper.swift */; };
 		43BB4B0224CF42C300DE96BB /* DoubleExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43288A6F1D20284600EE3999 /* DoubleExtension.swift */; };
 		43BB4B0324CF42C400DE96BB /* DoubleExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43288A6F1D20284600EE3999 /* DoubleExtension.swift */; };
@@ -556,6 +558,7 @@
 		4351E6AD1D2ADFBE001E4AE4 /* StatsPrefsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatsPrefsViewController.swift; sourceTree = "<group>"; };
 		4351E6AF1D2EFA8C001E4AE4 /* StatisticsRepository.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatisticsRepository.swift; sourceTree = "<group>"; };
 		4351E6B11D2EFDFE001E4AE4 /* TimeServiceTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TimeServiceTest.swift; sourceTree = "<group>"; };
+		435DFF5E29E08808007A25EA /* nightguard ComplicationExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "nightguard ComplicationExtension.entitlements"; sourceTree = "<group>"; };
 		43647BCA1BFF6435004389F9 /* nightguard.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = nightguard.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		43647BD21BFF6435004389F9 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		43647BD71BFF6435004389F9 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -892,6 +895,7 @@
 		43647BC11BFF6435004389F9 = {
 			isa = PBXGroup;
 			children = (
+				435DFF5E29E08808007A25EA /* nightguard ComplicationExtension.entitlements */,
 				43CB358D28D71F79002AF707 /* nightguard Widget ExtensionExtension.entitlements */,
 				43647BCC1BFF6435004389F9 /* nightguard */,
 				43647BE11BFF6435004389F9 /* nightguardTests */,
@@ -1468,8 +1472,8 @@
 				43647BC91BFF6435004389F9 /* nightguard */,
 				43647BDD1BFF6435004389F9 /* nightguardTests */,
 				43647BE81BFF6435004389F9 /* nightguardUITests */,
-				43647BF11BFF6435004389F9 /* nightguard WatchKit App */,
 				438DAC7A28D2356800FBF520 /* nightguard Widget Extension */,
+				43647BF11BFF6435004389F9 /* nightguard WatchKit App */,
 				43D005CE29DC9BFA003BCE92 /* nightguard ComplicationExtension */,
 			);
 		};
@@ -1978,6 +1982,7 @@
 				437EEDC41FB7180000694EAD /* NightscoutDataRepository.swift in Sources */,
 				D1ECDA282202C8F0002BE6F9 /* UIColorExtension.swift in Sources */,
 				43647C0D1BFF6435004389F9 /* NotificationController.swift in Sources */,
+				43AE645A29E0173D000BEC95 /* NightscoutDataEntry.swift in Sources */,
 				432E62F01D188A2400DD7978 /* UnitsConverter.swift in Sources */,
 				4303406C24CA1DA60088AB9A /* DeviceStatusData.swift in Sources */,
 				43D28A0620321AAF003859DE /* AlarmRule.swift in Sources */,
@@ -2037,6 +2042,7 @@
 				43794F421C2F435A00DB8B58 /* AppConstants.swift in Sources */,
 				439C39181C0E002F00D89872 /* ChartPainter.swift in Sources */,
 				D13A4C212221E49200C71F08 /* NightSafeMessage.swift in Sources */,
+				43AE645929E0172A000BEC95 /* NightguardTimelineProvider.swift in Sources */,
 				43BB4B0824CF5DBA00DE96BB /* TemporaryTargetData.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2387,7 +2393,7 @@
 				CODE_SIGN_ENTITLEMENTS = "nightguard WatchKit Extension/scoutwatch WatchKit Extension.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 808;
+				CURRENT_PROJECT_VERSION = 809;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = BSAVUVP8PV;
 				INFOPLIST_FILE = "nightguard WatchKit App/Info.plist";
@@ -2418,7 +2424,7 @@
 				CODE_SIGN_ENTITLEMENTS = "nightguard WatchKit Extension/scoutwatch WatchKit Extension.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 808;
+				CURRENT_PROJECT_VERSION = 809;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = BSAVUVP8PV;
 				INFOPLIST_FILE = "nightguard WatchKit App/Info.plist";
@@ -2447,7 +2453,7 @@
 				CODE_SIGN_ENTITLEMENTS = nightguard/scoutwatch.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 808;
+				CURRENT_PROJECT_VERSION = 809;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = BSAVUVP8PV;
 				ENABLE_BITCODE = NO;
@@ -2476,7 +2482,7 @@
 				CODE_SIGN_ENTITLEMENTS = nightguard/scoutwatch.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 808;
+				CURRENT_PROJECT_VERSION = 809;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = BSAVUVP8PV;
 				ENABLE_BITCODE = NO;
@@ -2592,7 +2598,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 808;
+				CURRENT_PROJECT_VERSION = 809;
 				DEVELOPMENT_TEAM = BSAVUVP8PV;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2633,7 +2639,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 808;
+				CURRENT_PROJECT_VERSION = 809;
 				DEVELOPMENT_TEAM = BSAVUVP8PV;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2668,10 +2674,11 @@
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_ENTITLEMENTS = "nightguard ComplicationExtension.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 808;
+				CURRENT_PROJECT_VERSION = 809;
 				DEVELOPMENT_TEAM = BSAVUVP8PV;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2710,10 +2717,11 @@
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_ENTITLEMENTS = "nightguard ComplicationExtension.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 808;
+				CURRENT_PROJECT_VERSION = 809;
 				DEVELOPMENT_TEAM = BSAVUVP8PV;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;

diff --git a/nightguard.xcodeproj/xcuserdata/dirk.xcuserdatad/xcschemes/xcschememanagement.plist b/nightguard.xcodeproj/xcuserdata/dirk.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
 		<key>nightguard ComplicationExtension.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>12</integer>
+			<integer>11</integer>
 		</dict>
 		<key>nightguard WatchKit App (Complication).xcscheme</key>
 		<dict>
@@ -27,7 +27,7 @@
 		<key>nightguard Widget Extension.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>11</integer>
+			<integer>12</integer>
 		</dict>
 		<key>nightguard Widget ExtensionExtension.xcscheme_^#shared#^_</key>
 		<dict>

diff --git a/nightguard/Info.plist b/nightguard/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>808</string>
+	<string>809</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>

diff --git a/nightguard/NightscoutData.swift b/nightguard/NightscoutData.swift
@@ -12,7 +12,7 @@ import Foundation
 // This data can be stored in the user defaults.
 class NightscoutData : NSObject, NSCoding, Codable {
 
-    var sgv : String = "---"
+    var sgv : String = "--1"
     // the delta Value in Display Units
     var bgdeltaString : String = "---"
     var bgdeltaArrow : String = "-"

diff --git a/nightguardTests/Info.plist b/nightguardTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>808</string>
+	<string>809</string>
 </dict>
 </plist>
diff --git a/nightguardUITests/Info.plist b/nightguardUITests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>808</string>
+	<string>809</string>
 </dict>
 </plist>