Edit FirebaseManage.kt

app version 131
2025-02-17 07:32:32 +00:00 · 2025-02-17 11:26:44 +05:30 · 2025-01-23 10:07:07 +05:30
23 changed files with 321 additions and 479 deletions
--- a/README.md
+++ b/README.md
@@ -1,5 +1,3 @@
-# Latest hpos app version 
-## current version : 2.1.132

 ### Release key

--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,10 +18,10 @@ android {
    // server -> for server switching for internal test
    defaultConfig {
        applicationId "in.sminnovations.hpostesting.server"
-        minSdk 30
+        minSdk 21
        targetSdk 34
-        versionCode 136
-        versionName "2.1.133"
+        versionCode 133
+        versionName "2.1.131"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }

@@ -30,7 +30,6 @@ android {
        release {
            minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.debug
        }
    }
    compileOptions {
--- a/app/google-services.json
+++ b/app/google-services.json
@@ -1,33 +1,33 @@
 {
  "project_info": {
-    "project_number": "1012719870714",
-    "project_id": "hpos-prod",
-    "storage_bucket": "hpos-prod.appspot.com"
+    "project_number": "650071678820",
+    "project_id": "hpos-af3cc",
+    "storage_bucket": "hpos-af3cc.appspot.com"
  },
  "client": [
    {
      "client_info": {
-        "mobilesdk_app_id": "1:1012719870714:android:d8d7c962d96f4097de5f43",
+        "mobilesdk_app_id": "1:650071678820:android:f6fd45e2f6a63aef6c6471",
        "android_client_info": {
          "package_name": "in.sminnovations.hpostesting.server"
        }
      },
      "oauth_client": [
        {
-          "client_id": "1012719870714-uli6cdjea3lfnnueh6e4r15i10ei1vlj.apps.googleusercontent.com",
+          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
          "client_type": 3
        }
      ],
      "api_key": [
        {
-          "current_key": "AIzaSyA_O0oZGzy3Kiw9fiLQ3OFPME-xQJP88vs"
+          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
        }
      ],
      "services": {
        "appinvite_service": {
          "other_platform_oauth_client": [
            {
-              "client_id": "1012719870714-uli6cdjea3lfnnueh6e4r15i10ei1vlj.apps.googleusercontent.com",
+              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
              "client_type": 3
            }
          ]
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -4,15 +4,15 @@
    "type": "APK",
    "kind": "Directory"
  },
-  "applicationId": "in.sminnovations.hpostesting.dev",
+  "applicationId": "in.sminnovations.hpostesting.server",
  "variantName": "release",
  "elements": [
    {
      "type": "SINGLE",
      "filters": [],
      "attributes": [],
-      "versionCode": 127,
-      "versionName": "2.1.127",
+      "versionCode": 133,
+      "versionName": "2.1.131",
      "outputFile": "app-release.apk"
    }
  ],
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,12 +24,13 @@
    <uses-feature android:name="android.hardware.usb.host" />

    <uses-permission android:name="android.permission.USB_PERMISSION" />
+
    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-    <uses-permission
-        android:name="android.permission.ACCOUNT_MANAGER"
+    <uses-permission android:name="android.permission.ACCOUNT_MANAGER"
        tools:ignore="ProtectedPermissions" />

+
    <application
        android:name="com.example.hpostesting.HPOSTestingApplication"
        android:allowBackup="true"
@@ -42,13 +43,10 @@
        android:supportsRtl="true"
        android:theme="@style/Theme.HPOSTesting"
        tools:targetApi="31">
-        <activity
-            android:name="com.example.hpostesting.presentation.randd.RandDActivity"
-            android:exported="false" />
        <activity
            android:name="com.example.hpostesting.presentation.main_base.UpdateValuesActivity"
            android:exported="false"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"/>

        <service
            android:name="com.example.hpostesting.util.MyAuthenticatorService"
--- a/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt
@@ -28,8 +28,8 @@ object Constants {
    const val DOCUMENT_ID_FOR_UPDATE ="2o71vBKLqdgEKYtFG8Lb"
    const val ABHA_APP_PACKAGE = "in.ndhm.phr"

-    var MOLBIO_INTEGRATION = true
-    var FIREBASE_INTEGRATION = false
+    const val MOLBIO_INTEGRATION = false
+    const val FIREBASE_INTEGRATION = true
    const val deviceProvisionEmail = "HPOS_provisioner@bigtec.co.in"
    const val deviceProvisionPassword = "f2ab0e7f9d69"
    const val DEVICE_ID_API = "deviceIDAPI"
--- a/app/src/main/java/com/example/hpostesting/di/AppModule.kt
+++ b/app/src/main/java/com/example/hpostesting/di/AppModule.kt
@@ -38,7 +38,6 @@ 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
@@ -241,12 +240,8 @@ object AppModule {
        return UsbServiceListenerImpl(context)
    }

-    @Provides
-    @Singleton
-    fun provideNetworkMonitor(
-        @ApplicationContext context: Context
-    ): NetworkMonitor {
-        return NetworkMonitor(context).apply { startMonitoring() }
-    }
+
+
+

 }
--- a/app/src/main/java/com/example/hpostesting/firebase/FirebaseManage.kt
+++ b/app/src/main/java/com/example/hpostesting/firebase/FirebaseManage.kt
@@ -14,8 +14,6 @@ package com.example.hpostesting.firebase
 import android.content.Context
 import android.content.Intent
 import android.os.Process
-import androidx.core.content.edit
-import com.example.hpostesting.data.constant.Constants
 import com.google.firebase.FirebaseApp
 import com.google.firebase.FirebaseOptions
 import com.google.firebase.firestore.FirebaseFirestore
@@ -29,8 +27,8 @@ import javax.inject.Inject

 class FirebaseManager @Inject constructor(private val context: Context) {

-    private val sharedPreferencesServerConfig = context.getSharedPreferences("FirebaseConfigPrefs", Context.MODE_PRIVATE)
-    private val sharedPreferencesDev = context.getSharedPreferences("DevMode",Context.MODE_PRIVATE)
+    private val sharedPreferences =
+        context.getSharedPreferences("FirebaseConfigPrefs", Context.MODE_PRIVATE)

    private var currentFirestore: FirebaseFirestore = FirebaseFirestore.getInstance()
    private var currentStorage: FirebaseStorage = FirebaseStorage.getInstance()
@@ -38,8 +36,7 @@ class FirebaseManager @Inject constructor(private val context: Context) {

    private val defaultServers = listOf(
        // i have it in different place look down
-        firebaseConfigProd,  firebaseConfigDev  , firebaseConfigQaQc,  firebaseConfigPreProd, firebaseConfigPreIIScRandD,
-        configMolbio //not a firebase config
+        firebaseConfig1, firebaseConfig2, firebaseConfig3,
    )

    init {
@@ -47,33 +44,15 @@ class FirebaseManager @Inject constructor(private val context: Context) {
        switchServer(lastSelectedServer)
    }

-
-    fun setDevModeOn(state : Boolean){
-        sharedPreferencesDev.edit {
-            putBoolean( "isDevModeOn",state )
-        }
-    }
-
-    fun getDevMode(): Boolean {
-        return sharedPreferencesDev.getBoolean("isDevModeOn",false)
-    }
-
-
    fun getCurrentFirestore(): FirebaseFirestore = currentFirestore
    fun getCurrentStorage(): FirebaseStorage = currentStorage

    fun switchServer(firebaseConfig: FirebaseConfig) {
-        if (firebaseConfig.serverName =="molbio" ||firebaseConfig.apiKey == "molbio"){
-            saveSelectedServer(firebaseConfig)
-            makeMolbioAsBackEnd()
-        }else {
-            makeSMIBackEnd()
-            saveSelectedServer(firebaseConfig)
-            val firebaseApp = getOrInitializeFirebaseApp(firebaseConfig)
-            currentFirestore = FirebaseFirestore.getInstance(firebaseApp)
-            currentStorage = FirebaseStorage.getInstance(firebaseApp)
-            updateStatus = true
-        }
+        saveSelectedServer(firebaseConfig)
+        val firebaseApp = getOrInitializeFirebaseApp(firebaseConfig)
+        currentFirestore = FirebaseFirestore.getInstance(firebaseApp)
+        currentStorage = FirebaseStorage.getInstance(firebaseApp)
+        updateStatus = true

    }

@@ -81,6 +60,7 @@ class FirebaseManager @Inject constructor(private val context: Context) {
        val existingApp = FirebaseApp.getApps(context).find { it.name == firebaseConfig.serverName }

        return if (existingApp != null) {
+
            existingApp
        } else {

@@ -93,7 +73,7 @@ class FirebaseManager @Inject constructor(private val context: Context) {
    }

    private fun saveSelectedServer(firebaseConfig: FirebaseConfig) {
-        with(sharedPreferencesServerConfig.edit()) {
+        with(sharedPreferences.edit()) {
            putString("selectedServerName", firebaseConfig.serverName)
            putString("projectId", firebaseConfig.projectId)
            putString("appId", firebaseConfig.appId)
@@ -113,12 +93,12 @@ class FirebaseManager @Inject constructor(private val context: Context) {

    fun getLastSelectedServer(): FirebaseConfig {
        val selectedServerName =
-            sharedPreferencesServerConfig.getString("selectedServerName", defaultServers.first().serverName)
-        val projectId = sharedPreferencesServerConfig.getString("projectId", defaultServers.first().projectId)
-        val appId = sharedPreferencesServerConfig.getString("appId", defaultServers.first().appId)
-        val apiKey = sharedPreferencesServerConfig.getString("apiKey", defaultServers.first().apiKey)
+            sharedPreferences.getString("selectedServerName", defaultServers.first().serverName)
+        val projectId = sharedPreferences.getString("projectId", defaultServers.first().projectId)
+        val appId = sharedPreferences.getString("appId", defaultServers.first().appId)
+        val apiKey = sharedPreferences.getString("apiKey", defaultServers.first().apiKey)
        val storageBucket =
-            sharedPreferencesServerConfig.getString("storageBucket", defaultServers.first().storageBucket)
+            sharedPreferences.getString("storageBucket", defaultServers.first().storageBucket)

        return FirebaseConfig(
            serverName = selectedServerName ?: defaultServers.first().serverName,
@@ -132,16 +112,6 @@ class FirebaseManager @Inject constructor(private val context: Context) {
    fun getAvailableServers(): List<FirebaseConfig> {
        return defaultServers
    }
-
-    private fun makeMolbioAsBackEnd(){
-        Constants.FIREBASE_INTEGRATION = false
-        Constants.MOLBIO_INTEGRATION = true
-        restartApp()
-    }
-    private fun makeSMIBackEnd(){
-        Constants.FIREBASE_INTEGRATION = true
-        Constants.MOLBIO_INTEGRATION = false
-    }
 }

 fun restartApp(context: Context) {
@@ -158,9 +128,7 @@ fun delayedRestart(context: Context) {
    }
 }

-
-
-private val firebaseConfigDev = FirebaseConfig(
+private val firebaseConfig1 = FirebaseConfig(
    serverName = "dev",
    apiKey = "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I",
    appId = "1:650071678820:android:a53292637abb7c0d6c6471",
@@ -168,7 +136,7 @@ private val firebaseConfigDev = FirebaseConfig(
    storageBucket = "hpos-af3cc.appspot.com"
 )

-private val firebaseConfigQaQc = FirebaseConfig(
+private val firebaseConfig2 = FirebaseConfig(
    serverName = "qc-qa",
    apiKey = "AIzaSyC4d4GhWHr_NMJAeBvnztQ_yQ3Qe9MAnLs",
    appId = "1:1004619739289:android:3dbcefb10ea99654e5c808",
@@ -176,34 +144,10 @@ private val firebaseConfigQaQc = FirebaseConfig(
    storageBucket = "hpos-qa.appspot.com"
 )

-private val firebaseConfigProd = FirebaseConfig(
-    serverName = "prod",
-    apiKey = "AIzaSyA_O0oZGzy3Kiw9fiLQ3OFPME-xQJP88vs",
-    appId = "1:1012719870714:android:d8d7c962d96f4097de5f43",
-    projectId = "hpos-prod",
-    storageBucket = "hpos-prod.appspot.com"
-)
-
-private val firebaseConfigPreProd = FirebaseConfig(
-    serverName = "pre prod",
+private val firebaseConfig3 = FirebaseConfig(
+    serverName = " pre prod",
    apiKey = "AIzaSyDYySi27LioZGNisP1NfnNU5inJX_0FT38",
-    appId = "1:121176529204:android:e6841fdac57bdc95bbed61",
+    appId = "1:121176529204:android:a7bc0842f61e5095bbed61",
    projectId = "hpos-preprod",
    storageBucket = "hpos-preprod.appspot.com"
 )
-
-private val firebaseConfigPreIIScRandD= FirebaseConfig(
-    serverName = "IISc R&D",
-    apiKey = "AIzaSyBvts2m1dZpULimZh6wn8C9E7npLnA8-A4",
-    appId = "1:699481688495:android:efe59ce3a83324dc00075a",
-    projectId = "randd-8329b",
-    storageBucket = "randd-8329b.firebasestorage.app"
-)
-
-private val configMolbio = FirebaseConfig(
-    serverName = "molbio",
-    apiKey = "molbio",
-    appId = "molbio",
-    projectId = "molbio",
-    storageBucket = "molbio"
-)
--- a/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt
@@ -141,9 +141,6 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
        val time = timeDifference(sharedPreference.getString(Constants.KIT_TIME, "").toString())
        val kitNum = sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
       // Toast.makeText(this@KitScanActivity,"Test MAx time"+ time+"-Test count-"+kitNum,Toast.LENGTH_SHORT).show()
-//        if (sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN") {
-//            moveToNext()
-//        }else{
        if (sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN") {
            moveToNext()
        }else{
--- a/app/src/main/java/com/example/hpostesting/presentation/main_base/AppVersionTapManage.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/main_base/AppVersionTapManage.kt
@@ -1,21 +1,16 @@
 package com.example.hpostesting.presentation.main_base

-import com.example.hpostesting.data.constant.Constants.FIREBASE_INTEGRATION
-import com.example.hpostesting.data.constant.Constants.MOLBIO_INTEGRATION
-
 class AppVersionTapManager {

-     private var tapCount = 0
+    private var tapCount = 0
    private val maxTapCount = 5
-     val shouldEnable = FIREBASE_INTEGRATION && !MOLBIO_INTEGRATION
-     val notEnable = MOLBIO_INTEGRATION && !FIREBASE_INTEGRATION

    fun registerTap(onMaxTapsReached: () -> Unit) {
        tapCount++
-            if (tapCount >= maxTapCount && shouldEnable) {
-                onMaxTapsReached()
-                reset()
-            }
+        if (tapCount >= maxTapCount) {
+            onMaxTapsReached()
+            reset()
+        }
    }
    private fun reset() {
        tapCount = 0
--- a/app/src/main/java/com/example/hpostesting/presentation/main_base/PanelFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/main_base/PanelFragment.kt
@@ -89,7 +89,6 @@ class PanelFragment : Fragment() {
            binding.btnDeviceInfo.visibility = View.VISIBLE
            binding.btnResetPassword.visibility = View.VISIBLE
            binding.btnUpdateValues.visibility = View.VISIBLE
-            binding.btnRnd.visibility = View.GONE
        }else{
            binding.btnResetPassword.visibility = View.GONE
            binding.btnDeviceProvision.visibility = View.GONE
@@ -103,7 +102,6 @@ class PanelFragment : Fragment() {
            binding.btnSubmit.visibility = View.GONE
            binding.btnDeviceInfo.visibility = View.VISIBLE
            binding.btnUpdateValues.visibility = View.GONE
-            binding.btnRnd.visibility = View.GONE
        }

        binding.btnResetPassword.setOnClickListener{
@@ -144,7 +142,6 @@ class PanelFragment : Fragment() {
            startActivity(intent)
        }

-
        binding.btnFiles.setOnClickListener {
            val intent = Intent(Intent.ACTION_GET_CONTENT)
            intent.type = "file/*"
--- a/app/src/main/java/com/example/hpostesting/presentation/main_base/SettingsFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/main_base/SettingsFragment.kt
@@ -13,6 +13,7 @@

 package com.example.hpostesting.presentation.main_base

+import android.app.AlertDialog
 import android.content.Context
 import android.content.SharedPreferences
 import android.content.pm.PackageManager
@@ -28,18 +29,15 @@ import androidx.fragment.app.Fragment
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
-import androidx.preference.SwitchPreferenceCompat
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.data.repository.DatabaseRepository
 import com.example.hpostesting.firebase.FirebaseConfig
 import com.example.hpostesting.firebase.FirebaseManager
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentSlideshowBinding

-
 private var isLanguageChanged = false

 class SlideshowFragment : Fragment() {
@@ -60,6 +58,7 @@ class SlideshowFragment : Fragment() {
        super.onViewCreated(view, savedInstanceState)

        binding.nameEditText.setText(sharedPreferences.getString(Constants.LABNAME, ""))
+
        selectedItem = sharedPreferences.getString(Constants.CUVETTE_SIZE, "10mm").toString()
        binding.btnGo.setOnClickListener {
            var labname = binding.nameEditText.text.toString()
@@ -98,7 +97,6 @@ class SlideshowFragment : Fragment() {
                    // Do nothing here
                }
            }
-
        binding.spinnerCuvette.setSelection(pos)
        binding.btnAddSize.setOnClickListener {
            with(sharedPreferences.edit()) {
@@ -115,25 +113,24 @@ class SlideshowFragment : Fragment() {
    }
 }

-class PrefsFragment : PreferenceFragmentCompat() {
+class PrefsFragment : PreferenceFragmentCompat(){
    private lateinit var tapManager: AppVersionTapManager
+    private var isServerSelectionVisible = false
    private lateinit var serverPreference: Preference
    private lateinit var currentServerPreference: Preference
    lateinit var firebaseManager: FirebaseManager
-    private var topDevMode = false
    lateinit var databaseRepository: DatabaseRepository

    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        firebaseManager = FirebaseManager(requireContext())
+         firebaseManager = FirebaseManager(requireContext())
        databaseRepository = (activity as DashboardActivity).databaseRepository
+
        tapManager = AppVersionTapManager()
-        topDevMode = firebaseManager.getDevMode()
        val sharedPreference =
            requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
        val preferenceScreen = preferenceManager.createPreferenceScreen(requireContext())
        val currentServer = firebaseManager.getLastSelectedServer().serverName

-
        // Language Preference
        val languagePreference = ListPreference(requireContext()).apply {
            key = "language_preference"
@@ -143,100 +140,52 @@ class PrefsFragment : PreferenceFragmentCompat() {
            entryValues = arrayOf("en", "kn", "hi")
            setDefaultValue("en")
            icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_translate_24)
+
            onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
                val languageCode = newValue as String
                updateLanguage(requireContext(), languageCode)
                true
            }
        }
-
-
-        val servers = firebaseManager.getAvailableServers()
-        val serverNames = servers.map { it.serverName }.toTypedArray()
-
-        val serverSelectorPreference = CustomDialogPreference(requireContext()).apply {
-            key = "server_preference"
-            title = "Select the Server"
-            summary = "Current server: $currentServer"
-            setEntries(serverNames)
-            setEntryValues(serverNames)
-            setValue(currentServer)
-            icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_cloud_sync_24)
-            setOnPreferenceChangeListener { newValue ->
-                val preferenceConfig = servers.find { it.serverName == newValue }
-                switchFirebaseServer(preferenceConfig!!)
-                true
-            }
-        }
-
-        // Add preferences to screen
        preferenceScreen.addPreference(languagePreference)
-        preferenceScreen.addPreference(languagePreference)
-
-
-        val developerToggle = SwitchPreferenceCompat(requireContext()).apply {
-            title = "Developer Options"
-            summary = "Enable or disable developer options"
-            icon =
-                ContextCompat.getDrawable(requireContext(), R.drawable.baseline_developer_mode_24)
-            key = "developer_options" // Unique key for SharedPreferences
-
-            // Load toggle state from SharedPreferences
-            isChecked = firebaseManager.getDevMode()
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val isEnabled = newValue as Boolean
-                firebaseManager.setDevModeOn(isEnabled)
-
-                if (!isEnabled) {
-                    preferenceScreen.removePreference(this)
-                    preferenceScreen.removePreference(serverSelectorPreference)
-                }
-                if (!firebaseManager.getDevMode() && currentServer != "prod"){
-                 val prodConfig =  servers.find { it.serverName == "prod" }
-                    switchFirebaseServer(prodConfig!!)
-                }
-                true
-            }
-        }

        val appVersionPreference = Preference(requireContext()).apply {
            title = "App Version"
            summary =
-                getAppVersion(requireContext()) + " [ " + getAppEnvironment(requireContext()) + "->" + currentServer + "]"
+                getAppVersion(requireContext()) + " [ " + getAppEnvironment(requireContext())  +"->"+currentServer+"]"
            icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_info_24)

            setOnPreferenceClickListener {
-                tapManager.registerTap {
-                   firebaseManager.setDevModeOn(true)
-
-
-                    if (firebaseManager.getDevMode()  && currentServer != "dev") {
-                        Toast.makeText(requireContext(), "Now you are a Developer", Toast.LENGTH_SHORT).show()
-                        Toast.makeText(requireContext(), "Setting Up developer Environmnet", Toast.LENGTH_SHORT).show()
+                if ((sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN")) {
+                    tapManager.registerTap {
+                        if (!isServerSelectionVisible) {
+                            showServerSelection()
+                        }
                    }
+                } else {

-                    if (preferenceScreen.findPreference<SwitchPreferenceCompat>("developer_options") == null) {
-                        preferenceScreen.addPreference(developerToggle)
-                    }
-                    if (preferenceScreen.findPreference<ListPreference>("server_preference") == null) {
-                        preferenceScreen.addPreference(serverSelectorPreference)
-                    }
-
-                    developerToggle.isChecked = true
-                    updateServerPreference(currentServer)
                }
                true
            }
-        }

+        }
        preferenceScreen.addPreference(appVersionPreference)
-        if (firebaseManager.getDevMode()) {
-            developerToggle.isChecked = true // Ensure it's checked
-            preferenceScreen.addPreference(developerToggle)
-            preferenceScreen.addPreference(serverSelectorPreference)
-        }

+
+        currentServerPreference = Preference(requireContext()).apply {
+            key = "current_server_preference"
+            title = "Current Server"
+            summary = "No server selected"
+            isVisible = false
+            icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_cloud_done_24)
+
+            setOnPreferenceClickListener {
+//                (activity as? DashboardActivity)?.sendData("hello test data")
+//                Toast.makeText(context, "data sent", Toast.LENGTH_SHORT).show()  this was used to send the basic data as test data
+            true
+            }
+        }
+        preferenceScreen.addPreference(currentServerPreference)
        setPreferenceScreen(preferenceScreen)

        if (isLanguageChanged) {
@@ -245,23 +194,58 @@ class PrefsFragment : PreferenceFragmentCompat() {
    }


-    private fun updateServerPreference(newServer: String) {
-        (findPreference<CustomDialogPreference>("server_preference"))?.let { pref ->
-            pref.setValue(newServer)
-            pref.summary = "Current server: $newServer"
+    private fun showServerSelection() {
+        val currentServer = firebaseManager.getLastSelectedServer().serverName
+        serverPreference = Preference(requireContext()).apply {
+            title = "Select Server"
+            summary = "Choose your server"
+            icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_cloud_sync_24)
+            setOnPreferenceClickListener {
+                showServerSelectionDialog()
+                true
+            }
        }
+
+
+
+        preferenceScreen.addPreference(serverPreference)
+        currentServerPreference.isVisible = true
+        currentServerPreference.summary = "Current Server: $currentServer"
+
+        Toast.makeText(requireContext(), "Server selection now available", Toast.LENGTH_SHORT).show()
    }

+    private fun showServerSelectionDialog() {
+        val servers = firebaseManager.getAvailableServers()
+
+        val serverNames = servers.map { it.serverName }.toTypedArray()
+        val builder = AlertDialog.Builder(requireContext())
+        builder.setTitle("Select Server")
+            .setItems(serverNames) { _, which ->
+                val selectedServer = servers[which]
+
+                switchFirebaseServer(selectedServer)
+            }
+            .setNegativeButton("Cancel", null)
+            .show()
+    }
+
+
    private fun switchFirebaseServer(firebaseConfig: FirebaseConfig) {
        firebaseManager.switchServer(firebaseConfig)
-        Toast.makeText(
-            requireContext(),
-            "Switched to ${firebaseConfig.serverName}, Please wait for few seconds",
-            Toast.LENGTH_SHORT
-        ).show()
-        Toast.makeText(requireContext(), "Restart needed restarting the app", Toast.LENGTH_SHORT)
-            .show()
+        Toast.makeText(requireContext(), "Switched to ${firebaseConfig.serverName}, Please wait for few seconds", Toast.LENGTH_SHORT).show()
+        Toast.makeText(requireContext(), "Restart needed restarting the app", Toast.LENGTH_SHORT).show()
        firebaseManager.restartApp()
+        currentServerPreference.summary = "Current Server: ${firebaseConfig.serverName}"
+
+    }
+
+
+    private fun switchCurrentServer(serverCode: String) {
+        Toast.makeText(requireContext(), "Switched to server: $serverCode", Toast.LENGTH_SHORT)
+            .show()
+        currentServerPreference.summary = "Current Server: $serverCode"
+
    }

    private fun updateLanguage(context: Context, languageCode: String) {
@@ -291,47 +275,3 @@ class PrefsFragment : PreferenceFragmentCompat() {
 }


-
-// CustomDialogPreference.kt
-class CustomDialogPreference(context: Context) : Preference(context) {
-    private var entries: Array<String> = arrayOf()
-    private var entryValues: Array<String> = arrayOf()
-    private var currentValue: String = ""
-    private var onValueChangeListener: ((String) -> Boolean)? = null
-
-    fun setEntries(entries: Array<String>) {
-        this.entries = entries
-    }
-
-    fun setEntryValues(values: Array<String>) {
-        this.entryValues = values
-    }
-
-    fun setValue(value: String) {
-        currentValue = value
-        persistString(value)
-    }
-
-    fun setOnPreferenceChangeListener(listener: (String) -> Boolean) {
-        onValueChangeListener = listener
-    }
-
-    override fun onClick() {
-        val builder = MaterialAlertDialogBuilder(context)
-        builder.setTitle(title)
-
-        builder.setSingleChoiceItems(entries, entries.indexOf(currentValue)) { dialog, which ->
-            val newValue = entryValues[which]
-            if (onValueChangeListener?.invoke(newValue) == true) {
-                setValue(newValue)
-                dialog.dismiss()
-            }
-        }
-
-        builder.setNegativeButton("Cancel") { dialog, _ ->
-            dialog.dismiss()
-        }
-
-        builder.show()
-    }
-}
--- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt
@@ -19,6 +19,7 @@ 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
@@ -35,7 +36,6 @@ 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,8 +69,9 @@ class TestRightViewModel @Inject constructor(

    var testDetails = DataHolder.selectedTest

-    private var _networkStatusLiveData = networkMonitor.isConnected
-    val networkStatusLiveData = _networkStatusLiveData
+    private val _networkStatusLiveData = context?.let { NetworkStatusLiveData(it) }
+    val networkStatusLiveData: NetworkStatusLiveData?
+        get() = _networkStatusLiveData

    val allUserData = userDao.getAll()

@@ -81,11 +82,6 @@ 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(",")
--- a/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeFragment.kt
@@ -593,7 +593,7 @@ class TrueHemeFragment : Fragment() {
                binding.btnSubmit.visibility = View.VISIBLE
                binding.btnSubmit.isEnabled = true
                binding.btnSubmit.isClickable = true
-//              binding.clParent.setBackgroundColor(Color.parseColor("#edfffd"))
+//                        binding.clParent.setBackgroundColor(Color.parseColor("#edfffd"))
                binding.ivCheck.visibility = View.VISIBLE
            }
        } else {
@@ -736,7 +736,7 @@ class TrueHemeFragment : Fragment() {
        }
    }

-    private fun processResult(){
+    private fun processResult() {
        try {
            hemoCubeViewModel.messages.postValue(getString(R.string.processing_result))
            val deviceLog = resultData
--- a/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeViewModel.kt
@@ -25,8 +25,11 @@ import androidx.lifecycle.viewModelScope
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
-import com.example.hpostesting.data.constant.Constants
+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
 import com.example.hpostesting.data.datasource.LocalFileDataSource
@@ -43,12 +46,10 @@ 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
@@ -69,22 +70,20 @@ 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 = context.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
+    private val sharedPreference =
+        context.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)

    private val workManager = WorkManager.getInstance(context)
-    //    init {
-    //        startPeriodicCheckUpdate()
-    //    }
-    init {
-        networkMonitor.startMonitoring()
-    }
+
+//    init {
+//        startPeriodicCheckUpdate()
+//    }

    val loginResponse = MutableLiveData<Result<LoginResponse>>()

@@ -98,7 +97,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 = networkMonitor.isConnected
+    private val _networkStatusLiveData = NetworkStatusLiveData(context)
    val allUserData = hemoCubeDao.getAll()
    val allKitTestData = hemoCubeBufferDao.getAll()
    val deviceData = MutableLiveData<DeviceData?>()
@@ -182,7 +181,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)
@@ -194,35 +193,37 @@ class TrueHemeViewModel @Inject constructor(
    fun uploadHemoCubeResultToDatabaseForBufferCheck(
        isOnline: Boolean,
        bufferCheckData: BufferCheckData,
-    ) = viewModelScope.launch {
-        if (isOnline) {
-            try {
-                when (val response = repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
-                    is Response.Success -> {
-                        Log.i("Testdb", "Data uploaded to Firestore successfully")
-                        fireBaseUpload.postValue("Success")
-                        bufferCheckData.localFlag = true
-                        hemoCubeBufferDao.insertAll(bufferCheckData)
-                    }
+    ) =
+        viewModelScope.launch {
+            if (isOnline) {
+                try {
+                    when (val response =
+                        repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
+                        is Response.Success -> {
+                            Log.i("Testdb", "Data uploaded to Firestore successfully")
+                            fireBaseUpload.postValue("Success")
+                            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)
-                    }
+                        is Response.Error -> {
+                            Log.e("Testdb", "Error uploading data to Firestore: $response")
+                            fireBaseUpload.postValue("Error")
+                            bufferCheckData.localFlag = true
+                            hemoCubeBufferDao.insertAll(bufferCheckData)
+                        }

-                    else -> {}
+                        else -> {}
+                    }
+                } catch (e: Exception) {
+                    Log.e("Testdb", "Exception during data upload: ${e.message}")
+                    fireBaseUpload.postValue("Error")
                }
-            } catch (e: Exception) {
-                Log.e("Testdb", "Exception during data upload: ${e.message}")
-                fireBaseUpload.postValue("Error")
+            } else {
+                hemoCubeBufferDao.insertAll(bufferCheckData)
+                fireBaseUpload.postValue("Local")
            }
-        } else {
-            hemoCubeBufferDao.insertAll(bufferCheckData)
-            fireBaseUpload.postValue("Local")
        }
-    }

    fun bulkAddResultKitTestToDb(bufferCheckData: BufferCheckData) {
        viewModelScope.launch {
@@ -395,7 +396,8 @@ class TrueHemeViewModel @Inject constructor(
        viewModelScope.launch {
            try {

-                when (val response = repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
+                when (val response =
+                    repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
                    is Response.Success -> {
                        Log.i("Testdb", "Data uploaded to Firestore successfully")
                        fireBaseUpload.postValue("Success")
@@ -413,9 +415,10 @@ class TrueHemeViewModel @Inject constructor(
        }
    }

-    private fun updateBufferLocalFlag(bufferId: String) = viewModelScope.launch {
-        hemoCubeBufferDao.updateFieldById(id = bufferId, true)
-    }
+    private fun updateBufferLocalFlag(bufferId: String) =
+        viewModelScope.launch {
+            hemoCubeBufferDao.updateFieldById(id = bufferId, true)
+        }

    fun getLocalUserDataForCsv(context: Context): Boolean {
        val localUserDataLiveData: LiveData<List<HemoCubeTestData>> = hemoCubeDao.getAll()
@@ -452,12 +455,16 @@ class TrueHemeViewModel @Inject constructor(

    fun getBatteryLevel(): Float? {
        val batteryPct: Float? = batteryStatus?.let { intent ->
-            val level: Int = intent.getIntExtra(
-                BatteryManager.EXTRA_LEVEL, -1
-            )
-            val scale: Int = intent.getIntExtra(
-                BatteryManager.EXTRA_SCALE, -1
-            )
+            val level: Int =
+                intent.getIntExtra(
+                    BatteryManager.EXTRA_LEVEL,
+                    -1
+                )
+            val scale: Int =
+                intent.getIntExtra(
+                    BatteryManager.EXTRA_SCALE,
+                    -1
+                )
            level * 100 / scale.toFloat()
        }

@@ -467,7 +474,8 @@ class TrueHemeViewModel @Inject constructor(
    fun getBatteryTemperature(): Float? {
        val batteryTemp: Float? = batteryStatus?.let { intent ->
            val temperature = intent.getIntExtra(
-                BatteryManager.EXTRA_TEMPERATURE, 0
+                BatteryManager.EXTRA_TEMPERATURE,
+                0
            )
            temperature.toFloat() / 10
        }
@@ -476,11 +484,14 @@ class TrueHemeViewModel @Inject constructor(
    }

    fun getBatteryVoltage(context: Context): Float {
-        val batteryIntent = context.registerReceiver(
-            null, IntentFilter(Intent.ACTION_BATTERY_CHANGED)
-        )
+        val batteryIntent =
+            context.registerReceiver(
+                null,
+                IntentFilter(Intent.ACTION_BATTERY_CHANGED)
+            )
        val voltage = batteryIntent?.getIntExtra(
-            BatteryManager.EXTRA_VOLTAGE, 0
+            BatteryManager.EXTRA_VOLTAGE,
+            0
        ) ?: 0

        // milli-volts to volts
@@ -489,7 +500,8 @@ class TrueHemeViewModel @Inject constructor(


    fun getBatteryCapacity(context: Context): Int {
-        val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
+        val batteryManager =
+            context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
        val currentCapacity =
            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)

@@ -498,7 +510,8 @@ class TrueHemeViewModel @Inject constructor(

    fun getBatteryMaxCapacity(context: Context): Float {
        val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
-        val designCapacity = batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
+        val designCapacity =
+            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
        val currentCapacity =
            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)

@@ -515,7 +528,8 @@ class TrueHemeViewModel @Inject constructor(
                hemoCubeTestData.forEach { data ->
                    data.localFlag = true
                    hemoCubeDao.updateCSVFieldById(
-                        data._id, true
+                        data._id,
+                        true
                    )
                }
            }
--- a/app/src/main/java/com/example/hpostesting/presentation/trueheme_test/TrueHemeTestViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/trueheme_test/TrueHemeTestViewModel.kt
@@ -27,6 +27,7 @@ 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
@@ -49,7 +50,6 @@ 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,7 +72,6 @@ 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
@@ -88,9 +87,6 @@ class TrueHemeTestViewModel @Inject constructor(
 //    init {
 //        startPeriodicCheckUpdate()
 //    }
-    init {
-        networkMonitor.startMonitoring()
-    }

    val loginResponse = MutableLiveData<Result<LoginResponse>>()

@@ -107,7 +103,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 =networkMonitor.isConnected
+    private val _networkStatusLiveData = NetworkStatusLiveData(context)
    val allUserData = hemoCubeDao.getAll()
    val allLocalData = hemoCubeDao.getAll()
    val allPendingUserToUpload = hemoCubeDao.getPendingUser()
@@ -801,5 +797,4 @@ class TrueHemeTestViewModel @Inject constructor(
            hemoCubeDao.updateTest(testDetails!!)
        }
    }
-
 }
--- a/app/src/main/java/com/example/hpostesting/util/NetworkChecker.kt
+++ b/app/src/main/java/com/example/hpostesting/util/NetworkChecker.kt
@@ -1,117 +0,0 @@
-package com.example.hpostesting.util
-
-import android.annotation.SuppressLint
-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.delay
-import kotlinx.coroutines.isActive
-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 var isMonitoringStarted = false
-    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()
-        }
-    }
-
-    @SuppressLint("NewApi")
-    fun startMonitoring() {
-        if (isMonitoringStarted) return  // Already started, do nothing.
-        isMonitoringStarted = true
-        // 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)
-        // Start periodic checks:
-        startPeriodicPingCheck()
-    }
-
-    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)
-            }
-        }
-    }
-
-    private fun startPeriodicPingCheck(intervalMillis: Long = 1 * 60_000L) {
-        networkScope.launch {
-            while (isActive) {
-                performPingCheck()
-                delay(intervalMillis)
-            }
-        }
-    }
-
-}
--- a/app/src/main/java/com/example/hpostesting/util/NetworkStatusLiveData.kt
+++ b/app/src/main/java/com/example/hpostesting/util/NetworkStatusLiveData.kt
@@ -0,0 +1,75 @@
+/*
+ * // 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)
+    }
+}
--- a/app/src/main/res/drawable/baseline_developer_mode_24.xml
+++ b/app/src/main/res/drawable/baseline_developer_mode_24.xml
@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M7,5h10v2h2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99L7,1c-1.1,0 -2,0.9 -2,2v4h2L7,5zM15.41,16.59L20,12l-4.59,-4.59L14,8.83 17.17,12 14,15.17l1.41,1.42zM10,15.17L6.83,12 10,8.83 8.59,7.41 4,12l4.59,4.59L10,15.17zM17,19L7,19v-2L5,17v4c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2v-4h-2v2z"/>
-    
-</vector>
--- a/app/src/main/res/layout/fragment_gallery.xml
+++ b/app/src/main/res/layout/fragment_gallery.xml
@@ -55,21 +55,7 @@
        app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />


-        <Button
-            android:id="@+id/btn_rnd"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
-            android:layout_marginTop="24dp"
-            android:clickable="false"
-            android:text="R and D"
-            android:textColor="@color/white"
-            app:cornerRadius="16dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_submit" />
-
-        <Button
+    <Button
        android:id="@+id/btn_diagnostics"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
@@ -81,7 +67,7 @@
        app:cornerRadius="16dp"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btn_rnd" />
+        app:layout_constraintTop_toBottomOf="@id/btn_submit" />

    <com.google.android.material.button.MaterialButton
        android:id="@+id/btn_auto_dac"
@@ -167,7 +153,6 @@
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@id/btn_deviceProvision" />
-
        <com.google.android.material.button.MaterialButton
            android:id="@+id/btn_update_values"
            android:layout_width="match_parent"
@@ -175,13 +160,12 @@
            android:layout_marginHorizontal="16dp"
            android:layout_marginTop="24dp"
            android:clickable="false"
-            android:text="Update valueLs"
+            android:text="Update values"
            android:textColor="@color/white"
            app:cornerRadius="16dp"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@id/btn_reset_password" />
-
    <com.google.android.material.button.MaterialButton
        android:id="@+id/btn_firefox"
        android:layout_width="match_parent"
--- a/app/src/main/res/layout/server_selector_drop_down.xml
+++ b/app/src/main/res/layout/server_selector_drop_down.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!-- RadioGroup to select servers -->
+    <RadioGroup
+        android:id="@+id/radioGroupServers"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:orientation="vertical">
+
+        <!-- Radio Buttons for each server option -->
+        <RadioButton
+            android:id="@+id/radioButtonInternal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Internal" />
+
+        <RadioButton
+            android:id="@+id/radioButtonClinical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Clinical" />
+
+        <RadioButton
+            android:id="@+id/radioButtonCustomer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Customer" />
+
+    </RadioGroup>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -25,7 +25,6 @@
        <item>ka</item>
        <!-- Use language codes (e.g., en, kn) as values -->
    </string-array>
-
    <string-array name="district">
        <item>Mysuru</item>
        <item>Kodagu</item>
--- a/app/src/test/java/com/example/hpostesting/AutoDacViewModelTest.kt
+++ b/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<NetworkMonitor>()
+    private val networkStatusLiveData = mockk<NetworkStatusLiveData>()

    @Before
    fun setup() {
@@ -54,7 +54,7 @@ class AutoDacViewModelTest {
        every { context.getSystemService(any()) } returns networkStatusLiveData

        // Mocking the NetworkStatusLiveData
-        every { networkStatusLiveData.startMonitoring() } just Runs
+        every { networkStatusLiveData.observe(any(), any()) } just Runs

        every { hemoCubeDao.getAll() } returns mockk()
 //        every { repository.addDiagnostics(any()) } returns Response.Success(Unit)
Author	SHA1	Message	Date
Sathwik C S	7785f24441	Edit FirebaseManage.kt	2025-02-17 07:32:32 +00:00
chandrashekhar reddy	5f2d5fed85	app version 131	2025-02-17 11:26:44 +05:30
chandrashekhar reddy	c312bf0f39	app version 131	2025-01-23 10:07:07 +05:30