Fix updated firebase function logic

Author: Haydart

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

@@ -103,8 +103,8 @@ class AlarmController(
                 .reportSecurityIncident(SecurityIncident(AlarmTriggerReason.BEAM_BREAK_DETECTOR, reportTimestamp))
                 .flatMapObservable { incidentModel ->
                     cameraPhotoObservable
-                            .flatMapSingle { photo ->
-                                backendInteractor.uploadIncidentPhoto(photo, incidentModel.generatedId)
+                            .flatMapSingle { (photo, photoNumber) ->
+                                backendInteractor.uploadIncidentPhoto(photo, incidentModel.generatedId, photoNumber)
                             }
                 }.applyIoSchedulers()
                 .subscribeBy(

app/src/main/java/pl/rmakowiecki/smartalarmcore/peripheral/camera/CameraPeriphery.kt

@@ -28,8 +28,9 @@ class CameraPeriphery(private var context: Context?) : CameraPeripheryContract {
     private var cameraCaptureSession: CameraCaptureSession? = null
     private var imageReadProcessor: ImageReader? = null
     private var cameraId: String = ""
+    private var photosEmittedInSequence = 0
 
-    private val photoPublishSubject: PublishSubject<ByteArray> = PublishSubject.create()
+    private val photoPublishSubject: PublishSubject<Pair<ByteArray, Int>> = PublishSubject.create()
 
     private val cameraStateCallback = object : CameraDevice.StateCallback() {
         override fun onOpened(camera: CameraDevice) {
@@ -89,7 +90,7 @@ class CameraPeriphery(private var context: Context?) : CameraPeripheryContract {
             val bitmap = BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.size)
             val outputStream = ByteArrayOutputStream()
             bitmap.compress(Bitmap.CompressFormat.JPEG, 90, outputStream)
-            photoPublishSubject.onNext(outputStream.toByteArray())
+            photoPublishSubject.onNext(Pair(outputStream.toByteArray(), ++photosEmittedInSequence))
         }
     }
 
@@ -117,8 +118,9 @@ class CameraPeriphery(private var context: Context?) : CameraPeripheryContract {
         }
     }
 
-    override fun capturePhoto(): Observable<ByteArray> {
+    override fun capturePhoto(): Observable<Pair<ByteArray, Int>> {
         takePicture()
+        photosEmittedInSequence = 0
         return photoPublishSubject
     }
 

app/src/main/java/pl/rmakowiecki/smartalarmcore/peripheral/camera/CameraPeripheryContract.kt

@@ -6,7 +6,7 @@ import io.reactivex.Observable
 interface CameraPeripheryContract {
     fun openCamera()
     fun closeCamera()
-    fun capturePhoto(): Observable<ByteArray>
+    fun capturePhoto(): Observable<Pair<ByteArray, Int>>
 
     companion object {
         fun create(context: Context) = CameraPeriphery(context)

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

@@ -12,7 +12,7 @@ interface AlarmBackendContract {
     fun observeAlarmArmingState(): Observable<AlarmArmingState>
     fun updateAlarmState(alarmState: AlarmTriggerState)
     fun reportSecurityIncident(securityIncident: SecurityIncident): Single<SecurityIncidentResponse>
-    fun uploadIncidentPhoto(photoBytes: ByteArray, uniqueIncidentId: String): Single<Boolean>
+    fun uploadIncidentPhoto(photoBytes: ByteArray, uniqueIncidentId: String, photoNumber: Int): Single<Boolean>
 
     companion object {
         fun create(activity: AlarmActivity) = AlarmBackendInteractor(activity)

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

@@ -125,11 +125,12 @@ class AlarmBackendInteractor(private val activity: AlarmActivity) : AlarmBackend
                 }
     }
 
-    override fun uploadIncidentPhoto(photoBytes: ByteArray, uniqueIncidentId: String): Single<Boolean> = Single.create { emitter ->
+    override fun uploadIncidentPhoto(photoBytes: ByteArray, uniqueIncidentId: String, photoNumber: Int): Single<Boolean> = Single.create { emitter ->
+
         storageNode.child(CORE_DEVICE_DIRECTORY)
                 .child(IMAGES_DIRECTORY)
                 .child(getCurrentBackendUser()?.uid ?: "non_assignable_incidents")
-                .child("$uniqueIncidentId.jpg")
+                .child("$uniqueIncidentId#$photoNumber.jpg")
                 .putBytes(photoBytes)
                 .addOnCompleteListener { emitter.onSuccess(it.isSuccessful) }
     }

functions/index.js

@@ -133,9 +133,10 @@ exports.generateThumbnail = functions.storage.object().onChange(event => {
   const tempLocalThumbFile = path.join(os.tmpdir(), thumbFilePath);
 
   const pathParts = fileDir.split('/')
+  const fileNameParts = fileName.split('#')
 
   const coreDeviceUid = pathParts[pathParts.length - 1]
-  const incidentUid = fileName.slice(0, -4);
+  const incidentUid = fileNameParts[0] //fileName is in format "x#y.jpg", where x is UID and y is the order number of the photo in photo sequence
 
   // Exit if this is triggered on a file that is not an image.
   if (!event.data.contentType.startsWith('image/')) {
@@ -161,7 +162,7 @@ exports.generateThumbnail = functions.storage.object().onChange(event => {
     return;
   }
 
-  if (!fileName.endsWith('#1')) {
+  if (!fileName.endsWith('#1.jpg')) {
     console.log('This is not the first photo in the sequence.');
     return;
   }