v1.2

Scout4all · Feb 27, 2023 · 769559a · 769559a
1 parent 339ca62
commit 769559a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 30 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/app-apk/app-debug.apk b/app-apk/app-debug.apk
diff --git a/...rc/main/java/com/udacity/project4/locationreminders/geofence/GeofenceBroadcastReceiver.kt b/...rc/main/java/com/udacity/project4/locationreminders/geofence/GeofenceBroadcastReceiver.kt
@@ -32,22 +32,9 @@ class GeofenceBroadcastReceiver : BroadcastReceiver() {
         Timber.e("GeoFence ${intent.extras.toString()}")
         if (intent.action == ACTION_GEOFENCE_EVENT) {
             val geofencingEvent: GeofencingEvent? = GeofencingEvent.fromIntent(intent)
-
             if (geofencingEvent != null) {
-                if (geofencingEvent.hasError()) {
-                    Timber.e(geofencingEvent.errorCode.toString())
-                    return
+                     GeofenceTransitionsJobIntentService.enqueueWork(context, intent)
                 }
-
-
-                Timber.e(geofencingEvent.triggeringGeofences.toString())
-
-                if (geofencingEvent.geofenceTransition == Geofence.GEOFENCE_TRANSITION_ENTER) {
-
-                    GeofenceTransitionsJobIntentService.enqueueWork(context, intent)
-                }
-            }
-
         }
 
     }

diff --git a/...va/com/udacity/project4/locationreminders/geofence/GeofenceTransitionsJobIntentService.kt b/...va/com/udacity/project4/locationreminders/geofence/GeofenceTransitionsJobIntentService.kt
@@ -49,30 +49,26 @@ class GeofenceTransitionsJobIntentService : JobIntentService(), CoroutineScope {
             return
         }
         Timber.e(geofencingEvent.triggeringGeofences.toString())
+        if (geofencingEvent.geofenceTransition == Geofence.GEOFENCE_TRANSITION_ENTER) {
+      val triggeredGeofence = geofencingEvent.triggeringGeofences
+            if(!triggeredGeofence.isNullOrEmpty()) {
+                sendNotification(triggeredGeofence.first())
+            }
 
-        when (geofencingEvent.geofenceTransition) {
-            Geofence.GEOFENCE_TRANSITION_ENTER -> {
-                sendNotification(geofencingEvent.triggeringGeofences!!)
 
-            }
         }
+
+
     }
 
-    //TODO: get the request id of the current geofence
-    private fun sendNotification(triggeringGeofences: List<Geofence>) {
-        var requestId = ""
 
-        for (geofence in triggeringGeofences) {
-            Timber.e(geofence.requestId)
-            requestId = geofence.requestId
-        }
-        //Get the local repository instance
+    private fun sendNotification(geofence: Geofence) {
+             //Get the local repository instance
         val remindersLocalRepository: ReminderDataSource by inject()
 //        Interaction to the repository has to be through a coroutine scope
         CoroutineScope(coroutineContext).launch(SupervisorJob()) {
             //get the reminder with the request id
-
-            val result = remindersLocalRepository.getReminder(requestId)
+            val result = remindersLocalRepository.getReminder(geofence.requestId)
             if (result is Result.Success<ReminderDTO>) {
                 val reminderDTO = result.data
                 //send a notification to the user with the reminder details