mirror-AU-COVIDSafe/mobile-ios
1
0
Fork 0
mirror of https://github.com/AU-COVIDSafe/mobile-ios.git synced 2025-04-19 21:15:21 +00:00
Code Issues Projects Releases Wiki Activity

COVIDSafe code from version 1.3 (#2)

Browse source
This commit is contained in:
COVIDSafe Support 2020-05-18 12:43:53 +10:00 • committed by GitHub
parent cae9823e44
commit 56c93f2079
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 88 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

68
CovidSafe/AppDelegate.swift
View file

@ -40,6 +40,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
UNUserNotificationCenter.current().delegate = self
NotificationCenter.default.addObserver(self, selector:#selector(jwtExpired(_:)),name: .jwtExpired, object: nil)
NotificationCenter.default.addObserver(self, selector:#selector(deferReminderNotifications(_:)),name: .encounterRecorded, object: nil)
setupBluetoothPNStatusCallback()
@ -103,23 +104,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
}
}
fileprivate func triggerCalendarLocalPushNotifications(pnContent: [String : String], identifier: String) {
let center = UNUserNotificationCenter.current()
let content = UNMutableNotificationContent()
content.title = pnContent["contentTitle"]!
content.body = pnContent["contentBody"]!
var dateComponents = DateComponents()
dateComponents.hour = 9
let trigger = UNCalendarNotificationTrigger(dateMatching: dateComponents, repeats: true)
let request = UNNotificationRequest(identifier: identifier, content: content, trigger: trigger)
center.add(request)
fileprivate func cancelPreviouslyScheduledNotifications() {
UNUserNotificationCenter.current().removeAllPendingNotificationRequests()
}
fileprivate func triggerIntervalLocalPushNotifications(pnContent: [String : String], identifier: String) {
let center = UNUserNotificationCenter.current()
@ -133,6 +121,48 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
let request = UNNotificationRequest(identifier: identifier, content: content, trigger: trigger)
center.add(request)
}
#if DEBUG
let intervals: [TimeInterval] = [60, 15 * 60, 30 * 60, 60 * 60, 120 * 60]
#else
let intervals: [TimeInterval] = [TimeInterval(60 * 60 * 48)]
#endif
fileprivate func scheduleReminderNotifications() {
let reminderContent = PushNotificationConstants.reminderPushNotifContents
guard
let title = reminderContent["contentTitle"],
let body = reminderContent["contentBody"] else {
return
}
let notificationCenter = UNUserNotificationCenter.current()
for interval in intervals {
let content = UNMutableNotificationContent()
#if DEBUG
content.title = "\(title) \(interval / 60) min"
#else
content.title = title
#endif
content.body = body
let trigger = UNTimeIntervalNotificationTrigger(timeInterval: interval, repeats: false)
let request = UNNotificationRequest(identifier: "reminder-\(interval)", content: content, trigger: trigger)
notificationCenter.add(request)
}
}
@objc
func deferReminderNotifications(_ notification: Notification) {
cancelPreviouslyScheduledNotifications()
scheduleReminderNotifications()
}
// MARK: - Core Data stack
@ -164,6 +194,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
DLog("applicationWillResignActive")
// Retry in case it failed on become active
clearOldDataInContext()
scheduleReminderNotifications()
}
func applicationDidEnterBackground(_ application: UIApplication) {
@ -171,14 +202,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
Encounter.timestamp(for: .appEnteredBackground)
self.dismissBlackscreen()
stopAccelerometerUpdates()
stopAccelerometerUpdates()
}
func applicationWillEnterForeground(_ application: UIApplication) {
DLog("applicationWillEnterForeground")
self.dismissBlackscreen()
UNUserNotificationCenter.current().removeAllPendingNotificationRequests()
cancelPreviouslyScheduledNotifications()
}
func applicationWillTerminate(_ application: UIApplication) {
@ -350,6 +381,7 @@ extension Notification.Name {
static let disableUserInteraction = Notification.Name("disableUserInteraction")
static let enableUserInteraction = Notification.Name("enableUserInteraction")
static let jwtExpired = Notification.Name("jwtExpired")
static let encounterRecorded = Notification.Name("encounterRecorded")
}
@available(iOS 10, *)

6
CovidSafe/CentralController.swift
View file

@ -228,8 +228,10 @@ extension CentralController: CBCentralManagerDelegate {
func centralManager(_ central: CBCentralManager, didDisconnectPeripheral peripheral: CBPeripheral, error: Error?) {
DLog("CC didDisconnectPeripheral \(peripheral) , \(error != nil ? "error: \(error.debugDescription)" : "" )")
let options = [CBConnectPeripheralOptionStartDelayKey: NSNumber(15)]
central.connect(peripheral, options: options)
if #available(iOS 12, *) {
let options = [CBConnectPeripheralOptionStartDelayKey: NSNumber(15)]
central.connect(peripheral, options: options)
}
}
func centralManager(_ central: CBCentralManager, didFailToConnect peripheral: CBPeripheral, error: Error?) {

1
CovidSafe/Encounter+EncounterRecord.swift
View file

@ -25,6 +25,7 @@ extension EncounterRecord {
} catch {
print("Could not save. \(error)")
}
NotificationCenter.default.post(name: .encounterRecorded, object: nil)
}
}

5
CovidSafe/PushNotificationConstants.swift
View file

@ -13,4 +13,9 @@ struct PushNotificationConstants {
"contentBody": "Help stop the spread of COVID-19 by keeping your phone’s Bluetooth on until the outbreak is over."
]
]
static let reminderPushNotifContents = [
"contentTitle": "Reminder: COVIDSafe app has not been active in the past 48 hours",
"contentBody": "Tap to open the app and keep Bluetooth enabled."
]
}