Skip to content

🍏 fix [value] placeholder is notifs' message not replaced after app h… #20

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

🍏 fix [value] placeholder is notifs' message not replaced after app h… #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 6 additions & 9 deletions ios/RNSimpleNativeGeofencing.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ class RNSimpleNativeGeofencing: RCTEventEmitter, CLLocationManagerDelegate, UNUs


//MARK: - Init / Setup / Vars

static let sharedInstance = RNSimpleNativeGeofencing()

let locationManager = CLLocationManager()
Expand All @@ -43,7 +42,6 @@ class RNSimpleNativeGeofencing: RCTEventEmitter, CLLocationManagerDelegate, UNUs
var globalDeletionTimer = 0
var globaltimer: Timer?

var valueDic: Dictionary<String, String> = [:]
var locationAuthorized = true
var notificationAuthorized = true

Expand Down Expand Up @@ -138,7 +136,7 @@ class RNSimpleNativeGeofencing: RCTEventEmitter, CLLocationManagerDelegate, UNUs
)

if value != nil {
self.valueDic[id] = value!
UserDefaults.standard.set(value, forKey: id);
}

geofenceRegion.notifyOnExit = true
Expand Down Expand Up @@ -284,7 +282,7 @@ class RNSimpleNativeGeofencing: RCTEventEmitter, CLLocationManagerDelegate, UNUs

for geo in self.currentActiveGeofences {

self.valueDic[geo.identifier] = nil
UserDefaults.standard.removeObject(forKey: geo.identifier)

self.locationManager.stopMonitoring(for: geo)

Expand Down Expand Up @@ -313,7 +311,7 @@ class RNSimpleNativeGeofencing: RCTEventEmitter, CLLocationManagerDelegate, UNUs
for geo in self.currentActiveGeofences {
if geo.identifier == geofenceKey{

self.valueDic[geo.identifier] = nil
UserDefaults.standard.removeObject(forKey: geo.identifier)

self.locationManager.stopMonitoring(for: geo)
self.currentActiveGeofences.remove(at: count)
Expand All @@ -325,7 +323,7 @@ class RNSimpleNativeGeofencing: RCTEventEmitter, CLLocationManagerDelegate, UNUs
for geo in self.currentGeofences {
if geo.identifier == geofenceKey{

self.valueDic[geo.identifier] = nil
UserDefaults.standard.removeObject(forKey: geo.identifier)

self.currentGeofences.remove(at: count2)
}
Expand Down Expand Up @@ -422,7 +420,6 @@ class RNSimpleNativeGeofencing: RCTEventEmitter, CLLocationManagerDelegate, UNUs
//MARK: - Setup Notifications

private func handleEvent(region: CLRegion!, didEnter: Bool) {

if region.identifier == "monitor" {

if didEnter {
Expand Down Expand Up @@ -452,13 +449,13 @@ class RNSimpleNativeGeofencing: RCTEventEmitter, CLLocationManagerDelegate, UNUs


if self.didEnterBody.contains("[value]") {
if let value = self.valueDic[region.identifier] {
if let value = UserDefaults.standard.string(forKey: region.identifier) {
self.didEnterBody = self.didEnterBody.replacingOccurrences(of: "[value]", with: value, options: NSString.CompareOptions.literal, range:nil)
}
}

if self.didExitBody.contains("[value]") {
if let value = self.valueDic[region.identifier] {
if let value = UserDefaults.standard.string(forKey: region.identifier) {
self.didExitBody = self.didExitBody.replacingOccurrences(of: "[value]", with: value, options: NSString.CompareOptions.literal, range:nil)
}
}
Expand Down