Merge branch 'dev-check-apk-update' of https://gitlab.com/sminnovations/hpos into dev-check-apk-update

.gitlab-ci.yml

@@ -1,31 +1,63 @@
+# This file is a template, and might need editing before it works on your project.
+# To contribute improvements to CI/CD templates, please follow the Development guide at:
+# https://docs.gitlab.com/ee/development/cicd/templates.html
+# This specific template is located at:
+# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Android.gitlab-ci.yml
+
+# Read more about this script on this blog post https://about.gitlab.com/2018/10/24/setting-up-gitlab-ci-for-android-projects/, by Jason Lenny
+# If you are interested in using Android with FastLane for publishing take a look at the Android-Fastlane template.
+
 image: eclipse-temurin:17-jdk-jammy
 
 variables:
-  ANDROID_COMPILE_SDK: "34"
-  ANDROID_BUILD_TOOLS: "33.0.2"
-  ANDROID_SDK_TOOLS: "9477386"
-  
-  # Keystore credentials stored as GitLab CI/CD variables
-  KEYSTORE_PASSWORD: $KS_PASSWORD
-  KEY_ALIAS: $KS_ALIAS
-  KEY_PASSWORD: $KS_KEY_PASSWORD
 
+  # ANDROID_COMPILE_SDK is the version of Android you're compiling with.
+  # It should match compileSdkVersion.
+  ANDROID_COMPILE_SDK: "34"
+
+  # ANDROID_BUILD_TOOLS is the version of the Android build tools you are using.
+  # It should match buildToolsVersion.
+  ANDROID_BUILD_TOOLS: "33.0.2"
+
+  # It's what version of the command line tools we're going to download from the official site.
+  # Official Site-> https://developer.android.com/studio/index.html
+  # There, look down below at the cli tools only, sdk tools package is of format:
+  #        commandlinetools-os_type-ANDROID_SDK_TOOLS_latest.zip
+  # when the script was last modified for latest compileSdkVersion, it was which is written down below
+  ANDROID_SDK_TOOLS: "9477386"
+
+# Packages installation before running script
 before_script:
   - apt-get --quiet update --yes
   - apt-get --quiet install --yes wget unzip
+
+  # Setup path as android_home for moving/exporting the downloaded sdk into it
   - export ANDROID_HOME="${PWD}/android-sdk-root"
+  # Create a new directory at specified location
   - install -d $ANDROID_HOME
+  # Here we are installing androidSDK tools from official source,
+  # (the key thing here is the url from where you are downloading these sdk tool for command line, so please do note this url pattern there and here as well)
+  # after that unzipping those tools and
+  # then running a series of SDK manager commands to install necessary android SDK packages that'll allow the app to build
   - wget --no-verbose --output-document=$ANDROID_HOME/cmdline-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_TOOLS}_latest.zip
   - unzip -q -d "$ANDROID_HOME/cmdline-tools" "$ANDROID_HOME/cmdline-tools.zip"
   - mv -T "$ANDROID_HOME/cmdline-tools/cmdline-tools" "$ANDROID_HOME/cmdline-tools/tools"
   - export PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/cmdline-tools/tools/bin
+
+  # Nothing fancy here, just checking sdkManager version
   - sdkmanager --version
+
+  # use yes to accept all licenses
   - yes | sdkmanager --licenses > /dev/null || true
   - sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}"
   - sdkmanager "platform-tools"
   - sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}"
+
+  # Not necessary, but just for surity
   - chmod +x ./gradlew
 
+# Basic android and gradle stuff
+# Check linting
 lintDebug:
   interruptible: true
   stage: build
@@ -37,6 +69,7 @@ lintDebug:
     expose_as: "lint-report"
     when: always
 
+# Make Project
 assembleDebug:
   interruptible: true
   stage: build
@@ -45,68 +78,8 @@ assembleDebug:
   artifacts:
     paths:
       - app/build/outputs/
-      
-# Job for building signed release APK for tags containing "release" on any branch
-assembleRelease:
-  stage: build
-  script:
-    - |
-      if [[ "$CI_COMMIT_TAG" =~ release ]]; then
-        echo "Decoding keystore file from Base64"
-        
-        # Debug: Print the first few characters of BASE64_KEYSTORE
-        echo "First 20 characters of BASE64_KEYSTORE: ${BASE64_KEYSTORE:0:20}..."
-        
-        # Check if BASE64_KEYSTORE is a file path
-        if [[ "$BASE64_KEYSTORE" == /* ]] && [[ -f "$BASE64_KEYSTORE" ]]; then
-          echo "BASE64_KEYSTORE appears to be a file path. Reading content..."
-          BASE64_CONTENT=$(cat "$BASE64_KEYSTORE")
-        else
-          echo "BASE64_KEYSTORE is not a file path. Using as-is."
-          BASE64_CONTENT="$BASE64_KEYSTORE"
-        fi
-        
-        # Remove any potential whitespace or newline characters
-        CLEANED_KEYSTORE=$(echo "$BASE64_CONTENT" | tr -d '[:space:]')
-        
-        # Attempt to decode and save to a file
-        if echo "$CLEANED_KEYSTORE" | base64 -d > "$CI_PROJECT_DIR/app/keystore.jks" 2>/tmp/base64_error; then
-          echo "Keystore file decoded successfully"
-        else
-          echo "Error decoding keystore file:"
-          cat /tmp/base64_error
-          echo "First 20 characters of cleaned content: ${CLEANED_KEYSTORE:0:20}..."
-          exit 1
-        fi
-        
-        # Check if the keystore file was created and has content
-        if [ -s "$CI_PROJECT_DIR/app/keystore.jks" ]; then
-          echo "Keystore file created successfully"
-          # Print file size for verification
-          ls -l "$CI_PROJECT_DIR/app/keystore.jks"
-        else
-          echo "Error: Keystore file is empty or not created"
-          exit 1
-        fi
-        
-        echo "Building signed release APK"
-        ./gradlew assembleRelease \
-          -Pandroid.injected.signing.store.file="$CI_PROJECT_DIR/app/keystore.jks" \
-          -Pandroid.injected.signing.store.password="$KEYSTORE_PASSWORD" \
-          -Pandroid.injected.signing.key.alias="$KEY_ALIAS" \
-          -Pandroid.injected.signing.key.password="$KEY_PASSWORD"
-      else
-        echo "Tag '$CI_COMMIT_TAG' does not contain 'release'. Skipping release build."
-      fi
-  artifacts:
-    paths:
-      - app/build/outputs/
-    expire_in: never
-  rules:
-    - if: $CI_COMMIT_TAG =~ /release/
-      when: always
-    - when: never
 
+# Run all tests, if any fails, interrupt the pipeline(fail it)
 debugTests:
   needs: [lintDebug, assembleDebug]
   interruptible: true
@@ -125,4 +98,4 @@ publishTestResults:
   artifacts:
     when: always
     reports:
-      junit: app/build/test-results/testDebugUnitTest/*.xml
+      junit: app/build/test-results/testDebugUnitTest/*.xml

README.md

@@ -2,4 +2,3 @@
 ### Release key
 
 	key0: prime24
-        

app/build.gradle

@@ -15,13 +15,13 @@ android {
     namespace 'in.sminnovations.hpostesting'
 
     // dev -> development, quality -> qc, uat -> User Acceptance Testing, preprod -> preproduction, prod -> production, iocl -> iocl-iisc production
-    // server -> for server switching for internal test
     defaultConfig {
-        applicationId "in.sminnovations.hpostesting.server"
+        applicationId "in.sminnovations.hpostesting.dev"
         minSdk 21
         targetSdk 34
-        versionCode 133
+        versionCode 114
-        versionName "2.1.131"
+        versionName "2.1.114"
+
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -62,7 +62,6 @@ android {
 
 dependencies {
     implementation "com.google.dagger:hilt-android:2.46"
-    implementation 'androidx.activity:activity:1.8.0'
     kapt "com.google.dagger:hilt-android-compiler:2.46"
 
     implementation 'androidx.core:core-ktx:1.12.0'
@@ -89,6 +88,7 @@ dependencies {
     implementation("com.google.firebase:firebase-appdistribution-api-ktx:16.0.0-beta12")
     implementation 'androidx.preference:preference-ktx:1.2.1'
     implementation 'androidx.preference:preference-ktx:1.2.1'
+    implementation 'com.google.android.play:core:1.10.3'
     implementation 'io.nats:jnats:2.11.4'
 
 
@@ -120,9 +120,10 @@ dependencies {
 
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
     implementation 'com.opencsv:opencsv:5.9'
-    implementation 'com.github.mik3y:usb-serial-for-android:3.8.0'
+    implementation 'com.github.mik3y:usb-serial-for-android:3.5.1'
 
     implementation "androidx.fragment:fragment-ktx:1.6.2"
+
     // CSV read, write
     implementation 'com.opencsv:opencsv:5.9'
 
@@ -136,7 +137,6 @@ dependencies {
     implementation "androidx.room:room-ktx:2.6.1"
     implementation "androidx.room:room-runtime:2.6.1"
     kapt ("androidx.room:room-compiler:2.6.1")
-    implementation "net.zetetic:android-database-sqlcipher:4.4.0"
 
     //image
     implementation 'com.github.bumptech.glide:glide:4.13.2'
@@ -162,12 +162,9 @@ dependencies {
     implementation("androidx.work:work-runtime-ktx:2.9.0")
 
     // implementation("io.nats:jnats:2.11.2")
-//    implementation 'com.google.android.play:core:1.10.3'
+    implementation 'com.google.android.play:core:1.10.3'
 
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     implementation 'io.nats:jnats:2.11.4'
-    implementation 'org.apache.commons:commons-math3:3.6.1'
-    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.17'
-    implementation 'androidx.security:security-crypto:1.1.0-alpha03'
 
 }

app/google-services.json

@@ -7,9 +7,178 @@
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:f6fd45e2f6a63aef6c6471",
+        "mobilesdk_app_id": "1:650071678820:android:f1435a1c07f710036c6471",
         "android_client_info": {
-          "package_name": "in.sminnovations.hpostesting.server"
+          "package_name": "com.example.hposconsentform"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:650071678820:android:7865bef608cdee6f6c6471",
+        "android_client_info": {
+          "package_name": "com.smi.counselling"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:650071678820:android:2925e9ce3417d2386c6471",
+        "android_client_info": {
+          "package_name": "in.sminnovations.hemocube"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "650071678820-srhm9spm9hjn4frcd3r6o02gdhdbtd15.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "in.sminnovations.hemocube",
+            "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a"
+          }
+        },
+        {
+          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:650071678820:android:7569c1cad4fc99916c6471",
+        "android_client_info": {
+          "package_name": "in.sminnovations.hposregistration"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "650071678820-70kp5jvjda4r5diqch2kn4lc40p4f42g.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "in.sminnovations.hposregistration",
+            "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a"
+          }
+        },
+        {
+          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:650071678820:android:f96be19e5d43102b6c6471",
+        "android_client_info": {
+          "package_name": "in.sminnovations.hpostesting"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "650071678820-l87dnr0bdj95get0khgnvfv2an1k6ogq.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "in.sminnovations.hpostesting",
+            "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a"
+          }
+        },
+        {
+          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:650071678820:android:a53292637abb7c0d6c6471",
+        "android_client_info": {
+          "package_name": "in.sminnovations.hpostesting.dev"
         }
       },
       "oauth_client": [

app/release/output-metadata.json

@@ -4,34 +4,17 @@
     "type": "APK",
     "kind": "Directory"
   },
-  "applicationId": "in.sminnovations.hpostesting.server",
+  "applicationId": "in.sminnovations.hpostesting.quality",
   "variantName": "release",
   "elements": [
     {
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 133,
+      "versionCode": 101,
-      "versionName": "2.1.131",
+      "versionName": "2.1.101",
       "outputFile": "app-release.apk"
     }
   ],
-  "elementType": "File",
+  "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/androidTest/java/com/example/hpostesting/AssuranceControlsActivityTest.kt

@@ -1,16 +1,3 @@
-/*
- * // 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
 
 import androidx.test.core.app.ActivityScenario

app/src/androidTest/java/com/example/hpostesting/ExampleInstrumentedTest.kt

@@ -1,16 +1,3 @@
-/*
- * // 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
 
 import androidx.test.ext.junit.runners.AndroidJUnit4

app/src/debug/res/drawable/downloads.xml

@@ -1,16 +1,3 @@
-<!--
-  ~ // 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.
-  -->
-
 <vector android:height="24dp" android:tint="@color/primary"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">

app/src/main/AndroidManifest.xml

@@ -2,13 +2,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission
-        android:name="android.permission.AUTHENTICATE_ACCOUNTS"
-        android:maxSdkVersion="22" />
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+
     <uses-permission
         android:name="android.permission.BATTERY_STATS"
         tools:ignore="ProtectedPermissions" />
@@ -25,72 +23,35 @@
 
     <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"
-        tools:ignore="ProtectedPermissions" />
-
-
     <application
         android:name="com.example.hpostesting.HPOSTestingApplication"
+        android:largeHeap="true"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/hpos_icon"
         android:label="@string/app_name"
-        android:largeHeap="true"
         android:roundIcon="@mipmap/hpos_icon_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.HPOSTesting"
         tools:targetApi="31">
-        <activity
-            android:name="com.example.hpostesting.presentation.main_base.UpdateValuesActivity"
-            android:exported="false"
-            android:screenOrientation="portrait"/>
-
-        <service
-            android:name="com.example.hpostesting.util.MyAuthenticatorService"
-            android:exported="true"
-            android:permission="android.permission.BIND_AUTOFILL_SERVICE">
-            <intent-filter>
-                <action android:name="android.accounts.AccountAuthenticator" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.accounts.AccountAuthenticator"
-                android:resource="@xml/authenticator" />
-        </service>
-
-        <activity
-            android:name="com.example.hpostesting.presentation.main_base.ui.PasswordResetActivity"
-            android:exported="false"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name="com.example.hpostesting.presentation.usb_teminal.UsbTerminalActivity"
-            android:exported="false"
-            android:screenOrientation="portrait" />
         <activity
             android:name="com.example.hpostesting.presentation.deviceinfo.DeviceActivity"
-            android:exported="false"
+            android:exported="false" />
-            android:theme="@style/Theme.HPOS.NoActionBar" />
         <activity
-            android:name="com.example.hpostesting.presentation.trueheme_test.DigitalCardActivity"
+            android:name="com.example.hpostesting.presentation.hemocube.DigitalCardActivity"
             android:exported="false" />
         <activity
             android:name="com.example.hpostesting.presentation.diagnostics.DiagnosticsActivity"
             android:exported="false"
             android:theme="@style/Theme.HPOS.NoActionBar" />
-        <activity
-            android:name="com.example.hpostesting.presentation.hb_test.HBTestActivity"
-            android:exported="false"
-            android:theme="@style/Theme.HPOS.NoActionBar" />
         <activity
             android:name="com.example.hpostesting.presentation.autodac.AutoDacActivity"
             android:exported="false"
             android:theme="@style/Theme.HPOS.NoActionBar" />
         <activity
             android:name="com.example.hpostesting.presentation.jig.JigActivity"
-            android:exported="true"
+            android:exported="false"
             android:theme="@style/Theme.HPOS.NoActionBar" />
         <activity
             android:name="com.example.hpostesting.presentation.deviceprovision.DeviceProvisionActivity"
@@ -99,20 +60,21 @@
         <activity
             android:name="com.example.hpostesting.presentation.calibration.CalibrationActivity"
             android:exported="false"
-            android:theme="@style/Theme.HPOS.NoActionBar" />
+            android:theme="@style/Theme.HPOS.NoActionBar"/>
+
         <activity
             android:name="com.example.hpostesting.presentation.assurance.AssuranceControlsActivity"
             android:exported="false"
-            android:screenOrientation="portrait"
+            android:theme="@style/Theme.HPOS.NoActionBar"/>
-            android:theme="@style/Theme.HPOS.NoActionBar" />
+
         <activity
-            android:name="com.example.hpostesting.presentation.trueheme_test.TrueHemeTestActivity"
+            android:name="com.example.hpostesting.presentation.hemocube.HemocubeActivity"
             android:exported="false"
             android:noHistory="true"
             android:parentActivityName="com.example.hpostesting.presentation.MainActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Theme.HPOS.NoActionBar"
             android:windowSoftInputMode="adjustPan" />
+
         <activity
             android:name="com.example.hpostesting.presentation.trueheme.TrueHemeActivity"
             android:exported="false"
@@ -120,6 +82,7 @@
             android:parentActivityName="com.example.hpostesting.presentation.MainActivity"
             android:theme="@style/Theme.HPOS.NoActionBar"
             android:windowSoftInputMode="adjustPan" />
+
         <activity
             android:name="com.example.hpostesting.presentation.buffercheck.HemocubeBufferCheckActivity"
             android:exported="false"
@@ -133,25 +96,25 @@
             android:noHistory="true"
             android:theme="@style/Theme.HPOS.NoActionBar" />
         <activity
-            android:name="com.example.hpostesting.presentation.main_base.DashboardActivity"
+            android:name="com.example.hpostesting.presentation.dashboard.DashboardActivity"
-            android:exported="true"
+            android:exported="false"
             android:label="@string/title_activity_dashboard"
-            android:screenOrientation="portrait"
             android:theme="@style/Theme.HPOS.NoActionBar"
+            android:screenOrientation="portrait"
             tools:ignore="AppLinkUrlError,MissingClass">
+
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
-
                 <data android:scheme="content" />
                 <data android:scheme="file" />
                 <data android:mimeType="application/vnd.android.package-archive" />
             </intent-filter>
         </activity>
 
+
         <service
-            android:name="com.example.hpostesting.util.UsbService"
+            android:name="com.example.hpostesting.presentation.testRight.UsbService"
             android:enabled="true"
             android:exported="false" />
 
@@ -161,22 +124,13 @@
             android:noHistory="true"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
-
+                <category android:name="android.intent.category.LAUNCHER"/>
-                <category android:name="android.intent.category.HOME" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.MONKEY" />
-                <category android:name="android.intent.category.LAUNCHER_APP" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
             android:name="com.example.hpostesting.presentation.testRight.TestRightActivity"
-            android:exported="true"
+            android:exported="false"
             android:noHistory="true"
             android:parentActivityName="com.example.hpostesting.presentation.MainActivity"
             android:theme="@style/Theme.HPOS.NoActionBar"
@@ -194,7 +148,6 @@
         <activity
             android:name="com.example.hpostesting.presentation.MainActivity"
             android:exported="true"
-            android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
@@ -208,7 +161,8 @@
             android:name="com.journeyapps.barcodescanner.CaptureActivity"
             android:screenOrientation="portrait"
             android:stateNotNeeded="true"
-            tools:replace="android:screenOrientation" /> <!-- ${applicationId} -->
+            tools:replace="android:screenOrientation" />
+<!--        ${applicationId}-->
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileprovider"
@@ -218,6 +172,7 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_paths" />
         </provider>
+
     </application>
 
 </manifest>

app/src/main/assets/app.properties

@@ -1,14 +1 @@
-#
-# // 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.
-#
-
 BASE_URL= https://datacollection.micropcr.com/api/

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

@@ -1,42 +1,25 @@
-/*
- * // 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
 
 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
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
-import javax.inject.Inject
 
 @HiltAndroidApp
 class HPOSTestingApplication : Application() {
-    @Inject
+    val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
-    lateinit var firebaseManager: FirebaseManager
+
     override fun onCreate() {
         super.onCreate()
         val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
-
-        // You can now use firebaseManager here after Hilt injects it
         val firestoreSettings = FirebaseFirestoreSettings.Builder()
             .setPersistenceEnabled(true) // Enable offline persistence if needed
             .build()
 
-        val firestore = firebaseManager.getCurrentFirestore()
+        val firestore = FirebaseFirestore.getInstance()
         firestore.firestoreSettings = firestoreSettings
     }
 }

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

@@ -1,17 +1,4 @@
-/*
+package com.example.hpostesting.data
- * // 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.os.Environment

app/src/main/java/com/example/hpostesting/data/DataHolder.kt

@@ -1,17 +1,4 @@
-/*
+package com.example.hpostesting.data
- * // 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.data.constant
 
 import androidx.lifecycle.MutableLiveData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
@@ -21,14 +8,12 @@ import com.example.hpostesting.data.model.test.TestType
 
 object DataHolder {
 
-    var sampleId: String = "sampleId"
     var selectedTestType: TestType = TestType.SICKLECERT
     val usbConnected = MutableLiveData(true)
     var mobileUniqueId: String? = null
     var isAppFolderCreated = false
     var appFolderPath = ""
     var isReferenceTaken = false
-    var isToken = false
     var sampleReadCounter = 0
 
     var deviceConstant: TestRightDeviceConstants? = null
@@ -38,14 +23,8 @@ object DataHolder {
     val intensityReferenceArray = ArrayList<Double>()
     var selectedTest: UserData? = null
     var hemoCubeTestData: HemoCubeTestData? = null
-    var bloodGroup: String = "Unknown"
-    var age = "0"
     var kitSerial: String = ""
-    var centerName: String = ""
-    var district: String = ""
-    var quickCapture:Boolean = false
     var location: UserData.Location? = null
-    var ipAddress: String ="0.0"
     var testExp: Boolean = true
     var hemocubeResult: Double? = null
 }

app/src/main/java/com/example/hpostesting/data/InternetConnectionLiveData.kt

@@ -1,17 +1,4 @@
-/*
+package com.example.hpostesting.data
- * // 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

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

@@ -1,17 +1,4 @@
-/*
+package com.example.hpostesting.data
- * // 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.content.SharedPreferences

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

@@ -0,0 +1,7 @@
+package com.example.hpostesting.data
+
+sealed class Result<out T : Any> {
+    data class Success<out T : Any>(val data: T) : Result<T>()
+    data class Error(val exception: Exception) : Result<Nothing>()
+    class Loading<T : Any> : Result<T>()
+}

app/src/main/java/com/example/hpostesting/data/api/MolbioAuthApi.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.api
 
 import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest

app/src/main/java/com/example/hpostesting/data/api/MolbioResultApi.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.api
 
 import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
@@ -23,7 +10,6 @@ import com.example.hpostesting.data.model.updates.CheckUpdateResponse
 import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
 import okhttp3.MultipartBody
 import okhttp3.ResponseBody
-import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.Multipart
@@ -43,14 +29,10 @@ interface MolbioResultApi {
         @Body checkUpdateRequest: CheckUpdateRequest,
     ): CheckUpdateResponse
 
-//    @POST("deviceService/device/getUpdate")
-//    suspend fun deviceUpdate(
-//        @Body deviceUpdateRequest: DeviceUpdateRequest,
-//    ): ResponseBody
     @POST("deviceService/device/getUpdate")
     suspend fun deviceUpdate(
         @Body deviceUpdateRequest: DeviceUpdateRequest,
-    ): Response<ResponseBody>
+    ): ResponseBody
 
     @GET("deviceService/device/getClientCertificate")
     suspend fun downloadClientCertificate(

app/src/main/java/com/example/hpostesting/data/api/PropertyProvider.kt

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

app/src/main/java/com/example/hpostesting/data/constant/Constants.kt

@@ -1,35 +1,14 @@
-/*
- * // 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.data.constant
 
 object Constants {
-    const val CENTER_NAME =""
-    const val DISTRICT =""
-    const val BUFFER_FLAGS_ENABLED = true//testing flag disable then pass buffer and sample checks
-    const val ABS_FLAGS_ENABLED = false
-    const val IP_ADDRESS="ip_address"
-    const val QUICK_CAPTURE="quick_capture"
-    const val KIT_TIME = "kit_time"
     const val ACTION_USB_PERMISSION = "shanmukha.in.sickle_cell.USB_PERMISSION"
     const val HEMOCUBE_USB_PERMISSION = "shanmukha.in.sickle_cell_homocube.USB_PERMISSION"
-    const val passphrase = "smi_#@sql"
+
     const val BASE_URL = "www.google.com"
     const val DOCUMENT_ID_FOR_UPDATE ="2o71vBKLqdgEKYtFG8Lb"
     const val ABHA_APP_PACKAGE = "in.ndhm.phr"
 
-    const val MOLBIO_INTEGRATION = false
+    const val MOLBIO_INTEGRATION = true
-    const val FIREBASE_INTEGRATION = true
     const val deviceProvisionEmail = "HPOS_provisioner@bigtec.co.in"
     const val deviceProvisionPassword = "f2ab0e7f9d69"
     const val DEVICE_ID_API = "deviceIDAPI"
@@ -45,8 +24,7 @@ object Constants {
 
     const val TEST_RIGHT_TOTAL_PIXEL = 3694
 
-    const val MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE = 34
+    const val MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE = 40
-    const val MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE10MM = 9
 
     const val RANGE_IN_RESULT_CALCULATIONS = 10
 
@@ -77,7 +55,6 @@ object Constants {
     const val USER_ID = "usernameId"
 
     const val QUICK_CAPTURE_SOLUTION = "SOLUTION"
-    const val QUICK_CAPTURE_FOR_ADMIN = "ADMIN"
     const val QUICK_CAPTURE_CONCENTRATION = "CONCENTRATION"
     const val QUICK_CAPTURE_VOLUME = "VOLUME"
     const val QUICK_CAPTURE_READING_PER_SAMPLE = "READING_PER_SAMPLE"
@@ -87,16 +64,168 @@ object Constants {
     // jig
     const val NAVIGATE_TO_TEST_JIG_DIRECTLY = false
 
-    //update values of abs
+    val STATICID = listOf(
-    const val ABS2LED1MMLL = "ABS2LED1MMLL"
+        "FACTORY",
-    const val ABS2LED1MMUL = "ABS2LED1MMUL"
+        "ADMIN",
-    const val ABS2LED2MMLL = "ABS2LED2MMLL"
+        "PQUSER",
-    const val ABS2LED2MMUL = "ABS2LED2MMUL"
+        "QCUSER",
+        "VIZ-1000-0004",
+        "VIZ-1000-0005",
+        "VIZ-1000-0006",
+        "HC-V1-001",
+        "HC-V1-002",
+        "HC-V1-003",
+        "HC-V1-004",
+        "HC-V1-005",
+        "HC-V1-006",
+        "HC-V1-007",
+        "HC-V1-008",
+        "HC-V1-009",
+        "HC-V1-010",
+        "HC-V1-011",
+        "HC-V1-012",
+        "HC-V1-013",
+        "HC-V1-014",
+        "HC-V1-015",
+        "HC-V1-016",
+        "HC-V1-017",
+        "HC-V1-018",
+        "HC-V1-019",
+        "HC-V1-020",
+        "HCV-000-1015",
+        "HCV-000-3002",
+        "HCV-000-3003",
+        "HCV-000-3004",
+        "HCV-000-3005",
+        "HCV-000-3006",
+        "HCV-000-3007",
+        "HCV-000-3008",
+        "HCV-000-3009",
+        "HCV-000-3010",
+        "HCV-000-3011",
+        "HCV-000-3012",
+        "HCV-000-3013",
+        "HCV-000-3014",
+        "HCV-000-3015",
+        "HCV-000-3016",
+        "HCV-000-3017",
+        "HCV-000-3018",
+        "HCV-000-3019",
+        "HCV-000-3020",
+        "HCV-000-3021",
+        "HCV-000-3022",
+        "HCV-000-3023",
+        "HCV-000-3024",
+        "HCV-000-3025",
+        "HCV-000-3026",
+        "HCV-000-3027",
+        "HCV-000-3028",
+        "HCV-000-3029",
+        "HCV-000-3030",
+        "HPP1-0124-0001",
+        "HPP1-0124-0002",
+        "HPP1-0124-0003",
+        "HPP1-0124-0004",
+        "HPP1-0124-0005",
+        "HPP1-0124-0006",
+        "HPP1-0124-0007",
+        "HPP1-0124-0008",
+        "HPP1-0124-0009",
+        "HPP1-0124-0010",
+        "HPP1-0124-0011",
+        "HPP1-0124-0012",
+        "HPP1-0124-0013",
+        "HPP1-0124-0014",
+        "HPP1-0124-0015",
+        "HPP1-0124-0016",
+        "HPP1-0124-0017",
+        "HPP1-0124-0018",
+        "HPP1-0124-0019",
+        "HPP1-0124-0020",
+        "HPP1-0124-0021",
+        "HPP1-0124-0022",
+        "HPP1-0124-0023",
+        "HPP1-0124-0024",
+        "HPP1-0124-0025",
+        "HPP1-0124-0026",
+        "HPP1-0124-0027",
+        "HPP1-0124-0028",
+        "HPP1-0124-0029",
+        "HPP1-0124-0030",
+        "HPP1-0124-0031",
+        "HPP1-0124-0032",
+        "HPP1-0124-0033",
+        "HPP1-0124-0034",
+        "HPP1-0124-0035",
+        "HPP1-0124-0036",
+        "HPP1-0124-0037",
+        "HPP1-0124-0038",
+        "HPP1-0124-0039",
+        "HPP1-0124-0040",
+        "HPP1-0124-0041",
+        "HPP1-0124-0042",
+        "HPP1-0124-0043",
+        "HPP1-0124-0044",
+        "HPP1-0124-0045",
+        "HPP1-0124-0046",
+        "HPP1-0124-0047",
+        "HPP1-0124-0048",
+        "HPP1-0124-0049",
+        "HPP1-0124-0050",
+        "HCV-001-0001",
+        "HCV-001-0002",
+        "HCV-001-0003",
+        "HCV-001-0004",
+        "HCV-001-0005",
+        "HCV-001-0006",
+        "HCV-001-0007",
+        "HCV-001-0008",
+        "HCV-001-0009",
+        "HCV-001-0010",
+        "HCV-001-0011",
+        "HCV-001-0012",
+        "HCV-001-0013",
+        "HCV-001-0014",
+        "HCV-001-0015",
+        "HCV-001-0016",
+        "HCV-001-0017",
+        "HCV-001-0018",
+        "HCV-001-0019",
+        "HCV-001-0020",
+        "HCV-001-0021",
+        "HCV-001-0022",
+        "HCV-001-0023",
+        "HCV-001-0024",
+        "HCV-001-0025",
+        "HCV-001-0026",
+        "HCV-001-0027",
+        "HCV-001-0028",
+        "HCV-001-0029",
+        "HCV-001-0030",
+        "HCV-001-0031",
+        "HCV-001-0032",
+        "HCV-001-0033",
+        "HCV-001-0034",
+        "HCV-001-0003",
+        "HCV-001-0035",
+        "HCV-001-0036",
+        "HCV-001-0037",
+        "HCV-001-0038",
+        "HCV-001-0039",
+        "HCV-001-0040",
+        "HCV-001-0041",
+        "HCV-001-0042",
+        "HCV-001-0043",
+        "HCV-001-0044",
+        "HCV-001-0045",
+        "HCV-001-0046",
+        "HCV-001-0047",
+        "HCV-001-0048",
+        "HCV-001-0049",
+        "HCV-001-0050",
+    )
 
-    const val ABS10LED1MMLL = "ABS10LED1MMLL"
+    const val password = "SMI@12345"
-    const val ABS10LED1MMUL = "ABS10LED1MMUL"
-    const val ABS10LED2MMLL = "ABS10LED2MMLL"
-    const val ABS10LED2MMUL = "ABS10LED2MMUL"
 
     const val KIT_NUMBER = "KitNumber"
     const val KIT_COUNT = "KitCount"
@@ -106,9 +235,7 @@ object Constants {
     const val BUFFER_VALUE_3 = "BufferValue3"
     const val BUFFER_VALUE_4 = "BufferValue4"
     const val DEVICE_ID = "DEVICE_ID"
-    const val LABNAME = "LAB_NAME"
+
-    const val CUVETTE_SIZE = "CUVETTE_SIZE"
-    const val IS_TOKEN_AVAILABLE = "IS_TOKEN_AVAILABLE"
     const val BUFFER_LED_LOWER_BOUND = 21000
     const val BUFFER_LED_UPPER_BOUND = 23500
 
@@ -1085,8 +1212,7 @@ object Constants {
     )
 
     const val INCUBATION_TIME_MIN = 0
-    const val INCUBATION_TIME_MAX = 300
+    const val INCUBATION_TIME_MAX = 1400
-    const val MAX_KIT_TIME = 240
     const val BATTERY_LEVEL_MIN = Int.MIN_VALUE
 
     const val PQ_MODE = true
@@ -1583,227 +1709,5 @@ object Constants {
             listOf(0.0, 0.0)
         )
     )
-    //Trueheme for 10mm
-    //Before changing below values review before
-    //classification borderline metric
-    const val positiveBoderLineMetricCheck10mmMin = 1.3
-    const val positiveBoderLineMetricCheck10mmMax = 1.66
-    const val negativeBoderLineMetricCheck10mmMin = 2.0
-    const val negativeBoderLineMetricCheck10mmMax = 2.4
-    //classification device ratio
-    const val normalMin10mm = 0.07
-    const val normalMax10mm = 0.23
-    const val negativeBorderlineMin10mm = 0.23
-    const val negativeBorderlineMax10mm = 0.27
-    const val sickleCellTraitMin10mm = 0.27
-    const val sickleCellTraitMax10mm = 0.31
-    const val positiveBoderlineMin10mm = 0.31
-    const val positiveBoderlineMax10mm = 0.39
-    const val sickleCellDiseaseMin10mm = 0.39
-    const val sickleCellDiseaseMax10mm = 0.7
-    //Trueheme for 2mm
-    //classification borderline metric
-    const val positiveBoderLineMetricCheck2mmMin = 0.8
-    const val positiveBoderLineMetricCheck2mmMax = 1.1
-    const val negativeBoderLineMetricCheck2mmMin = 1.5
-    const val negativeBoderLineMetricCheck2mmMax = 1.9
-    //classification device ratio
-    const val normalMin2mm = 0.1
-    const val normalMax2mm = 0.23
-    const val negativeBorderlineMin2mm = 0.23
-    const val negativeBorderlineMax2mm = 0.25
-    const val sickleCellTraitMin2mm = 0.25
-    const val sickleCellTraitMax2mm = 0.31
-    const val positiveForSickleCellMin2mm = 0.31
-    const val positiveForSickleCellMax2mm = 0.45
-    const val sickleCellDiseaseMin2mm = 0.45
-    const val sickleCellDiseaseMax2mm = 0.7
 
-    const val min2mmLed1 = 0.34
-    const val max2mmLed1 = 1.48
-    const val min2mmLed2 = 0.04
-    const val max2mmLed2 = 0.33
-    const val min10mmLed1 = 0.22
-    const val max10mmLed1 = 1.12
-    const val min10mmLed2 = 0.05
-    const val max10mmLed2 = 0.41
-
-    //Check used in handling the buffer values on buffer complete
-    const val bufferMinLed1 = 21000.00
-    const val bufferMaxLed1 = 23000.00
-    const val bufferMinLed2 = 17000.00
-    const val bufferMaxLed2 = 19000.00
-
-
-    //    val STATICID = listOf(
-//        "FACTORY",
-//        "ADMIN",
-//        "PQUSER",
-//        "QCUSER",
-//        "VIZ-1000-0004",
-//        "VIZ-1000-0005",
-//        "VIZ-1000-0006",
-//        "HC-V1-001",
-//        "HC-V1-002",
-//        "HC-V1-003",
-//        "HC-V1-004",
-//        "HC-V1-005",
-//        "HC-V1-006",
-//        "HC-V1-007",
-//        "HC-V1-008",
-//        "HC-V1-009",
-//        "HC-V1-010",
-//        "HC-V1-011",
-//        "HC-V1-012",
-//        "HC-V1-013",
-//        "HC-V1-014",
-//        "HC-V1-015",
-//        "HC-V1-016",
-//        "HC-V1-017",
-//        "HC-V1-018",
-//        "HC-V1-019",
-//        "HC-V1-020",
-//        "HCV-000-1015",
-//        "HCV-000-3002",
-//        "HCV-000-3003",
-//        "HCV-000-3004",
-//        "HCV-000-3005",
-//        "HCV-000-3006",
-//        "HCV-000-3007",
-//        "HCV-000-3008",
-//        "HCV-000-3009",
-//        "HCV-000-3010",
-//        "HCV-000-3011",
-//        "HCV-000-3012",
-//        "HCV-000-3013",
-//        "HCV-000-3014",
-//        "HCV-000-3015",
-//        "HCV-000-3016",
-//        "HCV-000-3017",
-//        "HCV-000-3018",
-//        "HCV-000-3019",
-//        "HCV-000-3020",
-//        "HCV-000-3021",
-//        "HCV-000-3022",
-//        "HCV-000-3023",
-//        "HCV-000-3024",
-//        "HCV-000-3025",
-//        "HCV-000-3026",
-//        "HCV-000-3027",
-//        "HCV-000-3028",
-//        "HCV-000-3029",
-//        "HCV-000-3030",
-//        "HPP1-0124-0001",
-//        "HPP1-0124-0002",
-//        "HPP1-0124-0003",
-//        "HPP1-0124-0004",
-//        "HPP1-0124-0005",
-//        "HPP1-0124-0006",
-//        "HPP1-0124-0007",
-//        "HPP1-0124-0008",
-//        "HPP1-0124-0009",
-//        "HPP1-0124-0010",
-//        "HPP1-0124-0011",
-//        "HPP1-0124-0012",
-//        "HPP1-0124-0013",
-//        "HPP1-0124-0014",
-//        "HPP1-0124-0015",
-//        "HPP1-0124-0016",
-//        "HPP1-0124-0017",
-//        "HPP1-0124-0018",
-//        "HPP1-0124-0019",
-//        "HPP1-0124-0020",
-//        "HPP1-0124-0021",
-//        "HPP1-0124-0022",
-//        "HPP1-0124-0023",
-//        "HPP1-0124-0024",
-//        "HPP1-0124-0025",
-//        "HPP1-0124-0026",
-//        "HPP1-0124-0027",
-//        "HPP1-0124-0028",
-//        "HPP1-0124-0029",
-//        "HPP1-0124-0030",
-//        "HPP1-0124-0031",
-//        "HPP1-0124-0032",
-//        "HPP1-0124-0033",
-//        "HPP1-0124-0034",
-//        "HPP1-0124-0035",
-//        "HPP1-0124-0036",
-//        "HPP1-0124-0037",
-//        "HPP1-0124-0038",
-//        "HPP1-0124-0039",
-//        "HPP1-0124-0040",
-//        "HPP1-0124-0041",
-//        "HPP1-0124-0042",
-//        "HPP1-0124-0043",
-//        "HPP1-0124-0044",
-//        "HPP1-0124-0045",
-//        "HPP1-0124-0046",
-//        "HPP1-0124-0047",
-//        "HPP1-0124-0048",
-//        "HPP1-0124-0049",
-//        "HPP1-0124-0050",
-//        "HCV-001-0001",
-//        "HCV-001-0002",
-//        "HCV-001-0003",
-//        "HCV-001-0004",
-//        "HCV-001-0005",
-//        "HCV-001-0006",
-//        "HCV-001-0007",
-//        "HCV-001-0008",
-//        "HCV-001-0009",
-//        "HCV-001-0010",
-//        "HCV-001-0011",
-//        "HCV-001-0012",
-//        "HCV-001-0013",
-//        "HCV-001-0014",
-//        "HCV-001-0015",
-//        "HCV-001-0016",
-//        "HCV-001-0017",
-//        "HCV-001-0018",
-//        "HCV-001-0019",
-//        "HCV-001-0020",
-//        "HCV-001-0021",
-//        "HCV-001-0022",
-//        "HCV-001-0023",
-//        "HCV-001-0024",
-//        "HCV-001-0025",
-//        "HCV-001-0026",
-//        "HCV-001-0027",
-//        "HCV-001-0028",
-//        "HCV-001-0029",
-//        "HCV-001-0030",
-//        "HCV-001-0031",
-//        "HCV-001-0032",
-//        "HCV-001-0033",
-//        "HCV-001-0034",
-//        "HCV-001-0003",
-//        "HCV-001-0035",
-//        "HCV-001-0036",
-//        "HCV-001-0037",
-//        "HCV-001-0038",
-//        "HCV-001-0039",
-//        "HCV-001-0040",
-//        "HCV-001-0041",
-//        "HCV-001-0042",
-//        "HCV-001-0043",
-//        "HCV-001-0044",
-//        "HCV-001-0045",
-//        "HCV-001-0046",
-//        "HCV-001-0047",
-//        "HCV-001-0048",
-//        "HCV-001-0049",
-//        "HCV-001-0050",
-//        "HCV-000-6001",
-//        "HCV-000-6002",
-//        "HCV-000-6003",
-//        "HCV-000-6004",
-//        "HCV-000-6005",
-//        "HCV-000-6006",
-//        "HCV-000-6007",
-//        "HCV-000-6008",
-//        "HCV-000-6009",
-//        "HCV-000-6010",
-//    )
-//
 }

app/src/main/java/com/example/hpostesting/data/constant/HemoCubeCommands.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.constant
 
 enum class HemoCubeCommands(val command: String) {
@@ -28,7 +15,4 @@ enum class HemoCubeCommands(val command: String) {
     SECOND_GAIN_COMMAND("U\r"),
     THIRD_GAIN_COMMAND("V\r"),
     FORTH_GAIN_COMMAND("W\r"),
-    CHECK_CUVETTE_COMMAND("L\r"),
-    CHECK_TEMP_COMMAND("A\r"),
-    J_COMMAND("J\r"),
 }

app/src/main/java/com/example/hpostesting/data/constant/LanguageManager.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.constant
 
 import android.content.Context

app/src/main/java/com/example/hpostesting/data/constant/TestRightCommands.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.constant
 
 enum class TestRightCommands(val command: String) {

app/src/main/java/com/example/hpostesting/data/constant/TestStatus.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.constant
 
 enum class TestStatus(val code: Double) {
@@ -23,20 +10,11 @@ enum class TestStatus(val code: Double) {
     FIRST_EMPTY_AIR_READING_PRINT_COMPLETED(4.4),
     EPROM_ADC_RETRIEVAL_STARTED(4.5),
     EPROM_ADC_RETRIEVAL_COMPLETED(4.6),
-    TEMPERATURE_CHECK(4.7),
+    BUFFER_STARTED(4.7),
-    CUVETTE_ABSENT(4.8),
+    BUFFER_COMPLETED(5.0),
-    CUVETTE_PRESENT(4.9),
-    CUVETTE_ABSENTR(5.1),
-    CUVETTE_PRESENTR(5.2),
-    CUVETTE_ABSENTS(7.7),
-    CUVETTE_PRESENTS(7.8),
-    BUFFER_STARTED(5.4),
-    BUFFER_COMPLETED(5.5),
     BUFFER_PRINT_STARTED(6.0),
     BUFFER_PRINT_COMPLETED(7.0),
     SAMPLE_STARTED(8.0),
-    CUVETTE_ABSENTT(30.2),
-    CUVETTE_PRESENTT(30.1),
     SAMPLE_COMPLETED(9.0),
     SAMPLE_PRINT_STARTED(10.0),
     SAMPLE_PRINT_COMPLETED(11.0),

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

@@ -1,16 +1,3 @@
-/*
- * // 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.data.dao
 
 import androidx.room.TypeConverter

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

@@ -1,16 +1,3 @@
-/*
- * // 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.data.dao
 
 import androidx.lifecycle.LiveData

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

@@ -1,16 +1,3 @@
-/*
- * // 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.data.dao
 
 import androidx.lifecycle.LiveData

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

@@ -1,16 +1,3 @@
-/*
- * // 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.data.dao
 
 import androidx.lifecycle.LiveData
@@ -18,7 +5,6 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import androidx.room.Update
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
 @Dao
@@ -26,12 +12,6 @@ interface HemoCubeDao {
     @Query("SELECT * from hemo_cube_test_table")
     fun getAll(): LiveData<List<HemoCubeTestData>>
 
-    @Query("SELECT * from hemo_cube_test_table WHERE molbioFlag=0")
-    fun getMolbioPending(): List<HemoCubeTestData>
-
-    @Query("SELECT * from hemo_cube_test_table WHERE localFlag=0")
-    fun getFirebasePending():List<HemoCubeTestData>
-
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertAll(hemoCubeTestData: HemoCubeTestData)
 
@@ -40,8 +20,7 @@ interface HemoCubeDao {
 
     @Query("DELETE FROM hemo_cube_test_table WHERE _id = :id")
     suspend fun deleteById(id: String)
-    @Query("DELETE FROM hemo_cube_test_table WHERE testStatus = 0")
+
-    suspend fun deleteByStatus()
     @Query("UPDATE hemo_cube_test_table SET localFlag = :newValue WHERE _id = :id")
     suspend fun updateFieldById(id: String, newValue: Boolean)
 
@@ -51,11 +30,7 @@ interface HemoCubeDao {
     @Query("UPDATE hemo_cube_test_table SET isCSVCreated = :newValue WHERE _id = :id")
     suspend fun updateCSVFieldById(id: String, newValue: Boolean)
 
-    @Query("SELECT * from hemo_cube_test_table WHERE localFlag = 0")
+    @Query("SELECT * from hemo_cube_test_table WHERE molbioFlag = :status")
-    fun getPendingUser(): LiveData<List<HemoCubeTestData>>
+    suspend fun getPendingUser(status: Boolean): List<HemoCubeTestData>
-
-    @Update
-    suspend fun updateTest(hemoCubeTestData: HemoCubeTestData)
-
 
 }

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

@@ -1,16 +1,3 @@
-/*
- * // 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.data.dao
 
 import androidx.room.Database
@@ -23,7 +10,7 @@ import com.example.hpostesting.data.model.patient.UserData
 
 @Database(
     entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class],
-    version = 38,
+    version = 28,
     exportSchema = false
 )
 @TypeConverters(Converters::class)

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

@@ -1,16 +1,3 @@
-/*
- * // 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.data.dao
 
 import androidx.lifecycle.LiveData

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

@@ -1,16 +1,3 @@
-/*
- * // 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.data.datasource
 
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
@@ -24,6 +11,4 @@ interface LocalFileDataSource {
     fun exportDataToCSV(
         fileName: String, dataList: List<HemoCubeTestData>,
     ): Boolean
-    fun backUpDataToCSV(fileName: String, dataList: List<HemoCubeTestData>)
-
 }

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

@@ -1,16 +1,3 @@
-/*
- * // 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.data.datasource
 
 import android.os.Environment
@@ -54,7 +41,7 @@ class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
                 "name",
                 "incubationTime",
                 "bloodGroup",
-                "age", // Include other fields from the data class
+                "birthYear", // Include other fields from the data class
                 "state",
                 "abhaId",
                 "userImageURL",
@@ -102,15 +89,14 @@ class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
             )
             csvWriter.writeNext(header)
 
-            // Filter and write data rows where testStatus is true
+            // Write data rows
-            val filteredDataList = dataList.filter { it.testStatus == true }
+            for (data in dataList) {
-            for (data in filteredDataList) {
                 val row = arrayOf(
                     data._id,
                     data.name,
                     data.incubationTime,
                     data.bloodGroup,
-                    data.age, // Include other fields similarly
+                    data.birthYear, // Include other fields similarly
                     data.state,
                     data.abhaId,
                     data.userImageURL,
@@ -166,127 +152,6 @@ class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
         }
     }
 
-    override fun backUpDataToCSV(fileName: String, dataList: List<HemoCubeTestData>) {
-        try {
-            val filePath = File(getExternalStorageDirectory(), fileName)
-            val writer = FileWriter(filePath)
-            val csvWriter = CSVWriter(writer)
-            // Write CSV header
-            val header = arrayOf(
-                "_id",
-                "name",
-                "incubationTime",
-                "bloodGroup",
-                "age", // Include other fields from the data class
-                "state",
-                "abhaId",
-                "userImageURL",
-                "location",
-                "reportUploadTime",
-                "testType",
-                "testTime",
-                "testStatus",
-                "gender",
-                "localFlag", // Add more fields as necessary
-                "deviceId",
-                "appVersion",
-                "deviceSerialNumber",
-                "deviceType",
-                "kitSerial",
-                "resultData",
-                "led1Buffer",
-                "led2Buffer",
-                "led3Buffer",
-                "led4Buffer",
-                "led1Sample",
-                "led2Sample",
-                "led3Sample",
-                "led4Sample",
-                "led1Average",
-                "led2Average",
-                "led3Average",
-                "led4Average",
-                "abs1",
-                "abs2",
-                "abs3",
-                "abs4",
-                "deviceRatio",
-                "calculatedRatio",
-                "predictedDenovixRatio",
-                "coefficients",
-                "classificationResult",
-                "prdClassification",
-                "errorMessages",
-                "batteryLevel",
-                "batteryCapacity",
-                "batteryMaxCapacity",
-                "batteryTemperature",
-                "batteryVoltage"
-            )
-            csvWriter.writeNext(header)
-
-            // Filter and write data rows where testStatus is true
-            val filteredDataList = dataList.filter { it.testStatus == true }
-            for (data in filteredDataList) {
-                val row = arrayOf(
-                    data._id,
-                    data.name,
-                    data.incubationTime,
-                    data.bloodGroup,
-                    data.age, // Include other fields similarly
-                    data.state,
-                    data.abhaId,
-                    data.userImageURL,
-                    data.location?.toString(),
-                    data.reportUploadTime ?: "",
-                    data.testType ?: "",
-                    data.testTime ?: "",
-                    data.testStatus?.toString() ?: "",
-                    data.gender,
-                    data.localFlag.toString(),
-                    data.deviceId ?: "",
-                    data.appVersion ?: "",
-                    data.deviceSerialNumber,
-                    data.deviceType,
-                    data.kitSerial,
-                    data.resultData,
-                    data.led1Buffer?.toString() ?: "",
-                    data.led2Buffer?.toString() ?: "",
-                    data.led3Buffer?.toString() ?: "",
-                    data.led4Buffer?.toString() ?: "",
-                    data.led1Sample?.toString() ?: "",
-                    data.led2Sample?.toString() ?: "",
-                    data.led3Sample?.toString() ?: "",
-                    data.led4Sample?.toString() ?: "",
-                    data.led1Average?.toString() ?: "",
-                    data.led2Average?.toString() ?: "",
-                    data.led3Average?.toString() ?: "",
-                    data.led4Average?.toString() ?: "",
-                    data.abs1?.toString() ?: "",
-                    data.abs2?.toString() ?: "",
-                    data.abs3?.toString() ?: "",
-                    data.abs4?.toString() ?: "",
-                    data.deviceRatio?.toString() ?: "",
-                    data.calculatedRatio?.toString() ?: "",
-                    data.predictedDenovixRatio?.toString() ?: "",
-                    data.coefficients ?: "",
-                    data.classificationResult,
-                    data.prdClassification,
-                    data.errorMessages,
-                    data.batteryLevel,
-                    data.batteryCapacity,
-                    data.batteryMaxCapacity,
-                    data.batteryTemperature,
-                    data.batteryVoltage
-                )
-                csvWriter.writeNext(row)
-            }
-            writer.close()
-        } catch (e: IOException) {
-            e.printStackTrace()
-        }
-    }
-
     private fun getExternalStorageDirectory(): File {
         val folder = File(Environment.getExternalStorageDirectory(), "HposFolder")
 

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

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model
 
 

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

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model
 
 data class CalculationVariableForTest(

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

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model
 
 data class ErrorMessage (

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

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model
 
 data class Location(

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

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model
 
 import com.example.hpostesting.data.model.test.TestRightResultType

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

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model
 
 import java.util.Calendar

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

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model
 
 sealed class Response<out R> {

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

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model
 
 import com.example.hpostesting.data.constant.Constants

app/src/main/java/com/example/hpostesting/data/model/calibration/CalibrationData.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.calibration
 
 data class CalibrationData (

app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/AdditionalDetails.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.devicediagnostics
 
 data class AdditionalDetails(

app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/DeviceDiagnosticsData.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.devicediagnostics
 
 data class DeviceDiagnosticsData(

app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/DeviceDiagnosticsRequest.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.devicediagnostics
 
 data class DeviceDiagnosticsRequest(

app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/DeviceDiagnosticsResponse.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.devicediagnostics
 
 import com.google.gson.annotations.SerializedName

app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Credentials.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.deviceprovision
 
 data class Credentials(

app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Device.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.deviceprovision
 
 data class Device(

app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionData.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.deviceprovision
 
 data class DeviceProvisionData(

app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionRequest.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.deviceprovision
 
 data class DeviceProvisionRequest(

app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionResponse.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.deviceprovision
 
 import com.google.gson.annotations.SerializedName

app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceType.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.deviceprovision
 
 data class DeviceType(

app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceUser.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.deviceprovision
 
 data class DeviceUser(

app/src/main/java/com/example/hpostesting/data/model/deviceprovision/ProvisionData.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.deviceprovision
 
 data class ProvisionData(

app/src/main/java/com/example/hpostesting/data/model/diagnostics/DiagnosticsData.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.diagnostics
 
 data class DiagnosticsData(

app/src/main/java/com/example/hpostesting/data/model/jig/JigData.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.jig
 
 data class JigData(

app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsData.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.log
 
 data class UploadLogsData(

app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsResponse.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.log
 
 import com.google.gson.annotations.SerializedName

app/src/main/java/com/example/hpostesting/data/model/login/Device.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.login
 
 data class Device(

app/src/main/java/com/example/hpostesting/data/model/login/DeviceType.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.login
 
 data class DeviceType(

app/src/main/java/com/example/hpostesting/data/model/login/DeviceUser.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.login
 
 data class DeviceUser(

app/src/main/java/com/example/hpostesting/data/model/login/LoginData.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.login
 
 data class LoginData(

app/src/main/java/com/example/hpostesting/data/model/login/LoginRequest.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.login
 
 data class LoginRequest(

app/src/main/java/com/example/hpostesting/data/model/login/LoginResponse.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.login
 
 import com.google.gson.annotations.SerializedName

app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2Result.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.molbioresult
 
 import com.example.hpostesting.data.model.patient.HemoCubeTestData

app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultData.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.molbioresult
 
 import com.example.hpostesting.data.model.patient.HemoCubeTestData

app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultRequest.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.molbioresult
 
 data class MolbioV2ResultRequest(

app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultResponse.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.molbioresult
 
 import com.google.gson.annotations.SerializedName

app/src/main/java/com/example/hpostesting/data/model/molbioresult/RawData.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.molbioresult
 
 import com.example.hpostesting.data.model.patient.UserData

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

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.patient
 
 import androidx.room.Entity

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

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.patient
 
 import androidx.room.Entity

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

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.patient
 
 import androidx.room.Entity
@@ -18,13 +5,12 @@ import androidx.room.PrimaryKey
 
 @Entity(tableName = "hemo_cube_test_table")
 data class HemoCubeTestData(
-    @PrimaryKey(autoGenerate = true)
+    @PrimaryKey
-    var sampleid: Int = 0,
     var _id: String = "",
     var name: String = "",
     var incubationTime: String = "",
     var bloodGroup: String = "",
-    var age: String = "",
+    var birthYear: String = "",
     var state: String = "",
     var abhaId: String = "",
     var userImageURL: String = "",
@@ -103,13 +89,6 @@ data class HemoCubeTestData(
     var quickCapture: Boolean = false,
     var solution: String? = "",
     var concentration: String? = "",
-    var filter: String? = "",
     var volume: String? = "",
     var isCSVCreated: Boolean = false,
-    var labName: String? = "",
-    var cuvetteSize: String? = "",
-    var district: String? = "",
-    var centerName: String? = "",
-    var ipAddress:String?= "",
-    var configUpdatedRecent:String?= ""
 )

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

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.patient
 
 import java.util.Date

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

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.patient
 
 import androidx.room.Entity
@@ -24,7 +11,7 @@ data class UserData(
     var name: String = "",
     var incubationTime: String = "",
     var gender: String = "",
-    var age: String = "",
+    var birthYear: String = "",
     var abhaId: String = "",
     var bloodGroup: String = "",
     var userImageURL: String = "",
@@ -43,7 +30,6 @@ data class UserData(
     var result: TestRightResultType? = null,
     var resultRatio: Double? = null,
     var prdClassification: String = "",
-    var sampleid: Int = 0
 ) {
     enum class Gender {
         MALE,
@@ -60,10 +46,8 @@ data class UserData(
 fun UserData.toHemoCubeTestData() = HemoCubeTestData(
     _id = _id,
     name = name,
-    sampleid = sampleid,
     bloodGroup = bloodGroup,
-    incubationTime = incubationTime,
+    birthYear = birthYear,
-    age = age,
     gender = gender,
     state = state,
     abhaId = abhaId,

app/src/main/java/com/example/hpostesting/data/model/test/TestRightCalculationData.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.test
 
 data class TestRightCalculationData(

app/src/main/java/com/example/hpostesting/data/model/test/TestRightDeviceConstants.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.test
 
 data class TestRightDeviceConstants(

app/src/main/java/com/example/hpostesting/data/model/test/TestRightResultType.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.test
 
 enum class TestRightResultType {

app/src/main/java/com/example/hpostesting/data/model/test/TestType.kt

@@ -1,20 +1,6 @@
-/*
- * // 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.data.model.test
 
 enum class TestType {
     SICKLECERT,
-    SICKLEFIND,
+    SICKLEFIND
-    HB_EST
 }

app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateData.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.updates
 
 data class CheckUpdateData(

app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateRequest.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.updates
 
 data class CheckUpdateRequest(

app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateResponse.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.updates
 
 import com.google.gson.annotations.SerializedName

app/src/main/java/com/example/hpostesting/data/model/updates/DeviceUpdateRequest.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.updates
 
 data class DeviceUpdateRequest(

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

@@ -1,23 +1,7 @@
-/*
- * // 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.data.repository
 
 import android.net.Uri
-import android.os.Build
+import com.example.hpostesting.data.Result
-import android.util.Log
-import androidx.annotation.RequiresApi
-import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.api.MolbioAuthApi
 import com.example.hpostesting.data.api.MolbioResultApi
 import com.example.hpostesting.data.model.PendingUploads
@@ -40,18 +24,17 @@ import com.example.hpostesting.data.model.patient.UserData
 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.firebase.FirebaseManager
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.firestore.FirebaseFirestore
+import com.google.firebase.firestore.ktx.firestore
 import com.google.firebase.ktx.Firebase
-import com.google.firebase.storage.FirebaseStorage
+import com.google.firebase.storage.ktx.storage
 import kotlinx.coroutines.tasks.await
 import okhttp3.MultipartBody
 import okhttp3.ResponseBody
 import java.io.File
 import java.net.ConnectException
 import java.net.SocketTimeoutException
-import java.time.LocalTime
 import javax.inject.Inject
 import javax.inject.Named
 
@@ -59,30 +42,11 @@ class NetworkException(message: String, cause: Throwable) : Exception(message, c
 class DatabaseRepository @Inject constructor(
     @Named("Auth") private val molbioAuthApi: MolbioAuthApi,
     private val molbioResultApi: MolbioResultApi,
-    private val firebaseManager: FirebaseManager,
 ) : Repository {
 
-    private val localdb: FirebaseFirestore
+    private val db: FirebaseFirestore = Firebase.firestore
-        get() = firebaseManager.getCurrentFirestore()
+    private val storage = Firebase.storage
 
-    private val localStg: FirebaseStorage
-        get() = firebaseManager.getCurrentStorage()
-
-
-
-//    // Example function to add data to Firestore , like the basic data as test data
-//    @RequiresApi(Build.VERSION_CODES.O)
-//    fun addtodb(data: String) {
-//        val date = LocalTime.now()
-//        localdb.collection("BasicData")
-//            .add(mapOf("data $date" to data))
-//            .addOnSuccessListener {
-//                Log.d("UPLOAD", "Data uploaded successfully ${localdb.app.name}")
-//            }
-//            .addOnFailureListener { exception ->
-//                Log.d("UPLOAD", "Failed to upload data: ${exception.message}  ${localdb.app.name}")
-//            }
-//    }
     private suspend fun <T : Any> safeApiCall(apiCall: suspend () -> T): Result<T> {
         return try {
             val response = apiCall.invoke()
@@ -112,8 +76,8 @@ class DatabaseRepository @Inject constructor(
         return safeApiCall { molbioResultApi.checkUpdate(checkUpdateRequest) }
     }
 
-    override suspend fun deviceUpdate(deviceUpdateRequest: DeviceUpdateRequest): retrofit2.Response<ResponseBody> {
+    override suspend fun deviceUpdate(deviceUpdateRequest: DeviceUpdateRequest): Result<ResponseBody> {
-        return molbioResultApi.deviceUpdate(deviceUpdateRequest)
+        return safeApiCall { molbioResultApi.deviceUpdate(deviceUpdateRequest) }
     }
 
     override suspend fun deviceDiagnostics(deviceDiagnosticsRequest: DeviceDiagnosticsRequest): Result<DeviceDiagnosticsResponse> {
@@ -131,28 +95,18 @@ class DatabaseRepository @Inject constructor(
     override suspend fun addTestToDatabase(data: HemoCubeTestData?): Response<String> {
         return try {
             val userdata =
-                localdb.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
+                db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
             if (userdata.documents.isNotEmpty()) {
                 userdata.documents.forEach {
-                    localdb.collection("patientData").document(it.id).update("testStatus", true)
+                    db.collection("patientData").document(it.id).update("testStatus", true)
                 }
             }
-            localdb.collection("testData").add(data).await()
+            db.collection("testData").add(data).await()
             Response.Success(data._id)
         } catch (e: Exception) {
             Response.Error(e)
         }
     }
-    override suspend fun addQcTestToDatabase(data: HemoCubeTestData?): Response<String> {
-        return try {
-
-            localdb.collection("qcData").add(data!!).await()
-            Response.Success(data._id)
-
-        } catch (e: Exception) {
-            Response.Error(e)
-        }
-    }
 
     override suspend fun addTestToDatabase(data: UserData?): Response<String> {
         TODO("Not yet implemented")
@@ -160,7 +114,7 @@ class DatabaseRepository @Inject constructor(
 
     override suspend fun addTestToDatabaseforBufferCheck(data: BufferCheckData?): Response<String> {
         return try {
-            localdb.collection("buffers").add(data!!).await()
+            db.collection("buffers").add(data!!).await()
             Response.Success(data.kitno)
         } catch (e: Exception) {
             Firebase.crashlytics.recordException(e)
@@ -170,7 +124,7 @@ class DatabaseRepository @Inject constructor(
 
     override suspend fun addDiagnostics(data: DiagnosticsData?): Response<String> {
         return try {
-            localdb.collection("diagnostics").add(data!!).await()
+            db.collection("diagnostics").add(data!!).await()
             Response.Success(data.deviceId)
         } catch (e: Exception) {
             Firebase.crashlytics.recordException(e)
@@ -178,10 +132,9 @@ class DatabaseRepository @Inject constructor(
         }
     }
 
-
     override suspend fun addTestJigData(data: JigData?): Response<String> {
         return try {
-            localdb.collection("jigs").add(data!!).await()
+            db.collection("jigs").add(data!!).await()
             Response.Success(data.deviceId)
         } catch (e: Exception) {
             Firebase.crashlytics.recordException(e)
@@ -195,7 +148,7 @@ class DatabaseRepository @Inject constructor(
         try {
 
             val file = Uri.fromFile(File(filePath))
-            val riversRef = localStg.reference.child("$patientID/${file.lastPathSegment}")
+            val riversRef = storage.reference.child("$patientID/${file.lastPathSegment}")
             riversRef.putFile(file).await()
             return Response.Success(true)
         } catch (e: Exception) {
@@ -206,7 +159,7 @@ class DatabaseRepository @Inject constructor(
 
     suspend fun addToPendingQueue(pendingUploads: PendingUploads): Response<Boolean> {
         return try {
-            localdb.collection("pendingUploads").document(pendingUploads.pendingId).set(pendingUploads)
+            db.collection("pendingUploads").document(pendingUploads.pendingId).set(pendingUploads)
                 .await()
 
             Response.Success(true)
@@ -219,7 +172,7 @@ class DatabaseRepository @Inject constructor(
     suspend fun getAllFromPendingQueue(): List<PendingUploads> {
         val pendingList = mutableListOf<PendingUploads>()
         return try {
-            val querySnapshot = localdb.collection("pendingUploads").orderBy("timeAdded").get().await()
+            val querySnapshot = db.collection("pendingUploads").orderBy("timeAdded").get().await()
 
             for (doc in querySnapshot.documents) {
                 val pendingFile = doc.toObject(PendingUploads::class.java)
@@ -237,7 +190,7 @@ class DatabaseRepository @Inject constructor(
 
     suspend fun removeFromPendingQueue(fileName: String): Response<Boolean> {
         return try {
-            localdb.collection("pendingUploads").document(fileName).delete().await()
+            db.collection("pendingUploads").document(fileName).delete().await()
 
             Response.Success(true)
         } catch (e: Exception) {
@@ -247,11 +200,11 @@ class DatabaseRepository @Inject constructor(
     }
 
     suspend fun getDeviceData(): List<DeviceData> {
-        return localdb.collection("devices").get().await().toObjects(DeviceData::class.java)
+        return db.collection("devices").get().await().toObjects(DeviceData::class.java)
     }
 
     override suspend fun getDeviceDataById(deviceId: String): DeviceData? {
-        val querySnapshot = localdb.collection("devices").get().await()
+        val querySnapshot = db.collection("devices").get().await()
         val allDeviceDataList = querySnapshot.toObjects(DeviceData::class.java)
 
         // Find the DeviceData object with the specified deviceId
@@ -260,7 +213,7 @@ class DatabaseRepository @Inject constructor(
 
     override suspend fun getDeviceResponse(data: DeviceData?): Response<String> {
         return try {
-            localdb.collection("devices").add(data!!).await()
+            db.collection("devices").add(data!!).await()
             Response.Success(data.deviceProvisionResponse)
         } catch (e: Exception) {
             Firebase.crashlytics.recordException(e)
@@ -270,7 +223,7 @@ class DatabaseRepository @Inject constructor(
 
     override suspend fun uploadDeviceId(data: DeviceData): Response<String>? {
         return try {
-            localdb.collection("devices").add(data!!).await()
+            db.collection("devices").add(data!!).await()
             Response.Success(data.deviceId)
         } catch (e: Exception) {
             Firebase.crashlytics.recordException(e)
@@ -285,13 +238,13 @@ class DatabaseRepository @Inject constructor(
     override suspend fun addTestToDatabasefornew(data: HemoCubeTestData?): Response<String> {
             return try {
                 val userdata =
-                    localdb.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
+                    db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
                 if (userdata.documents.isNotEmpty()) {
                     userdata.documents.forEach {
-                        localdb.collection("patientData").document(it.id).update("testStatus", true)
+                        db.collection("patientData").document(it.id).update("testStatus", true)
                     }
                 }
-                localdb.collection("testData").add(data).await()
+                db.collection("testData").add(data).await()
                 Response.Success(data._id)
             } catch (e: Exception) {
                 Firebase.crashlytics.recordException(e)

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

@@ -1,16 +1,3 @@
-/*
- * // 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.data.repository
 
 import android.os.Environment

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

@@ -1,19 +1,6 @@
-/*
- * // 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.data.repository
 
-import com.example.hpostesting.util.Result
+import com.example.hpostesting.data.Result
 import com.example.hpostesting.data.model.Response
 import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
 import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsResponse
@@ -38,7 +25,6 @@ import okhttp3.ResponseBody
 
 interface Repository {
     suspend fun addTestToDatabase(data: HemoCubeTestData?): Response<String>
-    suspend fun addQcTestToDatabase(data: HemoCubeTestData?): Response<String>
     suspend fun addTestToDatabasefornew(data: HemoCubeTestData?): Response<String>
 
     suspend fun addTestToDatabase(data: UserData?): Response<String>
@@ -65,7 +51,7 @@ interface Repository {
 
     suspend fun checkUpdate(checkUpdateRequest: CheckUpdateRequest): Result<CheckUpdateResponse>
 
-    suspend fun deviceUpdate(deviceUpdateRequest: DeviceUpdateRequest): retrofit2.Response<ResponseBody>
+    suspend fun deviceUpdate(deviceUpdateRequest: DeviceUpdateRequest): Result<ResponseBody>
     suspend fun deviceDiagnostics(deviceDiagnosticsRequest: DeviceDiagnosticsRequest): Result<DeviceDiagnosticsResponse>
     suspend fun downloadClientCertificate(): Result<ResponseBody>
     suspend fun uploadLogs(logFile: MultipartBody.Part): Result<UploadLogsResponse>

app/src/main/java/com/example/hpostesting/domain/AuthInterceptor.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.domain
 
 import android.content.SharedPreferences

app/src/main/java/com/example/hpostesting/domain/CheckUpdateWorker.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.domain
 
 import android.content.Context

app/src/main/java/com/example/hpostesting/domain/LogFileManager.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.domain
 
 import android.content.Context

app/src/main/java/com/example/hpostesting/domain/LogFileManagerImpl.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.domain
 
 import android.content.Context

app/src/main/java/com/example/hpostesting/domain/ResultCalculationWithMaxImpl.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.domain
 
 import com.example.hpostesting.data.constant.Constants

app/src/main/java/com/example/hpostesting/domain/SaveRawData.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.domain
 
 import android.util.Log

app/src/main/java/com/example/hpostesting/domain/SaveRawDataTest.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.domain
 
 import com.example.hpostesting.data.repository.LocalFileRepository

app/src/main/java/com/example/hpostesting/domain/SickleFindResultCaluculationWithMaxImpl.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.domain
 
 import com.example.hpostesting.data.constant.Constants

app/src/main/java/com/example/hpostesting/domain/TestRightResultCalculation.kt

@@ -1,16 +1,3 @@
-/*
- * // 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.domain
 
 import com.example.hpostesting.data.model.test.TestRightCalculationData

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

@@ -1,17 +1,4 @@
-/*
+package com.example.hpostesting.domain.di
- * // 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.di
 
 import android.app.Application
 import android.content.Context
@@ -20,7 +7,7 @@ import android.content.res.AssetManager
 import androidx.room.Room
 import com.example.hpostesting.data.api.MolbioAuthApi
 import com.example.hpostesting.data.api.MolbioResultApi
-import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.api.PropertyProvider
 import com.example.hpostesting.data.dao.HemoCubeBufferDao
 import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.dao.MyDatabase
@@ -35,20 +22,14 @@ import com.example.hpostesting.domain.LogFileManager
 import com.example.hpostesting.domain.LogFileManagerImpl
 import com.example.hpostesting.domain.SaveRawData
 import com.example.hpostesting.domain.SaveRawDataTest
-import com.example.hpostesting.firebase.FirebaseManager
+import com.example.hpostesting.presentation.UsbServiceListener
-import com.example.hpostesting.presentation.utils.UsbServiceListener
+import com.example.hpostesting.presentation.UsbServiceListenerImpl
-import com.example.hpostesting.presentation.utils.UsbServiceListenerImpl
-import com.example.hpostesting.util.PropertyProvider
 import com.example.hpostesting.util.PropertyProviderImpl
-import com.google.firebase.firestore.FirebaseFirestore
-import com.google.firebase.storage.FirebaseStorage
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import net.sqlcipher.database.SQLiteDatabase
-import net.sqlcipher.database.SupportFactory
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
@@ -63,12 +44,9 @@ object AppModule {
     @Provides
     @Singleton
     fun provideMyDatabase(@ApplicationContext context: Context): MyDatabase {
-        val passphraseBytes: ByteArray = SQLiteDatabase.getBytes(Constants.passphrase.toCharArray())
-        val factory = SupportFactory(passphraseBytes)
-
         return Room.databaseBuilder(
             context, MyDatabase::class.java, "my_database"
-        ).openHelperFactory(factory).fallbackToDestructiveMigration().build()
+        ).fallbackToDestructiveMigration().build()
     }
 
     @Provides
@@ -110,52 +88,22 @@ object AppModule {
         return SaveRawDataTest(repository)
     }
 
-    @Provides
-    @Singleton
-    fun provideFirebaseFirestore(): FirebaseFirestore {
-        return FirebaseFirestore.getInstance()
-    }
-
-    @Provides
-    @Singleton
-    fun provideFirebaseStorage(): FirebaseStorage {
-        return FirebaseStorage.getInstance()
-    }
-
-    @Provides
-    @Singleton
-    fun provideFirebaseManager(
-        @ApplicationContext context: Context,
-    ): FirebaseManager {
-        return FirebaseManager(context)
-    }
-
     @Provides
     @Singleton
     fun provideDatabaseRepository(
-        firebaseManager: FirebaseManager,
         @Named("Auth") molbioAuthApi: MolbioAuthApi,
         molbioResultApi: MolbioResultApi
     ): DatabaseRepository {
-        return DatabaseRepository(
+        return DatabaseRepository(molbioAuthApi = molbioAuthApi, molbioResultApi = molbioResultApi)
-            firebaseManager = firebaseManager,
-            molbioAuthApi = molbioAuthApi,
-            molbioResultApi = molbioResultApi
-        )
     }
 
     @Provides
     @Singleton
     fun provideRepository(
-        firebaseManager: FirebaseManager,
         @Named("Auth") molbioAuthApi: MolbioAuthApi,
         molbioResultApi: MolbioResultApi
     ): Repository {
-        return DatabaseRepository(
+        return DatabaseRepository(molbioAuthApi, molbioResultApi)
-            firebaseManager = firebaseManager,
-            molbioAuthApi = molbioAuthApi,
-            molbioResultApi = molbioResultApi
-        )
     }
 
     @Provides
@@ -199,7 +147,7 @@ object AppModule {
     @Provides
     @Singleton
     fun provideRetrofit(
-        propertyProvider: PropertyProvider, @Named("Auth") client: OkHttpClient
+        propertyProvider: PropertyProvider,@Named("Auth") client: OkHttpClient
     ): Retrofit {
         return Retrofit.Builder().baseUrl(propertyProvider.getProperty("BASE_URL")).client(client)
             .addConverterFactory(GsonConverterFactory.create()).build()
@@ -239,9 +187,4 @@ object AppModule {
     fun provideUsbServiceListener(context: Context): UsbServiceListener {
         return UsbServiceListenerImpl(context)
     }
-
-
-
-
-
 }

app/src/main/java/com/example/hpostesting/encryption/Encryption.kt

@@ -1,55 +0,0 @@
-/*
- * // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
- * // Notice: All information contained herein is, and remains
- * // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
- * // if any. The intellectual and technical concepts contained
- * // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
- * // and its suppliers and may be covered by Indian and Foreign Patents,
- * // patents in process, and are protected by trade secret or copyright law.
- * // Dissemination of this information or reproduction of this material
- * // is strictly forbidden unless prior written permission is obtained
- * // from ShanMukha Innovations Pvt. Ltd.
- */
-
-package com.example.hpostesting.encryption
-
-import android.util.Base64
-import javax.crypto.Cipher
-import javax.crypto.SecretKeyFactory
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.PBEKeySpec
-import javax.crypto.spec.SecretKeySpec
-
-object Encryption {
-    private const val AES_MODE = "AES/CBC/PKCS5Padding"
-    private const val KEY_SPEC_ALGORITHM = "PBKDF2WithHmacSHA1"
-    private const val SALT = "Bigtec"
-    private const val ITERATION_COUNT = 10000
-    private const val KEY_LENGTH = 256
-    private val FIXED_IV = byteArrayOf(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15)
-
-    fun encrypt(textToEncrypt: String, password: String): String {
-        val salt = SALT.toByteArray()
-        val factory = SecretKeyFactory.getInstance(KEY_SPEC_ALGORITHM)
-        val spec = PBEKeySpec(password.toCharArray(), salt, ITERATION_COUNT, KEY_LENGTH)
-        val tmp = factory.generateSecret(spec)
-        val key = SecretKeySpec(tmp.encoded, "AES")
-        val cipher = Cipher.getInstance(AES_MODE)
-        cipher.init(Cipher.ENCRYPT_MODE, key, IvParameterSpec(FIXED_IV))
-        val encryptedBytes = cipher.doFinal(textToEncrypt.toByteArray(Charsets.UTF_8))
-        return Base64.encodeToString(encryptedBytes, Base64.NO_WRAP)
-    }
-
-    fun decrypt(encryptedText: String, password: String): String {
-        val salt = SALT.toByteArray()
-        val encryptedBytes = Base64.decode(encryptedText, Base64.NO_WRAP)
-        val factory = SecretKeyFactory.getInstance(KEY_SPEC_ALGORITHM)
-        val spec = PBEKeySpec(password.toCharArray(), salt, ITERATION_COUNT, KEY_LENGTH)
-        val tmp = factory.generateSecret(spec)
-        val key = SecretKeySpec(tmp.encoded, "AES")
-        val cipher = Cipher.getInstance(AES_MODE)
-        cipher.init(Cipher.DECRYPT_MODE, key, IvParameterSpec(FIXED_IV))
-        val decryptedBytes = cipher.doFinal(encryptedBytes)
-        return String(decryptedBytes, Charsets.UTF_8)
-    }
-}

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

@@ -1,153 +0,0 @@
-package com.example.hpostesting.firebase
-/*
- * // 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.
- */
-import android.content.Context
-import android.content.Intent
-import android.os.Process
-import com.google.firebase.FirebaseApp
-import com.google.firebase.FirebaseOptions
-import com.google.firebase.firestore.FirebaseFirestore
-import com.google.firebase.storage.FirebaseStorage
-import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-class FirebaseManager @Inject constructor(private val context: Context) {
-
-    private val sharedPreferences =
-        context.getSharedPreferences("FirebaseConfigPrefs", Context.MODE_PRIVATE)
-
-    private var currentFirestore: FirebaseFirestore = FirebaseFirestore.getInstance()
-    private var currentStorage: FirebaseStorage = FirebaseStorage.getInstance()
-    var updateStatus = false
-
-    private val defaultServers = listOf(
-        // i have it in different place look down
-        firebaseConfig1, firebaseConfig2, firebaseConfig3,
-    )
-
-    init {
-        val lastSelectedServer = getLastSelectedServer()
-        switchServer(lastSelectedServer)
-    }
-
-    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
-
-    }
-
-    private fun getOrInitializeFirebaseApp(firebaseConfig: FirebaseConfig): FirebaseApp {
-        val existingApp = FirebaseApp.getApps(context).find { it.name == firebaseConfig.serverName }
-
-        return if (existingApp != null) {
-
-            existingApp
-        } else {
-
-            val options = FirebaseOptions.Builder().setProjectId(firebaseConfig.projectId)
-                .setApplicationId(firebaseConfig.appId).setApiKey(firebaseConfig.apiKey)
-                .setStorageBucket(firebaseConfig.storageBucket).build()
-
-            FirebaseApp.initializeApp(context, options, firebaseConfig.serverName)
-        }
-    }
-
-    private fun saveSelectedServer(firebaseConfig: FirebaseConfig) {
-        with(sharedPreferences.edit()) {
-            putString("selectedServerName", firebaseConfig.serverName)
-            putString("projectId", firebaseConfig.projectId)
-            putString("appId", firebaseConfig.appId)
-            putString("apiKey", firebaseConfig.apiKey)
-            putString("storageBucket", firebaseConfig.storageBucket)
-            apply()
-        }
-
-    }
-
-    fun restartApp() {
-        if (updateStatus) {
-            updateStatus = false
-            delayedRestart(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)
-        val storageBucket =
-            sharedPreferences.getString("storageBucket", defaultServers.first().storageBucket)
-
-        return FirebaseConfig(
-            serverName = selectedServerName ?: defaultServers.first().serverName,
-            projectId = projectId ?: defaultServers.first().projectId,
-            appId = appId ?: defaultServers.first().appId,
-            apiKey = apiKey ?: defaultServers.first().apiKey,
-            storageBucket = storageBucket ?: defaultServers.first().storageBucket
-        )
-    }
-
-    fun getAvailableServers(): List<FirebaseConfig> {
-        return defaultServers
-    }
-}
-
-fun restartApp(context: Context) {
-    val intent = context.packageManager.getLaunchIntentForPackage(context.packageName)
-    intent?.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
-    context.startActivity(intent)
-    Process.killProcess(Process.myPid())
-}
-@OptIn(DelicateCoroutinesApi::class)
-fun delayedRestart(context: Context) {
-    GlobalScope.launch(Dispatchers.Main) {
-        delay(5000L)
-        restartApp(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 = " pre prod",
-    apiKey = "AIzaSyDYySi27LioZGNisP1NfnNU5inJX_0FT38",
-    appId = "1:121176529204:android:a7bc0842f61e5095bbed61",
-    projectId = "hpos-preprod",
-    storageBucket = "hpos-preprod.appspot.com"
-)

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

@@ -1,21 +0,0 @@
-package com.example.hpostesting.firebase
-/*
- * // 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.
- */
-data class FirebaseConfig(
-    val serverName: String,
-    val apiKey: String,
-    val appId: String,
-    val projectId: String,
-    val storageBucket: String
-)
-

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

@@ -1,16 +1,3 @@
-/*
- * // 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.presentation
 
 import android.content.Context
@@ -19,17 +6,18 @@ import android.content.SharedPreferences
 import android.os.Bundle
 import android.text.Editable
 import android.util.Log
+import android.view.View
 import android.widget.EditText
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
-import com.example.hpostesting.data.constant.DataHolder
+import com.example.hpostesting.data.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.presentation.dashboard.DashboardActivity
-import com.example.hpostesting.presentation.main_base.DashboardActivity
+import com.example.hpostesting.presentation.hemocube.HemocubeActivity
-import com.example.hpostesting.presentation.hb_test.HBTestActivity
-import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestActivity
 import com.example.hpostesting.presentation.testRight.TestRightActivity
+import com.google.android.material.snackbar.Snackbar
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.journeyapps.barcodescanner.ScanContract
 import com.journeyapps.barcodescanner.ScanIntentResult
 import com.journeyapps.barcodescanner.ScanOptions
@@ -43,13 +31,9 @@ import com.zebra.scannercontrol.IDcsSdkApiDelegate
 import com.zebra.scannercontrol.SDKHandler
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityKitScanBinding
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Date
-import java.util.Locale
 
 class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
-    private var fromWhere = "Home"
+
     private val TAG = "KitScanActivity"
     private lateinit var binding: ActivityKitScanBinding
 
@@ -70,24 +54,8 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
         }
     }
 
-    private fun processScannedData(contents: String) {//edited auto selection of cuvette size
+    private fun processScannedData(contents: String) {
-        if(contents.contains("SMI/SC/")){
+        binding.nameEditText.setText(contents)
-            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/")){
-            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{
-            Toast.makeText(this, R.string.invalid_kit, Toast.LENGTH_LONG).show()
-        }
     }
 
     override fun attachBaseContext(newBase: Context?) {
@@ -131,33 +99,10 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
         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 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 (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()
-                DataHolder.sampleReadCounter = 0
-                DataHolder.kitSerial = ""
 
-                with(sharedPreference.edit()) {
+        if (DataHolder.sampleReadCounter <= Constants.MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE && DataHolder.isReferenceTaken) {
-                    putString(Constants.KIT_NUMBER, "")
+            DataHolder.selectedTest!!.kitSerial = DataHolder.kitSerial
-                    putString(Constants.BUFFER_VALUE_1, "")
+            moveToNext()
-                    putString(Constants.BUFFER_VALUE_2, "")
-                    apply()
-                }
-            }
         }
 
 //        if (checkHemoCubeKitData()) {
@@ -174,31 +119,35 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
 //            }
 //        }
 
-//        try {
+        try {
-//            if (checkHemoCubeKitData()) {
+            if (checkHemoCubeKitData()) {
-//                DataHolder.selectedTest!!.kitSerial =
+                DataHolder.selectedTest!!.kitSerial =
-//                    sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
+                    sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
-//                moveToNext()
+                moveToNext()
-//            } else {
+            } else {
-//                // Handle the case when checkHemoCubeKitData() returns false
+                // Handle the case when checkHemoCubeKitData() returns false
-//                with(sharedPreference.edit()) {
+                with(sharedPreference.edit()) {
-//                    putString(Constants.KIT_NUMBER, "")
+                    putString(Constants.KIT_NUMBER, "")
-//                    putInt(Constants.KIT_COUNT, 0)
+                    putInt(Constants.KIT_COUNT, 0)
-//                    putString(Constants.BUFFER_VALUE_1, "")
+                    putString(Constants.BUFFER_VALUE_1, "")
-//                    putString(Constants.BUFFER_VALUE_2, "")
+                    putString(Constants.BUFFER_VALUE_2, "")
-//                    apply()
+                    apply()
-//                }
+                }
-//            }
+            }
-//        } catch (e: NullPointerException) {
+        } catch (e: NullPointerException) {
-//            // Handle the NullPointerException here
+            // Handle the NullPointerException here
-//            e.printStackTrace() // You can log the exception for debugging
+            e.printStackTrace() // You can log the exception for debugging
-//            FirebaseCrashlytics.getInstance().recordException(e)
+            FirebaseCrashlytics.getInstance().recordException(e)
-//            val errorMessage = "An error occurred: ${e.message}"
+            val errorMessage = "An error occurred: ${e.message}"
-//            val rootView = findViewById<View>(android.R.id.content)
+            val rootView = findViewById<View>(android.R.id.content)
-//            Snackbar.make(rootView, errorMessage, Snackbar.LENGTH_LONG).show()
+            Snackbar.make(rootView, errorMessage, Snackbar.LENGTH_LONG).show()
-//            // Optionally, show a user-friendly error message to the user
+            // Optionally, show a user-friendly error message to the user
-//            // Toast.makeText(applicationContext, "An error occurred", Toast.LENGTH_SHORT).show()
+            // Toast.makeText(applicationContext, "An error occurred", Toast.LENGTH_SHORT).show()
-//        }
+        }
+
+
+        binding.nameEditText.setText("SMI/SC/")
+
         setSupportActionBar(binding.toolbar)
 
         binding.btnScanNow.setOnClickListener {
@@ -209,39 +158,20 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
         binding.btnGo.setOnClickListener {
             val serialNumber = binding.nameEditText.text.toString().trim()
             if (serialNumber.isNotEmpty() && isSerialValid(serialNumber)) {
-                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/")){
-                    with(sharedPreference.edit()) {
-                        putString(Constants.CUVETTE_SIZE, "10mm")
-                        apply()
-                    }
-                    Toast.makeText(this, "Selected cuvette size: 10mm", Toast.LENGTH_SHORT).show()
-                }
-                val kitTime = SimpleDateFormat(
-                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                ).format(Calendar.getInstance().time).toString()
                 if (DataHolder.selectedTest == null) {
                     with(sharedPreference.edit()) {
                         putString(
                             Constants.KIT_NUMBER, binding.nameEditText.text.toString()
                         )
-                        putString(Constants.BUFFER_VALUE_1, "")
-                        putString(Constants.BUFFER_VALUE_2, "")
-                        putString(Constants.KIT_TIME, kitTime)
                         putInt(Constants.KIT_COUNT, 1)
                         apply()
                     }
-                    DataHolder.kitSerial = binding.nameEditText.text.toString()
                     Toast.makeText(
                         applicationContext,
                         R.string.kit_updated,
                         Toast.LENGTH_SHORT
                     ).show()
+
                     val i = Intent(applicationContext, DashboardActivity::class.java)
                     startActivity(i)
                     finish()
@@ -249,9 +179,6 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
                     DataHolder.kitSerial = binding.nameEditText.text.toString()
                     DataHolder.selectedTest?.kitSerial = binding.nameEditText.text.toString()
                     with(sharedPreference.edit()) {
-                        putString(Constants.BUFFER_VALUE_1, "")
-                        putString(Constants.BUFFER_VALUE_2, "")
-                        putString(Constants.KIT_TIME, kitTime)
                         putString(Constants.KIT_NUMBER, binding.nameEditText.text.toString())
                         putInt(Constants.KIT_COUNT, 1)
                         apply()
@@ -262,21 +189,21 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
                 Toast.makeText(this, R.string.invalid_kit_number, Toast.LENGTH_LONG).show()
                 return@setOnClickListener
             }
-//            if (serialNumber.isNotEmpty() && checkDataNotNull() && isSerialValid(
+            if (serialNumber.isNotEmpty() && checkDataNotNull() && isSerialValid(
-//                    serialNumber
+                    serialNumber
-//                )
+                )
-//            ) {
+            ) {
-//                DataHolder.kitSerial = binding.nameEditText.text.toString()
+                DataHolder.kitSerial = binding.nameEditText.text.toString()
-//                DataHolder.selectedTest?.kitSerial = binding.nameEditText.text.toString()
+                DataHolder.selectedTest?.kitSerial = binding.nameEditText.text.toString()
-//                with(sharedPreference.edit()) {
+                with(sharedPreference.edit()) {
-//                    putString(Constants.KIT_NUMBER, binding.nameEditText.text.toString())
+                    putString(Constants.KIT_NUMBER, binding.nameEditText.text.toString())
-//                    putInt(Constants.KIT_COUNT, 1)
+                    putInt(Constants.KIT_COUNT, 1)
-//                    apply()
+                    apply()
-//                }
+                }
-//                moveToNext()
+                moveToNext()
-//            } else {
+            } else {
-//                Toast.makeText(this, R.string.invalid_kit_number, Toast.LENGTH_LONG).show()
+                Toast.makeText(this, R.string.invalid_kit_number, Toast.LENGTH_LONG).show()
-//            }
+            }
         }
 
         //Setting up the SDK handler
@@ -335,58 +262,42 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
         Log.d("BARCODE", result)
         runOnUiThread {
             val editableResult: Editable = Editable.Factory.getInstance().newEditable(result)
-            processScannedData(result)
+            binding.nameEditText.text = editableResult
-           // binding.nameEditText.text = editableResult
         }
     }
 
-//    private fun checkHemoCubeKitData(): Boolean {
+    private fun checkHemoCubeKitData(): Boolean {
-//        return sharedPreference.getString(Constants.KIT_NUMBER, "")
+        return sharedPreference.getString(Constants.KIT_NUMBER, "")
-//            ?.isNotBlank() == true && sharedPreference.getInt(
+            ?.isNotBlank() == true && sharedPreference.getInt(
-//            Constants.KIT_COUNT, 0
+            Constants.KIT_COUNT, 0
-//        ) > 0 && sharedPreference.getInt(Constants.KIT_COUNT, 0) < Constants.KIT_CAPACITY
+        ) > 0 && sharedPreference.getInt(Constants.KIT_COUNT, 0) < Constants.KIT_CAPACITY
-//    }
+    }
 
     private fun isSerialValid(s: String): Boolean {
-        if (s.contains("SMI/SC/")) {
+        if (s.length != 17) {
-            if(s.length != 17){
+            binding.nameEditText.error = getString(R.string.invalid_kit)
-                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"
-                return false
-            }
-        }else{
             return false
         }
         return true
     }
 
     private fun moveToNext() {
-        if(fromWhere == "Main"){
-            if(DataHolder.selectedTestType == TestType.HB_EST){
-                val i = Intent(applicationContext, HBTestActivity::class.java)
-                startActivity(i)
-            }else{
-                DataHolder.deviceType.observe(this) { deviceType ->
-                    when (deviceType) {
-                        Constants.DEVICE_TYPE_HEMOCUBE -> {
-                            val i = Intent(applicationContext, TrueHemeTestActivity::class.java)
-                            startActivity(i)
-                        }
 
-                        Constants.DEVICE_TYPE_TEST_RIGHT -> {
+        DataHolder.deviceType.observe(this) { deviceType ->
-                            val i = Intent(applicationContext, TestRightActivity::class.java)
+            when (deviceType) {
-                            startActivity(i)
+                Constants.DEVICE_TYPE_HEMOCUBE -> {
-                        }
+                    val i = Intent(applicationContext, HemocubeActivity::class.java)
+                    startActivity(i)
+                }
 
-                        Constants.DEVICE_TYPE_TRUEHEME -> {
+                Constants.DEVICE_TYPE_TEST_RIGHT -> {
-                            val i = Intent(applicationContext, TrueHemeTestActivity::class.java)
+                    val i = Intent(applicationContext, TestRightActivity::class.java)
-                            startActivity(i)
+                    startActivity(i)
-                        }
+                }
-                    }
+
+                Constants.DEVICE_TYPE_TRUEHEME -> {
+                    val i = Intent(applicationContext, HemocubeActivity::class.java)
+                    startActivity(i)
                 }
             }
         }
@@ -422,18 +333,4 @@ 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())
-
-        val createdAtDate: Date = if (createdAt.isEmpty()) {
-            currentTime
-        } else {
-            formatter.parse(createdAt) ?: currentTime
-        }
-
-        val diffMillis = currentTime.time - createdAtDate.time
-
-        return diffMillis / (60 * 1000)  // Convert milliseconds to minutes
-    }
 }

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

@@ -1,16 +1,3 @@
-/*
- * // 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.presentation
 
 import android.Manifest
@@ -18,7 +5,6 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.content.SharedPreferences
 import android.content.pm.PackageManager
 import android.hardware.usb.UsbManager
 import android.location.Location
@@ -31,11 +17,12 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
+import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.LanguageManager
+import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.data.model.test.TestType
-import com.example.hpostesting.presentation.main_base.DashboardActivity
+import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.google.android.gms.location.FusedLocationProviderClient
 import com.google.android.gms.location.LocationCallback
 import com.google.android.gms.location.LocationRequest
@@ -48,12 +35,12 @@ import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
+
     private lateinit var binding: ActivityMainBinding
     private var myMenu: Menu? = null
     private val TAG = "MainActivity"
     private lateinit var fusedLocationClient: FusedLocationProviderClient
     private lateinit var locationCallback: LocationCallback
-    private lateinit var sharedPreference: SharedPreferences
 
     private val usbReceiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context?, intent: Intent) {
@@ -73,32 +60,26 @@ class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        sharedPreference = getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
-
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        binding.myToolbar.title = "Test Type"
+
         setSupportActionBar(binding.myToolbar)
-        if ((sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN")) {
+
-            binding.cvItem3.visibility = View.VISIBLE
-        }else{
-            binding.cvItem3.visibility = View.GONE
-        }
         setupListeners()
         fusedLocationClient = LocationServices.getFusedLocationProviderClient(this)
         getLocation()
-
         locationCallback = object : LocationCallback() {
             override fun onLocationResult(locationResult: LocationResult) {
                 locationResult.lastLocation?.let { location ->
-//                    DataHolder.location =
+                    DataHolder.location =
-//                        UserData.Location(location.latitude, location.longitude)
+                        UserData.Location(location.latitude, location.longitude)
-//                    DataHolder.selectedTest?.location =
+                    DataHolder.selectedTest?.location =
-//                        UserData.Location(location.latitude, location.longitude)
+                        UserData.Location(location.latitude, location.longitude)
                     Log.i("Location", DataHolder.location.toString())
                 }
             }
         }
+
         val usbFilter = IntentFilter().apply {
             addAction(UsbManager.ACTION_USB_DEVICE_DETACHED)
             addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED)
@@ -117,13 +98,12 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
-//        if (DataHolder.selectedTest == null) {
+        if (DataHolder.selectedTest == null) {
-//            startActivity(Intent(this, DashboardActivity::class.java))
+            startActivity(Intent(this, DashboardActivity::class.java))
-//            finish()
+            finish()
-//        }
+        }
     }
 
-
     private fun checkAndUpdateUsbConnection() {
         val availableDrivers = UsbSerialProber.getDefaultProber()
             .findAllDrivers(getSystemService(Context.USB_SERVICE) as UsbManager)
@@ -227,7 +207,6 @@ class MainActivity : AppCompatActivity() {
         binding.cvItem1.setOnClickListener {
             DataHolder.selectedTestType = TestType.SICKLECERT
             val i = Intent(applicationContext, KitScanActivity::class.java)
-            i.putExtra("fromWhere","Main")
             startActivity(i)
             finish()
         }
@@ -235,14 +214,6 @@ class MainActivity : AppCompatActivity() {
         binding.cvItem2.setOnClickListener {
             DataHolder.selectedTestType = TestType.SICKLEFIND
             val i = Intent(applicationContext, KitScanActivity::class.java)
-            i.putExtra("fromWhere","Main")
-            startActivity(i)
-            finish()
-        }
-        binding.cvItem3.setOnClickListener {
-            DataHolder.selectedTestType = TestType.HB_EST
-            val i = Intent(applicationContext, KitScanActivity::class.java)
-            i.putExtra("fromWhere","Main")
             startActivity(i)
             finish()
         }
@@ -330,14 +301,14 @@ class MainActivity : AppCompatActivity() {
         fusedLocationClient.lastLocation.addOnSuccessListener { location: Location? ->
             location?.let {
                 if (DataHolder.selectedTest != null) {
-//                    DataHolder.selectedTest!!.location =
+                    DataHolder.selectedTest!!.location =
-//                        UserData.Location(location.latitude, location.longitude)
+                        UserData.Location(location.latitude, location.longitude)
                 } else {
                     startActivity(Intent(this, DashboardActivity::class.java))
                     finish()
                 }
-//                DataHolder.location =
+                DataHolder.location =
-//                    UserData.Location(location.latitude, location.longitude)
+                    UserData.Location(location.latitude, location.longitude)
             } ?: run {
                 requestLocationUpdates()
             }

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

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