From 5a309e1b2408adb1b2def7a8175b8da33b5c2f1b Mon Sep 17 00:00:00 2001
From: Pritimay Sarkar <pritimay@sminnovations.in>
Date: Sun, 14 Jan 2024 08:50:44 +0530
Subject: [PATCH] release 2.1.90 with upload flags

---
 app/build.gradle                                           | 6 +++---
 .../hpostesting/presentation/hemocube/HemoCubeFragment.kt  | 7 ++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1b45f56..7839f4b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,11 +16,11 @@ android {
 
     // prod - production, preprod - preproduction, quality - qc, dev - development
     defaultConfig {
-        applicationId "in.sminnovations.hpostesting.quality"
+        applicationId "in.sminnovations.hpostesting.preprod"
         minSdk 21
         targetSdk 34
-        versionCode 88
-        versionName "2.1.88"
+        versionCode 90
+        versionName "2.1.90"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
index 677dc27..d403f7c 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
@@ -65,6 +65,8 @@ class HemoCubeFragment : Fragment() {
     private var testStatusCode = 0.0
     private var repeatReadingCount = 0
     private var readingsPerSample = Constants.READINGS_PER_SAMPLE
+    private var uploadedToCloud = false
+    private var uploadedToMolbio = false
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
@@ -140,10 +142,12 @@ class HemoCubeFragment : Fragment() {
     private fun observeViewModel() {
         hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
             if (result == "Success") {
+                uploadedToCloud = true
                 showToast(R.string.test_upload)
                 hemoCubeViewModel.resultUpload.observe(viewLifecycleOwner) {
                     when (it) {
                         is Result.Success -> {
+                            uploadedToMolbio = true
                             if (Constants.MOLBIO_INTERGATION) {
                                 it.data.data?.get(0)?.rawData?.let { it1 ->
                                     hemoCubeViewModel.updateMolbioFlag(
@@ -160,6 +164,7 @@ class HemoCubeFragment : Fragment() {
                                 Toast.makeText(activity, "An error occurred: $message", Toast.LENGTH_LONG)
                                     .show()
                             }
+                            handleReadingFinish()
                         }
 
                         else -> {}
@@ -224,7 +229,7 @@ class HemoCubeFragment : Fragment() {
     }
 
     private fun handleReadingFinish() {
-        if (allReadingsComplete()) {
+        if (allReadingsComplete() && uploadedToCloud) {
             activity?.runOnUiThread {
                 binding.btnSubmit.visibility = View.GONE
                 val i = Intent(