Edit README.md

README.md

@@ -1,3 +1,5 @@
+# This version has the new network checker implemented 
+## current version : 2.1.131-network
 
 ### Release key
 

app/build.gradle

@@ -18,7 +18,7 @@ android {
     // server -> for server switching for internal test
     defaultConfig {
         applicationId "in.sminnovations.hpostesting.server"
-        minSdk 21
+        minSdk 30
         targetSdk 34
         versionCode 133
         versionName "2.1.131"
@@ -30,6 +30,7 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.debug
         }
     }
     compileOptions {

app/release/output-metadata.json

@@ -4,15 +4,15 @@
     "type": "APK",
     "kind": "Directory"
   },
-  "applicationId": "in.sminnovations.hpostesting.server",
+  "applicationId": "in.sminnovations.hpostesting.dev",
   "variantName": "release",
   "elements": [
     {
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 133,
+      "versionCode": 127,
-      "versionName": "2.1.131",
+      "versionName": "2.1.127",
       "outputFile": "app-release.apk"
     }
   ],

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

@@ -38,6 +38,7 @@ import com.example.hpostesting.domain.SaveRawDataTest
 import com.example.hpostesting.firebase.FirebaseManager
 import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.utils.UsbServiceListenerImpl
+import com.example.hpostesting.util.NetworkMonitor
 import com.example.hpostesting.util.PropertyProvider
 import com.example.hpostesting.util.PropertyProviderImpl
 import com.google.firebase.firestore.FirebaseFirestore
@@ -240,8 +241,11 @@ object AppModule {
         return UsbServiceListenerImpl(context)
     }
 
-
+    @Provides
-
+    @Singleton
+    fun provideNetworkMonitor(@ApplicationContext context: Context): NetworkMonitor {
+        return NetworkMonitor(context)
+    }
 
 
 }

app/src/main/java/com/example/hpostesting/firebase/FirebaseManage.kt

@@ -145,7 +145,7 @@ private val firebaseConfig2 = FirebaseConfig(
 )
 
 private val firebaseConfig3 = FirebaseConfig(
-    serverName = " pre prod",
+    serverName = "prod",
     apiKey = "AIzaSyDYySi27LioZGNisP1NfnNU5inJX_0FT38",
     appId = "1:121176529204:android:a7bc0842f61e5095bbed61",
     projectId = "hpos-preprod",

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

@@ -19,7 +19,6 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 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
@@ -36,6 +35,7 @@ import com.example.hpostesting.domain.SaveRawDataTest
 import com.example.hpostesting.domain.SickleFindResultCaluculationWithMaxImpl
 import com.example.hpostesting.domain.TestRightResultCalculation
 import com.example.hpostesting.util.MyUtils
+import com.example.hpostesting.util.NetworkMonitor
 import com.google.firebase.storage.FirebaseStorage
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
@@ -55,10 +55,10 @@ class TestRightViewModel @Inject constructor(
     private val saveRawDataTest: SaveRawDataTest,
     private val repository: DatabaseRepository,
     private val userDao: UserDao,
+    networkMonitor: NetworkMonitor,
     context: Context?
 ) : ViewModel() {
 
-
     var isServiceConnected = false
     val progressBar = MutableLiveData(false)
 
@@ -69,9 +69,8 @@ class TestRightViewModel @Inject constructor(
 
     var testDetails = DataHolder.selectedTest
 
-    private val _networkStatusLiveData = context?.let { NetworkStatusLiveData(it) }
+    private var _networkStatusLiveData = networkMonitor.isConnected
-    val networkStatusLiveData: NetworkStatusLiveData?
+    val networkStatusLiveData = _networkStatusLiveData
-        get() = _networkStatusLiveData
 
     val allUserData = userDao.getAll()
 
@@ -82,6 +81,11 @@ class TestRightViewModel @Inject constructor(
 
     val calculationVariableList = ArrayList<CalculationVariableForTest>()
 
+    init {
+        networkMonitor.startMonitoring()
+        _networkStatusLiveData = networkMonitor.isConnected
+    }
+
     fun mapDeviceConstants(string: String) {
         if (string.isNotEmpty()) {
             val listOfStrings = string.split(",")

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

@@ -25,11 +25,8 @@ import androidx.lifecycle.viewModelScope
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
-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.constant.DataHolder
 import com.example.hpostesting.data.dao.HemoCubeBufferDao
 import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.datasource.LocalFileDataSource
@@ -46,10 +43,12 @@ import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
 import com.example.hpostesting.data.model.updates.CheckUpdateRequest
 import com.example.hpostesting.data.model.updates.CheckUpdateResponse
-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.example.hpostesting.util.CsvWriter
+import com.example.hpostesting.util.NetworkMonitor
+import com.example.hpostesting.util.Result
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
@@ -70,20 +69,22 @@ class TrueHemeViewModel @Inject constructor(
     private val repository: Repository,
     private val logFileManager: LogFileManager,
     private val localFileDataSource: LocalFileDataSource,
+    networkMonitor: NetworkMonitor,
     context: Context,
 ) : ViewModel() {
     var isServiceConnected = false
     val progressBar = MutableLiveData(false)
     private val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
     val messages = MutableLiveData<String>()
-    private val sharedPreference =
+    private val sharedPreference = context.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
-        context.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
 
     private val workManager = WorkManager.getInstance(context)
-
+    //    init {
-//    init {
+    //        startPeriodicCheckUpdate()
-//        startPeriodicCheckUpdate()
+    //    }
-//    }
+    init {
+        networkMonitor.startMonitoring()
+    }
 
     val loginResponse = MutableLiveData<Result<LoginResponse>>()
 
@@ -97,7 +98,7 @@ class TrueHemeViewModel @Inject constructor(
 
     // Get the device ID of the device you want to retrieve data for (e.g., the first device in the list)
 
-    private val _networkStatusLiveData = NetworkStatusLiveData(context)
+    private val _networkStatusLiveData = networkMonitor.isConnected
     val allUserData = hemoCubeDao.getAll()
     val allKitTestData = hemoCubeBufferDao.getAll()
     val deviceData = MutableLiveData<DeviceData?>()
@@ -181,7 +182,7 @@ class TrueHemeViewModel @Inject constructor(
         val logFile = logFileManager.createLogFile().let { file ->
             val requestBody = file?.asRequestBody("multipart/form-data".toMediaTypeOrNull())
             val multipartFile =
-                requestBody?.let { MultipartBody.Part.createFormData("logFile", file?.name, it) }
+                requestBody?.let { MultipartBody.Part.createFormData("logFile", file.name, it) }
             multipartFile?.let { partFile ->
                 repository.uploadLogs(partFile).let { result ->
                     uploadLogs.postValue(result)
@@ -193,37 +194,35 @@ class TrueHemeViewModel @Inject constructor(
     fun uploadHemoCubeResultToDatabaseForBufferCheck(
         isOnline: Boolean,
         bufferCheckData: BufferCheckData,
-    ) =
+    ) = viewModelScope.launch {
-        viewModelScope.launch {
+        if (isOnline) {
-            if (isOnline) {
+            try {
-                try {
+                when (val response = repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
-                    when (val response =
+                    is Response.Success -> {
-                        repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
+                        Log.i("Testdb", "Data uploaded to Firestore successfully")
-                        is Response.Success -> {
+                        fireBaseUpload.postValue("Success")
-                            Log.i("Testdb", "Data uploaded to Firestore successfully")
+                        bufferCheckData.localFlag = true
-                            fireBaseUpload.postValue("Success")
+                        hemoCubeBufferDao.insertAll(bufferCheckData)
-                            bufferCheckData.localFlag = true
-                            hemoCubeBufferDao.insertAll(bufferCheckData)
-                        }
-
-                        is Response.Error -> {
-                            Log.e("Testdb", "Error uploading data to Firestore: $response")
-                            fireBaseUpload.postValue("Error")
-                            bufferCheckData.localFlag = true
-                            hemoCubeBufferDao.insertAll(bufferCheckData)
-                        }
-
-                        else -> {}
                     }
-                } catch (e: Exception) {
+
-                    Log.e("Testdb", "Exception during data upload: ${e.message}")
+                    is Response.Error -> {
-                    fireBaseUpload.postValue("Error")
+                        Log.e("Testdb", "Error uploading data to Firestore: $response")
+                        fireBaseUpload.postValue("Error")
+                        bufferCheckData.localFlag = true
+                        hemoCubeBufferDao.insertAll(bufferCheckData)
+                    }
+
+                    else -> {}
                 }
-            } else {
+            } catch (e: Exception) {
-                hemoCubeBufferDao.insertAll(bufferCheckData)
+                Log.e("Testdb", "Exception during data upload: ${e.message}")
-                fireBaseUpload.postValue("Local")
+                fireBaseUpload.postValue("Error")
             }
+        } else {
+            hemoCubeBufferDao.insertAll(bufferCheckData)
+            fireBaseUpload.postValue("Local")
         }
+    }
 
     fun bulkAddResultKitTestToDb(bufferCheckData: BufferCheckData) {
         viewModelScope.launch {
@@ -396,8 +395,7 @@ class TrueHemeViewModel @Inject constructor(
         viewModelScope.launch {
             try {
 
-                when (val response =
+                when (val response = repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
-                    repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
                     is Response.Success -> {
                         Log.i("Testdb", "Data uploaded to Firestore successfully")
                         fireBaseUpload.postValue("Success")
@@ -415,10 +413,9 @@ class TrueHemeViewModel @Inject constructor(
         }
     }
 
-    private fun updateBufferLocalFlag(bufferId: String) =
+    private fun updateBufferLocalFlag(bufferId: String) = viewModelScope.launch {
-        viewModelScope.launch {
+        hemoCubeBufferDao.updateFieldById(id = bufferId, true)
-            hemoCubeBufferDao.updateFieldById(id = bufferId, true)
+    }
-        }
 
     fun getLocalUserDataForCsv(context: Context): Boolean {
         val localUserDataLiveData: LiveData<List<HemoCubeTestData>> = hemoCubeDao.getAll()
@@ -455,16 +452,12 @@ class TrueHemeViewModel @Inject constructor(
 
     fun getBatteryLevel(): Float? {
         val batteryPct: Float? = batteryStatus?.let { intent ->
-            val level: Int =
+            val level: Int = intent.getIntExtra(
-                intent.getIntExtra(
+                BatteryManager.EXTRA_LEVEL, -1
-                    BatteryManager.EXTRA_LEVEL,
+            )
-                    -1
+            val scale: Int = intent.getIntExtra(
-                )
+                BatteryManager.EXTRA_SCALE, -1
-            val scale: Int =
+            )
-                intent.getIntExtra(
-                    BatteryManager.EXTRA_SCALE,
-                    -1
-                )
             level * 100 / scale.toFloat()
         }
 
@@ -474,8 +467,7 @@ class TrueHemeViewModel @Inject constructor(
     fun getBatteryTemperature(): Float? {
         val batteryTemp: Float? = batteryStatus?.let { intent ->
             val temperature = intent.getIntExtra(
-                BatteryManager.EXTRA_TEMPERATURE,
+                BatteryManager.EXTRA_TEMPERATURE, 0
-                0
             )
             temperature.toFloat() / 10
         }
@@ -484,14 +476,11 @@ class TrueHemeViewModel @Inject constructor(
     }
 
     fun getBatteryVoltage(context: Context): Float {
-        val batteryIntent =
+        val batteryIntent = context.registerReceiver(
-            context.registerReceiver(
+            null, IntentFilter(Intent.ACTION_BATTERY_CHANGED)
-                null,
+        )
-                IntentFilter(Intent.ACTION_BATTERY_CHANGED)
-            )
         val voltage = batteryIntent?.getIntExtra(
-            BatteryManager.EXTRA_VOLTAGE,
+            BatteryManager.EXTRA_VOLTAGE, 0
-            0
         ) ?: 0
 
         // milli-volts to volts
@@ -500,8 +489,7 @@ class TrueHemeViewModel @Inject constructor(
 
 
     fun getBatteryCapacity(context: Context): Int {
-        val batteryManager =
+        val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
-            context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
         val currentCapacity =
             batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
 
@@ -510,8 +498,7 @@ class TrueHemeViewModel @Inject constructor(
 
     fun getBatteryMaxCapacity(context: Context): Float {
         val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
-        val designCapacity =
+        val designCapacity = batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
-            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
         val currentCapacity =
             batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
 
@@ -528,8 +515,7 @@ class TrueHemeViewModel @Inject constructor(
                 hemoCubeTestData.forEach { data ->
                     data.localFlag = true
                     hemoCubeDao.updateCSVFieldById(
-                        data._id,
+                        data._id, true
-                        true
                     )
                 }
             }

app/src/main/java/com/example/hpostesting/presentation/trueheme_test/TrueHemeTestFragment.kt

@@ -1390,7 +1390,6 @@ class TrueHemeTestFragment : Fragment() {
                     apply()
                 }
             }
-            trueHemeTestViewModel.updateLocalData()
         } catch (e: Exception) {
             Toast.makeText(
                 requireContext(),

app/src/main/java/com/example/hpostesting/presentation/trueheme_test/TrueHemeTestViewModel.kt

@@ -27,7 +27,6 @@ import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 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
@@ -50,6 +49,7 @@ import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
 import com.example.hpostesting.data.repository.Repository
 import com.example.hpostesting.domain.CheckUpdateWorker
 import com.example.hpostesting.domain.LogFileManager
+import com.example.hpostesting.util.NetworkMonitor
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -72,6 +72,7 @@ class TrueHemeTestViewModel @Inject constructor(
     private val repository: Repository,
     private val logFileManager: LogFileManager,
     private val localFileDataSource: LocalFileDataSource,
+    networkMonitor: NetworkMonitor,
     context: Context,
 ) : ViewModel() {
     private var testUpload: Boolean = false
@@ -87,6 +88,9 @@ class TrueHemeTestViewModel @Inject constructor(
 //    init {
 //        startPeriodicCheckUpdate()
 //    }
+    init {
+        networkMonitor.startMonitoring()
+    }
 
     val loginResponse = MutableLiveData<Result<LoginResponse>>()
 
@@ -103,7 +107,7 @@ class TrueHemeTestViewModel @Inject constructor(
 
     // Get the device ID of the device you want to retrieve data for (e.g., the first device in the list)
 
-    private val _networkStatusLiveData = NetworkStatusLiveData(context)
+    private val _networkStatusLiveData =networkMonitor.isConnected
     val allUserData = hemoCubeDao.getAll()
     val allLocalData = hemoCubeDao.getAll()
     val allPendingUserToUpload = hemoCubeDao.getPendingUser()
@@ -791,10 +795,4 @@ class TrueHemeTestViewModel @Inject constructor(
             "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
         ).format(Calendar.getInstance().time)
     }
-    fun updateLocalData() {
-        viewModelScope.launch {
-            parseData()
-            hemoCubeDao.updateTest(testDetails!!)
-        }
-    }
 }

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

@@ -0,0 +1,99 @@
+package com.example.hpostesting.util
+
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
+import android.net.NetworkRequest
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
+import java.net.HttpURLConnection
+import java.net.URL
+import javax.inject.Inject
+import javax.inject.Singleton
+
+
+@Singleton
+class NetworkMonitor @Inject constructor(
+    @ApplicationContext private val context: Context
+) {
+
+    private val connectivityManager =
+        context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+
+    private val _isConnected = MutableLiveData(false)
+    val isConnected: LiveData<Boolean> get() = _isConnected
+
+    private val networkScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+
+    private val networkCallback = object : ConnectivityManager.NetworkCallback() {
+        override fun onAvailable(network: Network) {
+            performPingCheck()
+        }
+
+        override fun onLost(network: Network) {
+            _isConnected.postValue(false)
+        }
+
+        override fun onCapabilitiesChanged(
+            network: Network, networkCapabilities: NetworkCapabilities
+        ) {
+            // Recheck connectivity when capabilities change (e.g., network becomes validated)
+            performPingCheck()
+        }
+    }
+
+    fun startMonitoring() {
+        // Check initial connectivity status
+        val network = connectivityManager.activeNetwork
+        val capabilities = connectivityManager.getNetworkCapabilities(network)
+        val isInitiallyConnected = capabilities?.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) == true
+
+        if (isInitiallyConnected) {
+            performPingCheck()
+        } else {
+            _isConnected.postValue(false)
+        }
+
+        val networkRequest =
+            NetworkRequest.Builder().addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+                .build()
+
+        connectivityManager.registerNetworkCallback(networkRequest, networkCallback)
+    }
+
+    fun stopMonitoring() {   // never needed to call
+        try {
+            connectivityManager.unregisterNetworkCallback(networkCallback)
+        } catch (_: IllegalArgumentException) {
+            // Ignore if callback was not registered
+        }
+        networkScope.cancel()
+    }
+
+    private fun performPingCheck() {
+        networkScope.launch {
+            try {
+                val url = URL("https://www.google.com")
+                val connection = url.openConnection() as HttpURLConnection
+                connection.connectTimeout = 2000
+                connection.readTimeout = 2000
+                connection.setRequestProperty("Connection", "close")
+                connection.connect()
+
+                // Consider any 2xx response as successful
+                val isReachable = connection.responseCode in 200..299
+                _isConnected.postValue(isReachable)
+                connection.disconnect()
+            } catch (e: Exception) {
+                _isConnected.postValue(false)
+            }
+        }
+    }
+}

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

@@ -1,75 +0,0 @@
-/*
- * // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
- * // Notice: All information contained herein is, and remains
- * // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
- * // if any. The intellectual and technical concepts contained
- * // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
- * // and its suppliers and may be covered by Indian and Foreign Patents,
- * // patents in process, and are protected by trade secret or copyright law.
- * // Dissemination of this information or reproduction of this material
- * // is strictly forbidden unless prior written permission is obtained
- * // from ShanMukha Innovations Pvt. Ltd.
- */
-
-package com.example.hpostesting.util
-
-
-import android.content.Context
-import android.net.ConnectivityManager
-import android.net.Network
-import android.net.NetworkCapabilities
-import android.net.NetworkRequest
-import android.os.Build
-import androidx.annotation.RequiresApi
-import androidx.lifecycle.LiveData
-
-class NetworkStatusLiveData(context: Context) : LiveData<Boolean>() {
-
-    private val connectivityManager: ConnectivityManager =
-        context.applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-
-    private val networkCallback = object : ConnectivityManager.NetworkCallback() {
-        override fun onAvailable(network: Network) {
-            postValue(true)
-        }
-
-        override fun onLost(network: Network) {
-            postValue(false)
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    override fun onActive() {
-        super.onActive()
-        postValue(isNetworkAvailable())
-        registerNetworkCallback()
-    }
-
-    override fun onInactive() {
-        super.onInactive()
-        unregisterNetworkCallback()
-    }
-
-    private fun registerNetworkCallback() {
-        val networkRequest = NetworkRequest.Builder()
-            .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
-            .addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
-            .addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET)
-            .build()
-
-        connectivityManager.registerNetworkCallback(networkRequest, networkCallback)
-    }
-
-    private fun unregisterNetworkCallback() {
-        connectivityManager.unregisterNetworkCallback(networkCallback)
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    private fun isNetworkAvailable(): Boolean {
-        val network = connectivityManager.activeNetwork
-        val networkCapabilities = connectivityManager.getNetworkCapabilities(network)
-        return networkCapabilities != null &&
-                networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
-                networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
-    }
-}

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

@@ -16,12 +16,12 @@ package com.example.hpostesting
 import android.content.Context
 import android.content.SharedPreferences
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-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.repository.Repository
 import com.example.hpostesting.presentation.autodac.AutoDacViewModel
+import com.example.hpostesting.util.NetworkMonitor
 import io.mockk.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -43,7 +43,7 @@ class AutoDacViewModelTest {
     private val repository = mockk<Repository>()
     private val context = mockk<Context>()
     private val sharedPreferences = mockk<SharedPreferences>()
-    private val networkStatusLiveData = mockk<NetworkStatusLiveData>()
+    private val networkStatusLiveData = mockk<NetworkMonitor>()
 
     @Before
     fun setup() {
@@ -54,7 +54,7 @@ class AutoDacViewModelTest {
         every { context.getSystemService(any()) } returns networkStatusLiveData
 
         // Mocking the NetworkStatusLiveData
-        every { networkStatusLiveData.observe(any(), any()) } just Runs
+        every { networkStatusLiveData.startMonitoring() } just Runs
 
         every { hemoCubeDao.getAll() } returns mockk()
 //        every { repository.addDiagnostics(any()) } returns Response.Success(Unit)