implementing the secure storage using ndk

README.md

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

app/build.gradle

@@ -20,9 +20,14 @@ android {
         applicationId "in.sminnovations.hpostesting.server"
         minSdk 30
         targetSdk 34
-        versionCode 133
-        versionName "2.1.131"
+        versionCode 138
+        versionName "2.1.133"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        externalNativeBuild {
+            cmake {
+                cppFlags ''
+            }
+        }
     }
 
 
@@ -54,6 +59,12 @@ android {
     packagingOptions {
         exclude 'mockito-extensions/org.mockito.plugins.MockMaker'
     }
+    externalNativeBuild {
+        cmake {
+            path file('src/main/cpp/CMakeLists.txt')
+            version '3.22.1'
+        }
+    }
 //    testOptions {
 //        unitTests {
 //            includeAndroidResources = true

app/google-services.json

@@ -1,33 +1,33 @@
 {
   "project_info": {
-    "project_number": "650071678820",
-    "project_id": "hpos-af3cc",
-    "storage_bucket": "hpos-af3cc.appspot.com"
+    "project_number": "1012719870714",
+    "project_id": "hpos-prod",
+    "storage_bucket": "hpos-prod.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:f6fd45e2f6a63aef6c6471",
+        "mobilesdk_app_id": "1:1012719870714:android:d8d7c962d96f4097de5f43",
         "android_client_info": {
           "package_name": "in.sminnovations.hpostesting.server"
         }
       },
       "oauth_client": [
         {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+          "client_id": "1012719870714-uli6cdjea3lfnnueh6e4r15i10ei1vlj.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
+          "current_key": "AIzaSyA_O0oZGzy3Kiw9fiLQ3OFPME-xQJP88vs"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+              "client_id": "1012719870714-uli6cdjea3lfnnueh6e4r15i10ei1vlj.apps.googleusercontent.com",
               "client_type": 3
             }
           ]

app/release/output-metadata.json

@@ -1,37 +0,0 @@
-{
-  "version": 3,
-  "artifactType": {
-    "type": "APK",
-    "kind": "Directory"
-  },
-  "applicationId": "in.sminnovations.hpostesting.dev",
-  "variantName": "release",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "attributes": [],
-      "versionCode": 127,
-      "versionName": "2.1.127",
-      "outputFile": "app-release.apk"
-    }
-  ],
-  "elementType": "File",
-  "baselineProfiles": [
-    {
-      "minApi": 28,
-      "maxApi": 30,
-      "baselineProfiles": [
-        "baselineProfiles/1/app-release.dm"
-      ]
-    },
-    {
-      "minApi": 31,
-      "maxApi": 2147483647,
-      "baselineProfiles": [
-        "baselineProfiles/0/app-release.dm"
-      ]
-    }
-  ],
-  "minSdkVersionForDexing": 21
-}

app/src/main/AndroidManifest.xml

@@ -24,13 +24,12 @@
     <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"
@@ -46,7 +45,7 @@
         <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"
@@ -219,5 +218,4 @@
                 android:resource="@xml/file_paths" />
         </provider>
     </application>
-
 </manifest>

app/src/main/cpp/CMakeLists.txt

@@ -0,0 +1,24 @@
+
+cmake_minimum_required(VERSION 3.18.1)
+
+project("native-server")
+
+# Create the shared library from server.cpp
+add_library(
+        native-server
+        SHARED
+        server.cpp
+)
+
+# Find Android logging library
+find_library(
+        log-lib
+        log
+)
+
+# Link logging library to our native lib
+target_link_libraries(
+        native-server
+        ${log-lib}
+)
+

app/src/main/cpp/server.cpp

@@ -0,0 +1,53 @@
+#include <jni.h>
+#include <string>
+#include <unordered_map>
+
+std::vector<std::pair<int, std::pair<std::string, std::unordered_map<std::string, std::string>>>> firebaseDataOrdered = {
+        {0, {"dev",  {{"apiKey", "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"},  {"appId", "1:650071678820:android:a53292637abb7c0d6c6471"},  {"projectId", "hpos-af3cc"},  {"storageBucket", "hpos-af3cc.appspot.com"}}}},
+        {1, {"qc-qa", {{"apiKey", "AIzaSyC4d4GhWHr_NMJAeBvnztQ_yQ3Qe9MAnLs"}, {"appId", "1:1004619739289:android:3dbcefb10ea99654e5c808"}, {"projectId", "hpos-qa"}, {"storageBucket", "hpos-qa.appspot.com"}}}},
+        {2, {"prod", {{"apiKey", "AIzaSyA_O0oZGzy3Kiw9fiLQ3OFPME-xQJP88vs"}, {"appId", "1:1012719870714:android:d8d7c962d96f4097de5f43"}, {"projectId", "hpos-prod"}, {"storageBucket", "hpos-prod.appspot.com"}}}},
+        {3, {"pre prod", {{"apiKey", "AIzaSyDYySi27LioZGNisP1NfnNU5inJX_0FT38"}, {"appId", "1:121176529204:android:e6841fdac57bdc95bbed61"}, {"projectId", "hpos-preprod"}, {"storageBucket", "hpos-preprod.appspot.com"}}}},
+        {4, {"SMI R&D", {{"apiKey", "AIzaSyAVxpilbB804iRCCpMBDjjmdZhQguctGHM"}, {"appId", "1:327771387914:android:a3b4ed2e42ea6e38dc87f3"}, {"projectId", "hposrandd"}, {"storageBucket", "hposrandd.firebasestorage.app"}}}},
+        {5, {"molbio", {{"apiKey", "molbio"}, {"appId", "molbio"}, {"projectId", "molbio"}, {"storageBucket", "molbio"}}}}
+};
+
+
+extern "C"
+JNIEXPORT jobject JNICALL
+Java_com_example_hpostesting_firebase_FirebaseManager_getFirebaseDataMap(JNIEnv *env,jobject thiz) {
+    jclass mapClass = env->FindClass("java/util/LinkedHashMap"); // ✅ preserves insertion order
+    jmethodID init = env->GetMethodID(mapClass, "<init>", "()V");
+    jmethodID put = env->GetMethodID(mapClass, "put", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
+    jobject outerMap = env->NewObject(mapClass, init);
+
+    for (const auto &entry : firebaseDataOrdered) {
+        int order = entry.first;
+        const std::string &outerKeyStr = entry.second.first;
+        const auto &innerMapData = entry.second.second;
+
+        jobject innerMap = env->NewObject(mapClass, init);
+        // "int" field for order
+
+        jstring intKey = env->NewStringUTF("int");
+        jstring intValue = env->NewStringUTF(std::to_string(order).c_str());
+        env->CallObjectMethod(innerMap, put, intKey, intValue);
+        env->DeleteLocalRef(intKey);
+        env->DeleteLocalRef(intValue);
+
+        // actual firebase config keys
+        for (const auto &innerPair : innerMapData) {
+            jstring key = env->NewStringUTF(innerPair.first.c_str());
+            jstring value = env->NewStringUTF(innerPair.second.c_str());
+            env->CallObjectMethod(innerMap, put, key, value);
+            env->DeleteLocalRef(key);
+            env->DeleteLocalRef(value);
+        }
+
+        jstring outerKey = env->NewStringUTF(outerKeyStr.c_str());
+        env->CallObjectMethod(outerMap, put, outerKey, innerMap);
+        env->DeleteLocalRef(outerKey);
+        env->DeleteLocalRef(innerMap);
+    }
+
+    return outerMap;
+}

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

@@ -15,7 +15,6 @@ package com.example.hpostesting
 
 import android.app.Application
 import com.example.hpostesting.firebase.FirebaseManager
-import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.FirebaseFirestoreSettings
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.CoroutineScope
@@ -23,8 +22,16 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import javax.inject.Inject
 
+
 @HiltAndroidApp
 class HPOSTestingApplication : Application() {
+    companion object {
+        init {
+            System.loadLibrary("native-server")
+        }
+    }
+
+
     @Inject
     lateinit var firebaseManager: FirebaseManager
     override fun onCreate() {
@@ -39,4 +46,5 @@ class HPOSTestingApplication : Application() {
         val firestore = firebaseManager.getCurrentFirestore()
         firestore.firestoreSettings = firestoreSettings
     }
+
 }

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"
 
-    const val MOLBIO_INTEGRATION = false
-    const val FIREBASE_INTEGRATION = true
+    var MOLBIO_INTEGRATION = true
+    var FIREBASE_INTEGRATION = false
     const val deviceProvisionEmail = "HPOS_provisioner@bigtec.co.in"
     const val deviceProvisionPassword = "f2ab0e7f9d69"
     const val DEVICE_ID_API = "deviceIDAPI"
@@ -44,9 +44,9 @@ object Constants {
     const val DELAY_BETWEEN_COMMANDS: Long = 1000
 
     const val TEST_RIGHT_TOTAL_PIXEL = 3694
-
     const val MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE = 34
     const val MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE10MM = 9
+    const val MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE10MM_RANDD= 129
 
     const val RANGE_IN_RESULT_CALCULATIONS = 10
 

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

@@ -243,9 +243,10 @@ object AppModule {
 
     @Provides
     @Singleton
-    fun provideNetworkMonitor(@ApplicationContext context: Context): NetworkMonitor {
-        return NetworkMonitor(context)
+    fun provideNetworkMonitor(
+        @ApplicationContext context: Context
+    ): NetworkMonitor {
+        return NetworkMonitor(context).apply { startMonitoring() }
     }
 
-
 }

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

@@ -14,6 +14,9 @@ package com.example.hpostesting.firebase
 import android.content.Context
 import android.content.Intent
 import android.os.Process
+import android.util.Log
+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
@@ -26,33 +29,84 @@ import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class FirebaseManager @Inject constructor(private val context: Context) {
+    private  var defaultServers = mutableListOf<FirebaseConfig>()
+    external fun getFirebaseDataMap(): Map<String, Map<String, String>>
+    private val map: Map<String, Map<String, String>> = getFirebaseDataMap()
+    companion object {
+        init {
+            System.loadLibrary("native-server") //use NDK ro secure somethings
+        }
 
-    private val sharedPreferences =
-        context.getSharedPreferences("FirebaseConfigPrefs", Context.MODE_PRIVATE)
+    }
+    private val sharedPreferencesServerConfig = context.getSharedPreferences("FirebaseConfigPrefs", Context.MODE_PRIVATE)
+    private val sharedPreferencesDev = context.getSharedPreferences("DevMode",Context.MODE_PRIVATE)
 
     private var currentFirestore: FirebaseFirestore = FirebaseFirestore.getInstance()
     private var currentStorage: FirebaseStorage = FirebaseStorage.getInstance()
-    var updateStatus = false
+    private var updateStatus = false
+
+
+    private fun Map<String, String>.toFirebaseConfig(server: String): FirebaseConfig? {
+        val apiKey = this["apiKey"] ?: return null
+        val appId = this["appId"] ?: return null
+        val projectId = this["projectId"] ?: return null
+        val storageBucket = this["storageBucket"] ?: return null
+        return FirebaseConfig(
+            serverName = server,
+            projectId = projectId,
+            appId = appId,
+            apiKey = apiKey,
+            storageBucket = storageBucket
+        )
+    }
+
+
+   fun populate() {
+        defaultServers.clear()
+        map.forEach { (server, config) ->
+            config.toFirebaseConfig(server)?.let {
+                defaultServers.add(it)
+            } ?: Log.w("Firebase", "Skipping $server due to missing keys")
+        }
+    }
+
+
+
 
-    private val defaultServers = listOf(
-        // i have it in different place look down
-        firebaseConfig1, firebaseConfig2, firebaseConfig3,
-    )
 
     init {
+        populate()
         val lastSelectedServer = getLastSelectedServer()
         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) {
-        saveSelectedServer(firebaseConfig)
-        val firebaseApp = getOrInitializeFirebaseApp(firebaseConfig)
-        currentFirestore = FirebaseFirestore.getInstance(firebaseApp)
-        currentStorage = FirebaseStorage.getInstance(firebaseApp)
-        updateStatus = true
+        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
+        }
 
     }
 
@@ -60,7 +114,6 @@ class FirebaseManager @Inject constructor(private val context: Context) {
         val existingApp = FirebaseApp.getApps(context).find { it.name == firebaseConfig.serverName }
 
         return if (existingApp != null) {
-
             existingApp
         } else {
 
@@ -73,7 +126,7 @@ class FirebaseManager @Inject constructor(private val context: Context) {
     }
 
     private fun saveSelectedServer(firebaseConfig: FirebaseConfig) {
-        with(sharedPreferences.edit()) {
+        with(sharedPreferencesServerConfig.edit()) {
             putString("selectedServerName", firebaseConfig.serverName)
             putString("projectId", firebaseConfig.projectId)
             putString("appId", firebaseConfig.appId)
@@ -93,12 +146,12 @@ class FirebaseManager @Inject constructor(private val context: Context) {
 
     fun getLastSelectedServer(): FirebaseConfig {
         val selectedServerName =
-            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)
+            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)
         val storageBucket =
-            sharedPreferences.getString("storageBucket", defaultServers.first().storageBucket)
+            sharedPreferencesServerConfig.getString("storageBucket", defaultServers.first().storageBucket)
 
         return FirebaseConfig(
             serverName = selectedServerName ?: defaultServers.first().serverName,
@@ -112,6 +165,16 @@ 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) {
@@ -128,26 +191,51 @@ fun delayedRestart(context: Context) {
     }
 }
 
-private val firebaseConfig1 = FirebaseConfig(
-    serverName = "dev",
-    apiKey = "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I",
-    appId = "1:650071678820:android:a53292637abb7c0d6c6471",
-    projectId = "hpos-af3cc",
-    storageBucket = "hpos-af3cc.appspot.com"
-)
-
-private val firebaseConfig2 = FirebaseConfig(
-    serverName = "qc-qa",
-    apiKey = "AIzaSyC4d4GhWHr_NMJAeBvnztQ_yQ3Qe9MAnLs",
-    appId = "1:1004619739289:android:3dbcefb10ea99654e5c808",
-    projectId = "hpos-qa",
-    storageBucket = "hpos-qa.appspot.com"
-)
-
-private val firebaseConfig3 = FirebaseConfig(
-    serverName = "prod",
-    apiKey = "AIzaSyDYySi27LioZGNisP1NfnNU5inJX_0FT38",
-    appId = "1:121176529204:android:a7bc0842f61e5095bbed61",
-    projectId = "hpos-preprod",
-    storageBucket = "hpos-preprod.appspot.com"
-)
+//
+//
+//private val firebaseConfigDev = FirebaseConfig(
+//    serverName = "dev",
+//    apiKey = "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I",
+//    appId = "1:650071678820:android:a53292637abb7c0d6c6471",
+//    projectId = "hpos-af3cc",
+//    storageBucket = "hpos-af3cc.appspot.com"
+//)
+//private val firebaseConfigQaQc = FirebaseConfig(
+//    serverName = "qc-qa",
+//    apiKey = "AIzaSyC4d4GhWHr_NMJAeBvnztQ_yQ3Qe9MAnLs",
+//    appId = "1:1004619739289:android:3dbcefb10ea99654e5c808",
+//    projectId = "hpos-qa",
+//    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",
+//    apiKey = "AIzaSyDYySi27LioZGNisP1NfnNU5inJX_0FT38",
+//    appId = "1:121176529204:android:e6841fdac57bdc95bbed61",
+//    projectId = "hpos-preprod",
+//    storageBucket = "hpos-preprod.appspot.com"
+//)
+//
+//private val firebaseConfigSmiRandD= FirebaseConfig(
+//    serverName = "SMI R&D",
+//    apiKey = "AIzaSyAVxpilbB804iRCCpMBDjjmdZhQguctGHM",
+//    appId = "1:327771387914:android:a3b4ed2e42ea6e38dc87f3",
+//    projectId = "hposrandd",
+//    storageBucket = "hposrandd.firebasestorage.app"
+//)
+//
+//private val configMolbio = FirebaseConfig(
+//    serverName = "molbio",
+//    apiKey = "molbio",
+//    appId = "molbio",
+//    projectId = "molbio",
+//    storageBucket = "molbio"
+//)

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

@@ -22,10 +22,12 @@ import android.util.Log
 import android.widget.EditText
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContentProviderCompat.requireContext
 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.test.TestType
+import com.example.hpostesting.firebase.FirebaseManager
 import com.example.hpostesting.presentation.main_base.DashboardActivity
 import com.example.hpostesting.presentation.hb_test.HBTestActivity
 import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestActivity
@@ -52,7 +54,7 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
     private var fromWhere = "Home"
     private val TAG = "KitScanActivity"
     private lateinit var binding: ActivityKitScanBinding
-
+    private lateinit var firebaseManager: FirebaseManager
     private lateinit var sharedPreference: SharedPreferences
 
     var sdkHandler: SDKHandler? = null
@@ -71,21 +73,21 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
     }
 
     private fun processScannedData(contents: String) {//edited auto selection of cuvette size
-        if(contents.contains("SMI/SC/")){
+        if (contents.contains("SMI/SC/")) {
             with(sharedPreference.edit()) {
                 putString(Constants.CUVETTE_SIZE, "2mm")
                 apply()
             }
             Toast.makeText(this, "Selected cuvette size: 2mm", Toast.LENGTH_SHORT).show()
             binding.nameEditText.setText(contents)
-        }else if(contents.contains("SMI/SC-2-D10/")){
+        } else if (contents.contains("SMI/SC-2-D10/")) {
             with(sharedPreference.edit()) {
                 putString(Constants.CUVETTE_SIZE, "10mm")
                 apply()
             }
             Toast.makeText(this, "Selected cuvette size: 10mm", Toast.LENGTH_SHORT).show()
             binding.nameEditText.setText(contents)
-        }else{
+        } else {
             Toast.makeText(this, R.string.invalid_kit, Toast.LENGTH_LONG).show()
         }
     }
@@ -127,27 +129,42 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
+        firebaseManager = FirebaseManager(this)
+        val currentServer = firebaseManager.getLastSelectedServer().serverName
         binding = ActivityKitScanBinding.inflate(layoutInflater)
         sharedPreference = this.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
         setContentView(binding.root)
         binding.toolbar.title = "Kit Serial Number"
         fromWhere = intent.getStringExtra("fromWhere").toString()
-        val maxTest = if(sharedPreference.getString(Constants.CUVETTE_SIZE, "10mm").toString() == "2mm"){
-            Constants.MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE
-        }else{
-            Constants.MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE10MM
+
+        val maxTest = if (currentServer == "SMI R&D"){
+            Constants.MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE10MM_RANDD
+
+            Log.d(TAG, "onCreate RandD mode")
+        }else {
+            if (sharedPreference.getString(Constants.CUVETTE_SIZE, "10mm").toString() == "2mm") {
+                Constants.MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE
+            } else {
+                Constants.MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE10MM
+            }
         }
         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()
+        // 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{
+        } else {
             if (DataHolder.sampleReadCounter <= maxTest && kitNum != "" && time < Constants.MAX_KIT_TIME) {
                 moveToNext()
             } else {
-                Toast.makeText(this@KitScanActivity, "Limit Reached, Use New KIT for testing", Toast.LENGTH_SHORT).show()
+                Toast.makeText(
+                    this@KitScanActivity,
+                    "Limit Reached, Use New KIT for testing",
+                    Toast.LENGTH_SHORT
+                ).show()
                 DataHolder.sampleReadCounter = 0
                 DataHolder.kitSerial = ""
 
@@ -209,13 +226,13 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
         binding.btnGo.setOnClickListener {
             val serialNumber = binding.nameEditText.text.toString().trim()
             if (serialNumber.isNotEmpty() && isSerialValid(serialNumber)) {
-                if(serialNumber.contains("SMI/SC/")){
+                if (serialNumber.contains("SMI/SC/")) {
                     with(sharedPreference.edit()) {
                         putString(Constants.CUVETTE_SIZE, "2mm")
                         apply()
                     }
                     Toast.makeText(this, "Selected cuvette size: 2mm", Toast.LENGTH_SHORT).show()
-                }else if(serialNumber.contains("SMI/SC-2-D10/")){
+                } else if (serialNumber.contains("SMI/SC-2-D10/")) {
                     with(sharedPreference.edit()) {
                         putString(Constants.CUVETTE_SIZE, "10mm")
                         apply()
@@ -298,7 +315,8 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
         if (mScannerInfoList.isNotEmpty()) {
             sdkHandler!!.dcssdkEstablishCommunicationSession(mScannerInfoList[0].scannerID)
         } else {
-            Toast.makeText(this,"Scanner Is not available In this device", Toast.LENGTH_LONG).show()
+            Toast.makeText(this, "Scanner Is not available In this device", Toast.LENGTH_LONG)
+                .show()
         }
     }
 
@@ -336,7 +354,7 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
         runOnUiThread {
             val editableResult: Editable = Editable.Factory.getInstance().newEditable(result)
             processScannedData(result)
-           // binding.nameEditText.text = editableResult
+            // binding.nameEditText.text = editableResult
         }
     }
 
@@ -349,27 +367,29 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
 
     private fun isSerialValid(s: String): Boolean {
         if (s.contains("SMI/SC/")) {
-            if(s.length != 17){
-                binding.nameEditText.error = "Invalid Kit Serial Number, correct example SMI/SC/000/00/000"
+            if (s.length != 17) {
+                binding.nameEditText.error =
+                    "Invalid Kit Serial Number, correct example SMI/SC/000/00/000"
                 return false
             }
-        }else if(s.contains("SMI/SC-2-D10/")){
-            if(s.length != 27){
-                binding.nameEditText.error = "Invalid Kit Serial Number, correct example SMI/SC-2-D10/000000/000/000"
+        } else if (s.contains("SMI/SC-2-D10/")) {
+            if (s.length != 27) {
+                binding.nameEditText.error =
+                    "Invalid Kit Serial Number, correct example SMI/SC-2-D10/000000/000/000"
                 return false
             }
-        }else{
+        } else {
             return false
         }
         return true
     }
 
     private fun moveToNext() {
-        if(fromWhere == "Main"){
-            if(DataHolder.selectedTestType == TestType.HB_EST){
+        if (fromWhere == "Main") {
+            if (DataHolder.selectedTestType == TestType.HB_EST) {
                 val i = Intent(applicationContext, HBTestActivity::class.java)
                 startActivity(i)
-            }else{
+            } else {
                 DataHolder.deviceType.observe(this) { deviceType ->
                     when (deviceType) {
                         Constants.DEVICE_TYPE_HEMOCUBE -> {
@@ -422,6 +442,7 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
             true
         }
     }
+
     private fun timeDifference(createdAt: String): Long {
         val currentTime = Calendar.getInstance().time
         val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())

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

@@ -14,6 +14,7 @@
 package com.example.hpostesting.presentation
 
 import android.Manifest
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -33,6 +34,7 @@ import com.example.hpostesting.util.MyUtils
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivitySplashBinding
 
+@SuppressLint("CustomSplashScreen")
 class SplashActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivitySplashBinding

app/src/main/java/com/example/hpostesting/presentation/main_base/AppVersionTapManage.kt

@@ -1,16 +1,21 @@
 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) {
-            onMaxTapsReached()
-            reset()
-        }
+            if (tapCount >= maxTapCount && shouldEnable) {
+                onMaxTapsReached()
+                reset()
+            }
     }
     private fun reset() {
         tapCount = 0

app/src/main/java/com/example/hpostesting/presentation/main_base/PanelFragment.kt

@@ -89,6 +89,7 @@ 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
@@ -102,6 +103,7 @@ 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{
@@ -142,6 +144,7 @@ class PanelFragment : Fragment() {
             startActivity(intent)
         }
 
+
         binding.btnFiles.setOnClickListener {
             val intent = Intent(Intent.ACTION_GET_CONTENT)
             intent.type = "file/*"

app/src/main/java/com/example/hpostesting/presentation/main_base/SettingsFragment.kt

@@ -13,7 +13,6 @@
 
 package com.example.hpostesting.presentation.main_base
 
-import android.app.AlertDialog
 import android.content.Context
 import android.content.SharedPreferences
 import android.content.pm.PackageManager
@@ -29,15 +28,18 @@ 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() {
@@ -58,7 +60,6 @@ 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()
@@ -97,6 +98,7 @@ class SlideshowFragment : Fragment() {
                     // Do nothing here
                 }
             }
+
         binding.spinnerCuvette.setSelection(pos)
         binding.btnAddSize.setOnClickListener {
             with(sharedPreferences.edit()) {
@@ -113,24 +115,25 @@ 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"
@@ -140,52 +143,100 @@ 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 {
-                if ((sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN")) {
-                    tapManager.registerTap {
-                        if (!isServerSelectionVisible) {
-                            showServerSelection()
-                        }
-                    }
-                } else {
+                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 (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)
-
-
-        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
-            }
+        if (firebaseManager.getDevMode()) {
+            developerToggle.isChecked = true // Ensure it's checked
+            preferenceScreen.addPreference(developerToggle)
+            preferenceScreen.addPreference(serverSelectorPreference)
         }
-        preferenceScreen.addPreference(currentServerPreference)
+
         setPreferenceScreen(preferenceScreen)
 
         if (isLanguageChanged) {
@@ -194,58 +245,23 @@ class PrefsFragment : PreferenceFragmentCompat(){
     }
 
 
-    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
-            }
+    private fun updateServerPreference(newServer: String) {
+        (findPreference<CustomDialogPreference>("server_preference"))?.let { pref ->
+            pref.setValue(newServer)
+            pref.summary = "Current server: $newServer"
         }
-
-
-
-        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()
-        firebaseManager.restartApp()
-        currentServerPreference.summary = "Current Server: ${firebaseConfig.serverName}"
-
-    }
-
-
-    private fun switchCurrentServer(serverCode: String) {
-        Toast.makeText(requireContext(), "Switched to server: $serverCode", Toast.LENGTH_SHORT)
+        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()
-        currentServerPreference.summary = "Current Server: $serverCode"
-
+        firebaseManager.restartApp()
     }
 
     private fun updateLanguage(context: Context, languageCode: String) {
@@ -275,3 +291,47 @@ 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()
+    }
+}

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

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

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

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

@@ -795,4 +795,11 @@ 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

@@ -1,5 +1,6 @@
 package com.example.hpostesting.util
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.net.ConnectivityManager
 import android.net.Network
@@ -12,6 +13,8 @@ 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
@@ -23,7 +26,7 @@ import javax.inject.Singleton
 class NetworkMonitor @Inject constructor(
     @ApplicationContext private val context: Context
 ) {
-
+    private var isMonitoringStarted = false
     private val connectivityManager =
         context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
 
@@ -49,7 +52,10 @@ class NetworkMonitor @Inject constructor(
         }
     }
 
+    @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)
@@ -66,6 +72,8 @@ class NetworkMonitor @Inject constructor(
                 .build()
 
         connectivityManager.registerNetworkCallback(networkRequest, networkCallback)
+        // Start periodic checks:
+        startPeriodicPingCheck()
     }
 
     fun stopMonitoring() {   // never needed to call
@@ -96,4 +104,14 @@ class NetworkMonitor @Inject constructor(
             }
         }
     }
+
+    private fun startPeriodicPingCheck(intervalMillis: Long = 1 * 60_000L) {
+        networkScope.launch {
+            while (isActive) {
+                performPingCheck()
+                delay(intervalMillis)
+            }
+        }
+    }
+
 }

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

@@ -0,0 +1,5 @@
+<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>

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

@@ -55,7 +55,21 @@
         app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
 
 
-    <Button
+        <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
         android:id="@+id/btn_diagnostics"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -67,7 +81,7 @@
         app:cornerRadius="16dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btn_submit" />
+        app:layout_constraintTop_toBottomOf="@id/btn_rnd" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_auto_dac"
@@ -153,6 +167,7 @@
             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"
@@ -160,12 +175,13 @@
             android:layout_marginHorizontal="16dp"
             android:layout_marginTop="24dp"
             android:clickable="false"
-            android:text="Update values"
+            android:text="Update valueLs"
             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"

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

@@ -1,38 +0,0 @@
-<?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>

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

@@ -25,6 +25,7 @@
         <item>ka</item>
         <!-- Use language codes (e.g., en, kn) as values -->
     </string-array>
+
     <string-array name="district">
         <item>Mysuru</item>
         <item>Kodagu</item>

build.gradle

@@ -25,4 +25,3 @@ plugins {
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
-