fixed some issues

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

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
@@ -12,6 +13,12 @@ interface HemoCubeDao {
     @Query("SELECT * from hemo_cube_test_table")
     fun getAll(): LiveData<List<HemoCubeTestData>>
 
+    @Query("SELECT * from hemo_cube_test_table WHERE molbioFlag=false")
+    fun getMolbioPending(): List<HemoCubeTestData>
+
+    @Query("SELECT * from hemo_cube_test_table WHERE localFlag=false")
+    fun getFirebasePending():List<HemoCubeTestData>
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertAll(hemoCubeTestData: HemoCubeTestData)
 
@@ -30,7 +37,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

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

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/encryption/Encryption.kt

@@ -0,0 +1,42 @@
+package com.example.hpostesting.encryption
+
+import android.util.Base64
+import javax.crypto.Cipher
+import javax.crypto.SecretKeyFactory
+import javax.crypto.spec.IvParameterSpec
+import javax.crypto.spec.PBEKeySpec
+import javax.crypto.spec.SecretKeySpec
+
+object Encryption {
+    private const val AES_MODE = "AES/CBC/PKCS5Padding"
+    private const val KEY_SPEC_ALGORITHM = "PBKDF2WithHmacSHA1"
+    private const val SALT = "Bigtec"
+    private const val ITERATION_COUNT = 10000
+    private const val KEY_LENGTH = 256
+    private val FIXED_IV = byteArrayOf(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15)
+
+    fun encrypt(textToEncrypt: String, password: String): String {
+        val salt = SALT.toByteArray()
+        val factory = SecretKeyFactory.getInstance(KEY_SPEC_ALGORITHM)
+        val spec = PBEKeySpec(password.toCharArray(), salt, ITERATION_COUNT, KEY_LENGTH)
+        val tmp = factory.generateSecret(spec)
+        val key = SecretKeySpec(tmp.encoded, "AES")
+        val cipher = Cipher.getInstance(AES_MODE)
+        cipher.init(Cipher.ENCRYPT_MODE, key, IvParameterSpec(FIXED_IV))
+        val encryptedBytes = cipher.doFinal(textToEncrypt.toByteArray(Charsets.UTF_8))
+        return Base64.encodeToString(encryptedBytes, Base64.NO_WRAP)
+    }
+
+    fun decrypt(encryptedText: String, password: String): String {
+        val salt = SALT.toByteArray()
+        val encryptedBytes = Base64.decode(encryptedText, Base64.NO_WRAP)
+        val factory = SecretKeyFactory.getInstance(KEY_SPEC_ALGORITHM)
+        val spec = PBEKeySpec(password.toCharArray(), salt, ITERATION_COUNT, KEY_LENGTH)
+        val tmp = factory.generateSecret(spec)
+        val key = SecretKeySpec(tmp.encoded, "AES")
+        val cipher = Cipher.getInstance(AES_MODE)
+        cipher.init(Cipher.DECRYPT_MODE, key, IvParameterSpec(FIXED_IV))
+        val decryptedBytes = cipher.doFinal(encryptedBytes)
+        return String(decryptedBytes, Charsets.UTF_8)
+    }
+}

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,59 @@
+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
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
+    ): View {
+        binding = FragmentActivitiesBinding.inflate(inflater, container, false)
+
+        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

@@ -3,8 +3,8 @@ package com.example.hpostesting.presentation.dashboard
 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
@@ -20,30 +20,22 @@ 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.updates.DeviceUpdateRequest
-import com.example.hpostesting.presentation.NatsManager
+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.BufferedInputStream
 import java.io.File
-import java.io.FileInputStream
-import java.io.FileOutputStream
-import java.io.InputStream
-import java.util.zip.ZipInputStream
 
 interface NatsMessageCallback {
     fun onMessageReceived(topic: String, message: String)
@@ -92,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, "")
 
@@ -142,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)
@@ -260,4 +255,20 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
             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

@@ -15,6 +15,8 @@ import android.net.Uri
 import android.os.BatteryManager
 import android.os.Build
 import android.os.Bundle
+import android.os.Environment
+import android.provider.Settings
 import android.util.Base64
 import android.util.Log
 import android.view.LayoutInflater
@@ -26,9 +28,9 @@ 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.presentation.utils.DeviceCommunicationHandler
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.login.LoginRequest
@@ -40,8 +42,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.encryption.Encryption
 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
@@ -151,69 +154,71 @@ class HomeFragment : Fragment() {
                 }
 
                 // Now re-subscribe to allUserData
-                hemoCubeViewModel.allLocalData.observe(viewLifecycleOwner) { originalUserDataList ->
+                /*                hemoCubeViewModel.allLocalData.observe(viewLifecycleOwner) { originalUserDataList ->
 
-                    Log.d("LOCAL_DB OBSERVE", "OBSERVE CALLED")
+                                    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.molbioFlag && isTokenAvailable && Constants.MOLBIO_INTEGRATION) {
-                                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
-                                    )
-                                )
-                            }
-                        }
-                    }
-                    Log.d("USER DATA LIST SIZE", resultList.results?.count().toString())
+                                    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.molbioFlag && isTokenAvailable && Constants.MOLBIO_INTEGRATION) {
+                                                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
+                                                    )
+                                                )
+                                            }
+                                        }
+                                    }
+                                    Log.d("USER DATA LIST SIZE", resultList.results?.count().toString())
 
-                    resultList.results?.forEach { result ->
-                        val userData = result.rawData
-                        Log.d("UserData", userData.toString())
-                        if (userData != null) {
-                            if (!userData.localFlag) {
-                                hemoCubeViewModel.bulkAddResultTestToDb(userData)
+                                    resultList.results?.forEach { result ->
+                                        val userData = result.rawData
+                                        Log.d("UserData", userData.toString())
+                                        if (userData != null) {
+                                            if (!userData.localFlag) {
+                                                hemoCubeViewModel.bulkAddResultTestToDb(userData)
 
-                            }
-                        }
-                    }
-                    resultList.results?.forEach { result ->
-                        result.rawData?.let { sanitizeDoubleValues(it) }
-                    }
+                                            }
+                                        }
+                                    }
+                                    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")
-                    }
+                // Then, check if there are any results to upload.
+                                    if (resultList.results?.isNotEmpty() == true) {
+                                        hemoCubeViewModel.uploadResult(resultList)
+                                        Log.d("resultcount1", "Uploading sanitized results")
+                                    }
 
-                }
+                                }*/
+                hemoCubeViewModel.sendDataToMolbio()
+                hemoCubeViewModel.sendDataToFirebase()
 
             } else {
                 binding.internetAvailableCL.visibility = View.GONE
@@ -308,26 +313,52 @@ class HomeFragment : Fragment() {
         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()) {
-            Log.d("istoken",isTokenAvailable.toString())
-               if (!isTokenAvailable) {
-                   Log.d("istoken1",isTokenAvailable.toString())
-                   hemoCubeViewModel.login(createLoginRequestData(userID, password))
-                   isTokenAvailable = true
 
-                }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))
-                   }
-             }
+        val target = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
+        val file = File(target, "credentials.txt")      //this file contains userID and password to communicate with API.
+
+        if (userID.isNotEmpty() && password.isNotEmpty()) {
+            Log.d("istoken", isTokenAvailable.toString())
+            if (!isTokenAvailable) {
+                Log.d("istoken1", isTokenAvailable.toString())
+                hemoCubeViewModel.login(createLoginRequestData(userID, password))
+                isTokenAvailable = true
+
+            } 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()
+        } else if (file.exists()) {
+            val encryptedString = file.readText()
+            val encryptionKey =
+                Settings.Secure.getString(context?.contentResolver, Settings.Secure.ANDROID_ID)
+            val decryptedMessage: String = Encryption.decrypt(encryptedString, encryptionKey)
+            val credentials = decryptedMessage.split("\n")
+            userID = credentials[0]
+            password = credentials[1]
+            Toast.makeText(context, "DECRYPTED: $credentials", Toast.LENGTH_SHORT).show()
+            if (!isTokenAvailable) {
+                hemoCubeViewModel.login(createLoginRequestData(userID, password))
+                isTokenAvailable = true
+
+            } else if (isTokenAvailable) {
+                isTokenAvailable = true
+                hemoCubeViewModel.startPeriodicCheckUpdate()
+                hemoCubeViewModel.checkUpdate(createCheckUpdateRequestData())
+            } else {
+                if (isTokenExpired(accessToken)) {
+                    hemoCubeViewModel.login(createLoginRequestData(userID, password))
+                }
+            }
         } else {
             Toast.makeText(
                 requireContext(),
@@ -342,7 +373,7 @@ class HomeFragment : Fragment() {
                     updateTokens(response)
                     response.data.data?.accessToken
                     isTokenAvailable = true
-                    Log.d("istoken2",isTokenAvailable.toString())
+                    Log.d("istoken2", isTokenAvailable.toString())
                 }
 
                 is Result.Error -> {
@@ -368,7 +399,7 @@ class HomeFragment : Fragment() {
             when (it) {
                 is Result.Success -> {
 
-                    Log.d("success,","uploded")
+                    Log.d("success,", "uploded")
                     it.data.data?.forEach { id ->
                         id.rawData?.let { it1 ->
                             hemoCubeViewModel.updateMolbioFlag(
@@ -376,7 +407,11 @@ class HomeFragment : Fragment() {
                             )
                         }
                     }
-                    Toast.makeText(activity, "Molbio Result is successfully uploaded", Toast.LENGTH_LONG)
+                    Toast.makeText(
+                        activity,
+                        "Molbio Result is successfully uploaded",
+                        Toast.LENGTH_LONG
+                    )
                         .show()
                 }
 
@@ -427,25 +462,29 @@ class HomeFragment : Fragment() {
         hemoCubeViewModel.checkUpdate.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Result.Success -> {
-                    val updatedversion =  response.data.data?.version.toString()
+                    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()
-                            }
+                            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(
+                                "AppInfo",
+                                "Version Name: $versionName, Version Code: $versionCode"
+                            )
                         }
-                    Log.d("versionnow",currentversion.toString())
-                    Log.d("versionnow",updatedversion.toString())
-                    if(updatedversion > currentversion.toString()){
+                    Log.d("versionnow", currentversion.toString())
+                    Log.d("versionnow", updatedversion.toString())
+                    if (updatedversion > currentversion.toString()) {
                         hemoCubeViewModel.deviceUpdate(createDeviceUpdateRequestData())
                         Toast.makeText(
                             activity,
@@ -453,7 +492,7 @@ class HomeFragment : Fragment() {
                             Toast.LENGTH_LONG
                         )
                             .show()
-                    }else{
+                    } else {
                         Toast.makeText(
                             activity,
                             "App is Up to date",
@@ -489,14 +528,19 @@ class HomeFragment : Fragment() {
 
                     val downloadDirectory = "NATS"
                     val fileName = "nats_certificate.zip"
-                    val unzipDirectoryPath = requireContext().getExternalFilesDir(null)?.absolutePath + "/$downloadDirectory"
+                    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()
+                        Toast.makeText(
+                            requireContext(),
+                            "NATS certificate already downloaded and extracted.",
+                            Toast.LENGTH_SHORT
+                        ).show()
                         return@observe
                     }
                     val file = downloadFile(url, requireContext(), fileName, downloadDirectory)
@@ -528,7 +572,7 @@ class HomeFragment : Fragment() {
 
 
     private fun isTokenExpired(token: String): Boolean {
-        if(token.isNotEmpty()) {
+        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)
@@ -537,7 +581,7 @@ class HomeFragment : Fragment() {
             val currentTimeSeconds = System.currentTimeMillis() / 1000
 
             return exp <= currentTimeSeconds
-        }else{
+        } else {
             return false
         }
     }
@@ -552,7 +596,7 @@ class HomeFragment : Fragment() {
             apply()
         }
         isTokenAvailable = true
-        Log.d("istoken3",isTokenAvailable.toString())
+        Log.d("istoken3", isTokenAvailable.toString())
     }
 
     private fun createLoginRequestData(userID: String, password: String): LoginRequest {
@@ -695,9 +739,9 @@ class HomeFragment : Fragment() {
                                 putString(Constants.NATS_TOKEN, natsToken)
                                 apply()
                             }
-                            if (!isTokenAvailable ) {
+                            if (!isTokenAvailable) {
                                 Log.d("istoken0", isTokenAvailable.toString())
-                                    hemoCubeViewModel.login(createLoginRequestData(username, password))
+                                hemoCubeViewModel.login(createLoginRequestData(username, password))
                             }
 
                         } ?: Log.e("fetchDeviceCredentials", "Failed to parse device data.")
@@ -902,7 +946,6 @@ class HomeFragment : Fragment() {
     }
 
 
-
     private fun showUploadDialog(context: Context) {
         val builder = AlertDialog.Builder(context)
         builder.setTitle(R.string.upload_db_registration_title)
@@ -1115,7 +1158,7 @@ class HomeFragment : Fragment() {
 //    }
 
     private fun getDeviceId() {
-        Log.d("HomeFragmentUSb","getDeviceId")
+        Log.d("HomeFragmentUSb", "getDeviceId")
         val handler = activity as? DeviceCommunicationHandler
         handler?.sendAndListenToDevice(
             HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND,
@@ -1123,9 +1166,10 @@ class HomeFragment : Fragment() {
                 override fun onUsbRead(data: ByteArray?) {
                     data?.let {
                         val receivedData = String(it, Charset.forName("UTF-8"))
-                        Log.d("HomeFragment","USB data"+receivedData)
+                        Log.d("HomeFragment", "USB data" + receivedData)
                         // Assuming the device ID is the full content of the received data. Adjust if needed.
-                        deviceId = extractDeviceId(receivedData) // Implement this method based on your data format.
+                        deviceId =
+                            extractDeviceId(receivedData) // Implement this method based on your data format.
                         if (deviceId.isNotEmpty()) {
                             // Store the deviceId in SharedPreferences
                             with(sharedPreference.edit()) {
@@ -1142,7 +1186,7 @@ class HomeFragment : Fragment() {
 
                 override fun onUsbError(e: Exception?) {
                     // Handle USB communication error
-                    Log.d("HomeFragment","USB read error"+e.toString())
+                    Log.d("HomeFragment", "USB read error" + e.toString())
                 }
 
             })
@@ -1154,94 +1198,103 @@ class HomeFragment : Fragment() {
         val matchResult = regex.find(receivedData)
         return matchResult?.groups?.get(1)?.value ?: ""
     }
+
     @SuppressLint("SuspiciousIndentation")
     private fun checkForUpdate() {
         try {
             val db = Firebase.firestore
-           //val deviceId = deviceId
+            //val deviceId = deviceId
 
             val deviceRef = db.collection("deviceUpdate").document(Constants.DOCUMENT_ID_FOR_UPDATE)
 
             deviceRef.get().addOnSuccessListener { documentSnapshot ->
-                    if (documentSnapshot.exists()) {
+                if (documentSnapshot.exists()) {
 
-                        val deviceData =
-                            documentSnapshot.toObject(DeviceData::class.java)
+                    val deviceData =
+                        documentSnapshot.toObject(DeviceData::class.java)
 
-                       // deviceData?.let { data ->
+                    // deviceData?.let { data ->
 
-                            val deviceVersion = deviceData!!.deviceVersion
-                            val deviceUpdateAvailableGlobal= deviceData.deviceUpdateAvailable
-                            val updatePathGlobal= deviceData.updatePath
+                    val deviceVersion = deviceData!!.deviceVersion
+                    val deviceUpdateAvailableGlobal = deviceData.deviceUpdateAvailable
+                    val updatePathGlobal = deviceData.updatePath
 
 
-                                 db.collection("devices").whereEqualTo("deviceId", deviceId).get().addOnSuccessListener { documentSnapshotNew ->
-                                    if (documentSnapshotNew.documents.isNotEmpty()) {
-                                        documentSnapshotNew.documents.forEach{
-                                            val documentIn = it.toObject(DeviceData::class.java)
+                    db.collection("devices").whereEqualTo("deviceId", deviceId).get()
+                        .addOnSuccessListener { documentSnapshotNew ->
+                            if (documentSnapshotNew.documents.isNotEmpty()) {
+                                documentSnapshotNew.documents.forEach {
+                                    val documentIn = it.toObject(DeviceData::class.java)
 
-                                            val globalUpdateIgnore = documentIn!!.globalUpdateIgnore
-                                            val deviceUpdateAvailable = documentIn.deviceUpdateAvailable
-                                            val globalUpdateDone = documentIn.globalUpdateDone
-                                            val updatePath = documentIn.updatePath
-                                            if(globalUpdateIgnore){
-                                                if(deviceUpdateAvailable){
-                                                    val update = db.collection("devices").document(it.id).update("deviceUpdateAvailable",false)
-                                                    update.addOnSuccessListener {
-                                                        Log.d("HomeFragmentUpdate","Device local update done")
+                                    val globalUpdateIgnore = documentIn!!.globalUpdateIgnore
+                                    val deviceUpdateAvailable = documentIn.deviceUpdateAvailable
+                                    val globalUpdateDone = documentIn.globalUpdateDone
+                                    val updatePath = documentIn.updatePath
+                                    if (globalUpdateIgnore) {
+                                        if (deviceUpdateAvailable) {
+                                            val update = db.collection("devices").document(it.id)
+                                                .update("deviceUpdateAvailable", false)
+                                            update.addOnSuccessListener {
+                                                Log.d(
+                                                    "HomeFragmentUpdate",
+                                                    "Device local update done"
+                                                )
 
-                                                        initiateUpdate(updatePath)
-                                                    }.addOnFailureListener{
-                                                        Log.e("fetchDeviceUpdate", "update fail.")
-                                                    }
-                                                }else{
-                                                    Log.d("HomeFragmentUpdate","Device update not available")
-                                                }
-                                            }else{
-                                                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(updatePath)
+                                            }.addOnFailureListener {
+                                                Log.e("fetchDeviceUpdate", "update fail.")
+                                            }
+                                        } else {
+                                            Log.d(
+                                                "HomeFragmentUpdate",
+                                                "Device update not available"
+                                            )
+                                        }
+                                    } else {
+                                        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."
+                                                    )
                                                 }
                                             }
                                         }
-
-                                    } else {
-                                        Log.e("fetchDeviceUpdate", "Document does not exist.")
                                     }
-                                }.addOnFailureListener { exception ->
-                                    Log.e("fetchDeviceUpdate", "Error fetching device data", exception)
                                 }
 
-
-                              //  Toast.makeText(requireActivity()," true -version."+deviceVersion+"updatePath.."+updatePath,Toast.LENGTH_LONG).show()
+                            } else {
+                                Log.e("fetchDeviceUpdate", "Document does not exist.")
+                            }
+                        }.addOnFailureListener { exception ->
+                            Log.e("fetchDeviceUpdate", "Error fetching device data", exception)
+                        }
 
 
-                            // Log for debugging
-                            Log.d(
-                                "fetchDeviceCredentials",
-                                "deviceVersion: $deviceVersion, Password: $deviceUpdateAvailableGlobal, updatePath: $updatePathGlobal"
-                            )
+                    //  Toast.makeText(requireActivity()," true -version."+deviceVersion+"updatePath.."+updatePath,Toast.LENGTH_LONG).show()
+
+
+                    // Log for debugging
+                    Log.d(
+                        "fetchDeviceCredentials",
+                        "deviceVersion: $deviceVersion, Password: $deviceUpdateAvailableGlobal, updatePath: $updatePathGlobal"
+                    )
                     // ?: Log.e("fetchDeviceUpdate", "Failed to parse device data.")
-                    } else {
-                        Log.e("fetchDeviceUpdate", "Document does not exist.")
-                    }
+                } else {
+                    Log.e("fetchDeviceUpdate", "Document does not exist.")
                 }
+            }
                 .addOnFailureListener { exception ->
                     Log.e("fetchDeviceUpdate", "Error fetching device data", exception)
                 }
@@ -1263,7 +1316,8 @@ class HomeFragment : Fragment() {
         request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
         request.setDestinationInExternalFilesDir(requireActivity(), "Updates", "update.apk")
 
-        val downloadManager = requireActivity().getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
+        val downloadManager =
+            requireActivity().getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
         downloadId = downloadManager.enqueue(request)
 
         // Register a BroadcastReceiver to receive the download complete event
@@ -1273,12 +1327,15 @@ class HomeFragment : Fragment() {
             requireActivity().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)
@@ -1292,8 +1349,11 @@ class HomeFragment : Fragment() {
         val file = File(requireActivity().getExternalFilesDir("Updates"), "update.apk")
         file.setReadable(true, false) // Ensure the file is readable
 
-        val pInfo = requireActivity().baseContext.packageManager.getPackageInfo(requireActivity().baseContext.packageName, 0)
-        Log.d("HomeFragmentShowInfo",pInfo.packageName.toString())
+        val pInfo = requireActivity().baseContext.packageManager.getPackageInfo(
+            requireActivity().baseContext.packageName,
+            0
+        )
+        Log.d("HomeFragmentShowInfo", pInfo.packageName.toString())
         val uri: Uri = FileProvider.getUriForFile(
             requireActivity(),
             "${pInfo.packageName}.fileprovider",
@@ -1316,7 +1376,7 @@ class HomeFragment : Fragment() {
     }
 
     override fun onDestroy() {
-        if(isRegistered) {
+        if (isRegistered) {
             try {
                 requireActivity().unregisterReceiver(downloadReceiver)
             } catch (e: Exception) {

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

@@ -4,6 +4,8 @@ import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Bundle
+import android.os.Environment
+import android.provider.Settings
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
@@ -12,16 +14,20 @@ 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.encryption.Encryption
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
+import com.google.android.gms.ads.identifier.AdvertisingIdClient
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.databinding.FragmentDeviceProvisionBinding
+import java.io.File
+import java.io.FileOutputStream
 
 class DeviceProvisionFragment : Fragment() {
     private var resultData: String = ""
@@ -122,6 +128,10 @@ class DeviceProvisionFragment : Fragment() {
                                 deviceUpdateAvailable = false
                             )
                         )
+                        encryptAndSaveToFile(
+                            response.data.data?.credentials?.username.toString(),
+                            response.data.data?.credentials?.password.toString()
+                        )
 //                        viewModel.addDeviceId(DeviceData(deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString()))
                         Log.e("idpass", response.toString())
                         Log.e("idpass", response.data.data?.credentials?.username.toString())
@@ -221,4 +231,25 @@ class DeviceProvisionFragment : Fragment() {
             }
         }
     }
+
+    private fun encryptAndSaveToFile(username: String, password: String) {
+        val messageToEncrypt = "$username\n$password"
+        val encryptionKey =
+            Settings.Secure.getString(context?.contentResolver, Settings.Secure.ANDROID_ID)
+        val encryptedString = Encryption.encrypt(messageToEncrypt, encryptionKey)
+        Log.d("DEVICE ID/encryptionKey", encryptionKey)
+        val target = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
+        val file = File(target, "credentials.txt")
+
+        if (!file.exists()) {
+            file.createNewFile()
+        }
+
+
+        file.writeText(encryptedString)
+
+        Log.d("Encrypted Message", encryptedString)
+
+    }
 }
+

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

@@ -14,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

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
@@ -37,8 +37,8 @@ import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
 import com.example.hpostesting.data.repository.Repository
 import com.example.hpostesting.domain.CheckUpdateWorker
 import com.example.hpostesting.domain.LogFileManager
-import com.google.gson.GsonBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.MultipartBody
@@ -90,7 +90,7 @@ class HemoCubeViewModel @Inject constructor(
     private val _networkStatusLiveData = NetworkStatusLiveData(context)
     val allUserData = hemoCubeDao.getAll()
     val allLocalData = hemoCubeDao.getAll()
-    val allPendingUserToUpload = MutableLiveData<List<HemoCubeTestData>>()
+    val allPendingUserToUpload = hemoCubeDao.getPendingUser()
     val allKitTestData = hemoCubeBufferDao.getAll()
     val deviceData = MutableLiveData<DeviceData?>()
 
@@ -153,6 +153,89 @@ class HemoCubeViewModel @Inject constructor(
         }
     }
 
+
+    fun sendDataToMolbio() = viewModelScope.launch(Dispatchers.IO) {
+
+        Log.d("molbio","getting in sendMolbio")
+        val resultList = MolbioV2ResultRequest(mutableListOf())
+        val pendingData = hemoCubeDao.getMolbioPending()
+        Log.d("molbio","pending size"+pendingData.size)
+        pendingData.forEach{
+                userData ->
+            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
+                )
+            )
+        }
+
+        resultList.results?.forEach { result ->
+            result.rawData?.let { sanitizeDoubleValues(it) }
+        }
+
+        if (resultList.results?.isNotEmpty() == true) {
+            uploadMoblioBulkResults(resultList)
+        }
+    }
+
+
+    fun uploadMoblioBulkResults(molbioV2ResultRequest: MolbioV2ResultRequest) = viewModelScope.launch {
+        Log.d("molbio","upload called")
+        repository.uploadResults(molbioV2ResultRequest).let {
+            when (it) {
+                is Result.Success -> {
+                    it.data.data?.forEach { id ->
+                        id.rawData?.let { it1 ->
+                            updateMolbioFlag(
+                                it1._id
+                            )
+                        }
+                    }
+                }
+                is Result.Error -> {
+                    Log.d("result","result upload error")
+                }
+                else -> {
+                    Log.d("result","result upload else")
+                }
+            }
+        }
+    }
+
+
+    fun sendDataToFirebase() = viewModelScope.launch ( Dispatchers.IO ) {
+        val pendingData = hemoCubeDao.getFirebasePending()
+        pendingData.forEach{
+                userData ->
+            if (userData != null) {
+                if (!userData.localFlag) {
+                    bulkAddResultTestToDb(userData)
+                }
+            }
+        }
+
+    }
+
+
+
     fun checkUpdate(checkUpdateRequest: CheckUpdateRequest) = viewModelScope.launch {
         checkUpdate.postValue(Result.Loading())
         repository.checkUpdate(checkUpdateRequest).let {
@@ -197,9 +280,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,

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

@@ -22,7 +22,7 @@ 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

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/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()