Added new screen ActivitiesFragment to check upload pending list and added version name in DashboardActivity, so it will be easy to know which version currently in use

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
-        versionName "2.1.114"
+        versionCode 120
+        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"

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/constant/DataHolder.kt

@@ -1,4 +1,4 @@
-package com.example.hpostesting.data
+package com.example.hpostesting.data.constant
 
 import androidx.lifecycle.MutableLiveData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData

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

@@ -5,6 +5,7 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
+import androidx.room.Update
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
 @Dao
@@ -30,7 +31,7 @@ interface HemoCubeDao {
     @Query("UPDATE hemo_cube_test_table SET isCSVCreated = :newValue WHERE _id = :id")
     suspend fun updateCSVFieldById(id: String, newValue: Boolean)
 
-    @Query("SELECT * from hemo_cube_test_table WHERE molbioFlag = :status")
-    suspend fun getPendingUser(status: Boolean): List<HemoCubeTestData>
+    @Query("SELECT * from hemo_cube_test_table WHERE localFlag = 0")
+    fun getPendingUser(): LiveData<List<HemoCubeTestData>>
 
 }

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 = 28,
+    version = 29,
     exportSchema = false
 )
 @TypeConverters(Converters::class)

app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSourceImpl.kt

@@ -89,8 +89,9 @@ class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
             )
             csvWriter.writeNext(header)
 
-            // Write data rows
-            for (data in dataList) {
+            // Filter and write data rows where testStatus is true
+            val filteredDataList = dataList.filter { it.testStatus == true }
+            for (data in filteredDataList) {
                 val row = arrayOf(
                     data._id,
                     data.name,

app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt

@@ -5,7 +5,8 @@ import androidx.room.PrimaryKey
 
 @Entity(tableName = "hemo_cube_test_table")
 data class HemoCubeTestData(
-    @PrimaryKey
+    @PrimaryKey(autoGenerate = true)
+    var sampleid: Int = 0,
     var _id: String = "",
     var name: String = "",
     var incubationTime: String = "",

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

@@ -1,7 +1,7 @@
 package com.example.hpostesting.data.repository
 
 import android.net.Uri
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.api.MolbioAuthApi
 import com.example.hpostesting.data.api.MolbioResultApi
 import com.example.hpostesting.data.model.PendingUploads
@@ -109,20 +109,7 @@ class DatabaseRepository @Inject constructor(
     }
 
     override suspend fun addTestToDatabase(data: UserData?): 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)
-        }
+        TODO("Not yet implemented")
     }
 
     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

@@ -1,6 +1,6 @@
 package com.example.hpostesting.data.repository
 
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.model.Response
 import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
 import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsResponse
@@ -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/di/AppModule.kt

@@ -1,4 +1,4 @@
-package com.example.hpostesting.domain.di
+package com.example.hpostesting.di
 
 import android.app.Application
 import android.content.Context
@@ -7,7 +7,7 @@ import android.content.res.AssetManager
 import androidx.room.Room
 import com.example.hpostesting.data.api.MolbioAuthApi
 import com.example.hpostesting.data.api.MolbioResultApi
-import com.example.hpostesting.data.api.PropertyProvider
+import com.example.hpostesting.util.PropertyProvider
 import com.example.hpostesting.data.dao.HemoCubeBufferDao
 import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.dao.MyDatabase
@@ -22,8 +22,8 @@ import com.example.hpostesting.domain.LogFileManager
 import com.example.hpostesting.domain.LogFileManagerImpl
 import com.example.hpostesting.domain.SaveRawData
 import com.example.hpostesting.domain.SaveRawDataTest
-import com.example.hpostesting.presentation.UsbServiceListener
-import com.example.hpostesting.presentation.UsbServiceListenerImpl
+import com.example.hpostesting.presentation.utils.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListenerImpl
 import com.example.hpostesting.util.PropertyProviderImpl
 import dagger.Module
 import dagger.Provides
@@ -147,7 +147,7 @@ object AppModule {
     @Provides
     @Singleton
     fun provideRetrofit(
-        propertyProvider: PropertyProvider,@Named("Auth") client: OkHttpClient
+        propertyProvider: PropertyProvider, @Named("Auth") client: OkHttpClient
     ): Retrofit {
         return Retrofit.Builder().baseUrl(propertyProvider.getProperty("BASE_URL")).client(client)
             .addConverterFactory(GsonConverterFactory.create()).build()

app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt

@@ -10,7 +10,7 @@ import android.view.View
 import android.widget.EditText
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.presentation.dashboard.DashboardActivity

app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt

@@ -17,7 +17,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.data.model.patient.UserData

app/src/main/java/com/example/hpostesting/presentation/MainViewModel.kt

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

app/src/main/java/com/example/hpostesting/presentation/SplashActivity.kt

@@ -13,7 +13,7 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.example.hpostesting.util.MyUtils

app/src/main/java/com/example/hpostesting/presentation/adapter/OfflineUserListAdapter.kt

@@ -11,7 +11,7 @@ import androidx.navigation.findNavController
 import androidx.recyclerview.widget.AsyncListDiffer
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData

app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt

@@ -14,7 +14,7 @@ import androidx.fragment.app.FragmentActivity
 import androidx.navigation.findNavController
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.firebase.ui.firestore.FirestoreRecyclerAdapter

app/src/main/java/com/example/hpostesting/presentation/assurance/AssuranceControlsFragment.kt

@@ -13,9 +13,8 @@ import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.Spinner
 import android.widget.Toast
-import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.presentation.hemocube.HemocubeActivity

app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacActivity.kt

@@ -20,7 +20,7 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.presentation.testRight.UsbService

app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacFragment.kt

@@ -14,7 +14,7 @@ import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
 import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.databinding.FragmentAutoDacBinding

app/src/main/java/com/example/hpostesting/presentation/blank/BlankActivity.kt

@@ -1,4 +0,0 @@
-package com.example.hpostesting.presentation.blank
-
-class BlankActivity {
-}

app/src/main/java/com/example/hpostesting/presentation/blank/BlankFragment.kt

@@ -1,4 +0,0 @@
-package com.example.hpostesting.presentation.blank
-
-class BlankFragment {
-}

app/src/main/java/com/example/hpostesting/presentation/blank/BlankViewModel.kt

@@ -1,4 +0,0 @@
-package com.example.hpostesting.presentation.blank
-
-class BlankViewModel {
-}

app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemoCubeBufferCheckFragment.kt

@@ -15,7 +15,7 @@ import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.patient.BufferCheckData
 import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.google.firebase.crashlytics.ktx.crashlytics

app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemocubeBufferCheckActivity.kt

@@ -20,7 +20,7 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel

app/src/main/java/com/example/hpostesting/presentation/calibration/CalibrationActivity.kt

@@ -20,7 +20,7 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.presentation.testRight.UsbService

app/src/main/java/com/example/hpostesting/presentation/calibration/CalibrationFragment.kt

@@ -17,7 +17,7 @@ import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.calibration.CalibrationData
 import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase

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

@@ -0,0 +1,63 @@
+package com.example.hpostesting.presentation.dashboard
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.os.BatteryManager
+import android.os.Bundle
+import android.util.Log
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.activityViewModels
+import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.constant.DataHolder
+import com.example.hpostesting.data.model.patient.HemoCubeTestData
+import com.example.hpostesting.presentation.adapter.OfflineUserListAdapter
+import com.example.hpostesting.presentation.adapter.UserListAdapter
+import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
+import com.example.hpostesting.presentation.testRight.TestRightViewModel
+import `in`.sminnovations.hpostesting.R
+import `in`.sminnovations.hpostesting.databinding.FragmentActivitiesBinding
+import `in`.sminnovations.hpostesting.databinding.FragmentHomeBinding
+
+class ActivitiesFragment : Fragment() {
+    private lateinit var binding: FragmentActivitiesBinding
+    private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
+    private lateinit var adapter: OfflineUserListAdapter
+    private lateinit var sharedPreference: SharedPreferences
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
+    ): View {
+        binding = FragmentActivitiesBinding.inflate(inflater, container, false)
+
+        sharedPreference = requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
+        DataHolder.selectedTest = null
+
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        hemoCubeViewModel.allPendingUserToUpload.observe(viewLifecycleOwner) { userData ->
+
+            if (userData.isNotEmpty()) {
+                binding.rvOrderOffline.visibility = View.VISIBLE
+                binding.noDataText.visibility = View.GONE
+                val bm =
+                    requireContext().getSystemService(Context.BATTERY_SERVICE) as BatteryManager
+                val batLevel: Int = bm.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
+                adapter = OfflineUserListAdapter(binding.root, batLevel)
+                adapter.differ.submitList(userData)
+                binding.rvOrderOffline.adapter = adapter
+            }else{
+                binding.rvOrderOffline.visibility = View.GONE
+                binding.noDataText.visibility = View.VISIBLE
+                Log.d("Activities","Nothing to show")
+            }
+        }
+    }
+
+}

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

@@ -1,11 +1,10 @@
 package com.example.hpostesting.presentation.dashboard
 
-import android.app.DownloadManager
-import android.content.BroadcastReceiver
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
-import android.content.IntentFilter
 import android.content.SharedPreferences
+import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
@@ -21,23 +20,21 @@ import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.navigateUp
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.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.presentation.NatsManager
+import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
+import com.example.hpostesting.presentation.utils.NatsManager
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.example.hpostesting.presentation.jig.JigActivity
 import com.google.android.material.navigation.NavigationView
 import com.google.firebase.appdistribution.FirebaseAppDistribution
 import com.google.firebase.appdistribution.FirebaseAppDistributionException
 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.File
 
 interface NatsMessageCallback {
@@ -62,7 +59,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)
@@ -75,6 +72,7 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
         Log.d(TAG, "Received message on topic $topic: $message")
     }
 
+    @SuppressLint("SetWorldReadable")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -86,6 +84,9 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             nats.connect()
         }
+        val versionName =  getAppVersion(this@DashboardActivity) + " [ " + getAppEnvironment(this@DashboardActivity) + " ]"
+        binding.appBarDashboard.versionName.text = versionName
+
 
         val deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "")
 
@@ -96,15 +97,22 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
             when (result) {
                 is Result.Success -> {
                     // Handle success
-                    val apkUrl = result.data
-//                    val apkUrl = "https://dl.dropboxusercontent.com/s/fi/1c3nn7t0co431hicl3hrt/app-debug.apk?rlkey=e4uf13ty1dpcked614vy1aaqp&dl=0"
-                    initiateUpdate(apkUrl.toString())
-                    Log.d("ApI", "APK URL: $apkUrl")
-//                    Toast.makeText(
-//                        this,
-//                        "APK UPLOAD ${result.data}",
-//                        Toast.LENGTH_SHORT
-//                    ).show()
+                    val apk = result.data
+                    val file = File(getExternalFilesDir("Updates"), "update.apk")
+                    file.setReadable(true, false) // Ensure the file is readable
+                    apk.byteStream().use { input ->
+                        file.outputStream().use { output ->
+                            input.copyTo(output)
+                        }
+                    }
+                    Log.d("Responsebodyformat", "Responsebodyformat: ")
+                   installApk(file)
+                    Log.e("ApI", "APK URL: $apk")
+                    Toast.makeText(
+                        this,
+                        "${result.data}",
+                        Toast.LENGTH_SHORT
+                    ).show()
                 }
 
                 is Result.Error -> {
@@ -129,7 +137,7 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
 
         appBarConfiguration = AppBarConfiguration(
             setOf(
-                R.id.nav_home, R.id.nav_profile, R.id.nav_settings
+                R.id.nav_home, R.id.nav_profile, R.id.nav_activity,R.id.nav_settings
             ), drawerLayout
         )
         setupActionBarWithNavController(navController, appBarConfiguration)
@@ -154,56 +162,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)
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            isRegistered = true
-            registerReceiver(downloadReceiver, filter, RECEIVER_EXPORTED)
-        }
-    }
-    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
@@ -221,7 +188,7 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
     override fun onDestroy() {
         if(isRegistered) {
             try {
-                unregisterReceiver(downloadReceiver)
+//                unregisterReceiver(downloadReceiver)
             } catch (e: Exception) {
                 Log.d("HomeFragment", e.toString())
             }
@@ -278,6 +245,30 @@ 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, "")
+        )
+    }
+    private fun getAppVersion(context: Context): String {
+        return try {
+            val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
+            pInfo.versionName
+        } catch (e: PackageManager.NameNotFoundException) {
+            "N/A"
+        }
+    }
+    private fun getAppEnvironment(context: Context): String {
+        return try {
+            val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
+            pInfo.packageName.substringAfterLast('.')
+        } catch (e: PackageManager.NameNotFoundException) {
+            "N/A"
+        }
     }
 }

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

@@ -21,13 +21,13 @@ 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
 import androidx.navigation.fragment.findNavController
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.Result
-import com.example.hpostesting.data.api.DeviceCommunicationHandler
+import com.example.hpostesting.data.constant.DataHolder
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.login.LoginRequest
@@ -39,8 +39,9 @@ import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.data.model.updates.CheckUpdateRequest
 import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
+import com.example.hpostesting.presentation.utils.DeviceCommunicationHandler
 import com.example.hpostesting.presentation.KitScanActivity
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.adapter.OfflineUserListAdapter
 import com.example.hpostesting.presentation.adapter.UserListAdapter
 import com.example.hpostesting.presentation.assurance.AssuranceControlsActivity
@@ -55,7 +56,6 @@ import com.google.firebase.perf.ktx.performance
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentHomeBinding
-import kotlinx.coroutines.tasks.await
 import okhttp3.ResponseBody
 import org.json.JSONObject
 import java.io.BufferedOutputStream
@@ -99,6 +99,7 @@ class HomeFragment : Fragment() {
         return binding.root
     }
 
+    @RequiresApi(Build.VERSION_CODES.P)
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -120,6 +121,8 @@ class HomeFragment : Fragment() {
                 userData.forEach {
                     if (it.testStatus == false) {
                         userList.add(it)
+                    }else if(it.testStatus == true){
+                        userList.removeAll(userData)
                     }
                 }
                 val bm = requireContext().getSystemService(BATTERY_SERVICE) as BatteryManager
@@ -148,35 +151,63 @@ class HomeFragment : Fragment() {
                     checkForTokenAndUpdate()
                 }
 
-                hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-                    val resultList = MolbioV2ResultRequest(mutableListOf(MolbioV2Result()))
-                    userDataList.forEach { userData ->
-                        if (!userData.molbioFlag && isTokenAvailable && Constants.MOLBIO_INTEGRATION) {
-                            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,
+                // Now re-subscribe to allUserData
+                hemoCubeViewModel.allLocalData.observe(viewLifecycleOwner) { originalUserDataList ->
+
+                    Log.d("LOCAL_DB OBSERVE", "OBSERVE CALLED")
+
+                    val resultList = MolbioV2ResultRequest(mutableListOf())
+                    originalUserDataList.forEach { userData ->
+                        Log.d(": USER DATA", originalUserDataList.count().toString() + " : " + userData._id)
+                        var accessToken = sharedPreference.getString(Constants.ACCESS_TOKEN, "").toString()
+                        // Upload results after processing all userData to avoid duplicates and ensure all modifications are done
+                        if(accessToken.isNotEmpty()) {
+
+                            if (!userData.localFlag && userData.testStatus == true) {
+                                hemoCubeViewModel.bulkAddResultTestToDb(userData)
+                            }
+
+                            if (!userData.molbioFlag && isTokenAvailable && Constants.MOLBIO_INTEGRATION && userData.testStatus == true) {
+                                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)
+                            }
                         }
+                    }
 
-                        if (!userData.localFlag) {
-                            userData.localFlag = true
-                            hemoCubeViewModel.bulkAddResultTestToDb(userData)
-                        }
+                    Log.d("USER DATA LIST SIZE", resultList.results?.count().toString())
 
+                    resultList.results?.forEach { result ->
+                        val userData = result.rawData
+                        Log.d("UserData", userData.toString())
+
+                    }
+                    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")
                     }
 
                 }
@@ -203,28 +234,33 @@ 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()
+            if (sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN") {
+                val btnSaveLocalVisibility =
+                    if (userData.any { it.testStatus == true }) View.VISIBLE 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()
+                    }
                 }
+            }else{
+                binding.downloadCSV.visibility = View.GONE
             }
         }
 
@@ -236,6 +272,17 @@ class HomeFragment : Fragment() {
                 apply()
             }
             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 {
@@ -253,41 +300,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 (!isTokenAvailable) {
-                hemoCubeViewModel.login(createLoginRequestData(userID, password))
-            } else {
-                if (isTokenExpired(accessToken)) {
-                    hemoCubeViewModel.login(createLoginRequestData(userID, password))
-                } else {
-                    isTokenAvailable = true
+        if(userID.isNotEmpty() && password.isNotEmpty()) {
+            Log.d("istoken",isTokenAvailable.toString())
+               if (!isTokenAvailable) {
+                   Log.d("istoken1",isTokenAvailable.toString())
+                   hemoCubeViewModel.login(createLoginRequestData(userID, password))
+                   isTokenAvailable = true
 
-                    hemoCubeViewModel.deviceUpdate(createDeviceUpdateRequestData())
-                    hemoCubeViewModel.uploadLogs()
-                    hemoCubeViewModel.startPeriodicCheckUpdate()
-                    hemoCubeViewModel.downloadClientCertificate()
-                }
-            }
-        } else if (deviceId.isNotEmpty()) {
+                }else if(isTokenAvailable){
+                   Log.d("istoken7",isTokenAvailable.toString())
+                   isTokenAvailable = true
+                   hemoCubeViewModel.startPeriodicCheckUpdate()
+                   hemoCubeViewModel.checkUpdate(createCheckUpdateRequestData())
+               }else{
+                   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(),
@@ -300,6 +338,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 -> {
@@ -321,6 +362,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 -> {
@@ -329,13 +400,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()
@@ -350,28 +422,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)
-                    Toast.makeText(
-                        requireContext(),
-                        "NATS certificate Downloaded",
-                        Toast.LENGTH_SHORT
-                    ).show()
+                    val fileName = "nats_certificate.zip"
+                    val unzipDirectoryPath = requireContext().getExternalFilesDir(null)?.absolutePath + "/$downloadDirectory"
+
+                    // Check if the directory with extracted files exists.
+                    val directory = File(unzipDirectoryPath)
+                    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 -> {
@@ -393,44 +521,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()
-        val decodedPayload = String(Base64.decode(parts[1], Base64.DEFAULT))
-        val jsonPayload = JSONObject(decodedPayload)
+        if(token.isNotEmpty()) {
+            val parts = token.split("\\.".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+            val decodedPayload = String(Base64.decode(parts[1], Base64.DEFAULT))
+            val jsonPayload = JSONObject(decodedPayload)
 
-        val exp = jsonPayload.optLong("exp", 0)
-        val currentTimeSeconds = System.currentTimeMillis() / 1000
+            val exp = jsonPayload.optLong("exp", 0)
+            val currentTimeSeconds = System.currentTimeMillis() / 1000
 
-        return exp <= currentTimeSeconds
+            return exp <= currentTimeSeconds
+        }else{
+            return false
+        }
     }
 
     private fun updateTokens(response: Result.Success<LoginResponse>) {
@@ -443,6 +550,7 @@ class HomeFragment : Fragment() {
             apply()
         }
         isTokenAvailable = true
+        Log.d("istoken3",isTokenAvailable.toString())
     }
 
     private fun createLoginRequestData(userID: String, password: String): LoginRequest {
@@ -553,6 +661,7 @@ class HomeFragment : Fragment() {
         }
     }
 
+    @RequiresApi(Build.VERSION_CODES.P)
     private fun fetchDeviceCredentials() {
         try {
             val db = Firebase.firestore
@@ -579,12 +688,16 @@ class HomeFragment : Fragment() {
                             )
                             // Save credentials in SharedPreferences
                             with(sharedPreference.edit()) {
-                                putString("username", username)
-                                putString("password", password)
+                                putString(Constants.DEVICE_ID_API, username)
+                                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.")
@@ -747,16 +860,16 @@ class HomeFragment : Fragment() {
     }
 
     private fun checkForLocalDBData() {
-        viewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            val uploadDataVisibility = if (userDataList.isEmpty()) View.GONE else View.VISIBLE
-            binding.uploadData.visibility = uploadDataVisibility
-        }
-
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            val uploadDataVisibility =
-                if (userDataList.any { !it.localFlag && !it.molbioFlag && it.testStatus == true }) View.VISIBLE else View.GONE
-            binding.uploadData.visibility = uploadDataVisibility
-        }
+//        viewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
+//            val uploadDataVisibility = if (userDataList.isEmpty()) View.GONE else View.VISIBLE
+//            binding.uploadData.visibility = uploadDataVisibility
+//        }
+//
+//        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
+//            val uploadDataVisibility =
+//                if (userDataList.any { !it.localFlag && !it.molbioFlag && it.testStatus == true }) View.VISIBLE else View.GONE
+//            binding.uploadData.visibility = uploadDataVisibility
+//        }
 
         hemoCubeViewModel.allKitTestData.observe(viewLifecycleOwner) { bufferData ->
             val uploadDataVisibility =
@@ -767,19 +880,38 @@ class HomeFragment : Fragment() {
 
     private fun checkUnprocessedCSVData() {
         hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            val downloadDataVisibility =
-                if (userDataList.any { !it.isCSVCreated && it.testStatus == true }) View.GONE else View.GONE
-            binding.downloadCSV.visibility = downloadDataVisibility
+            if (sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN") {
+                val downloadDataVisibility =
+                    if (userDataList.any { !it.isCSVCreated && it.testStatus == true }) View.VISIBLE else View.GONE
+                binding.downloadCSV.visibility = downloadDataVisibility
+            }else{
+                binding.downloadCSV.visibility = View.GONE
+            }
         }
     }
 
+    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, _ ->
@@ -790,72 +922,72 @@ class HomeFragment : Fragment() {
         dialog.show()
     }
 
-//    private fun showDownloadDialog(context: Context) {
-//        val builder = AlertDialog.Builder(context)
-//        builder.setTitle(R.string.download_db_registration_title)
-//        builder.setMessage(R.string.download_db_registration_message)
-//
-//        builder.setPositiveButton(R.string.downloadcsv) { dialog, _ ->
-//            downloadLocalDBData(dialog)
-//        }
-//
-//        builder.setNegativeButton(R.string.cancel) { dialog, _ ->
-//            dialog.dismiss()
-//        }
-//
-//        val dialog = builder.create()
-//        dialog.show()
-//    }
+    private fun showDownloadDialog(context: Context) {
+        val builder = AlertDialog.Builder(context)
+        builder.setTitle(R.string.download_db_registration_title)
+        builder.setMessage(R.string.download_db_registration_message)
 
-    private fun uploadLocalDBData(dialog: DialogInterface) {
-        viewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            if (userDataList.isEmpty()) {
-                dialog.dismiss()
-            } else {
-                userDataList.forEach { userData ->
-                    viewModel.bulkUploadResultToDatabase(userData)
-                    viewModel.deleteById(userData._id)
-                }
-                dialog.dismiss()
-                Toast.makeText(
-                    requireContext(), R.string.upload_success_message, Toast.LENGTH_SHORT
-                ).show()
-            }
+        builder.setPositiveButton(R.string.downloadcsv) { dialog, _ ->
+            downloadLocalDBData(dialog)
         }
 
-        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.reportUploadTime,
-                            analysisStatus = userData.classificationResult,
-                            thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[userData.deviceId].toString(),
-                            interpretation = userData.classificationResult,
-                            testId = userData._id,
-                            testTime = userData.testTime,
-                            collectionTime = "2024-02-08 16:33:56",//userData.testTime,
-                            expiryTime = "2024-02-08 16:33:56",//userData.testTime,
-                        )
-                    )
-
-                }
-
-                if (!userData.localFlag) {
-                    userData.localFlag = true
-                    hemoCubeViewModel.bulkAddResultTestToDb(userData)
-                }
-                if (!userData.molbioFlag && isTokenAvailable && Constants.MOLBIO_INTEGRATION) {
-                    userData.molbioFlag = true
-                    hemoCubeViewModel.uploadResult(resultList)
-                }
-            }
+        builder.setNegativeButton(R.string.cancel) { dialog, _ ->
             dialog.dismiss()
         }
 
+        val dialog = builder.create()
+        dialog.show()
+    }
+
+    private fun uploadLocalDBData(dialog: DialogInterface) {
+//        viewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
+//            if (userDataList.isEmpty()) {
+//                dialog.dismiss()
+//            } else {
+//                userDataList.forEach { userData ->
+//                    viewModel.bulkUploadResultToDatabase(userData)
+//                    viewModel.deleteById(userData._id)
+//                }
+//                dialog.dismiss()
+//                Toast.makeText(
+//                    requireContext(), R.string.upload_success_message, Toast.LENGTH_SHORT
+//                ).show()
+//            }
+//        }
+
+//        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.reportUploadTime,
+//                            analysisStatus = userData.classificationResult,
+//                            thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[userData.deviceId].toString(),
+//                            interpretation = userData.classificationResult,
+//                            testId = userData._id,
+//                            testTime = userData.testTime,
+//                            collectionTime = "2024-02-08 16:33:56",//userData.testTime,
+//                            expiryTime = "2024-02-08 16:33:56",//userData.testTime,
+//                        )
+//                    )
+//
+//                }
+
+//                if (!userData.localFlag) {
+//                    userData.localFlag = true
+//                    hemoCubeViewModel.bulkAddResultTestToDb(userData)
+//                }
+//                if (!userData.molbioFlag && isTokenAvailable && Constants.MOLBIO_INTEGRATION) {
+//                    userData.molbioFlag = true
+//                    hemoCubeViewModel.uploadResult(resultList)
+//                }
+//            }
+//            dialog.dismiss()
+//        }
+
         hemoCubeViewModel.allKitTestData.observe(viewLifecycleOwner) { kitDataList ->
             kitDataList.forEach { userData ->
                 if (!userData.localFlag) {
@@ -865,61 +997,28 @@ class HomeFragment : Fragment() {
             }
             dialog.dismiss()
         }
+    }
 
+    private fun downloadLocalDBData(dialog: DialogInterface) {
         hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            val resultList = MolbioV2ResultRequest(mutableListOf(MolbioV2Result()))
+            val downloadList = mutableListOf<HemoCubeTestData>()
+
             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.isCSVCreated) {
+                    downloadList.add(userData) // Add the userData to downloadList
                 }
-
-                if (!userData.localFlag) {
-                    userData.localFlag = true
-                    hemoCubeViewModel.bulkAddResultTestToDb(userData)
-                }
-
             }
+
+            if (downloadList.isNotEmpty()) {
+                // Call ViewModel function to create CSV with filtered data
+                hemoCubeViewModel.createCSV(downloadList, requireContext())
+                Toast.makeText(requireContext(), "Done", Toast.LENGTH_SHORT).show()
+            }
+
             dialog.dismiss()
         }
     }
 
-//    private fun downloadLocalDBData(dialog: DialogInterface) {
-//        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-//            val downloadList = mutableListOf<HemoCubeTestData>()
-//
-//            userDataList.forEach { userData ->
-//                if (!userData.isCSVCreated) {
-//                    downloadList.add(userData) // Add the userData to downloadList
-//                }
-//            }
-//
-//            if (downloadList.isNotEmpty()) {
-//                // Call ViewModel function to create CSV with filtered data
-//                hemoCubeViewModel.createCSV(downloadList, requireContext())
-//                Toast.makeText(requireContext(), "Done", Toast.LENGTH_SHORT).show()
-//            } else {
-//                Toast.makeText(requireContext(), "Failed", Toast.LENGTH_SHORT).show()
-//            }
-//
-//            dialog.dismiss()
-//        }
-//    }
-
     private fun deleteIncompleteRegistrations(userDataList: List<UserData>) {
         userDataList.forEach { userData ->
             if (userData.csvPath.isEmpty()) {
@@ -954,66 +1053,66 @@ class HomeFragment : Fragment() {
         }
     }
 
-    private fun showDownloadDialog(context: Context) {
-        val builder = AlertDialog.Builder(context)
-        builder.setTitle(R.string.download_db_registration_title)
-        builder.setMessage(R.string.download_db_registration_message)
+//    private fun showDownloadDialog(context: Context) {
+//        val builder = AlertDialog.Builder(context)
+//        builder.setTitle(R.string.download_db_registration_title)
+//        builder.setMessage(R.string.download_db_registration_message)
+//
+//        builder.setPositiveButton(R.string.downloadcsv) { dialog, _ ->
+//            downloadLocalDBData(dialog)
+//        }
+//
+//        builder.setNegativeButton(R.string.cancel) { dialog, _ ->
+//            dialog.dismiss()
+//        }
+//
+//        val dialog = builder.create()
+//        dialog.show()
+//    }
 
-        builder.setPositiveButton(R.string.downloadcsv) { dialog, _ ->
-            downloadLocalDBData(dialog)
-        }
-
-        builder.setNegativeButton(R.string.cancel) { dialog, _ ->
-            dialog.dismiss()
-        }
-
-        val dialog = builder.create()
-        dialog.show()
-    }
-
-    private fun downloadLocalDBData(dialog: DialogInterface) {
-        var csvDownloaded = false
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            try {
-                if (!csvDownloaded) {
-                    val downloadList = mutableListOf<HemoCubeTestData>()
-
-                    userDataList.forEach { userData ->
-                        if (userData.testStatus == true) {
-//                        if (!userData.isCSVCreated) {
-                            downloadList.add(userData) // Add the userData to downloadList
-                        }
+//    private fun downloadLocalDBData(dialog: DialogInterface) {
+//        var csvDownloaded = false
+//        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
+//            try {
+//                if (!csvDownloaded) {
+//                    val downloadList = mutableListOf<HemoCubeTestData>()
+//
+//                    userDataList.forEach { userData ->
+//                        if (userData.testStatus == true) {
+////                        if (!userData.isCSVCreated) {
+//                            downloadList.add(userData) // Add the userData to downloadList
 //                        }
-                    }
-
-                    if (downloadList.isNotEmpty()) {
-                        // Call ViewModel function to create CSV with filtered data
-                        hemoCubeViewModel.createCSV(downloadList, requireContext())
-                        csvDownloaded = true
-                        Toast.makeText(
-                            requireContext(),
-                            "CSV file downloaded successfully",
-                            Toast.LENGTH_SHORT
-                        ).show()
-                    } else {
-                        Toast.makeText(
-                            requireContext(),
-                            "No data to download",
-                            Toast.LENGTH_SHORT
-                        )
-                            .show()
-                    }
-                }
-
-            } catch (e: Exception) {
-                e.printStackTrace()
-                Toast.makeText(requireContext(), "Error downloading CSV file", Toast.LENGTH_SHORT)
-                    .show()
-            } finally {
-                dialog.dismiss()
-            }
-        }
-    }
+////                        }
+//                    }
+//
+//                    if (downloadList.isNotEmpty()) {
+//                        // Call ViewModel function to create CSV with filtered data
+//                        hemoCubeViewModel.createCSV(downloadList, requireContext())
+//                        csvDownloaded = true
+//                        Toast.makeText(
+//                            requireContext(),
+//                            "CSV file downloaded successfully",
+//                            Toast.LENGTH_SHORT
+//                        ).show()
+//                    } else {
+//                        Toast.makeText(
+//                            requireContext(),
+//                            "No data to download",
+//                            Toast.LENGTH_SHORT
+//                        )
+//                            .show()
+//                    }
+//                }
+//
+//            } catch (e: Exception) {
+//                e.printStackTrace()
+//                Toast.makeText(requireContext(), "Error downloading CSV file", Toast.LENGTH_SHORT)
+//                    .show()
+//            } finally {
+//                dialog.dismiss()
+//            }
+//        }
+//    }
 
     private fun getDeviceId() {
         Log.d("HomeFragmentUSb","getDeviceId")
@@ -1075,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{
@@ -1099,14 +1198,24 @@ class HomeFragment : Fragment() {
                                                     Log.d("HomeFragmentUpdate","Device update not available")
                                                 }
                                             }else{
-                                                if(!globalUpdateDone){
-                                                    val update = db.collection("devices").document(it.id).update("globalUpdateDone",true)
-                                                    update.addOnSuccessListener {
-                                                        Log.d("HomeFragmentUpdate","Device global update done")
+                                                if(deviceUpdateAvailableGlobal) {
+                                                    if (!globalUpdateDone) {
+                                                        val update =
+                                                            db.collection("devices").document(it.id)
+                                                                .update("globalUpdateDone", true)
+                                                        update.addOnSuccessListener {
+                                                            Log.d(
+                                                                "HomeFragmentUpdate",
+                                                                "Device global update done"
+                                                            )
 
-                                                        initiateUpdate(updatePathGlobal)
-                                                    }.addOnFailureListener{
-                                                        Log.e("fetchDeviceUpdate", "update fail.")
+                                                            initiateUpdate(updatePathGlobal)
+                                                        }.addOnFailureListener {
+                                                            Log.e(
+                                                                "fetchDeviceUpdate",
+                                                                "update fail."
+                                                            )
+                                                        }
                                                     }
                                                 }
                                             }
@@ -1128,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.")
                     }

app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceActivity.kt

@@ -21,12 +21,12 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.api.DeviceCommunicationHandler
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.DeviceCommunicationHandler
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.testRight.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber

app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceFragment.kt

@@ -12,7 +12,7 @@ import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.MutableLiveData
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase

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

@@ -20,12 +20,12 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.api.DeviceCommunicationHandler
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.DeviceCommunicationHandler
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.testRight.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber

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

@@ -12,12 +12,12 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.MutableLiveData
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
 import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase

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

@@ -3,7 +3,7 @@ package com.example.hpostesting.presentation.deviceprovision
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.model.Response
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse

app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsActivity.kt

@@ -20,7 +20,7 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.presentation.testRight.UsbService

app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsFragment.kt

@@ -13,15 +13,15 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.MutableLiveData
-import com.example.hpostesting.data.Result
-import com.example.hpostesting.data.Result.Success
+import com.example.hpostesting.util.Result
+import com.example.hpostesting.util.Result.Success
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.devicediagnostics.AdditionalDetails
 import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
 import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
 import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.databinding.FragmentDiagnosticsBinding

app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsViewModel.kt

@@ -3,7 +3,7 @@ package com.example.hpostesting.presentation.diagnostics
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.model.Response
 import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
 import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsResponse
@@ -25,7 +25,7 @@ class DiagnosticsViewModel @Inject constructor(
 
     val deviceData = MutableLiveData<DeviceData?>()
     val fireBaseUpload = MutableLiveData<String>()
-    val deviceDiagnosticsResponse = MutableLiveData<com.example.hpostesting.data.Result<DeviceDiagnosticsResponse>>()
+    val deviceDiagnosticsResponse = MutableLiveData<Result<DeviceDiagnosticsResponse>>()
 //    private val batteryStatus: Intent? =
 //        IntentFilter(Intent.ACTION_BATTERY_CHANGED).let { ifilter ->
 //            context.registerReceiver(null, ifilter)

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

@@ -10,7 +10,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
 import `in`.sminnovations.hpostesting.databinding.FragmentDigitalCardBinding
 import java.text.SimpleDateFormat

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
@@ -13,15 +14,15 @@ import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.MutableLiveData
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.data.constant.DataHolder
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.constant.TestStatus
 import com.example.hpostesting.data.model.TestState
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.example.hpostesting.presentation.utils.MyDialogListener
 import com.example.hpostesting.presentation.utils.UIUtils
@@ -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

@@ -12,10 +12,10 @@ import androidx.lifecycle.viewModelScope
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
-import com.example.hpostesting.data.CsvWriter
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.NetworkStatusLiveData
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.CsvWriter
+import com.example.hpostesting.data.constant.DataHolder
+import com.example.hpostesting.util.NetworkStatusLiveData
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.dao.HemoCubeBufferDao
 import com.example.hpostesting.data.dao.HemoCubeDao
@@ -88,7 +88,8 @@ class HemoCubeViewModel @Inject constructor(
 
     private val _networkStatusLiveData = NetworkStatusLiveData(context)
     val allUserData = hemoCubeDao.getAll()
-    val allPendingUserToUpload = MutableLiveData<List<HemoCubeTestData>>()
+    val allLocalData = hemoCubeDao.getAll()
+    val allPendingUserToUpload = hemoCubeDao.getPendingUser()
     val allKitTestData = hemoCubeBufferDao.getAll()
     val deviceData = MutableLiveData<DeviceData?>()
 
@@ -143,6 +144,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 {
@@ -187,9 +196,9 @@ class HemoCubeViewModel @Inject constructor(
             }
         }
     }
-    fun uploadPendingUser() = viewModelScope.launch {
-        allPendingUserToUpload.postValue(hemoCubeDao.getPendingUser(false))
-    }
+//    fun getPendingUser() = viewModelScope.launch {
+//        allPendingUserToUpload.postValue(hemoCubeDao.getPendingUser(true))
+//    }
 
     fun uploadHemoCubeResultToDatabaseForBufferCheck(
         isOnline: Boolean,
@@ -325,20 +334,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,
-                                            analysisId = testDetails._id,
-                                            analysisDate = testDetails.testTime,
-                                            analysisStatus = testDetails.classificationResult,
-                                            thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[testDetails.deviceId].toString(),
-                                            interpretation = testDetails.classificationResult,
-                                            testId = testDetails._id,
-                                            testTime = testDetails.testTime,
-                                            collectionTime = testDetails.testTime,
-                                            expiryTime = testDetails.testTime,
+                                            rawData = sanitizedTestDetails,
+                                            analysisId = sanitizedTestDetails._id,
+                                            analysisDate = sanitizedTestDetails.testTime,
+                                            analysisStatus = sanitizedTestDetails.classificationResult,
+                                            thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[sanitizedTestDetails.deviceId]?.toString(),
+                                            interpretation = sanitizedTestDetails.classificationResult,
+                                            testId = sanitizedTestDetails._id,
+                                            testTime = sanitizedTestDetails.testTime,
+                                            collectionTime = sanitizedTestDetails.testTime,
+                                            expiryTime = sanitizedTestDetails.testTime,
                                         )
                                     )
                                 )
@@ -380,6 +393,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

@@ -18,10 +18,11 @@ 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
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.presentation.testRight.UsbService
@@ -44,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) {
@@ -83,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)
@@ -107,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
@@ -126,6 +130,7 @@ open class HemocubeActivity : AppCompatActivity() {
         }
     }
 
+    @RequiresApi(Build.VERSION_CODES.O)
     @SuppressLint("MutableImplicitPendingIntent")
     private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
         val mPendingIntent: PendingIntent
@@ -151,11 +156,13 @@ open class HemocubeActivity : AppCompatActivity() {
         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/java/com/example/hpostesting/presentation/jig/JigActivity.kt

@@ -21,7 +21,7 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.presentation.testRight.UsbService

app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightActivity.kt

@@ -19,7 +19,7 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
@@ -132,7 +132,7 @@ class TestRightActivity : AppCompatActivity() {
                 this,
                 0,
                 Intent(Constants.ACTION_USB_PERMISSION),
-                PendingIntent.FLAG_MUTABLE
+                PendingIntent.FLAG_IMMUTABLE
             )
         } else {
             mPendingIntent = PendingIntent.getBroadcast(

app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpReference.kt

@@ -10,11 +10,11 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.TestRightCommands
 import com.example.hpostesting.data.model.ErrorMessage
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.utils.MyDialogListener
 import com.example.hpostesting.presentation.utils.UIUtils
 import dagger.hilt.android.AndroidEntryPoint

app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpSample.kt

@@ -10,13 +10,13 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.TestRightCommands
 import com.example.hpostesting.data.model.ErrorMessage
 import com.example.hpostesting.data.model.test.TestType
 import com.example.hpostesting.presentation.MainActivity
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.utils.MyDialogListener
 import com.example.hpostesting.presentation.utils.UIUtils
 import dagger.hilt.android.AndroidEntryPoint

app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt

@@ -11,7 +11,7 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.model.test.TestRightResultType
 import com.example.hpostesting.data.model.test.TestType

app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt

@@ -5,8 +5,8 @@ import android.net.Uri
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.NetworkStatusLiveData
+import com.example.hpostesting.data.constant.DataHolder
+import com.example.hpostesting.util.NetworkStatusLiveData
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.dao.UserDao
 import com.example.hpostesting.data.model.CalculationVariableForTest

app/src/main/java/com/example/hpostesting/presentation/testRight/UsbService.kt

@@ -9,7 +9,7 @@ import android.util.Log
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.constant.TestRightCommands
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialPort
 import com.hoho.android.usbserial.util.SerialInputOutputManager

app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeActivity.kt

@@ -20,7 +20,7 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.presentation.hemocube.HemoCubeFragment

app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeFragment.kt

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
+import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -13,15 +14,15 @@ import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.MutableLiveData
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.data.constant.DataHolder
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.constant.TestStatus
 import com.example.hpostesting.data.model.TestState
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.example.hpostesting.presentation.hemocube.HemocubeActivity
 import com.example.hpostesting.presentation.utils.MyDialogListener
@@ -1155,6 +1156,8 @@ class TrueHemeFragment : Fragment() {
     }
 
     private fun reconnect() {
-        (activity as HemocubeActivity).reconnectDevice()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            (activity as HemocubeActivity).reconnectDevice()
+        }
     }
 }

app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeViewModel.kt

@@ -12,10 +12,10 @@ import androidx.lifecycle.viewModelScope
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
-import com.example.hpostesting.data.CsvWriter
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.NetworkStatusLiveData
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.CsvWriter
+import com.example.hpostesting.data.constant.DataHolder
+import com.example.hpostesting.util.NetworkStatusLiveData
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.dao.HemoCubeBufferDao
 import com.example.hpostesting.data.dao.HemoCubeDao

app/src/main/java/com/example/hpostesting/presentation/utils/DeviceCommunicationHandler.kt

@@ -1,12 +1,6 @@
-package com.example.hpostesting.data.api
+package com.example.hpostesting.presentation.utils
 
 import com.example.hpostesting.data.constant.HemoCubeCommands
-import com.example.hpostesting.presentation.UsbServiceListener
-
-interface PropertyProvider {
-
-    fun getProperty(key: String): String
-}
 
 interface DeviceCommunicationHandler {
     fun sendAndListenToDevice(command: HemoCubeCommands, listener: UsbServiceListener)

app/src/main/java/com/example/hpostesting/presentation/utils/NatsManager.kt

@@ -1,4 +1,4 @@
-package com.example.hpostesting.presentation
+package com.example.hpostesting.presentation.utils
 
 import android.content.Context
 import android.os.Build

app/src/main/java/com/example/hpostesting/presentation/utils/UsbServiceListener.kt

@@ -1,4 +1,4 @@
-package com.example.hpostesting.presentation
+package com.example.hpostesting.presentation.utils
 
 interface UsbServiceListener {
     fun onUsbRead(data: ByteArray?)

app/src/main/java/com/example/hpostesting/presentation/utils/UsbServiceListenerImpl.kt

@@ -1,8 +1,9 @@
-package com.example.hpostesting.presentation
+package com.example.hpostesting.presentation.utils
 
 import android.content.Context
 import android.util.Log
 import android.widget.Toast
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 
 class UsbServiceListenerImpl(private val context: Context): UsbServiceListener {
     override fun onUsbRead(data: ByteArray?) {

app/src/main/java/com/example/hpostesting/test.kt

@@ -1,11 +0,0 @@
-package com.example.hpostesting
-
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-
-fun main(){
-    val dateFormat = SimpleDateFormat("MM:HHddMMyyyy", Locale.getDefault())
-    val currentDate = Date()
-    print(dateFormat.format(currentDate))
-}

app/src/main/java/com/example/hpostesting/util/CsvWriter.kt

@@ -1,4 +1,4 @@
-package com.example.hpostesting.data
+package com.example.hpostesting.util
 
 import android.content.Context
 import android.os.Environment

app/src/main/java/com/example/hpostesting/util/NetworkStatusLiveData.kt

@@ -1,4 +1,4 @@
-package com.example.hpostesting.data
+package com.example.hpostesting.util
 
 
 import android.content.Context

app/src/main/java/com/example/hpostesting/util/PreferenceUtility.kt

@@ -1,4 +1,4 @@
-package com.example.hpostesting.data
+package com.example.hpostesting.util
 
 import android.content.Context
 import android.content.SharedPreferences

app/src/main/java/com/example/hpostesting/util/PropertyProvider.kt

@@ -0,0 +1,7 @@
+package com.example.hpostesting.util
+
+interface PropertyProvider {
+
+    fun getProperty(key: String): String
+}
+

app/src/main/java/com/example/hpostesting/util/PropertyProviderImpl.kt

@@ -1,7 +1,6 @@
 package com.example.hpostesting.util
 
 import android.content.res.AssetManager
-import com.example.hpostesting.data.api.PropertyProvider
 import java.io.InputStream
 import java.util.Properties
 

app/src/main/java/com/example/hpostesting/util/Result.kt

@@ -1,4 +1,4 @@
-package com.example.hpostesting.data
+package com.example.hpostesting.util
 
 sealed class Result<out T : Any> {
     data class Success<out T : Any>(val data: T) : Result<T>()

app/src/main/res/drawable/shows_activity_24.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM14,17L7,17v-2h7v2zM17,13L7,13v-2h10v2zM17,9L7,9L7,7h10v2z"/>
+    
+</vector>

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".presentation.dashboard.DashboardActivity">
+    >
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -16,7 +16,17 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
-            app:popupTheme="@style/Theme.HPOS.PopupOverlay" />
+            app:popupTheme="@style/Theme.HPOS.PopupOverlay" >
+            <TextView
+                android:id="@+id/version_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="--"
+                android:textStyle="bold"
+                android:layout_gravity="end"
+                android:textSize="18sp"
+                android:layout_marginEnd="15dp"/>
+        </androidx.appcompat.widget.Toolbar>
 
     </com.google.android.material.appbar.AppBarLayout>
 

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

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    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">
+    <TextView
+        android:id="@+id/titleText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:gravity="center"
+        android:text="Upload Pending List(Local data)"
+        android:layout_marginTop="5dp"
+        android:textSize="21sp"
+        android:textColor="@color/black"
+        />
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_order_offline"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/titleText"
+        android:layout_alignParentStart="true"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        tools:listitem="@layout/offline_user_list_view" />
+
+    <TextView
+        android:id="@+id/noDataText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:text="All up-to-date"
+        android:textSize="22sp"
+        android:textColor="@color/black"
+        />
+
+</RelativeLayout>

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

app/src/main/res/menu/activity_main_drawer.xml

@@ -12,6 +12,10 @@
             android:id="@+id/nav_profile"
             android:icon="@drawable/control_panel"
             android:title="@string/profile" />
+        <item
+            android:id="@+id/nav_activity"
+            android:icon="@drawable/shows_activity_24"
+            android:title="@string/action_activity" />
         <item
             android:id="@+id/nav_settings"
             android:icon="@drawable/baseline_settings_24"

app/src/main/res/navigation/dashboard_navigation.xml

@@ -32,6 +32,11 @@
         android:name="com.example.hpostesting.presentation.dashboard.SlideshowFragment"
         android:label="@string/action_settings"
         tools:layout="@layout/fragment_slideshow" />
+    <fragment
+        android:id="@+id/nav_activity"
+        android:name="com.example.hpostesting.presentation.dashboard.ActivitiesFragment"
+        android:label="@string/action_activity"
+        tools:layout="@layout/fragment_activities" />
     <activity
         android:id="@+id/mainActivity"
         android:name="com.example.hpostesting.presentation.MainActivity"

app/src/main/res/values-hi/strings.xml

@@ -271,4 +271,5 @@
     <string name="deviceinfo">डिवाइस जानकारी</string>
 
     <string name="downloadcsv">सीएसवी डाउनलोड करें</string>
+    <string name="action_activity">Activities</string>
 </resources>

app/src/main/res/values-kn/strings.xml

@@ -270,6 +270,7 @@
     <string name="add_blood_group">ರಕ್ತ ಗುಂಡನ್ನು ಸೇರಿಸಿ</string>
     <string name="ok">ಸರಿ</string>
     <string name="downloadcsv">CSV ಡೌನ್ಲೋಡ್ ಮಾಡಿ</string>
+    <string name="action_activity">Activities</string>
     <!-- Add translations for other strings -->
 
 </resources>

app/src/main/res/values/strings.xml

@@ -273,4 +273,5 @@
     <string name="select_language">Select your preferred language</string>
     <string name="app_language">App Language</string>
     <string name="ok">OK</string>
+    <string name="action_activity">Activities</string>
 </resources>

app/src/test/java/com/example/hpostesting/AutoDacViewModelTest.kt

@@ -3,18 +3,15 @@ package com.example.hpostesting
 import android.content.Context
 import android.content.SharedPreferences
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import androidx.lifecycle.Observer
-import com.example.hpostesting.data.NetworkStatusLiveData
+import com.example.hpostesting.util.NetworkStatusLiveData
 import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.model.Response
 import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
-import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.repository.Repository
 import com.example.hpostesting.presentation.autodac.AutoDacViewModel
 import io.mockk.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.TestCoroutineDispatcher
 import kotlinx.coroutines.test.setMain

app/src/test/java/com/example/hpostesting/CsvWriterTest.kt

@@ -1,7 +1,7 @@
 package com.example.hpostesting
 
 import android.content.Context
-import com.example.hpostesting.data.CsvWriter
+import com.example.hpostesting.util.CsvWriter
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test

app/src/test/java/com/example/hpostesting/DeviceFragmentTest.kt

@@ -1,26 +1,5 @@
 package com.example.hpostesting
 
-import android.content.Context
-import android.content.SharedPreferences
-import androidx.fragment.app.testing.FragmentScenario
-import androidx.fragment.app.testing.launchFragmentInContainer
-import androidx.lifecycle.MutableLiveData
-import androidx.test.core.app.ApplicationProvider
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.HemoCubeCommands
-import com.example.hpostesting.presentation.deviceinfo.DeviceActivity
-import com.example.hpostesting.presentation.UsbServiceListener
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
-import com.google.firebase.crashlytics.ktx.crashlytics
-import com.google.firebase.ktx.Firebase
-import `in`.sminnovations.hpostesting.databinding.FragmentDeviceBinding
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.mockito.Mock
-import org.mockito.Mockito.*
-import org.mockito.MockitoAnnotations
-
 class DeviceFragmentTest {
 //
 //    @Mock

app/src/test/java/com/example/hpostesting/DeviceProvisionViewModelTest.kt

@@ -2,7 +2,7 @@ package com.example.hpostesting
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.Observer
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
 import com.example.hpostesting.data.repository.Repository

app/src/test/java/com/example/hpostesting/HemocubeViewModelTest.kt

@@ -3,7 +3,7 @@ package com.example.hpostesting
 import android.content.Context
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.Observer
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.model.login.LoginResponse
 import com.example.hpostesting.data.repository.Repository
 import com.example.hpostesting.domain.LogFileManager

app/src/test/java/com/example/hpostesting/TestRightViewModelTest.kt

@@ -1,22 +1,5 @@
 package com.example.hpostesting
 
-import android.content.Context
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.dao.UserDao
-import com.example.hpostesting.data.model.patient.UserData
-import com.example.hpostesting.data.repository.DatabaseRepository
-import com.example.hpostesting.domain.SaveRawData
-import com.example.hpostesting.domain.SaveRawDataTest
-import com.example.hpostesting.presentation.testRight.TestRightViewModel
-import junit.framework.Assert.assertEquals
-import org.junit.Before
-import org.junit.Test
-import org.mockito.Mock
-import org.mockito.MockitoAnnotations
-import java.math.RoundingMode
-import java.text.DecimalFormat
-
 class TestRightViewModelTest {
 //    private val viewModel = TestRightViewModel()
 //    private val data = InputData()

build.gradle

@@ -3,9 +3,9 @@ buildscript {
         kotlin_version = '1.8.21'
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.0'
-        classpath 'com.google.gms:google-services:4.4.0'
-        classpath 'com.google.firebase:firebase-appdistribution-gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:8.2.2'
+        classpath 'com.google.gms:google-services:4.4.1'
+        classpath 'com.google.firebase:firebase-appdistribution-gradle:4.1.0'
     }
     repositories {
         mavenCentral()

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#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.4-bin.zip