Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Geofence reporting bugfix #277

Merged
merged 2 commits into from
Apr 27, 2021
Merged

Geofence reporting bugfix #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f663e2
Fixing bug where geofences wouldn't get reported to the system
ssathy2 Apr 26, 2021
fba83bc
Update regions to register logic
ssathy2 Apr 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions Examples/GroceryExpress/AddressUpdateViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ private struct AddressUpdateRequestFactory {
let userId: String
let entryPlacemark: MKPlacemark
let entryAddress: String
let entryRadius: Int
let exitPlacemark: MKPlacemark
let exitAddress: String
let exitRadius: Int
let connectionId: String

func generate() -> URLRequest {
Expand All @@ -39,7 +41,7 @@ private struct AddressUpdateRequestFactory {
"address": "\(exitAddress)",
"lat": "\(exitPlacemark.coordinate.latitude)",
"lng": "\(exitPlacemark.coordinate.longitude)",
"radius": 200
"radius": "\(exitRadius)"
}
}
]
Expand All @@ -57,7 +59,7 @@ private struct AddressUpdateRequestFactory {
"address": "\(entryAddress)",
"lat": "\(entryPlacemark.coordinate.latitude)",
"lng": "\(entryPlacemark.coordinate.longitude)",
"radius": 200
"radius": "\(entryRadius)"
}
}
]
Expand Down Expand Up @@ -238,14 +240,18 @@ final class AddressUpdateViewController: UIViewController {
guard let userId = addressUpdate.userId,
let entryPlacemark = addressUpdate.entryPlacemark,
let entryAddress = addressUpdate.entryAddress?.replacingOccurrences(of: "\n", with: " "),
let entryRadius = addressUpdate.geofenceEntryRadius,
let exitPlacemark = addressUpdate.exitPlacemark,
let exitAddress = addressUpdate.exitAddress?.replacingOccurrences(of: "\n", with: " ") else { return }
let exitAddress = addressUpdate.exitAddress?.replacingOccurrences(of: "\n", with: " "),
let exitRadius = addressUpdate.geofenceExitRadius else { return }
let requestFactory = AddressUpdateRequestFactory(token: token,
userId: userId,
entryPlacemark: entryPlacemark,
entryAddress: entryAddress,
entryRadius: entryRadius,
exitPlacemark: exitPlacemark,
exitAddress: exitAddress,
exitRadius: exitRadius,
connectionId: connectionId)
let task = urlSession.dataTask(with: requestFactory.generate()) { (data, response, error) in
DispatchQueue.main.async {
Expand Down
4 changes: 1 addition & 3 deletions IFTTT SDK/ConnectionsSynchronizer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,16 +289,14 @@ final class ConnectionsSynchronizer {
private class NativeServicesCoordinator {
private let locationService: LocationService
private let permissionsRequestor: PermissionsRequestor
private let operationQueue: OperationQueue

init(locationService: LocationService, permissionsRequestor: PermissionsRequestor) {
self.locationService = locationService
self.permissionsRequestor = permissionsRequestor
self.operationQueue = OperationQueue.main
}

func processConnectionUpdate(_ updates: Set<Connection.ConnectionStorage>) {
operationQueue.addOperation {
DispatchQueue.main.async {
self.permissionsRequestor.processUpdate(with: updates)
self.locationService.updateRegions(from: updates)
}
Expand Down
10 changes: 6 additions & 4 deletions IFTTT SDK/RegionsMonitor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,14 @@ class RegionsMonitor: NSObject, CLLocationManagerDelegate, LocationMonitor {
/// - Parameters:
/// - regions: The list of regions to monitor with the CLLocationManager.
private func register(regions: [CLRegion]) {
let regionsToRegisterMapped = regions.compactMap { $0 as? CLCircularRegion }.map { IFTTTCircularRegion(region: $0) }
let regionsMapped = Set(regions.compactMap { $0 as? CLCircularRegion }.map { IFTTTCircularRegion(region: $0) })
let currentlyMonitoredRegionsMapped = currentlyMonitoredRegions.compactMap { $0 as? CLCircularRegion }.map { IFTTTCircularRegion(region: $0) }
let regionsToStopMonitoringMapped = currentlyMonitoredRegionsMapped.subtracting(regionsToRegisterMapped)
let regionsToStopMonitoring = regionsToStopMonitoringMapped.map { $0.region }

regionsToStopMonitoring.forEach { (region) in
let regionsToRegisterMapped = regionsMapped.subtracting(currentlyMonitoredRegionsMapped)
let regionsToStopMonitoringMapped = currentlyMonitoredRegionsMapped.subtracting(regionsMapped)

regionsToStopMonitoringMapped.forEach { (iftttCircularRegion) in
let region = iftttCircularRegion.region
locationManager.stopMonitoring(for: region)
ConnectButtonController.synchronizationLog("Did end monitoring for region: \(region)")
}
Expand Down