-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathtest9.patch
381 lines (378 loc) · 21.5 KB
/
test9.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
diff --git a/Common/Models/BuildDetails.swift b/Common/Models/BuildDetails.swift
index 63517e7e..0badb257 100644
--- a/Common/Models/BuildDetails.swift
+++ b/Common/Models/BuildDetails.swift
@@ -65,5 +65,9 @@ class BuildDetails {
var workspaceGitBranch: String? {
return dict["com-loopkit-LoopWorkspace-git-branch"] as? String
}
+
+ var isGitHubBuild: Bool? {
+ return dict["com-loopkit-GitHub-build"] as? Bool
+ }
}
diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj
index aaa0a470..ecba1c2d 100644
--- a/Loop.xcodeproj/project.pbxproj
+++ b/Loop.xcodeproj/project.pbxproj
@@ -479,7 +479,7 @@
C1EF747228D6A44A00C8C083 /* CrashRecoveryManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1EF747128D6A44A00C8C083 /* CrashRecoveryManager.swift */; };
C1F00C60285A802A006302C5 /* SwiftCharts in Frameworks */ = {isa = PBXBuildFile; productRef = C1F00C5F285A802A006302C5 /* SwiftCharts */; };
C1F00C78285A8256006302C5 /* SwiftCharts in Embed Frameworks */ = {isa = PBXBuildFile; productRef = C1F00C5F285A802A006302C5 /* SwiftCharts */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
- C1F2075C26D6F9B0007AB7EB /* ProfileExpirationAlerter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1F2075B26D6F9B0007AB7EB /* ProfileExpirationAlerter.swift */; };
+ C1F2075C26D6F9B0007AB7EB /* AppExpirationAlerter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1F2075B26D6F9B0007AB7EB /* AppExpirationAlerter.swift */; };
C1F7822627CC056900C0919A /* SettingsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1F7822527CC056900C0919A /* SettingsManager.swift */; };
C1F8B243223E73FD00DD66CF /* BolusProgressTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1F8B1D122375E4200DD66CF /* BolusProgressTableViewCell.swift */; };
C1FB428C217806A400FAB378 /* StateColorPalette.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1FB428B217806A300FAB378 /* StateColorPalette.swift */; };
@@ -1565,7 +1565,7 @@
C1EB0D22299581D900628475 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/ckcomplication.strings; sourceTree = "<group>"; };
C1EE9E802A38D0FB0064784A /* BuildDetails.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = BuildDetails.plist; sourceTree = "<group>"; };
C1EF747128D6A44A00C8C083 /* CrashRecoveryManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrashRecoveryManager.swift; sourceTree = "<group>"; };
- C1F2075B26D6F9B0007AB7EB /* ProfileExpirationAlerter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileExpirationAlerter.swift; sourceTree = "<group>"; };
+ C1F2075B26D6F9B0007AB7EB /* AppExpirationAlerter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppExpirationAlerter.swift; sourceTree = "<group>"; };
C1F48FF62995821600C8BD69 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
C1F48FF72995821600C8BD69 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
C1F48FF82995821600C8BD69 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -2307,7 +2307,7 @@
1DA6499D2441266400F61E75 /* Alerts */,
E95D37FF24EADE68005E2F50 /* Store Protocols */,
E9B355232935906B0076AB04 /* Missed Meal Detection */,
- C1F2075B26D6F9B0007AB7EB /* ProfileExpirationAlerter.swift */,
+ C1F2075B26D6F9B0007AB7EB /* AppExpirationAlerter.swift */,
A96DAC2B2838F31200D94E38 /* SharedLogging.swift */,
7E69CFFB2A16A77E00203CBD /* ResetLoopManager.swift */,
84AA81E42A4A3981000B658B /* DeeplinkManager.swift */,
@@ -3654,7 +3654,7 @@
C1D289B522F90A52003FFBD9 /* BasalDeliveryState.swift in Sources */,
4F2C15821E074FC600E160D4 /* NSTimeInterval.swift in Sources */,
4311FB9B1F37FE1B00D4C0A7 /* TitleSubtitleTextFieldTableViewCell.swift in Sources */,
- C1F2075C26D6F9B0007AB7EB /* ProfileExpirationAlerter.swift in Sources */,
+ C1F2075C26D6F9B0007AB7EB /* AppExpirationAlerter.swift in Sources */,
B4FEEF7D24B8A71F00A8DF9B /* DeviceDataManager+DeviceStatus.swift in Sources */,
142CB7592A60BF2E0075748A /* EditMode.swift in Sources */,
E95D380324EADF36005E2F50 /* CarbStoreProtocol.swift in Sources */,
diff --git a/Loop/Managers/AppExpirationAlerter.swift b/Loop/Managers/AppExpirationAlerter.swift
new file mode 100644
index 00000000..23ceb1e7
--- /dev/null
+++ b/Loop/Managers/AppExpirationAlerter.swift
@@ -0,0 +1,134 @@
+//
+// AppExpirationAlerter.swift
+// Loop
+//
+// Created by Pete Schwamb on 8/21/21.
+// Copyright © 2021 LoopKit Authors. All rights reserved.
+//
+
+import Foundation
+import UserNotifications
+import LoopCore
+
+
+class AppExpirationAlerter {
+
+ static let expirationAlertWindow: TimeInterval = .days(20)
+ static let settingsPageExpirationWarningModeWindow: TimeInterval = .days(3)
+
+ static func alertIfNeeded(viewControllerToPresentFrom: UIViewController) {
+
+ let now = Date()
+
+ guard let profileExpiration = BuildDetails.default.profileExpiration, now > profileExpiration - expirationAlertWindow else {
+ return
+ }
+
+ let expirationDate = calculateExpirationDate(profileExpiration: profileExpiration)
+
+ let timeUntilExpiration = expirationDate.timeIntervalSince(now)
+
+ let minimumTimeBetweenAlerts: TimeInterval = timeUntilExpiration > .hours(24) ? .days(2) : .hours(1)
+
+ if let lastAlertDate = UserDefaults.appGroup?.lastProfileExpirationAlertDate {
+ guard now > lastAlertDate + minimumTimeBetweenAlerts else {
+ return
+ }
+ }
+
+ let formatter = DateComponentsFormatter()
+ formatter.allowedUnits = [.day, .hour]
+ formatter.unitsStyle = .full
+ formatter.zeroFormattingBehavior = .dropLeading
+ formatter.maximumUnitCount = 1
+ let timeUntilExpirationStr = formatter.string(from: timeUntilExpiration)
+
+ let alertMessage = createVerboseAlertMessage(timeUntilExpirationStr: timeUntilExpirationStr!)
+
+ var dialog: UIAlertController
+ if isTestFlightBuild() {
+ dialog = UIAlertController(
+ title: NSLocalizedString("TestFlight Expires Soon", comment: "The title for notification of upcoming TestFlight expiration"),
+ message: alertMessage,
+ preferredStyle: .alert)
+ dialog.addAction(UIAlertAction(title: NSLocalizedString("OK", comment: "Text for ok action on notification of upcoming profile expiration"), style: .default, handler: nil))
+ dialog.addAction(UIAlertAction(title: NSLocalizedString("More Info", comment: "Text for more info action on notification of upcoming TestFlight expiration"), style: .default, handler: { (_) in
+ UIApplication.shared.open(URL(string: "https://loopkit.github.io/loopdocs/gh-actions/gh-update/")!)
+ }))
+
+ } else {
+ dialog = UIAlertController(
+ title: NSLocalizedString("Profile Expires Soon", comment: "The title for notification of upcoming profile expiration"),
+ message: alertMessage,
+ preferredStyle: .alert)
+ dialog.addAction(UIAlertAction(title: NSLocalizedString("OK", comment: "Text for ok action on notification of upcoming profile expiration"), style: .default, handler: nil))
+ dialog.addAction(UIAlertAction(title: NSLocalizedString("More Info", comment: "Text for more info action on notification of upcoming profile expiration"), style: .default, handler: { (_) in
+ UIApplication.shared.open(URL(string: "https://loopkit.github.io/loopdocs/build/updating/")!)
+ }))
+ }
+ viewControllerToPresentFrom.present(dialog, animated: true, completion: nil)
+
+ UserDefaults.appGroup?.lastProfileExpirationAlertDate = now
+ }
+
+ static func createVerboseAlertMessage(timeUntilExpirationStr:String) -> String {
+ if isTestFlightBuild() {
+ return String(format: NSLocalizedString("%1$@ will stop working in %2$@. You will need to update before that, with a new provisioning profile.", comment: "Format string for body for notification of upcoming provisioning profile expiration. (1: app name) (2: amount of time until expiration"), Bundle.main.bundleDisplayName, timeUntilExpirationStr)
+ } else {
+ return String(format: NSLocalizedString("%1$@ will stop working in %2$@. You will need to rebuild before that.", comment: "Format string for body for notification of upcoming provisioning profile expiration. (1: app name) (2: amount of time until expiration"), Bundle.main.bundleDisplayName, timeUntilExpirationStr)
+ }
+ }
+
+ static func isNearExpiration(expirationDate:Date) -> Bool {
+ return expirationDate.timeIntervalSinceNow < settingsPageExpirationWarningModeWindow
+ }
+
+ static func createProfileExpirationSettingsMessage(expirationDate:Date) -> String {
+ let nearExpiration = isNearExpiration(expirationDate: expirationDate)
+ let maxUnitCount = nearExpiration ? 2 : 1 // only include hours in the msg if near expiration
+ let readableRelativeTime: String? = relativeTimeFormatter(maxUnitCount: maxUnitCount).string(from: expirationDate.timeIntervalSinceNow)
+ let relativeTimeRemaining: String = readableRelativeTime ?? NSLocalizedString("Unknown time", comment: "Unknown amount of time in settings' profile expiration section")
+ let verboseMessage = createVerboseAlertMessage(timeUntilExpirationStr: relativeTimeRemaining)
+ let conciseMessage = relativeTimeRemaining + NSLocalizedString(" remaining", comment: "remaining time in setting's profile expiration section")
+ return nearExpiration ? verboseMessage : conciseMessage
+ }
+
+ private static func relativeTimeFormatter(maxUnitCount:Int) -> DateComponentsFormatter {
+ let formatter = DateComponentsFormatter()
+ let includeHours = maxUnitCount == 2
+ formatter.allowedUnits = includeHours ? [.day, .hour] : [.day]
+ formatter.unitsStyle = .full
+ formatter.zeroFormattingBehavior = .dropLeading
+ formatter.maximumUnitCount = maxUnitCount
+ return formatter;
+ }
+
+ static func buildDate() -> Date? {
+ let dateFormatter = DateFormatter()
+ dateFormatter.dateFormat = "EEE MMM d HH:mm:ss 'UTC' yyyy"
+ dateFormatter.locale = Locale(identifier: "en_US_POSIX") // Set locale to ensure parsing works
+
+ guard let dateString = BuildDetails.default.buildDateString,
+ let date = dateFormatter.date(from: dateString) else {
+ return nil
+ }
+
+ return date
+ }
+
+ static func isTestFlightBuild() -> Bool {
+ return BuildDetails.default.isGitHubBuild ?? false
+ }
+
+ static func calculateExpirationDate(profileExpiration: Date) -> Date {
+ let isTestFlight = isTestFlightBuild()
+
+ if isTestFlight, let buildDate = buildDate() {
+ let testflightExpiration = Calendar.current.date(byAdding: .day, value: 90, to: buildDate)!
+
+ return profileExpiration < testflightExpiration ? profileExpiration : testflightExpiration
+ } else {
+ return profileExpiration
+ }
+ }
+}
diff --git a/Loop/Managers/LoopAppManager.swift b/Loop/Managers/LoopAppManager.swift
index 43c62d12..9edf481b 100644
--- a/Loop/Managers/LoopAppManager.swift
+++ b/Loop/Managers/LoopAppManager.swift
@@ -323,7 +323,7 @@ class LoopAppManager: NSObject {
func didBecomeActive() {
if let rootViewController = rootViewController {
- ProfileExpirationAlerter.alertIfNeeded(viewControllerToPresentFrom: rootViewController)
+ AppExpirationAlerter.alertIfNeeded(viewControllerToPresentFrom: rootViewController)
}
settingsManager?.didBecomeActive()
deviceDataManager?.didBecomeActive()
diff --git a/Loop/Managers/ProfileExpirationAlerter.swift b/Loop/Managers/ProfileExpirationAlerter.swift
deleted file mode 100644
index 3aa74273..00000000
--- a/Loop/Managers/ProfileExpirationAlerter.swift
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// ProfileExpirationAlerter.swift
-// Loop
-//
-// Created by Pete Schwamb on 8/21/21.
-// Copyright © 2021 LoopKit Authors. All rights reserved.
-//
-
-import Foundation
-import UserNotifications
-import LoopCore
-
-
-class ProfileExpirationAlerter {
-
- static let expirationAlertWindow: TimeInterval = .days(20)
- static let settingsPageExpirationWarningModeWindow: TimeInterval = .days(3)
-
- static func alertIfNeeded(viewControllerToPresentFrom: UIViewController) {
-
- let now = Date()
-
- guard let profileExpiration = BuildDetails.default.profileExpiration, now > profileExpiration - expirationAlertWindow else {
- return
- }
-
- let timeUntilExpiration = profileExpiration.timeIntervalSince(now)
-
- let minimumTimeBetweenAlerts: TimeInterval = timeUntilExpiration > .hours(24) ? .days(2) : .hours(1)
-
- if let lastAlertDate = UserDefaults.appGroup?.lastProfileExpirationAlertDate {
- guard now > lastAlertDate + minimumTimeBetweenAlerts else {
- return
- }
- }
-
- let formatter = DateComponentsFormatter()
- formatter.allowedUnits = [.day, .hour]
- formatter.unitsStyle = .full
- formatter.zeroFormattingBehavior = .dropLeading
- formatter.maximumUnitCount = 1
- let timeUntilExpirationStr = formatter.string(from: timeUntilExpiration)
-
- let alertMessage = createVerboseAlertMessage(timeUntilExpirationStr: timeUntilExpirationStr!)
-
- let dialog = UIAlertController(
- title: NSLocalizedString("Profile Expires Soon", comment: "The title for notification of upcoming profile expiration"),
- message: alertMessage,
- preferredStyle: .alert)
- dialog.addAction(UIAlertAction(title: NSLocalizedString("OK", comment: "Text for ok action on notification of upcoming profile expiration"), style: .default, handler: nil))
- dialog.addAction(UIAlertAction(title: NSLocalizedString("More Info", comment: "Text for more info action on notification of upcoming profile expiration"), style: .default, handler: { (_) in
- UIApplication.shared.open(URL(string: "https://loopkit.github.io/loopdocs/build/updating/")!)
- }))
- viewControllerToPresentFrom.present(dialog, animated: true, completion: nil)
-
- UserDefaults.appGroup?.lastProfileExpirationAlertDate = now
- }
-
- static func createVerboseAlertMessage(timeUntilExpirationStr:String) -> String {
- return String(format: NSLocalizedString("%1$@ will stop working in %2$@. You will need to update before that, with a new provisioning profile.", comment: "Format string for body for notification of upcoming provisioning profile expiration. (1: app name) (2: amount of time until expiration"), Bundle.main.bundleDisplayName, timeUntilExpirationStr)
- }
-
- static func isNearProfileExpiration(profileExpiration:Date) -> Bool {
- return profileExpiration.timeIntervalSinceNow < settingsPageExpirationWarningModeWindow
- }
-
- static func createProfileExpirationSettingsMessage(profileExpiration:Date) -> String {
- let nearExpiration = isNearProfileExpiration(profileExpiration: profileExpiration)
- let maxUnitCount = nearExpiration ? 2 : 1 // only include hours in the msg if near expiration
- let readableRelativeTime: String? = relativeTimeFormatter(maxUnitCount: maxUnitCount).string(from: profileExpiration.timeIntervalSinceNow)
- let relativeTimeRemaining: String = readableRelativeTime ?? NSLocalizedString("Unknown time", comment: "Unknown amount of time in settings' profile expiration section")
- let verboseMessage = createVerboseAlertMessage(timeUntilExpirationStr: relativeTimeRemaining)
- let conciseMessage = relativeTimeRemaining + NSLocalizedString(" remaining", comment: "remaining time in setting's profile expiration section")
- return nearExpiration ? verboseMessage : conciseMessage
- }
-
- private static func relativeTimeFormatter(maxUnitCount:Int) -> DateComponentsFormatter {
- let formatter = DateComponentsFormatter()
- let includeHours = maxUnitCount == 2
- formatter.allowedUnits = includeHours ? [.day, .hour] : [.day]
- formatter.unitsStyle = .full
- formatter.zeroFormattingBehavior = .dropLeading
- formatter.maximumUnitCount = maxUnitCount
- return formatter;
- }
-}
diff --git a/Loop/Views/SettingsView.swift b/Loop/Views/SettingsView.swift
index 0b4cb551..a07d623f 100644
--- a/Loop/Views/SettingsView.swift
+++ b/Loop/Views/SettingsView.swift
@@ -417,25 +417,48 @@ extension SettingsView {
DIY loop specific component to show users the amount of time remaining on their build before a rebuild is necessary.
*/
private func profileExpirationSection(profileExpiration:Date) -> some View {
- let nearExpiration : Bool = ProfileExpirationAlerter.isNearProfileExpiration(profileExpiration: profileExpiration)
- let profileExpirationMsg = ProfileExpirationAlerter.createProfileExpirationSettingsMessage(profileExpiration: profileExpiration)
- let readableExpirationTime = Self.dateFormatter.string(from: profileExpiration)
+ let expirationDate = AppExpirationAlerter.calculateExpirationDate(profileExpiration: profileExpiration)
+ let isTestFlight = AppExpirationAlerter.isTestFlightBuild()
- return Section(header: SectionHeader(label: NSLocalizedString("App Profile", comment: "Settings app profile section")),
- footer: Text(NSLocalizedString("Profile expires ", comment: "Time that profile expires") + readableExpirationTime)) {
- if(nearExpiration) {
- Text(profileExpirationMsg).foregroundColor(.red)
- } else {
- HStack {
- Text("Profile Expiration", comment: "Settings App Profile expiration view")
- Spacer()
- Text(profileExpirationMsg).foregroundColor(Color.secondary)
+ let nearExpiration : Bool = AppExpirationAlerter.isNearExpiration(expirationDate: expirationDate)
+ let profileExpirationMsg = AppExpirationAlerter.createProfileExpirationSettingsMessage(expirationDate: expirationDate)
+ let readableExpirationTime = Self.dateFormatter.string(from: expirationDate)
+
+ if isTestFlight {
+ return Section(header: SectionHeader(label: NSLocalizedString("TestFlight", comment: "Settings app TestFlight section")),
+ footer: Text(NSLocalizedString("TestFlight expires ", comment: "Time that build expires") + readableExpirationTime)) {
+ if(nearExpiration) {
+ Text(profileExpirationMsg).foregroundColor(.red)
+ } else {
+ HStack {
+ Text("TestFlight Expiration", comment: "Settings TestFlight expiration view")
+ Spacer()
+ Text(profileExpirationMsg).foregroundColor(Color.secondary)
+ }
+ }
+ Button(action: {
+ UIApplication.shared.open(URL(string: "https://loopkit.github.io/loopdocs/gh-actions/gh-update/")!)
+ }) {
+ Text(NSLocalizedString("How to update (LoopDocs)", comment: "The title text for how to update"))
}
}
- Button(action: {
- UIApplication.shared.open(URL(string: "https://loopkit.github.io/loopdocs/build/updating/")!)
- }) {
- Text(NSLocalizedString("How to update (LoopDocs)", comment: "The title text for how to update"))
+ } else {
+ return Section(header: SectionHeader(label: NSLocalizedString("App Profile", comment: "Settings app profile section")),
+ footer: Text(NSLocalizedString("Profile expires ", comment: "Time that profile expires") + readableExpirationTime)) {
+ if(nearExpiration) {
+ Text(profileExpirationMsg).foregroundColor(.red)
+ } else {
+ HStack {
+ Text("Profile Expiration", comment: "Settings App Profile expiration view")
+ Spacer()
+ Text(profileExpirationMsg).foregroundColor(Color.secondary)
+ }
+ }
+ Button(action: {
+ UIApplication.shared.open(URL(string: "https://loopkit.github.io/loopdocs/build/updating/")!)
+ }) {
+ Text(NSLocalizedString("How to update (LoopDocs)", comment: "The title text for how to update"))
+ }
}
}
}
diff --git a/Scripts/capture-build-details.sh b/Scripts/capture-build-details.sh
index 66f827d7..932e1c7b 100755
--- a/Scripts/capture-build-details.sh
+++ b/Scripts/capture-build-details.sh
@@ -91,3 +91,8 @@ then
fi
popd . > /dev/null
fi
+
+# Handle github action
+if [ -n "$GITHUB_ACTIONS" ]; then
+ plutil -replace com-loopkit-GitHub-build -bool true "${info_plist_path}"
+fi