Report alarm incident issued by motion sensor

Author: Haydart

app/src/main/java/pl/rmakowiecki/smartalarmcore/AlarmController.kt

@@ -70,7 +70,7 @@ class AlarmController(
                             onNext = {
                                 updateAlarmTriggerState(it)
                                 if (it == TRIGGERED) {
-                                    reportBeamBreakIncident()
+                                    reportAlarmIncident(AlarmTriggerReason.BEAM_BREAK_DETECTOR)
                                 }
                             }
                     )
@@ -83,15 +83,24 @@ class AlarmController(
                     .registerForChanges()
                     .applyIoSchedulers()
                     .subscribeBy(
-                            onNext = { /*logD(it)*/ }
+                            onNext = {
+                                updateAlarmTriggerState(it)
+                                if (it == TRIGGERED) {
+                                    reportAlarmIncident(AlarmTriggerReason.MOTION_SENSOR)
+                                }
+                            }
                     )
         }
     }
 
-    private fun updateAlarmTriggerState(alarmTriggerState: AlarmTriggerState)
-            = backendInteractor.updateAlarmState(alarmTriggerState)
+    private fun updateAlarmTriggerState(alarmTriggerState: AlarmTriggerState) = backendInteractor
+            .updateAlarmState(alarmTriggerState)
+            .applyIoSchedulers()
+            .subscribeBy(
+                    onSuccess = { logD("Updating trigger value on server successful") }
+            )
 
-    private fun reportBeamBreakIncident() {
+    private fun reportAlarmIncident(reason: AlarmTriggerReason) {
         val reportTimestamp = System.currentTimeMillis()
 
         val cameraPhotoObservable = camera.capturePhoto()
@@ -100,7 +109,7 @@ class AlarmController(
         cameraPhotoObservable.subscribeBy(onNext = { logD("camera photo taken") })
 
         backendInteractor
-                .reportSecurityIncident(SecurityIncident(AlarmTriggerReason.BEAM_BREAK_DETECTOR, reportTimestamp))
+                .reportSecurityIncident(SecurityIncident(reason, reportTimestamp))
                 .flatMapObservable { incidentModel ->
                     cameraPhotoObservable
                             .flatMapSingle { (photo, photoNumber) ->

app/src/main/java/pl/rmakowiecki/smartalarmcore/remote/AlarmBackendContract.kt

@@ -12,7 +12,7 @@ interface AlarmBackendContract {
     fun isLoggedInToBackend(): Single<Boolean>
     fun signInToBackend(): Single<Boolean>
     fun observeAlarmArmingState(): Observable<AlarmArmingState>
-    fun updateAlarmState(alarmState: AlarmTriggerState)
+    fun updateAlarmState(alarmState: AlarmTriggerState): Single<Boolean>
     fun reportSecurityIncident(securityIncident: SecurityIncident): Single<SecurityIncidentResponse>
     fun uploadIncidentPhoto(photoBytes: ByteArray, uniqueIncidentId: String, photoNumber: Int): Single<Boolean>