add local data upload screen

app update and other api calls managing for molbio

See merge request sminnovations/hpos!39

app/build.gradle

@@ -19,8 +19,8 @@ android {
         applicationId "in.sminnovations.hpostesting.dev"
         minSdk 21
         targetSdk 34
-        versionCode 114
+        versionCode 120
-        versionName "2.1.114"
+        versionName "2.1.120"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/AndroidManifest.xml

@@ -25,6 +25,7 @@
 
     <application
         android:name="com.example.hpostesting.HPOSTestingApplication"
+        android:largeHeap="true"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -66,6 +67,11 @@
             android:exported="false"
             android:theme="@style/Theme.HPOS.NoActionBar"/>
 
+        <activity
+            android:name="com.example.hpostesting.presentation.datatransfer.DataTransferActivity"
+            android:exported="false"
+            android:theme="@style/Theme.HPOS.NoActionBar"/>
+
         <activity
             android:name="com.example.hpostesting.presentation.hemocube.HemocubeActivity"
             android:exported="false"

app/src/main/java/com/example/hpostesting/data/constant/Constants.kt

@@ -8,7 +8,7 @@ object Constants {
     const val DOCUMENT_ID_FOR_UPDATE ="2o71vBKLqdgEKYtFG8Lb"
     const val ABHA_APP_PACKAGE = "in.ndhm.phr"
 
-    const val MOLBIO_INTEGRATION = false
+    const val MOLBIO_INTEGRATION = true
     const val deviceProvisionEmail = "HPOS_provisioner@bigtec.co.in"
     const val deviceProvisionPassword = "f2ab0e7f9d69"
     const val DEVICE_ID_API = "deviceIDAPI"

app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt

@@ -10,7 +10,7 @@ import com.example.hpostesting.data.model.patient.UserData
 
 @Database(
     entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class],
-    version = 27,
+    version = 28,
     exportSchema = false
 )
 @TypeConverters(Converters::class)

app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt

@@ -109,20 +109,7 @@ class DatabaseRepository @Inject constructor(
     }
 
     override suspend fun addTestToDatabase(data: UserData?): Response<String> {
-        return try {
+        TODO("Not yet implemented")
-            val userdata =
-                db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
-            if (userdata.documents.isNotEmpty()) {
-                userdata.documents.forEach {
-                    db.collection("patientData").document(it.id).update("testStatus", true)
-                }
-            }
-            db.collection("testData").add(data).await()
-            Response.Success(data._id)
-        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
-            Response.Error(e)
-        }
     }
 
     override suspend fun addTestToDatabaseforBufferCheck(data: BufferCheckData?): Response<String> {
@@ -247,4 +234,22 @@ class DatabaseRepository @Inject constructor(
     override fun <UserData> addTestToDatabase(testDetails: UserData): Any {
         TODO("Not yet implemented")
     }
+
+    override suspend fun addTestToDatabasefornew(data: HemoCubeTestData?): Response<String> {
+            return try {
+                val userdata =
+                    db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
+                if (userdata.documents.isNotEmpty()) {
+                    userdata.documents.forEach {
+                        db.collection("patientData").document(it.id).update("testStatus", true)
+                    }
+                }
+                db.collection("testData").add(data).await()
+                Response.Success(data._id)
+            } catch (e: Exception) {
+                Firebase.crashlytics.recordException(e)
+                Response.Error(e)
+            }
+        }
+
 }

app/src/main/java/com/example/hpostesting/data/repository/Repository.kt

@@ -25,6 +25,7 @@ import okhttp3.ResponseBody
 
 interface Repository {
     suspend fun addTestToDatabase(data: HemoCubeTestData?): Response<String>
+    suspend fun addTestToDatabasefornew(data: HemoCubeTestData?): Response<String>
 
     suspend fun addTestToDatabase(data: UserData?): Response<String>
 

app/src/main/java/com/example/hpostesting/domain/di/AppModule.kt

@@ -45,7 +45,7 @@ object AppModule {
     @Singleton
     fun provideMyDatabase(@ApplicationContext context: Context): MyDatabase {
         return Room.databaseBuilder(
-            context, MyDatabase::class.java, "my_database"
+            context, MyDatabase::class.java, "hpos_database"
         ).fallbackToDestructiveMigration().build()
     }
 

app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt

@@ -1,7 +1,6 @@
 package com.example.hpostesting.presentation.dashboard
 
-import android.app.DownloadManager
+import android.annotation.SuppressLint
-import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
@@ -24,7 +23,7 @@ import androidx.navigation.ui.setupWithNavController
 import com.example.hpostesting.data.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.data.model.patient.DeviceData
+import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
 import com.example.hpostesting.presentation.NatsManager
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.example.hpostesting.presentation.jig.JigActivity
@@ -35,10 +34,16 @@ import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.firebase.firestore.ktx.firestore
 import com.google.firebase.ktx.Firebase
 import dagger.hilt.android.AndroidEntryPoint
+import `in`.sminnovations.hpostesting.BuildConfig
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityDashboardBinding
 import okhttp3.ResponseBody
+import java.io.BufferedInputStream
 import java.io.File
+import java.io.FileInputStream
+import java.io.FileOutputStream
+import java.io.InputStream
+import java.util.zip.ZipInputStream
 
 interface NatsMessageCallback {
     fun onMessageReceived(topic: String, message: String)
@@ -53,6 +58,7 @@ open interface IDataCollector: NatsMessageCallback {
 class DashboardActivity : AppCompatActivity(), IDataCollector {
 
     val TAG = "DashboardActivity"
+    private var isRegistered = false
     private lateinit var appBarConfiguration: AppBarConfiguration
     private lateinit var binding: ActivityDashboardBinding
     lateinit var sharedPreferences: SharedPreferences
@@ -61,7 +67,7 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
     private var downloadId: Long = 0
     // TODO: Remove hemocube viewmodel
     private val hemocubeViewModel: HemoCubeViewModel by viewModels()
-
+    private lateinit var sharedPreference: SharedPreferences
     override fun attachBaseContext(newBase: Context?) {
         val languageCode = LanguageManager.getSavedLanguage(newBase!!)
         LanguageManager.setLocale(newBase, languageCode)
@@ -74,6 +80,7 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
         Log.d(TAG, "Received message on topic $topic: $message")
     }
 
+    @SuppressLint("SetWorldReadable")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -95,15 +102,22 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
             when (result) {
                 is Result.Success -> {
                     // Handle success
-                    val apkUrl = result.data
+                    val apk = result.data
-//                    val apkUrl = "https://dl.dropboxusercontent.com/s/fi/1c3nn7t0co431hicl3hrt/app-debug.apk?rlkey=e4uf13ty1dpcked614vy1aaqp&dl=0"
+                    val file = File(getExternalFilesDir("Updates"), "update.apk")
-                    initiateUpdate(apkUrl.toString())
+                    file.setReadable(true, false) // Ensure the file is readable
-                    Log.d("ApI", "APK URL: $apkUrl")
+                    apk.byteStream().use { input ->
-//                    Toast.makeText(
+                        file.outputStream().use { output ->
-//                        this,
+                            input.copyTo(output)
-//                        "APK UPLOAD ${result.data}",
+                        }
-//                        Toast.LENGTH_SHORT
+                    }
-//                    ).show()
+                    Log.d("Responsebodyformat", "Responsebodyformat: ")
+                   installApk(file)
+                    Log.e("ApI", "APK URL: $apk")
+                    Toast.makeText(
+                        this,
+                        "${result.data}",
+                        Toast.LENGTH_SHORT
+                    ).show()
                 }
 
                 is Result.Error -> {
@@ -153,52 +167,15 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
         return navController.navigateUp(appBarConfiguration) || super.onSupportNavigateUp()
     }
 
-    private fun initiateUpdate(url: String) {
-        val apkUrl = url
-        if (!isValidHttpUrl(apkUrl)) {
-            return
-        }
-
-        val request = DownloadManager.Request(Uri.parse(apkUrl))
-        request.setTitle("App Update")
-        request.setDescription("Downloading update...")
-        request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
-        request.setDestinationInExternalFilesDir(this, "Updates", "update.apk")
-
-        val downloadManager = getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-        downloadId = downloadManager.enqueue(request)
-
-        // Register a BroadcastReceiver to receive the download complete event
-        val filter = IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
-        registerReceiver(downloadReceiver, filter)
-    }
-    private fun extractApkUrl(responseBody: ResponseBody): String {
-        return responseBody.string()
-    }
-    private fun isValidHttpUrl(url: String): Boolean {
-        return url.startsWith("http://") || url.startsWith("https://")
-    }
-    private val downloadReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context?, intent: Intent?) {
-            val id = intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1)
-            if (id == downloadId) {
-                installApk()
-            }
-        }
-    }
-
-    private fun installApk() {
-        val file = File(getExternalFilesDir("Updates"), "update.apk")
-        file.setReadable(true, false) // Ensure the file is readable
 
+    private fun installApk(file: File) {
         val pInfo = baseContext.packageManager.getPackageInfo(baseContext.packageName, 0)
         val uri: Uri = FileProvider.getUriForFile(
             this,
-            "in.sminnovations.hpostesting.dev.fileprovider",
+            "${BuildConfig.APPLICATION_ID}.fileprovider",
             file
         )
 
-        // Create an intent to install the APK
         val installIntent = Intent(Intent.ACTION_INSTALL_PACKAGE)
         installIntent.data = uri
         installIntent.flags = Intent.FLAG_GRANT_READ_URI_PERMISSION or
@@ -214,8 +191,14 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
     }
 
     override fun onDestroy() {
+        if(isRegistered) {
+            try {
+//                unregisterReceiver(downloadReceiver)
+            } catch (e: Exception) {
+                Log.d("HomeFragment", e.toString())
+            }
+        }
         super.onDestroy()
-        unregisterReceiver(downloadReceiver)
     }
 
     override fun onResume() {
@@ -267,6 +250,14 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
     override fun setResponse(response: String) {
         responses = responses+response+"\n"
         println(responses)
-        Log.d("DashBoardActResponse",response)
+//        if (response.contains("checkUpdate")) {
+//            hemocubeViewModel.deviceUpdate(createDeviceUpdateRequestData())
+//        }
+    }
+
+    private fun createDeviceUpdateRequestData(): DeviceUpdateRequest {
+        return DeviceUpdateRequest(
+            serial_no = sharedPreference.getString(Constants.DEVICE_ID, "")
+        )
     }
 }

app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt

@@ -6,12 +6,14 @@ import android.app.DownloadManager
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Context.BATTERY_SERVICE
+import android.content.Context.RECEIVER_EXPORTED
 import android.content.DialogInterface
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.SharedPreferences
 import android.net.Uri
 import android.os.BatteryManager
+import android.os.Build
 import android.os.Bundle
 import android.util.Base64
 import android.util.Log
@@ -19,6 +21,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.annotation.RequiresApi
 import androidx.core.content.FileProvider
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
@@ -70,6 +73,7 @@ import java.util.zip.ZipInputStream
 
 @AndroidEntryPoint
 class HomeFragment : Fragment() {
+    private var isRegistered = false
     private var downloadId: Long = 0
     private lateinit var binding: FragmentHomeBinding
     private val viewModel: TestRightViewModel by activityViewModels()
@@ -96,6 +100,7 @@ class HomeFragment : Fragment() {
         return binding.root
     }
 
+    @RequiresApi(Build.VERSION_CODES.P)
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -145,35 +150,67 @@ class HomeFragment : Fragment() {
                     checkForTokenAndUpdate()
                 }
 
-                hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
+                // Now re-subscribe to allUserData
-                    val resultList = MolbioV2ResultRequest(mutableListOf(MolbioV2Result()))
+                hemoCubeViewModel.allLocalData.observe(viewLifecycleOwner) { originalUserDataList ->
-                    userDataList.forEach { userData ->
+
-                        if (!userData.molbioFlag && isTokenAvailable && Constants.MOLBIO_INTEGRATION) {
+                    Log.d("LOCAL_DB OBSERVE", "OBSERVE CALLED")
-                            resultList.results?.add(
+
-                                MolbioV2Result(
+                    val resultList = MolbioV2ResultRequest(mutableListOf())
-                                    rawData = userData,
+                    originalUserDataList.forEach { userData ->
-                                    analysisId = userData._id,
+                        Log.d(
-                                    analysisDate = "2024-02-08 16:33:56",//userData.testTime,
+                            ": USER DATA",
-                                    analysisStatus = userData.classificationResult,
+                            originalUserDataList.count().toString() + " : " + userData._id
-                                    thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[userData.deviceId].toString(),
+                        )
-                                    interpretation = userData.classificationResult,
+                        var accessToken = sharedPreference.getString(Constants.ACCESS_TOKEN, "").toString()
-                                    testId = userData._id,
+                        // Upload results after processing all userData to avoid duplicates and ensure all modifications are done
-                                    testTime = "2024-02-08 16:33:56",//userData.testTime,
+                        if(accessToken.isNotEmpty()) {
-                                    collectionTime = "2024-02-08 16:33:56",//userData.testTime,
+                            if (!userData.molbioFlag && isTokenAvailable && Constants.MOLBIO_INTEGRATION) {
-                                    expiryTime = "2024-02-08 16:33:56"//userData.testTime,
+                                val currentTimeFormatted = SimpleDateFormat(
+                                    "yyyy-MM-dd'T'HH:mm:ssZZZZZ",
+                                    Locale.getDefault()
+                                ).format(Calendar.getInstance().time)
+                                val bufferIntensityThreshold =
+                                    Constants.BUFFER_INTENSITY_THRESHOLDS[userData.deviceId]?.toString()
+                                        ?: "defaultThreshold" // Handle possible nulls safely
+                                resultList.results?.add(
+                                    MolbioV2Result(
+                                        rawData = userData,
+                                        analysisId = userData._id,
+                                        analysisDate = currentTimeFormatted,
+                                        analysisStatus = userData.classificationResult
+                                            ?: "defaultStatus", // Handle possible nulls
+                                        thresholds = bufferIntensityThreshold,
+                                        interpretation = userData.classificationResult
+                                            ?: "defaultInterpretation", // Handle possible nulls
+                                        testId = userData._id,
+                                        testTime = currentTimeFormatted,
+                                        collectionTime = currentTimeFormatted,
+                                        expiryTime = currentTimeFormatted
+                                    )
                                 )
-                            )
+                            }
-                        }
-                        if (!userData.molbioFlag && isTokenAvailable && Constants.MOLBIO_INTEGRATION) {
-                            userData.molbioFlag = true
-                            hemoCubeViewModel.uploadResult(resultList)
                         }
+                    }
+                    Log.d("USER DATA LIST SIZE", resultList.results?.count().toString())
 
-                        if (!userData.localFlag) {
+                    resultList.results?.forEach { result ->
-                            userData.localFlag = true
+                        val userData = result.rawData
-                            hemoCubeViewModel.bulkAddResultTestToDb(userData)
+                        Log.d("UserData", userData.toString())
-                        }
+                        if (userData != null) {
+                            if (!userData.localFlag) {
+                                hemoCubeViewModel.bulkAddResultTestToDb(userData)
 
+                            }
+                        }
+                    }
+                    resultList.results?.forEach { result ->
+                        result.rawData?.let { sanitizeDoubleValues(it) }
+                    }
+
+// Then, check if there are any results to upload.
+                    if (resultList.results?.isNotEmpty() == true) {
+                        hemoCubeViewModel.uploadResult(resultList)
+                        Log.d("resultcount1", "Uploading sanitized results")
                     }
 
                 }
@@ -200,30 +237,34 @@ class HomeFragment : Fragment() {
             logoutUser(requireContext())
         }
 
+        binding.btnLogout1.setOnClickListener {
+            logoutUser(requireContext())
+        }
+
         binding.uploadData.setOnClickListener {
-            showUploadDialog(requireContext())
+//            showUploadDialog(requireContext())
-        }
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userData ->
-
-            val btnSaveLocalVisibility =
-                if (userData.any { it.testStatus == true }) View.GONE else View.GONE
-
-            binding.downloadCSV.visibility = btnSaveLocalVisibility
-
-            binding.downloadCSV.setOnClickListener {
-                if (btnSaveLocalVisibility == View.VISIBLE) {
-                    // Execute the action when the button is visible (testStatus is true for at least one user)
-                    showDownloadDialog(requireContext())
-                } else {
-                    // Handle the case when the button is not visible
-                    Toast.makeText(
-                        requireContext(),
-                        "No test details stored locally",
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
-            }
         }
+//        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userData ->
+//
+//            val btnSaveLocalVisibility =
+//                if (userData.any { it.testStatus == true }) View.GONE else View.GONE
+//
+//            binding.downloadCSV.visibility = btnSaveLocalVisibility
+//
+//            binding.downloadCSV.setOnClickListener {
+//                if (btnSaveLocalVisibility == View.VISIBLE) {
+//                    // Execute the action when the button is visible (testStatus is true for at least one user)
+//                    showDownloadDialog(requireContext())
+//                } else {
+//                    // Handle the case when the button is not visible
+//                    Toast.makeText(
+//                        requireContext(),
+//                        "No test details stored locally",
+//                        Toast.LENGTH_SHORT
+//                    ).show()
+//                }
+//            }
+//        }
 
 
         binding.btnNewKit.setOnClickListener {
@@ -235,6 +276,17 @@ class HomeFragment : Fragment() {
             startActivity(Intent(requireContext(), KitScanActivity::class.java))
             requireActivity().finish()
         }
+
+
+        binding.btnNewKitoffline.setOnClickListener {
+            with(sharedPreference.edit()) {
+                putString(Constants.KIT_NUMBER, "")
+                putInt(Constants.KIT_COUNT, 0)
+                apply()
+            }
+            startActivity(Intent(requireContext(), KitScanActivity::class.java))
+            requireActivity().finish()
+        }
         binding.btnQuickCapture.setOnClickListener {
             DataHolder.hemoCubeTestData = HemoCubeTestData()
 
@@ -250,41 +302,32 @@ class HomeFragment : Fragment() {
 
     }
 
+    @RequiresApi(Build.VERSION_CODES.P)
     private fun checkForTokenAndUpdate() {
         var accessToken = sharedPreference.getString(Constants.ACCESS_TOKEN, "").toString()
         var password = sharedPreference.getString(Constants.DEVICE_PASSWORD_API, "").toString()
         var userID = sharedPreference.getString(Constants.DEVICE_ID_API, "").toString()
         deviceId = sharedPreference.getString(Constants.DEVICE_ID, "").toString()
-        if (userID.isNotEmpty() && password.isNotEmpty()) {
+        if(userID.isNotEmpty() && password.isNotEmpty()) {
-            if (!isTokenAvailable) {
+            Log.d("istoken",isTokenAvailable.toString())
-                hemoCubeViewModel.login(createLoginRequestData(userID, password))
+               if (!isTokenAvailable) {
-            } else {
+                   Log.d("istoken1",isTokenAvailable.toString())
-                if (isTokenExpired(accessToken)) {
+                   hemoCubeViewModel.login(createLoginRequestData(userID, password))
-                    hemoCubeViewModel.login(createLoginRequestData(userID, password))
+                   isTokenAvailable = true
-                } else {
-                    isTokenAvailable = true
 
-                    hemoCubeViewModel.deviceUpdate(createDeviceUpdateRequestData())
+                }else if(isTokenAvailable){
-                    hemoCubeViewModel.uploadLogs()
+                   Log.d("istoken7",isTokenAvailable.toString())
-                    hemoCubeViewModel.startPeriodicCheckUpdate()
+                   isTokenAvailable = true
-                    hemoCubeViewModel.downloadClientCertificate()
+                   hemoCubeViewModel.startPeriodicCheckUpdate()
-                }
+                   hemoCubeViewModel.checkUpdate(createCheckUpdateRequestData())
-            }
+               }else{
-        } else if (deviceId.isNotEmpty()) {
+                   if(isTokenExpired(accessToken)) {
+                       Log.d("istoken8",isTokenAvailable.toString())
+                       hemoCubeViewModel.login(createLoginRequestData(userID, password))
+                   }
+             }
+        } else if (userID == "deviceIDAPI" && password == "devicePasswordAPI" && deviceId.isNotEmpty()) {
             fetchDeviceCredentials()
-            // This code will execute after credentials have been successfully fetched and stored.
-            userID = sharedPreference.getString("username", "").toString()
-            password = sharedPreference.getString("password", "").toString()
-            accessToken = sharedPreference.getString(Constants.ACCESS_TOKEN, "").toString()
-            if (accessToken.isEmpty()) {
-                hemoCubeViewModel.login(createLoginRequestData(userID, password))
-            } else {
-                // Continue with your existing logic if the token is not empty.
-                isTokenAvailable = true
-                hemoCubeViewModel.deviceUpdate(createDeviceUpdateRequestData())
-                hemoCubeViewModel.uploadLogs()
-                hemoCubeViewModel.startPeriodicCheckUpdate()
-            }
         } else {
             Toast.makeText(
                 requireContext(),
@@ -297,6 +340,9 @@ class HomeFragment : Fragment() {
             when (response) {
                 is Result.Success -> {
                     updateTokens(response)
+                    response.data.data?.accessToken
+                    isTokenAvailable = true
+                    Log.d("istoken2",isTokenAvailable.toString())
                 }
 
                 is Result.Error -> {
@@ -318,6 +364,36 @@ class HomeFragment : Fragment() {
             }
         }
 
+        hemoCubeViewModel.resultUpload.observe(viewLifecycleOwner) {
+            when (it) {
+                is Result.Success -> {
+
+                    Log.d("success,","uploded")
+                    it.data.data?.forEach { id ->
+                        id.rawData?.let { it1 ->
+                            hemoCubeViewModel.updateMolbioFlag(
+                                it1._id
+                            )
+                        }
+                    }
+                    Toast.makeText(activity, "Molbio Result is successfully uploaded", Toast.LENGTH_LONG)
+                        .show()
+                }
+
+                is Result.Error -> {
+                    binding.btnSubmit.visibility = View.VISIBLE
+                    //Remove this line of code while deploying to IOCL
+                    it.exception.let { message ->
+                        Toast.makeText(activity, "$message", Toast.LENGTH_LONG)
+                            .show()
+                        Log.d("resultuploadfail", message.toString())
+                    }
+                }
+
+                else -> {}
+            }
+        }
+
         hemoCubeViewModel.uploadLogs.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Result.Success -> {
@@ -326,13 +402,14 @@ class HomeFragment : Fragment() {
 //                        "Log uploaded ${response.data.data?.filename}",
 //                        Toast.LENGTH_SHORT
 //                    ).show()
+
                 }
 
                 is Result.Error -> {
                     response.exception.let { message ->
                         Toast.makeText(
                             activity,
-                            "An error occurred in uploading logs: $message",
+                            "$message",
                             Toast.LENGTH_LONG
                         )
                             .show()
@@ -347,28 +424,84 @@ class HomeFragment : Fragment() {
             }
         }
 
+        hemoCubeViewModel.checkUpdate.observe(viewLifecycleOwner) { response ->
+            when (response) {
+                is Result.Success -> {
+                    val updatedversion =  response.data.data?.version.toString()
+                    val currentversion =
+                        context?.let { ctx ->
+                            val packageInfo = ctx.packageManager.getPackageInfo(ctx.packageName, 0)
+                            val versionName = packageInfo.versionName
+                            val versionCode: Long = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                                // From Android P (API level 28), versionCode is deprecated and you should use longVersionCode instead.
+                                packageInfo.longVersionCode
+                            } else {
+                                // For older Android versions, use versionCode (cast it to Long for consistency).
+                                packageInfo.versionCode.toLong()
+                            }
+
+                            // Use versionName and versionCode as needed
+                            Log.d("AppInfo", "Version Name: $versionName, Version Code: $versionCode")
+                        }
+                    Log.d("versionnow",currentversion.toString())
+                    Log.d("versionnow",updatedversion.toString())
+                    if(updatedversion > currentversion.toString()){
+                        hemoCubeViewModel.deviceUpdate(createDeviceUpdateRequestData())
+                        Toast.makeText(
+                            activity,
+                            "new version ${response.data.data?.version} Available",
+                            Toast.LENGTH_LONG
+                        )
+                            .show()
+                    }else{
+                        Toast.makeText(
+                            activity,
+                            "App is Up to date",
+                            Toast.LENGTH_LONG
+                        )
+                            .show()
+                    }
+                }
+
+                is Result.Error -> {
+//                    response.exception.let { message ->
+////                        Toast.makeText(
+////                            activity,
+////                            "$message",
+////                            Toast.LENGTH_LONG
+////                        )
+////                            .show()
+//                    }
+                }
+
+                is Result.Loading -> {
+                }
+
+                else -> {
+                }
+            }
+        }
+
         hemoCubeViewModel.downloadcertificate.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Result.Success -> {
                     val url = response.data
 
-                    val fileName = "nats_certificate.zip"
                     val downloadDirectory = "NATS"
-                    val file = downloadFile(url, requireContext(), fileName, downloadDirectory)
+                    val fileName = "nats_certificate.zip"
-                    Toast.makeText(
+                    val unzipDirectoryPath = requireContext().getExternalFilesDir(null)?.absolutePath + "/$downloadDirectory"
-                        requireContext(),
+
-                        "NATS certificate Downloaded",
+                    // Check if the directory with extracted files exists.
-                        Toast.LENGTH_SHORT
+                    val directory = File(unzipDirectoryPath)
-                    ).show()
+                    if (directory.exists() && directory.isDirectory) {
+                        // Assuming if the directory exists, the certificate has been downloaded and extracted.
+                        // You can add more specific checks here, e.g., checking for specific files within the directory.
+                        Toast.makeText(requireContext(), "NATS certificate already downloaded and extracted.", Toast.LENGTH_SHORT).show()
+                        return@observe
+                    }
+                    val file = downloadFile(url, requireContext(), fileName, downloadDirectory)
 
-                    val unzipDirectoryPath =
-                        requireContext().getExternalFilesDir(null)?.absolutePath + "/$downloadDirectory"
                     unzip(file.absolutePath, unzipDirectoryPath)
-                    Toast.makeText(
-                        requireContext(),
-                        "NATS certificate Extracted",
-                        Toast.LENGTH_SHORT
-                    ).show()
                 }
 
                 is Result.Error -> {
@@ -390,44 +523,23 @@ class HomeFragment : Fragment() {
             }
         }
 
-        hemoCubeViewModel.resultUpload.observe(viewLifecycleOwner) {
-            when (it) {
-                is Result.Success -> {
-                    it.data.data?.forEach { id ->
-                        id.rawData?.let { it1 ->
-                            hemoCubeViewModel.updateMolbioFlag(
-                                it1._id
-                            )
-                        }
-                    }
-                }
-
-                is Result.Error -> {
-                    binding.btnSubmit.visibility = View.VISIBLE
-                    //Remove this line of code while deploying to IOCL
-                    it.exception.let { message ->
-                        Toast.makeText(activity, "An error occurred: $message", Toast.LENGTH_LONG)
-                            .show()
-                    }
-                }
-
-                else -> {}
-            }
-        }
-
 
     }
 
 
     private fun isTokenExpired(token: String): Boolean {
-        val parts = token.split("\\.".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+        if(token.isNotEmpty()) {
-        val decodedPayload = String(Base64.decode(parts[1], Base64.DEFAULT))
+            val parts = token.split("\\.".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
-        val jsonPayload = JSONObject(decodedPayload)
+            val decodedPayload = String(Base64.decode(parts[1], Base64.DEFAULT))
+            val jsonPayload = JSONObject(decodedPayload)
 
-        val exp = jsonPayload.optLong("exp", 0)
+            val exp = jsonPayload.optLong("exp", 0)
-        val currentTimeSeconds = System.currentTimeMillis() / 1000
+            val currentTimeSeconds = System.currentTimeMillis() / 1000
 
-        return exp <= currentTimeSeconds
+            return exp <= currentTimeSeconds
+        }else{
+            return false
+        }
     }
 
     private fun updateTokens(response: Result.Success<LoginResponse>) {
@@ -440,6 +552,7 @@ class HomeFragment : Fragment() {
             apply()
         }
         isTokenAvailable = true
+        Log.d("istoken3",isTokenAvailable.toString())
     }
 
     private fun createLoginRequestData(userID: String, password: String): LoginRequest {
@@ -550,6 +663,7 @@ class HomeFragment : Fragment() {
         }
     }
 
+    @RequiresApi(Build.VERSION_CODES.P)
     private fun fetchDeviceCredentials() {
         try {
             val db = Firebase.firestore
@@ -576,12 +690,16 @@ class HomeFragment : Fragment() {
                             )
                             // Save credentials in SharedPreferences
                             with(sharedPreference.edit()) {
-                                putString("username", username)
+                                putString(Constants.DEVICE_ID_API, username)
-                                putString("password", password)
+                                putString(Constants.DEVICE_PASSWORD_API, password)
                                 putString(Constants.NATS_TOKEN, natsToken)
                                 apply()
                             }
-                            hemoCubeViewModel.login(createLoginRequestData(username, password))
+                            if (!isTokenAvailable ) {
+                                Log.d("istoken0", isTokenAvailable.toString())
+                                    hemoCubeViewModel.login(createLoginRequestData(username, password))
+                            }
+
                         } ?: Log.e("fetchDeviceCredentials", "Failed to parse device data.")
                     } else {
                         Log.e("fetchDeviceCredentials", "Document does not exist.")
@@ -744,16 +862,16 @@ class HomeFragment : Fragment() {
     }
 
     private fun checkForLocalDBData() {
-        viewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
+//        viewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            val uploadDataVisibility = if (userDataList.isEmpty()) View.GONE else View.VISIBLE
+//            val uploadDataVisibility = if (userDataList.isEmpty()) View.GONE else View.VISIBLE
-            binding.uploadData.visibility = uploadDataVisibility
+//            binding.uploadData.visibility = uploadDataVisibility
-        }
+//        }
-
+//
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
+//        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            val uploadDataVisibility =
+//            val uploadDataVisibility =
-                if (userDataList.any { !it.localFlag && !it.molbioFlag && it.testStatus == true }) View.VISIBLE else View.GONE
+//                if (userDataList.any { !it.localFlag && !it.molbioFlag && it.testStatus == true }) View.VISIBLE else View.GONE
-            binding.uploadData.visibility = uploadDataVisibility
+//            binding.uploadData.visibility = uploadDataVisibility
-        }
+//        }
 
         hemoCubeViewModel.allKitTestData.observe(viewLifecycleOwner) { bufferData ->
             val uploadDataVisibility =
@@ -763,20 +881,35 @@ class HomeFragment : Fragment() {
     }
 
     private fun checkUnprocessedCSVData() {
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
+//        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            val downloadDataVisibility =
+//            val downloadDataVisibility =
-                if (userDataList.any { !it.isCSVCreated && it.testStatus == true }) View.GONE else View.GONE
+//                if (userDataList.any { !it.isCSVCreated && it.testStatus == true }) View.GONE else View.GONE
-            binding.downloadCSV.visibility = downloadDataVisibility
+//            binding.downloadCSV.visibility = downloadDataVisibility
-        }
+//        }
     }
 
+    private fun sanitizeDoubleValues(hemoCubeTestData: HemoCubeTestData): HemoCubeTestData {
+        hemoCubeTestData::class.java.declaredFields.forEach { field ->
+            if (field.type == Double::class.javaObjectType || field.type == Double::class.javaPrimitiveType) {
+                field.isAccessible = true
+                val value = field.get(hemoCubeTestData) as Double?
+                if (value != null && (value.isInfinite() || value.isNaN())) {
+                    field.set(hemoCubeTestData, 0.0) // Replace with a suitable default value
+                }
+            }
+        }
+        return hemoCubeTestData
+    }
+
+
+
     private fun showUploadDialog(context: Context) {
         val builder = AlertDialog.Builder(context)
         builder.setTitle(R.string.upload_db_registration_title)
         builder.setMessage(R.string.upload_db_registration_message)
 
         builder.setPositiveButton(R.string.upload) { dialog, _ ->
-            uploadLocalDBData(dialog)
+//            uploadLocalDBData(dialog)
         }
 
         builder.setNegativeButton(R.string.cancel) { dialog, _ ->
@@ -805,53 +938,53 @@ class HomeFragment : Fragment() {
 //    }
 
     private fun uploadLocalDBData(dialog: DialogInterface) {
-        viewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
+//        viewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            if (userDataList.isEmpty()) {
+//            if (userDataList.isEmpty()) {
-                dialog.dismiss()
+//                dialog.dismiss()
-            } else {
+//            } else {
-                userDataList.forEach { userData ->
+//                userDataList.forEach { userData ->
-                    viewModel.bulkUploadResultToDatabase(userData)
+//                    viewModel.bulkUploadResultToDatabase(userData)
-                    viewModel.deleteById(userData._id)
+//                    viewModel.deleteById(userData._id)
-                }
+//                }
-                dialog.dismiss()
+//                dialog.dismiss()
-                Toast.makeText(
+//                Toast.makeText(
-                    requireContext(), R.string.upload_success_message, Toast.LENGTH_SHORT
+//                    requireContext(), R.string.upload_success_message, Toast.LENGTH_SHORT
-                ).show()
+//                ).show()
-            }
+//            }
-        }
+//        }
 
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
+//        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            val resultList = MolbioV2ResultRequest(mutableListOf(MolbioV2Result()))
+//            val resultList = MolbioV2ResultRequest(mutableListOf(MolbioV2Result()))
-            userDataList.forEach { userData ->
+//            userDataList.forEach { userData ->
-                if (!userData.molbioFlag && isTokenAvailable) {
+//                if (!userData.molbioFlag && isTokenAvailable) {
-                    resultList.results?.add(
+//                    resultList.results?.add(
-                        MolbioV2Result(
+//                        MolbioV2Result(
-                            rawData = userData,
+//                            rawData = userData,
-                            analysisId = userData._id,
+//                            analysisId = userData._id,
-                            analysisDate = "2024-02-08 16:33:56", //userData.reportUploadTime,
+//                            analysisDate = "2024-02-08 16:33:56", //userData.reportUploadTime,
-                            analysisStatus = userData.classificationResult,
+//                            analysisStatus = userData.classificationResult,
-                            thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[userData.deviceId].toString(),
+//                            thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[userData.deviceId].toString(),
-                            interpretation = userData.classificationResult,
+//                            interpretation = userData.classificationResult,
-                            testId = userData._id,
+//                            testId = userData._id,
-                            testTime = userData.testTime,
+//                            testTime = userData.testTime,
-                            collectionTime = "2024-02-08 16:33:56",//userData.testTime,
+//                            collectionTime = "2024-02-08 16:33:56",//userData.testTime,
-                            expiryTime = "2024-02-08 16:33:56",//userData.testTime,
+//                            expiryTime = "2024-02-08 16:33:56",//userData.testTime,
-                        )
+//                        )
-                    )
+//                    )
+//
+//                }
 
-                }
+//                if (!userData.localFlag) {
-
+//                    userData.localFlag = true
-                if (!userData.localFlag) {
+//                    hemoCubeViewModel.bulkAddResultTestToDb(userData)
-                    userData.localFlag = true
+//                }
-                    hemoCubeViewModel.bulkAddResultTestToDb(userData)
+//                if (!userData.molbioFlag && isTokenAvailable && Constants.MOLBIO_INTEGRATION) {
-                }
+//                    userData.molbioFlag = true
-                if (!userData.molbioFlag && isTokenAvailable && Constants.MOLBIO_INTEGRATION) {
+//                    hemoCubeViewModel.uploadResult(resultList)
-                    userData.molbioFlag = true
+//                }
-                    hemoCubeViewModel.uploadResult(resultList)
+//            }
-                }
+//            dialog.dismiss()
-            }
+//        }
-            dialog.dismiss()
-        }
 
         hemoCubeViewModel.allKitTestData.observe(viewLifecycleOwner) { kitDataList ->
             kitDataList.forEach { userData ->
@@ -862,37 +995,6 @@ class HomeFragment : Fragment() {
             }
             dialog.dismiss()
         }
-
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            val resultList = MolbioV2ResultRequest(mutableListOf(MolbioV2Result()))
-            userDataList.forEach { userData ->
-                if (!userData.molbioFlag && isTokenAvailable) {
-                    resultList.results?.add(
-                        MolbioV2Result(
-                            rawData = userData,
-                            analysisId = userData._id,
-                            analysisDate = "2024-02-08 16:33:56",//userData.testTime,
-                            analysisStatus = userData.classificationResult,
-                            thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[userData.deviceId].toString(),
-                            interpretation = userData.classificationResult,
-                            testId = userData._id,
-                            testTime = "2024-02-08 16:33:56",//userData.testTime,
-                            collectionTime = "2024-02-08 16:33:56",//userData.testTime,
-                            expiryTime = "2024-02-08 16:33:56"//userData.testTime,
-                        )
-                    )
-                    userData.molbioFlag = true
-                    hemoCubeViewModel.uploadResult(resultList)
-                }
-
-                if (!userData.localFlag) {
-                    userData.localFlag = true
-                    hemoCubeViewModel.bulkAddResultTestToDb(userData)
-                }
-
-            }
-            dialog.dismiss()
-        }
     }
 
 //    private fun downloadLocalDBData(dialog: DialogInterface) {
@@ -957,7 +1059,7 @@ class HomeFragment : Fragment() {
         builder.setMessage(R.string.download_db_registration_message)
 
         builder.setPositiveButton(R.string.downloadcsv) { dialog, _ ->
-            downloadLocalDBData(dialog)
+//            downloadLocalDBData(dialog)
         }
 
         builder.setNegativeButton(R.string.cancel) { dialog, _ ->
@@ -968,51 +1070,52 @@ class HomeFragment : Fragment() {
         dialog.show()
     }
 
-    private fun downloadLocalDBData(dialog: DialogInterface) {
+//    private fun downloadLocalDBData(dialog: DialogInterface) {
-        var csvDownloaded = false
+//        var csvDownloaded = false
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
+//        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            try {
+//            try {
-                if (!csvDownloaded) {
+//                if (!csvDownloaded) {
-                    val downloadList = mutableListOf<HemoCubeTestData>()
+//                    val downloadList = mutableListOf<HemoCubeTestData>()
-
+//
-                    userDataList.forEach { userData ->
+//                    userDataList.forEach { userData ->
-                        if (userData.testStatus == true) {
+//                        if (userData.testStatus == true) {
-//                        if (!userData.isCSVCreated) {
+////                        if (!userData.isCSVCreated) {
-                            downloadList.add(userData) // Add the userData to downloadList
+//                            downloadList.add(userData) // Add the userData to downloadList
-                        }
 //                        }
-                    }
+////                        }
-
+//                    }
-                    if (downloadList.isNotEmpty()) {
+//
-                        // Call ViewModel function to create CSV with filtered data
+//                    if (downloadList.isNotEmpty()) {
-                        hemoCubeViewModel.createCSV(downloadList, requireContext())
+//                        // Call ViewModel function to create CSV with filtered data
-                        csvDownloaded = true
+//                        hemoCubeViewModel.createCSV(downloadList, requireContext())
-                        Toast.makeText(
+//                        csvDownloaded = true
-                            requireContext(),
+//                        Toast.makeText(
-                            "CSV file downloaded successfully",
+//                            requireContext(),
-                            Toast.LENGTH_SHORT
+//                            "CSV file downloaded successfully",
-                        ).show()
+//                            Toast.LENGTH_SHORT
-                    } else {
+//                        ).show()
-                        Toast.makeText(
+//                    } else {
-                            requireContext(),
+//                        Toast.makeText(
-                            "No data to download",
+//                            requireContext(),
-                            Toast.LENGTH_SHORT
+//                            "No data to download",
-                        )
+//                            Toast.LENGTH_SHORT
-                            .show()
+//                        )
-                    }
+//                            .show()
-                }
+//                    }
-
+//                }
-            } catch (e: Exception) {
+//
-                e.printStackTrace()
+//            } catch (e: Exception) {
-                Toast.makeText(requireContext(), "Error downloading CSV file", Toast.LENGTH_SHORT)
+//                e.printStackTrace()
-                    .show()
+//                Toast.makeText(requireContext(), "Error downloading CSV file", Toast.LENGTH_SHORT)
-            } finally {
+//                    .show()
-                dialog.dismiss()
+//            } finally {
-            }
+//                dialog.dismiss()
-        }
+//            }
-    }
+//        }
+//    }
 
     private fun getDeviceId() {
+        Log.d("HomeFragmentUSb","getDeviceId")
         val handler = activity as? DeviceCommunicationHandler
         handler?.sendAndListenToDevice(
             HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND,
@@ -1020,9 +1123,9 @@ class HomeFragment : Fragment() {
                 override fun onUsbRead(data: ByteArray?) {
                     data?.let {
                         val receivedData = String(it, Charset.forName("UTF-8"))
+                        Log.d("HomeFragment","USB data"+receivedData)
                         // Assuming the device ID is the full content of the received data. Adjust if needed.
-                        deviceId =
+                        deviceId = extractDeviceId(receivedData) // Implement this method based on your data format.
-                            extractDeviceId(receivedData) // Implement this method based on your data format.
                         if (deviceId.isNotEmpty()) {
                             // Store the deviceId in SharedPreferences
                             with(sharedPreference.edit()) {
@@ -1039,6 +1142,7 @@ class HomeFragment : Fragment() {
 
                 override fun onUsbError(e: Exception?) {
                     // Handle USB communication error
+                    Log.d("HomeFragment","USB read error"+e.toString())
                 }
 
             })
@@ -1054,8 +1158,8 @@ class HomeFragment : Fragment() {
     private fun checkForUpdate() {
         try {
             val db = Firebase.firestore
+           //val deviceId = deviceId
 
-            val deviceId="HHH-AAA-ZZZ"
             val deviceRef = db.collection("deviceUpdate").document(Constants.DOCUMENT_ID_FOR_UPDATE)
 
             deviceRef.get().addOnSuccessListener { documentSnapshot ->
@@ -1070,7 +1174,7 @@ class HomeFragment : Fragment() {
                             val deviceUpdateAvailableGlobal= deviceData.deviceUpdateAvailable
                             val updatePathGlobal= deviceData.updatePath
 
-                           // if(deviceUpdateAvailableGlobal){
+
                                  db.collection("devices").whereEqualTo("deviceId", deviceId).get().addOnSuccessListener { documentSnapshotNew ->
                                     if (documentSnapshotNew.documents.isNotEmpty()) {
                                         documentSnapshotNew.documents.forEach{
@@ -1094,14 +1198,24 @@ class HomeFragment : Fragment() {
                                                     Log.d("HomeFragmentUpdate","Device update not available")
                                                 }
                                             }else{
-                                                if(!globalUpdateDone){
+                                                if(deviceUpdateAvailableGlobal) {
-                                                    val update = db.collection("devices").document(it.id).update("globalUpdateDone",true)
+                                                    if (!globalUpdateDone) {
-                                                    update.addOnSuccessListener {
+                                                        val update =
-                                                        Log.d("HomeFragmentUpdate","Device global update done")
+                                                            db.collection("devices").document(it.id)
+                                                                .update("globalUpdateDone", true)
+                                                        update.addOnSuccessListener {
+                                                            Log.d(
+                                                                "HomeFragmentUpdate",
+                                                                "Device global update done"
+                                                            )
 
-                                                        initiateUpdate(updatePathGlobal)
+                                                            initiateUpdate(updatePathGlobal)
-                                                    }.addOnFailureListener{
+                                                        }.addOnFailureListener {
-                                                        Log.e("fetchDeviceUpdate", "update fail.")
+                                                            Log.e(
+                                                                "fetchDeviceUpdate",
+                                                                "update fail."
+                                                            )
+                                                        }
                                                     }
                                                 }
                                             }
@@ -1123,8 +1237,7 @@ class HomeFragment : Fragment() {
                                 "fetchDeviceCredentials",
                                 "deviceVersion: $deviceVersion, Password: $deviceUpdateAvailableGlobal, updatePath: $updatePathGlobal"
                             )
-
+                    // ?: Log.e("fetchDeviceUpdate", "Failed to parse device data.")
-                       // } ?: Log.e("fetchDeviceUpdate", "Failed to parse device data.")
                     } else {
                         Log.e("fetchDeviceUpdate", "Document does not exist.")
                     }
@@ -1155,7 +1268,10 @@ class HomeFragment : Fragment() {
 
         // Register a BroadcastReceiver to receive the download complete event
         val filter = IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
-        requireActivity().registerReceiver(downloadReceiver, filter)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            isRegistered = true
+            requireActivity().registerReceiver(downloadReceiver, filter, RECEIVER_EXPORTED)
+        }
     }
     private fun extractApkUrl(responseBody: ResponseBody): String {
         return responseBody.string()
@@ -1200,8 +1316,15 @@ class HomeFragment : Fragment() {
     }
 
     override fun onDestroy() {
+        if(isRegistered) {
+            try {
+                requireActivity().unregisterReceiver(downloadReceiver)
+            } catch (e: Exception) {
+                Log.d("HomeFragment", e.toString())
+            }
+        }
         super.onDestroy()
-        requireActivity().unregisterReceiver(downloadReceiver)
+
     }
 
 }

app/src/main/java/com/example/hpostesting/presentation/datatransfer/DataTransferActivity.kt

@@ -0,0 +1,28 @@
+package com.example.hpostesting.presentation.datatransfer
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import dagger.hilt.android.AndroidEntryPoint
+import `in`.sminnovations.hpostesting.databinding.ActivityDataTransferBinding
+
+@AndroidEntryPoint
+class DataTransferActivity  : AppCompatActivity() {
+    lateinit var binding: ActivityDataTransferBinding
+    lateinit var sharedPreference: SharedPreferences
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        binding = ActivityDataTransferBinding.inflate(layoutInflater)
+        sharedPreference = this.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
+        setContentView(binding.root)
+
+        if (savedInstanceState == null) {
+            supportFragmentManager.beginTransaction()
+                .replace(binding.fgDataTransfer.id, DataTransferFragment())
+                .commit()
+        }
+    }
+}

app/src/main/java/com/example/hpostesting/presentation/datatransfer/DataTransferFragment.kt

@@ -0,0 +1,63 @@
+package com.example.hpostesting.presentation.datatransfer
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import com.google.firebase.storage.FirebaseStorage
+import `in`.sminnovations.hpostesting.databinding.FragmentAssuranceControlsBinding
+import java.io.File
+
+class DataTransferFragment : Fragment() {
+    private lateinit var binding: FragmentAssuranceControlsBinding
+    private lateinit var sharedPreferences: SharedPreferences
+    private lateinit var databasePath: String
+    private val storage = FirebaseStorage.getInstance()
+    private val storageReference = storage.reference
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
+    ): View {
+        binding = FragmentAssuranceControlsBinding.inflate(inflater, container, false)
+        sharedPreferences = requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
+
+        val databaseName = "hpos_database.db"
+        databasePath = requireContext().getDatabasePath(databaseName).absolutePath
+
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initViews()
+    }
+
+    private fun initViews() {
+        binding.btnSubmit.setOnClickListener {
+            uploadDatabaseFile()
+        }
+    }
+
+    private fun uploadDatabaseFile() {
+        val databaseFile = File(databasePath)
+        val deviceId = "unknown"
+
+        if (databaseFile.exists()) {
+            val storageRef = storageReference.child("databases/${deviceId}/${databaseFile.name}")
+
+            val fileUri = android.net.Uri.fromFile(databaseFile)
+            val fileReference = storageRef.child(fileUri.lastPathSegment!!)
+
+            fileReference.putFile(fileUri)
+                .addOnSuccessListener {
+
+                }
+                .addOnFailureListener {
+
+                }
+        }
+    }
+}

app/src/main/java/com/example/hpostesting/presentation/datatransfer/DataTransferViewModel.kt

@@ -0,0 +1,6 @@
+package com.example.hpostesting.presentation.datatransfer
+
+import androidx.lifecycle.ViewModel
+
+class DataTransferViewModel : ViewModel()  {
+}

app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt

@@ -116,7 +116,10 @@ class DeviceProvisionFragment : Fragment() {
                                 password = response.data.data?.credentials?.password.toString(),
                                 deviceProvisionResponse = response.data.data.toString(),
                                 natsToken = response.data.data?.device?.deviceUser?.natsToken.toString(),
-                                natsTokenExpiry = response.data.data?.device?.deviceUser?.natsTokenExpiry.toString()
+                                natsTokenExpiry = response.data.data?.device?.deviceUser?.natsTokenExpiry.toString(),
+                                globalUpdateIgnore = false,
+                                globalUpdateDone = false,
+                                deviceUpdateAvailable = false
                             )
                         )
 //                        viewModel.addDeviceId(DeviceData(deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString()))

app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt

@@ -5,6 +5,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -149,6 +150,7 @@ class HemoCubeFragment : Fragment() {
         hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
             if (result == "Success") {
                 uploadedToCloud = true
+                var accessToken = sharedPreferences.getString(Constants.ACCESS_TOKEN, "").toString()
                 showToast(R.string.test_upload)
                 if (Constants.MOLBIO_INTEGRATION) {
                     hemoCubeViewModel.resultUpload.observe(viewLifecycleOwner) {
@@ -161,6 +163,8 @@ class HemoCubeFragment : Fragment() {
                                     )
                                 }
                                 handleReadingFinish()
+                                hemoCubeViewModel.uploadLogs()
+                                hemoCubeViewModel.downloadClientCertificate()
                             }
 
                             is Result.Error -> {
@@ -169,10 +173,11 @@ class HemoCubeFragment : Fragment() {
                                 it.exception.let { message ->
                                     Toast.makeText(
                                         activity,
-                                        "An error occurred: $message",
+                                        "$message",
                                         Toast.LENGTH_LONG
                                     )
                                         .show()
+                                    Log.d("resultuploadfail1", message.toString())
                                 }
                                 handleReadingFinish()
                             }

app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt

@@ -37,6 +37,7 @@ import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
 import com.example.hpostesting.data.repository.Repository
 import com.example.hpostesting.domain.CheckUpdateWorker
 import com.example.hpostesting.domain.LogFileManager
+import com.google.gson.GsonBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
@@ -88,6 +89,7 @@ class HemoCubeViewModel @Inject constructor(
 
     private val _networkStatusLiveData = NetworkStatusLiveData(context)
     val allUserData = hemoCubeDao.getAll()
+    val allLocalData = hemoCubeDao.getAll()
     val allPendingUserToUpload = MutableLiveData<List<HemoCubeTestData>>()
     val allKitTestData = hemoCubeBufferDao.getAll()
     val deviceData = MutableLiveData<DeviceData?>()
@@ -143,6 +145,14 @@ class HemoCubeViewModel @Inject constructor(
         }
     }
 
+
+    fun uploadResultfornew(molbioV2ResultRequest: MolbioV2ResultRequest) = viewModelScope.launch {
+        resultUpload.postValue(Result.Loading())
+        repository.uploadResults(molbioV2ResultRequest).let {
+            resultUpload.postValue(it)
+        }
+    }
+
     fun checkUpdate(checkUpdateRequest: CheckUpdateRequest) = viewModelScope.launch {
         checkUpdate.postValue(Result.Loading())
         repository.checkUpdate(checkUpdateRequest).let {
@@ -325,20 +335,24 @@ class HemoCubeViewModel @Inject constructor(
                         fireBaseUpload.postValue("Success")
                         testDetails.localFlag = true
                         if (Constants.MOLBIO_INTEGRATION) {
+                            // Sanitize testDetails before using it in the API call
+                            val sanitizedTestDetails = sanitizeDoubleValues(testDetails)
+
+                            // Now, use sanitizedTestDetails for the API call
                             uploadResult(
                                 MolbioV2ResultRequest(
                                     mutableListOf(
                                         MolbioV2Result(
-                                            rawData = testDetails,
+                                            rawData = sanitizedTestDetails,
-                                            analysisId = testDetails._id,
+                                            analysisId = sanitizedTestDetails._id,
-                                            analysisDate = testDetails.testTime,
+                                            analysisDate = sanitizedTestDetails.testTime,
-                                            analysisStatus = testDetails.classificationResult,
+                                            analysisStatus = sanitizedTestDetails.classificationResult,
-                                            thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[testDetails.deviceId].toString(),
+                                            thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[sanitizedTestDetails.deviceId]?.toString(),
-                                            interpretation = testDetails.classificationResult,
+                                            interpretation = sanitizedTestDetails.classificationResult,
-                                            testId = testDetails._id,
+                                            testId = sanitizedTestDetails._id,
-                                            testTime = testDetails.testTime,
+                                            testTime = sanitizedTestDetails.testTime,
-                                            collectionTime = testDetails.testTime,
+                                            collectionTime = sanitizedTestDetails.testTime,
-                                            expiryTime = testDetails.testTime,
+                                            expiryTime = sanitizedTestDetails.testTime,
                                         )
                                     )
                                 )
@@ -380,6 +394,19 @@ class HemoCubeViewModel @Inject constructor(
         }
     }
 
+    fun sanitizeDoubleValues(hemoCubeTestData: HemoCubeTestData): HemoCubeTestData {
+        hemoCubeTestData::class.java.declaredFields.forEach { field ->
+            if (field.type == Double::class.javaObjectType || field.type == Double::class.javaPrimitiveType) {
+                field.isAccessible = true
+                val value = field.get(hemoCubeTestData) as Double?
+                if (value != null && (value.isInfinite() || value.isNaN())) {
+                    field.set(hemoCubeTestData, 0.0) // Replace with a suitable default value
+                }
+            }
+        }
+        return hemoCubeTestData
+    }
+
     private fun updateLocalFlag(userId: String) = viewModelScope.launch {
         hemoCubeDao.updateFieldById(id = userId, true)
     }

app/src/main/java/com/example/hpostesting/presentation/hemocube/HemocubeActivity.kt

@@ -11,12 +11,14 @@ import android.content.ServiceConnection
 import android.hardware.usb.UsbDevice
 import android.hardware.usb.UsbDeviceConnection
 import android.hardware.usb.UsbManager
+import android.os.Build
 import android.os.Bundle
 import android.os.IBinder
 import android.util.Log
 import android.view.Menu
 import android.widget.Toast
 import androidx.activity.viewModels
+import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
@@ -43,6 +45,7 @@ open class HemocubeActivity : AppCompatActivity() {
     private val TAG = "HemoCube"
 
     private val broadcastReceiver = object : BroadcastReceiver() {
+        @RequiresApi(Build.VERSION_CODES.O)
         override fun onReceive(context: Context, intent: Intent) {
 
             synchronized(this) {
@@ -82,6 +85,7 @@ open class HemocubeActivity : AppCompatActivity() {
         super.attachBaseContext(newBase)
     }
 
+    @RequiresApi(Build.VERSION_CODES.O)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityHemocubeBinding.inflate(layoutInflater)
@@ -106,6 +110,7 @@ open class HemocubeActivity : AppCompatActivity() {
         }
     }
 
+    @RequiresApi(Build.VERSION_CODES.O)
     open fun connectUsb(permissionGranted: Boolean) {
         Log.d(TAG, "connectUsb() called, permission variable = $permissionGranted")
         val manager = getSystemService(Context.USB_SERVICE) as UsbManager
@@ -125,6 +130,7 @@ open class HemocubeActivity : AppCompatActivity() {
         }
     }
 
+    @RequiresApi(Build.VERSION_CODES.O)
     @SuppressLint("MutableImplicitPendingIntent")
     private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
         val mPendingIntent: PendingIntent
@@ -142,15 +148,21 @@ open class HemocubeActivity : AppCompatActivity() {
         }
 
         val filter = IntentFilter(Constants.HEMOCUBE_USB_PERMISSION)
-        registerReceiver(broadcastReceiver, filter)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            registerReceiver(broadcastReceiver, filter, RECEIVER_EXPORTED)
+        }else{
+            registerReceiver(broadcastReceiver, filter)
+        }
         manager.requestPermission(device, mPendingIntent)
     }
 
+
     fun setupService() {
         val intent = Intent(this, UsbService::class.java)
         bindService(intent, connection, Context.BIND_AUTO_CREATE)
     }
 
+    @RequiresApi(Build.VERSION_CODES.O)
     open fun reconnectDevice() {
         mService.disconnect()
         unbindService(connection)

app/src/main/res/layout/activity_data_transfer.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <FrameLayout
+            android:id="@+id/fg_data_transfer"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            tools:context=".presentation.assurance.AssuranceControlsActivity">
+
+        </FrameLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

app/src/main/res/layout/fragment_data_transfer.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.example.hpostesting.presentation.datatransfer.DataTransferFragment">
+
+    <TextView
+        android:id="@+id/tv_subtitle2"
+        style="@style/title2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="16dp"
+        android:textSize="22sp"
+        android:text="Local Data Transfer"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <Button
+        android:id="@+id/btn_submit"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginTop="352dp"
+        android:clickable="false"
+        android:gravity="center"
+        android:text="Upload"
+        android:textColor="@color/white"
+        app:cornerRadius="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />
+
+    <ImageView
+        android:id="@+id/iv_check"
+        android:visibility="gone"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:layout_marginTop="40dp"
+        android:importantForAccessibility="no"
+        android:src="@drawable/check"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/btn_submit" />
+
+    <ProgressBar
+        android:id="@+id/progressBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:elevation="12dp"
+        android:indeterminate="true"
+        android:indeterminateDrawable="@drawable/progressbar_drawable"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_home.xml

@@ -38,10 +38,20 @@
         android:visibility="gone"
         android:padding="24dp">
 
+        <ImageView
+            android:id="@+id/btnLogout1"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_marginEnd="10dp"
+            android:src="@drawable/baseline_logout_24"
+            app:layout_constraintTop_toTopOf="@+id/internetNotAvailableCL"
+            app:layout_constraintEnd_toEndOf="parent"
+            />
+
         <TextView
             android:id="@+id/tv_title_no_internet"
             style="@style/title1"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:layout_marginTop="24dp"
@@ -125,6 +135,27 @@
 <!--            app:layout_constraintBottom_toBottomOf="@+id/rv_order_offline"-->
 <!--            app:layout_constraintStart_toStartOf="parent" />-->
 
+        <TextView
+            android:id="@+id/label1"
+            style="@style/title1_1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/new_kit"
+            app:layout_constraintBottom_toTopOf="@+id/btnNewKitoffline"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/btnNewKitoffline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:backgroundTint="@color/primary"
+            android:contentDescription="@string/new_kit"
+            android:src="@drawable/ic_add"
+            app:elevation="1dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout

build.gradle

@@ -4,8 +4,8 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:8.2.2'
-        classpath 'com.google.gms:google-services:4.4.0'
+        classpath 'com.google.gms:google-services:4.4.1'
-        classpath 'com.google.firebase:firebase-appdistribution-gradle:4.0.1'
+        classpath 'com.google.firebase:firebase-appdistribution-gradle:4.1.0'
     }
     repositories {
         mavenCentral()

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Jun 12 17:07:47 IST 2023
+#Mon Mar 04 17:08:24 IST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists