Merge pull request #243 from shankari/ignore-ble-beacon-found-non-fleet

👔 Do not start a trip if we see a beacon in non-fleet mode
e-mission · Dec 20, 2024 · cd9f80a · cd9f80a
2 parents 06a90be + c3df0d8
commit cd9f80a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-em-datacollection",
-  "version": "1.9.2",
+  "version": "1.9.5",
   "description": "The main tracking for the e-mission platform",
   "license": "BSD-3-clause",
   "cordova": {

diff --git a/plugin.xml b/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
         id="cordova-plugin-em-datacollection"
-        version="1.9.4">
+        version="1.9.5">
 
   <name>DataCollection</name>
   <description>Background data collection FTW! This is the part that I really

diff --git a/src/ios/Location/TripDiaryStateMachine.m b/src/ios/Location/TripDiaryStateMachine.m
@@ -259,15 +259,15 @@ -(void) handleStart:(NSString*) transition withUserInfo:(NSDictionary*) userInfo
                                                        [TripDiaryStateMachine getStateName:self.currState]]];
             [TripDiaryActions startTracking:transition withLocationMgr:self.locMgr];
             [TripDiaryActions deleteGeofence:self.locMgr];
+            [[NSNotificationCenter defaultCenter] postNotificationName:CFCTransitionNotificationName
+                                                                object:CFCTransitionTripStarted];
         } else {
             [LocalNotificationManager addNotification:[NSString stringWithFormat:
                                                        @"ERROR: Got transition %@ in state %@ without fleet mode",
                                                        transition,
                                                        [TripDiaryStateMachine getStateName:self.currState]]];
 
         }
-        [[NSNotificationCenter defaultCenter] postNotificationName:CFCTransitionNotificationName
-                                                            object:CFCTransitionTripStarted];
     } else if ([transition isEqualToString:CFCTransitionInitComplete]) {
         // Geofence has been successfully created and we are inside it so we are about to move to
         // the WAITING_FOR_TRIP_START state.
@@ -357,15 +357,15 @@ - (void) handleWaitingForTripStart:(NSString*) transition  withUserInfo:(NSDicti
                                                        [TripDiaryStateMachine getStateName:self.currState]]];
             [TripDiaryActions startTracking:transition withLocationMgr:self.locMgr];
             [TripDiaryActions deleteGeofence:self.locMgr];
+            [[NSNotificationCenter defaultCenter] postNotificationName:CFCTransitionNotificationName
+                                                                object:CFCTransitionTripStarted];
         } else {
             [LocalNotificationManager addNotification:[NSString stringWithFormat:
                                                        @"ERROR: Got transition %@ in state %@ without fleet mode",
                                                        transition,
                                                        [TripDiaryStateMachine getStateName:self.currState]]];
 
         }
-        [[NSNotificationCenter defaultCenter] postNotificationName:CFCTransitionNotificationName
-                                                            object:CFCTransitionTripStarted];
 
     } else if ([transition isEqualToString:CFCTransitionVisitEnded]) { 
         if ([ConfigManager instance].ios_use_visit_notifications_for_detection) {