Enable Cloud Run deployments

2024-01-20 05:12:27 +00:00
341 changed files with 2669 additions and 21702 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,101 +1,53 @@
-# 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 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
+  ANDROID_COMPILE_SDK: '34'
+  ANDROID_BUILD_TOOLS: 33.0.2
+  ANDROID_SDK_TOOLS: '9477386'
 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
+- apt-get --quiet update --yes
+- apt-get --quiet install --yes wget unzip
+- export ANDROID_HOME="${PWD}/android-sdk-root"
+- install -d $ANDROID_HOME
+- 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
+- sdkmanager --version
+- yes | sdkmanager --licenses > /dev/null || true
+- sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}"
+- sdkmanager "platform-tools"
+- sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}"
+- chmod +x ./gradlew
 lintDebug:
  interruptible: true
  stage: build
  script:
-    - ./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint
+  - "./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint"
  artifacts:
    paths:
    - app/lint/reports/lint-results-debug.html
-    expose_as: "lint-report"
+    expose_as: lint-report
    when: always
-
-# Make Project
 assembleDebug:
  interruptible: true
  stage: build
  script:
-    - ./gradlew assembleDebug
+  - "./gradlew assembleDebug"
  artifacts:
    paths:
    - app/build/outputs/
-
-# Run all tests, if any fails, interrupt the pipeline(fail it)
 debugTests:
-  needs: [lintDebug, assembleDebug]
+  needs:
+  - lintDebug
+  - assembleDebug
  interruptible: true
  stage: test
  script:
-    - ./gradlew -Pci --console=plain :app:testDebug
-  artifacts:
-    paths:
-      - app/build/test-results/
-
-publishTestResults:
-  stage: test
-  script:
-    - echo "Publishing JUnit test results"
-  needs: [debugTests]
-  artifacts:
-    when: always
-    reports:
-      junit: app/build/test-results/testDebugUnitTest/*.xml
+  - "./gradlew -Pci --console=plain :app:testDebug"
+stages:
+- build
+- test
+- deploy
+include:
+- remote: https://gitlab.com/gitlab-org/incubation-engineering/five-minute-production/library/-/raw/main/gcp/cloud-run.gitlab-ci.yml
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,8 +4,9 @@
  <component name="GradleSettings">
    <option name="linkedExternalProjectsSettings">
      <GradleProjectSettings>
+        <option name="testRunner" value="GRADLE" />
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="gradleJvm" value="jbr-17" />
        <option name="modules">
          <set>
            <option value="$PROJECT_DIR$" />
--- a/README.md
+++ b/README.md
@@ -1,4 +0,0 @@
-
-### Release key
-
-	key0: prime24
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1,4 +1,3 @@
 /build
-/release
 /google-services*
 /idea
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,18 +14,17 @@ android {
    compileSdk 34
    namespace 'in.sminnovations.hpostesting'

-    // dev -> development, quality -> qc, uat -> User Acceptance Testing, preprod -> preproduction, prod -> production, iocl -> iocl-iisc production
+    // prod - production, preprod - preproduction, quality - qc, dev - development
    defaultConfig {
        applicationId "in.sminnovations.hpostesting.dev"
        minSdk 21
        targetSdk 34
-        versionCode 128
-        versionName "2.1.128"
+        versionCode 91
+        versionName "2.1.91"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }

-
    buildTypes {
        release {
            minifyEnabled false
@@ -62,7 +61,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'
@@ -76,29 +74,27 @@ dependencies {
    implementation platform('com.google.firebase:firebase-bom:32.1.0')
    implementation("com.google.firebase:firebase-perf-ktx")
    implementation("com.google.firebase:firebase-crashlytics-ktx")
-    implementation("com.google.firebase:firebase-config-ktx")
    implementation("com.google.firebase:firebase-analytics-ktx")
    implementation 'com.google.firebase:firebase-firestore-ktx'
    implementation 'com.google.firebase:firebase-auth-ktx'
    implementation 'com.google.firebase:firebase-storage-ktx'
    implementation 'com.firebaseui:firebase-ui-firestore:8.0.2'
-    implementation 'com.google.android.gms:play-services-auth:21.0.0'
-    implementation 'com.google.android.gms:play-services-location:21.1.0'
+    implementation 'com.google.android.gms:play-services-auth:20.7.0'
+    implementation 'com.google.android.gms:play-services-location:21.0.1'
    implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
    implementation 'com.google.android.things:androidthings:1.0'
-    implementation 'com.google.firebase:firebase-appdistribution:16.0.0-beta12'
-    implementation("com.google.firebase:firebase-appdistribution-api-ktx:16.0.0-beta12")
+    implementation 'com.google.firebase:firebase-appdistribution:16.0.0-beta11'
+    implementation("com.google.firebase:firebase-appdistribution-api-ktx:16.0.0-beta11")
    implementation 'androidx.preference:preference-ktx:1.2.1'
    implementation 'androidx.preference:preference-ktx:1.2.1'
-    implementation 'io.nats:jnats:2.11.4'
+    implementation 'com.google.android.play:core:1.10.3'
+    implementation 'io.nats:jnats:2.11.2'



    // Testing
    testImplementation 'junit:junit:4.13.2'
    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test:rules:1.0.2'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
    testImplementation "androidx.work:work-testing:2.9.0"
    androidTestImplementation 'androidx.test:core-ktx:1.5.0'
@@ -112,16 +108,13 @@ dependencies {
    testImplementation 'org.mockito:mockito-core:3.12.4'
    androidTestImplementation 'org.mockito:mockito-android:3.12.4'
    androidTestImplementation 'org.mockito:mockito-inline:3.12.4'
-    androidTestImplementation 'org.mockito:mockito-android:3.12.4'
-    testImplementation 'org.powermock:powermock-api-mockito2:2.0.9'
-    testImplementation 'org.powermock:powermock-module-junit4:2.0.9'
-
    testImplementation "androidx.arch.core:core-testing:2.2.0"
    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.1'

+
    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"

@@ -138,15 +131,14 @@ 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'
    annotationProcessor 'com.github.bumptech.glide:compiler:4.13.2'

    // Navigation Component
-    implementation "androidx.navigation:navigation-fragment-ktx:2.7.7"
-    implementation "androidx.navigation:navigation-ui-ktx:2.7.7"
+    implementation "androidx.navigation:navigation-fragment-ktx:2.7.6"
+    implementation "androidx.navigation:navigation-ui-ktx:2.7.6"

    //Dagger - Hilt
    implementation "com.google.dagger:hilt-android:2.46"
@@ -159,17 +151,11 @@ dependencies {
    implementation("com.squareup.okhttp3:okhttp:4.9.3")

    implementation "androidx.preference:preference-ktx:1.2.1"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1'
+    implementation 'io.nats:jnats:2.11.2'

    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 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'
+    implementation 'com.google.android.play:core:1.10.3'

 }
--- a/app/google-services.json
+++ b/app/google-services.json
@@ -34,35 +34,6 @@
        }
      }
    },
-    {
-      "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",
--- a/app/libs/barcode_scanner_library_v2.6.19.0-release.aar
+++ b/app/libs/barcode_scanner_library_v2.6.19.0-release.aar
--- a/app/release/hpos-app.apk
+++ b/app/release/hpos-app.apk
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -4,34 +4,17 @@
    "type": "APK",
    "kind": "Directory"
  },
-  "applicationId": "in.sminnovations.hpostesting.dev",
+  "applicationId": "com.example.hpos",
  "variantName": "release",
  "elements": [
    {
      "type": "SINGLE",
      "filters": [],
      "attributes": [],
-      "versionCode": 128,
-      "versionName": "2.1.128",
+      "versionCode": 1,
+      "versionName": "1.0",
      "outputFile": "app-release.apk"
    }
  ],
-  "elementType": "File",
-  "baselineProfiles": [
-    {
-      "minApi": 28,
-      "maxApi": 30,
-      "baselineProfiles": [
-        "baselineProfiles/1/app-release.dm"
-      ]
-    },
-    {
-      "minApi": 31,
-      "maxApi": 2147483647,
-      "baselineProfiles": [
-        "baselineProfiles/0/app-release.dm"
-      ]
-    }
-  ],
-  "minSdkVersionForDexing": 21
+  "elementType": "File"
 }
--- a/app/src/androidTest/java/com/example/hpostesting/AssuranceControlsActivityTest.kt
+++ b/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
--- a/app/src/androidTest/java/com/example/hpostesting/ExampleInstrumentedTest.kt
+++ b/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
--- a/app/src/debug/res/drawable/downloads.xml
+++ b/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">
--- a/app/src/main/AndroidManifest.xml
+++ b/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" />
@@ -32,41 +30,13 @@
        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.dashboard.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.dashboard.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:theme="@style/Theme.HPOS.NoActionBar" />
+            android:exported="false" />
        <activity
            android:name="com.example.hpostesting.presentation.hemocube.DigitalCardActivity"
            android:exported="false" />
@@ -74,18 +44,10 @@
            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="false"
-            android:theme="@style/Theme.HPOS.NoActionBar" />
        <activity
            android:name="com.example.hpostesting.presentation.deviceprovision.DeviceProvisionActivity"
            android:exported="false"
@@ -93,25 +55,18 @@
        <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.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"
-            android:noHistory="true"
-            android:parentActivityName="com.example.hpostesting.presentation.MainActivity"
            android:theme="@style/Theme.HPOS.NoActionBar"
            android:windowSoftInputMode="adjustPan" />
        <activity
@@ -130,22 +85,21 @@
            android:name="com.example.hpostesting.presentation.dashboard.DashboardActivity"
            android:exported="false"
            android:label="@string/title_activity_dashboard"
-            android:screenOrientation="portrait"
            android:theme="@style/Theme.HPOS.NoActionBar"
            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" />

@@ -157,14 +111,6 @@
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

-                <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>
@@ -188,7 +134,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" />
@@ -202,16 +147,18 @@
            android:name="com.journeyapps.barcodescanner.CaptureActivity"
            android:screenOrientation="portrait"
            android:stateNotNeeded="true"
-            tools:replace="android:screenOrientation" /> <!-- ${applicationId} -->
+            tools:replace="android:screenOrientation" />
+
        <provider
            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileprovider"
+            android:authorities="com.example.hpostesting.fileprovider"
            android:exported="false"
            android:grantUriPermissions="true">
            <meta-data
                android:name="android.support.FILE_PROVIDER_PATHS"
                android:resource="@xml/file_paths" />
        </provider>
+
    </application>

 </manifest>
--- a/app/src/main/assets/app.properties
+++ b/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/
--- a/app/src/main/java/com/example/hpostesting/HPOSTestingApplication.kt
+++ b/app/src/main/java/com/example/hpostesting/HPOSTestingApplication.kt
@@ -1,28 +1,20 @@
-/*
- * // 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 android.content.Context
+import androidx.room.Room
+import com.example.hpostesting.data.dao.MyDatabase
+import com.google.android.datatransport.runtime.dagger.Provides
 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.Singleton

@HiltAndroidApp
-class HPOSTestingApplication : Application() {
+class HPOSTestingApplication: Application() {
    val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)

    override fun onCreate() {
--- a/app/src/main/java/com/example/hpostesting/data/CsvWriter.kt
+++ b/app/src/main/java/com/example/hpostesting/data/CsvWriter.kt
@@ -1,17 +1,4 @@
-/*
- * // 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
+package com.example.hpostesting.data

 import android.content.Context
 import android.os.Environment
--- a/app/src/main/java/com/example/hpostesting/data/constant/DataHolder.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/DataHolder.kt
@@ -1,17 +1,4 @@
-/*
- * // 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
+package com.example.hpostesting.data

 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
 }
--- a/app/src/main/java/com/example/hpostesting/data/InternetConnectionLiveData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/InternetConnectionLiveData.kt
@@ -1,17 +1,4 @@
-/*
- * // 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
+package com.example.hpostesting.data


 import android.content.Context
--- a/app/src/main/java/com/example/hpostesting/data/PreferenceUtility.kt
+++ b/app/src/main/java/com/example/hpostesting/data/PreferenceUtility.kt
@@ -1,17 +1,4 @@
-/*
- * // 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
+package com.example.hpostesting.data

 import android.content.Context
 import android.content.SharedPreferences
--- a/app/src/main/java/com/example/hpostesting/data/Result.kt
+++ b/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>()
+}
--- a/app/src/main/java/com/example/hpostesting/data/api/MolbioAuthApi.kt
+++ b/app/src/main/java/com/example/hpostesting/data/api/MolbioAuthApi.kt
@@ -1,20 +1,5 @@
-/*
- * // 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
-import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsResponse
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
 import com.example.hpostesting.data.model.login.LoginRequest
@@ -26,12 +11,11 @@ interface MolbioAuthApi {

    @POST("deviceManagement/device/provision")
    suspend fun deviceProvision(
-        @Body deviceProvisionRequest: DeviceProvisionRequest,
+        @Body deviceProvisionRequest: DeviceProvisionRequest
    ): DeviceProvisionResponse

    @POST("deviceService/device/login")
    suspend fun login(
-        @Body loginRequest: LoginRequest,
+        @Body loginRequest: LoginRequest
    ): LoginResponse
-
 }
--- a/app/src/main/java/com/example/hpostesting/data/api/MolbioResultApi.kt
+++ b/app/src/main/java/com/example/hpostesting/data/api/MolbioResultApi.kt
@@ -1,20 +1,5 @@
-/*
- * // 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
-import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsResponse
 import com.example.hpostesting.data.model.log.UploadLogsResponse
 import com.example.hpostesting.data.model.molbioresult.MolbioV2ResultRequest
 import com.example.hpostesting.data.model.molbioresult.MolbioV2ResultResponse
@@ -23,9 +8,7 @@ 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
 import retrofit2.http.POST
 import retrofit2.http.PUT
@@ -35,36 +18,22 @@ interface MolbioResultApi {

    @PUT("deviceService/results/HPOS")
    suspend fun uploadResults(
-        @Body molbioV2ResultRequest: MolbioV2ResultRequest,
+        @Body molbioV2ResultRequest: MolbioV2ResultRequest
    ): MolbioV2ResultResponse

    @POST("deviceService/device/checkUpdate")
    suspend fun checkUpdate(
-        @Body checkUpdateRequest: CheckUpdateRequest,
+        @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>
-
-    @GET("deviceService/device/getClientCertificate")
-    suspend fun downloadClientCertificate(
+        @Body deviceUpdateRequest: DeviceUpdateRequest
    ): ResponseBody

    @Multipart
    @POST("deviceService/device/uploadLogs")
    suspend fun uploadLogs(
-        @Part logFile: MultipartBody.Part,
+        @Part logFile: MultipartBody.Part
    ): UploadLogsResponse
-
-
-    @PUT("deviceService/device/uploadDeviceDiagnostics")
-    suspend fun deviceDiagnostics(
-        @Body deviceDiagnosticsRequest: DeviceDiagnosticsRequest
-    ): DeviceDiagnosticsResponse
 }
--- a/app/src/main/java/com/example/hpostesting/data/api/PropertyProvider.kt
+++ b/app/src/main/java/com/example/hpostesting/data/api/PropertyProvider.kt
@@ -0,0 +1,6 @@
+package com.example.hpostesting.data.api
+
+interface PropertyProvider {
+
+    fun getProperty(key: String): String
+}
--- a/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt
--- a/app/src/main/java/com/example/hpostesting/data/constant/HemoCubeCommands.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/HemoCubeCommands.kt
@@ -1,34 +1,16 @@
-/*
- * // 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) {
    START_BUFFER_COMMAND("B\r"),
    AUTO_DAC_COMMAND("C\r"),
-    SET_AUTO_DAC_TO_EPROM_COMMAND("G\r"),
    DIAGNOSTICS_COMMAND("D\r"),
    FIRMWARE_INFO_COMMAND("F\r"),
    START_SAMPLE("S\r"),
    PRINT_COMMAND("P\r"),
    READ_DAC_COMMAND("R\r"),
    DEVICE_CONFIGURATION_COMMAND("I\r"),
-    LOAD_DAC_VALUES("E\r"),
    FIRST_GAIN_COMMAND("T\r"),
    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"),
 }
--- a/app/src/main/java/com/example/hpostesting/data/constant/LanguageManager.kt
+++ b/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
@@ -32,14 +19,12 @@ object LanguageManager {
    }

    fun persistLanguagePreference(context: Context, languageCode: String) {
-        val prefs: SharedPreferences =
-            context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
+        val prefs: SharedPreferences = context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
        prefs.edit().putString(LANGUAGE_PREF_KEY, languageCode).apply()
    }

    fun getSavedLanguage(context: Context): String {
-        val prefs: SharedPreferences =
-            context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
+        val prefs: SharedPreferences = context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
        return prefs.getString(LANGUAGE_PREF_KEY, "en") ?: "en"
    }
 }
--- a/app/src/main/java/com/example/hpostesting/data/constant/TestRightCommands.kt
+++ b/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) {
--- a/app/src/main/java/com/example/hpostesting/data/constant/TestStatus.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/TestStatus.kt
@@ -1,49 +1,17 @@
-/*
- * // 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) {
    TEST_STARTED(1.0),
    CONFIG_STARTED(2.0),
    CONFIG_COMPLETED(3.0),
-    FIRST_EMPTY_AIR_READING_STARTED(4.1),
-    FIRST_EMPTY_AIR_READING_COMPLETED(4.2),
-    FIRST_EMPTY_AIR_READING_PRINT_STARTED(4.3),
-    FIRST_EMPTY_AIR_READING_PRINT_COMPLETED(4.4),
-    EPROM_ADC_RETRIEVAL_STARTED(4.5),
-    EPROM_ADC_RETRIEVAL_COMPLETED(4.6),
-    TEMPERATURE_CHECK(4.7),
-    CUVETTE_ABSENT(4.8),
-    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_STARTED(4.0),
+    BUFFER_COMPLETED(5.0),
    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),
-    SECOND_EMPTY_AIR_READING_STARTED(11.1),
-    SECOND_EMPTY_AIR_READING_COMPLETED(11.2),
-    SECOND_EMPTY_AIR_PRINT_STARTED(11.3),
-    SECOND_EMPTY_AIR_PRINT_COMPLETED(11.4),
    FIRST_GAIN_STARTED(12.0),
    FIRST_GAIN_COMPLETED(13.0),
    FIRST_GAIN_PRINT_STARTED(14.0),
--- a/app/src/main/java/com/example/hpostesting/data/dao/Converters.kt
+++ b/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
@@ -29,7 +16,6 @@ class Converters {
            null
        }
    }
-
    @TypeConverter
    fun toString(location: UserData.Location?): String? {
        return if (location != null) {
--- a/app/src/main/java/com/example/hpostesting/data/dao/DeviceDao.kt
+++ b/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
@@ -20,7 +7,7 @@ import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
-
+import com.example.hpostesting.data.model.patient.UserData
@Dao
 interface DeviceDao {
    @Query("SELECT * from device_table")
--- a/app/src/main/java/com/example/hpostesting/data/dao/HemoCubeBufferDao.kt
+++ b/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
--- a/app/src/main/java/com/example/hpostesting/data/dao/HemoCubeDao.kt
+++ b/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)

@@ -50,12 +29,4 @@ 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")
-    fun getPendingUser(): LiveData<List<HemoCubeTestData>>
-
-    @Update
-    suspend fun updateTest(hemoCubeTestData: HemoCubeTestData)
-
-
 }
--- a/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt
+++ b/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
@@ -21,11 +8,7 @@ import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData

-@Database(
-    entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class],
-    version = 38,
-    exportSchema = false
-)
+@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class], version = 23, exportSchema = false)
@TypeConverters(Converters::class)
 abstract class MyDatabase : RoomDatabase() {
    abstract fun userDao(): UserDao
--- a/app/src/main/java/com/example/hpostesting/data/dao/UserDao.kt
+++ b/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
--- a/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSource.kt
+++ b/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSource.kt
@@ -1,19 +1,11 @@
-/*
- * // 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
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
+import com.opencsv.CSVWriter
+import java.io.File
+import java.io.FileWriter
+import java.io.IOException

 interface LocalFileDataSource {

@@ -22,8 +14,6 @@ interface LocalFileDataSource {
    fun saveTextToDisk(filepath: String, contents: String)

    fun exportDataToCSV(
-        fileName: String, dataList: List<HemoCubeTestData>,
+        fileName: String, dataList: List<HemoCubeTestData>
    ): Boolean
-    fun backUpDataToCSV(fileName: String, dataList: List<HemoCubeTestData>)
-
 }
--- a/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSourceImpl.kt
+++ b/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
@@ -21,7 +8,7 @@ import java.io.FileWriter
 import java.io.IOException
 import javax.inject.Inject

-class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
+class LocalFileDataSourceImpl @Inject constructor(): LocalFileDataSource {

    override fun saveCsvToDisk(filepath: String, contents: ArrayList<Array<String>>) {
        val writer = CSVWriter(FileWriter(filepath))
@@ -38,13 +25,10 @@ class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
    }

    override fun exportDataToCSV(
-        fileName: String, dataList: List<HemoCubeTestData>,
+        fileName: String, dataList: List<HemoCubeTestData>
    ): Boolean {
        try {
-            val formattedFileName = fileName.replace(
-                Regex("[^a-zA-Z0-9.-]"),
-                "_"
-            ) // Replace special characters with underscores
+            val formattedFileName = fileName.replace(Regex("[^a-zA-Z0-9.-]"), "_") // Replace special characters with underscores
            val filePath = File(getExternalStorageDirectory(), formattedFileName)
            val writer = FileWriter(filePath)
            val csvWriter = CSVWriter(writer)
@@ -54,7 +38,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 +86,14 @@ class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
            )
            csvWriter.writeNext(header)

-            // Filter and write data rows where testStatus is true
-            val filteredDataList = dataList.filter { it.testStatus == true }
-            for (data in filteredDataList) {
+            // Write data rows
+            for (data in dataList) {
                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 +149,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")

--- a/app/src/main/java/com/example/hpostesting/data/model/AadharCard.kt
+++ b/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


--- a/app/src/main/java/com/example/hpostesting/data/model/CalculationVariableForTest.kt
+++ b/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(
--- a/app/src/main/java/com/example/hpostesting/data/model/ErrorMessage.kt
+++ b/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 (
--- a/app/src/main/java/com/example/hpostesting/data/model/Location.kt
+++ b/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(
--- a/app/src/main/java/com/example/hpostesting/data/model/PatientData.kt
+++ b/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
--- a/app/src/main/java/com/example/hpostesting/data/model/PendingUploads.kt
+++ b/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
--- a/app/src/main/java/com/example/hpostesting/data/model/Response.kt
+++ b/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> {
--- a/app/src/main/java/com/example/hpostesting/data/model/TestState.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/TestState.kt
@@ -1,57 +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.data.model
-
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
-
-data class TestState (
-    var testDetails: HemoCubeTestData? = null,
-    var isOnline: Boolean = false,
-    var currentDeviceData: DeviceData? = null,
-    var resultData: String = "",
-    var currentResultData: String = "",
-    var isUsingExistingBuffer: Boolean = false,
-    var isTestOngoing: Boolean = false,
-    var led1BufferForDevice: Double = 0.0,
-    var led2BufferForDevice: Double = 0.0,
-    var led3BufferForDevice: Double = 0.0,
-    var led4BufferForDevice: Double = 0.0,
-    var led1SampleForDevice: Double = 0.0,
-    var led2SampleForDevice: Double = 0.0,
-    var led3SampleForDevice: Double = 0.0,
-    var led4SampleForDevice: Double = 0.0,
-    var fittedAbs1: Double = 0.0,
-    var fittedAbs2: Double = 0.0,
-    var fittedAbs3: Double = 0.0,
-    var fittedAbs4: Double = 0.0,
-//    var led1Air1: Double? = null,
-//    var led2Air1: Double? = null,
-//    var led3Air1: Double? = null,
-//    var led4Air1: Double? = null,
-//    var led1Air2: Double? = null,
-//    var led2Air2: Double? = null,
-//    var led3Air2: Double? = null,
-//    var led4Air2: Double? = null,
-    var calculatedPredictedDenovixRatio: Double = 0.0,
-    var validationError: Boolean = false,
-    var deviceHardwareId: String = "",
-    var allErrorMessages: String = "",
-    var testStatusCode: Double = 0.0,
-    var repeatReadingCount: Int = 0,
-    var readingsPerSample: Int = Constants.READINGS_PER_SAMPLE,
-    var uploadedToCloud: Boolean = false,
-    var uploadedToMolbio: Boolean = false
-)
--- a/app/src/main/java/com/example/hpostesting/data/model/calibration/CalibrationData.kt
+++ b/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 (
--- a/app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/AdditionalDetails.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/AdditionalDetails.kt
@@ -1,27 +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.data.model.devicediagnostics
-
-data class AdditionalDetails(
-     val batteryLevel: String? = "",
-     val batteryCapacity: String? = "",
-     val batteryMaxCapacity: String? = "",
-     val batteryTemperature: String? = "",
-     val batteryVoltage: String? = "",
-)
-
-
-
-
-
--- a/app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/DeviceDiagnosticsData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/DeviceDiagnosticsData.kt
@@ -1,25 +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.data.model.devicediagnostics
-
-data class DeviceDiagnosticsData(
-    val id: String? = "",
-    val deviceId: String? = "",
-    val additionalDetails: AdditionalDetails?= AdditionalDetails(),
-    val createdBy: String? = "",
-    val updatedBy: String? = "",
-    val updatedAt: String? = "",
-    val createdAt: String? = "",
-)
-
--- a/app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/DeviceDiagnosticsRequest.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/DeviceDiagnosticsRequest.kt
@@ -1,18 +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.data.model.devicediagnostics
-
-data class DeviceDiagnosticsRequest(
-    val additionalDetails: AdditionalDetails?= AdditionalDetails()
-)
--- a/app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/DeviceDiagnosticsResponse.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/DeviceDiagnosticsResponse.kt
@@ -1,24 +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.data.model.devicediagnostics
-
-import com.google.gson.annotations.SerializedName
-
-
-data class DeviceDiagnosticsResponse(
-    @SerializedName("Data")
-    val data: DeviceDiagnosticsData? = DeviceDiagnosticsData(),
-    val message: String? = "",
-    val result: String? = ""
-)
--- a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Credentials.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Credentials.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.model.deviceprovision

 data class Credentials(
    val password: String? = "",
-    val username: String? = "",
+    val username: String? = ""
 )
--- a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Device.kt
+++ b/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(
@@ -26,5 +13,5 @@ data class Device(
    val serialNumber: String? = "",
    val uid: String? = "",
    val updatedAt: String? = "",
-    val updatedBy: Int? = 0,
+    val updatedBy: Int? = 0
 )
--- a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionData.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.model.deviceprovision

 data class DeviceProvisionData(
    val credentials: Credentials? = Credentials(),
-    val device: Device? = Device(),
+    val device: Device? = Device()
 )
--- a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionRequest.kt
+++ b/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(
@@ -18,5 +5,5 @@ data class DeviceProvisionRequest(
    val email: String? = "",
    val password: String? = "",
    val serialNumber: String? = "",
-    val uid: String? = "",
+    val uid: String? = ""
 )
--- a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionResponse.kt
+++ b/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
@@ -21,5 +8,5 @@ data class DeviceProvisionResponse(
    @SerializedName("Message")
    val message: String? = "",
    @SerializedName("Result")
-    val result: String? = "",
+    val result: String? = ""
 )
--- a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceType.kt
+++ b/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(
@@ -21,5 +8,5 @@ data class DeviceType(
    val id: Int? = 0,
    val name: String? = "",
    val updatedAt: String? = "",
-    val updatedBy: Int? = 0,
+    val updatedBy: Int? = 0
 )
--- a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceUser.kt
+++ b/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(
@@ -24,5 +11,5 @@ data class DeviceUser(
    val natsTokenExpiry: String? = "",
    val updatedAt: String? = "",
    val updatedBy: Int? = 0,
-    val username: String? = "",
+    val username: String? = ""
 )
--- a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/ProvisionData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/ProvisionData.kt
@@ -1,21 +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.data.model.deviceprovision
-
-data class ProvisionData(
-    val username: String?,
-    val password: String?,
-    val natsToken: String?,
-)
-
--- a/app/src/main/java/com/example/hpostesting/data/model/diagnostics/DiagnosticsData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/diagnostics/DiagnosticsData.kt
@@ -1,25 +1,9 @@
-/*
- * // 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(
+data class DiagnosticsData (
    var deviceId: String = "",
    var appVersion: String? = "",
    var deviceType: String = "HEMOCUBE",
    var deviceData: String = "",
-    var devicePassword: String = "",
-    var deviceNatsToken: String = "",
-    var accessToken: String = "",
-    var runTime: String = "",
+    var runTime: String = ""
 )
--- a/app/src/main/java/com/example/hpostesting/data/model/jig/JigData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/jig/JigData.kt
@@ -1,22 +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.data.model.jig
-
-data class JigData(
-    var deviceId: String = "",
-    var appVersion: String? = "",
-    var deviceType: String = "JIG",
-    var scanData: String = "",
-    var createdAt: String = "",
-)
--- a/app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsData.kt
@@ -1,18 +1,5 @@
-/*
- * // 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(
-    val filename: String? = "",
+    val filename: String? = ""
 )
--- a/app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsResponse.kt
+++ b/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
@@ -21,5 +8,5 @@ data class UploadLogsResponse(
    @SerializedName("Message")
    val message: String? = "",
    @SerializedName("Result")
-    val result: String? = "",
+    val result: String? = ""
 )
--- a/app/src/main/java/com/example/hpostesting/data/model/login/Device.kt
+++ b/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(
@@ -25,5 +12,5 @@ data class Device(
    val serialNumber: String? = "",
    val uid: String? = "",
    val updatedAt: String? = "",
-    val updatedBy: Int? = 0,
+    val updatedBy: Int? = 0
 )
--- a/app/src/main/java/com/example/hpostesting/data/model/login/DeviceType.kt
+++ b/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(
@@ -21,5 +8,5 @@ data class DeviceType(
    val id: Int? = 0,
    val name: String? = "",
    val updatedAt: String? = "",
-    val updatedBy: Int? = 0,
+    val updatedBy: Int? = 0
 )
--- a/app/src/main/java/com/example/hpostesting/data/model/login/DeviceUser.kt
+++ b/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(
@@ -25,5 +12,5 @@ data class DeviceUser(
    val natsTokenExpiry: String? = "",
    val updatedAt: String? = "",
    val updatedBy: Int? = 0,
-    val username: String? = "",
+    val username: String? = ""
 )
--- a/app/src/main/java/com/example/hpostesting/data/model/login/LoginData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/login/LoginData.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.model.login

 data class LoginData(
    val accessToken: String? = "",
-    val deviceUser: DeviceUser? = DeviceUser(),
+    val deviceUser: DeviceUser? = DeviceUser()
 )
--- a/app/src/main/java/com/example/hpostesting/data/model/login/LoginRequest.kt
+++ b/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(
@@ -22,5 +9,5 @@ data class LoginRequest(
    val password: String? = "",
    val serialNumber: String? = "",
    val username: String? = "",
-    val version: String? = "",
+    val version: String? = ""
 )
--- a/app/src/main/java/com/example/hpostesting/data/model/login/LoginResponse.kt
+++ b/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
@@ -21,5 +8,5 @@ data class LoginResponse(
    @SerializedName("Message")
    val message: String? = "",
    @SerializedName("Result")
-    val result: String? = "",
+    val result: String? = ""
 )
--- a/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2Result.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2Result.kt
@@ -1,23 +1,10 @@
-/*
- * // 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

 data class MolbioV2Result(
    val age: Int? = 31,
-    val analysisDate: String? = "2024-02-08 16:33:56",
+    val analysisDate: String? = "",
    val analysisId: String? = "",
    val analysisStatus: String? = "",
    val analysisType: String? = "HPOS",
@@ -25,11 +12,11 @@ data class MolbioV2Result(
    val bloodGroup: String? = "",
    val coefficients: List<Int>? = listOf(22, 22),
    val collectionLocation: List<Any>? = listOf(),
-    val collectionTime: String? = "2024-02-08 16:33:56",
+    val collectionTime: String? = "",
    val collector: String? = "",
    val curveFitting: String? = "Linear",
    val deviceName: String? = "HPOS",
-    val expiryTime: String? = "2024-02-08 16:33:56",
+    val expiryTime: String? = "",
    val gender: String? = "",
    val interpretation: String? = "",
    val `operator`: String? = "",
@@ -43,9 +30,9 @@ data class MolbioV2Result(
    val testId: String? = "",
    val testResult: String? = "",
    val testStatus: String? = "",
-    val testTime: String? = "2024-02-08 16:33:56",
+    val testTime: String? = "",
    val testType: String? = "",
    val thresholds: String? = "",
    val underMedication: Boolean? = false,
-    val volume: Int? = 2,
+    val volume: Int? = 2
 )
--- a/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultData.kt
@@ -1,36 +1,23 @@
-/*
- * // 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

 data class MolbioV2ResultData(
    val age: Int? = 0,
-    val analysisDate: String? = "2024-02-08 16:33:56",
+    val analysisDate: String? = "",
    val analysisStatus: String? = "",
    val analysisType: String? = "",
    val analysisTypeMethod: String? = "",
    val bloodGroup: String? = "",
    val coefficients: List<Int>? = listOf(),
    val collectionLocation: List<Any>? = listOf(),
-    val collectionTime: String? = "2024-02-08 16:33:56",
+    val collectionTime: String? = "",
    val collector: String? = "",
    val createdAt: String? = "",
    val createdBy: Int? = 0,
    val curveFitting: String? = "",
    val deviceId: Int? = 0,
-    val expiryTime: String? = "2024-02-08 16:33:56",
+    val expiryTime: String? = "",
    val gender: String? = "",
    val id: Int? = 0,
    val interpretation: String? = "",
@@ -45,11 +32,11 @@ data class MolbioV2ResultData(
    val testId: String? = "",
    val testResult: String? = "",
    val testStatus: String? = "",
-    val testTime: String? = "2024-02-08 16:33:56",
+    val testTime: String? = "",
    val testType: String? = "",
    val thresholds: String? = "",
    val underMedication: Boolean? = false,
    val updatedAt: String? = "",
    val updatedBy: Int? = 0,
-    val volume: Int? = 0,
+    val volume: Int? = 0
 )
--- a/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultRequest.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultRequest.kt
@@ -1,18 +1,5 @@
-/*
- * // 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(
-    val results: MutableList<MolbioV2Result>? = mutableListOf(),
+    val results: MutableList<MolbioV2Result>? = mutableListOf()
 )
--- a/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultResponse.kt
+++ b/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
@@ -21,5 +8,5 @@ data class MolbioV2ResultResponse(
    @SerializedName("Message")
    val message: String? = "",
    @SerializedName("Result")
-    val result: String? = "",
+    val result: String? = ""
 )
--- a/app/src/main/java/com/example/hpostesting/data/model/molbioresult/RawData.kt
+++ b/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
@@ -32,7 +19,7 @@ data class RawData(
    var gender: String = "",
    var localFlag: Boolean = false,
    var deviceId: String? = "",
-    var appVersion: String? = "",
+    var appVersion:String? = "",
    var deviceSerialNumber: String = "",
    var deviceType: String = "HEMOCUBE",
    var kitSerial: String = "",
--- a/app/src/main/java/com/example/hpostesting/data/model/patient/BufferCheckData.kt
+++ b/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
@@ -22,7 +9,7 @@ data class BufferCheckData(
    var _id: String = "",
    var kitno: String = "",
    var deviceId: String? = "",
-    var appVersion: String? = "",
+    var appVersion:String? = "",
    var deviceSerialNumber: String = "",
    var deviceType: String = "HEMOCUBE",
    var localFlag: Boolean = false,
--- a/app/src/main/java/com/example/hpostesting/data/model/patient/DeviceData.kt
+++ b/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
@@ -28,25 +15,5 @@ data class DeviceData(
    @get:PropertyName("coefficients") @set:PropertyName("coefficients")
    var coefficients: List<Double> = emptyList(),
    @get:PropertyName("calibratedAt") @set:PropertyName("calibratedAt")
-    var calibratedAt: String = "",
-    @get:PropertyName("deviceProvisionResponse") @set:PropertyName("deviceProvisionResponse")
-    var deviceProvisionResponse: String = "",
-    @get:PropertyName("username") @set:PropertyName("username")
-    var username: String = "",
-    @get:PropertyName("password") @set:PropertyName("password")
-    var password: String = "",
-    @get:PropertyName("natsToken") @set:PropertyName("natsToken")
-    var natsToken: String = "",
-    @get:PropertyName("natsTokenExpiry") @set:PropertyName("natsTokenExpiry")
-    var natsTokenExpiry: String = "",
-    @get:PropertyName("deviceUpdateAvailable") @set:PropertyName("deviceUpdateAvailable")
-    var deviceUpdateAvailable: Boolean = false,
-    @get:PropertyName("updatePath") @set:PropertyName("updatePath")
-    var updatePath: String = "",
-    @get:PropertyName("deviceVersion") @set:PropertyName("deviceVersion")
-    var deviceVersion: String = "",
-    @get:PropertyName("globalUpdateDone") @set:PropertyName("globalUpdateDone")
-    var globalUpdateDone: Boolean = false,
-    @get:PropertyName("globalUpdateIgnore") @set:PropertyName("globalUpdateIgnore")
-    var globalUpdateIgnore: Boolean = false,
+    var calibratedAt: String = ""
 )
--- a/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt
+++ b/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)
-    var sampleid: Int = 0,
+    @PrimaryKey
    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 = "",
@@ -36,7 +22,7 @@ data class HemoCubeTestData(
    var gender: String = "",
    var localFlag: Boolean = false,
    var deviceId: String? = "",
-    var appVersion: String? = "",
+    var appVersion:String? = "",
    var deviceSerialNumber: String = "",
    var deviceType: String = "HEMOCUBE",
    var kitSerial: String = "",
@@ -75,14 +61,6 @@ data class HemoCubeTestData(
    var led2Gain4: Double? = null,
    var led3Gain4: Double? = null,
    var led4Gain4: Double? = null,
-    var led1Air1: Double? = null,
-    var led2Air1: Double? = null,
-    var led3Air1: Double? = null,
-    var led4Air1: Double? = null,
-    var led1Air2: Double? = null,
-    var led2Air2: Double? = null,
-    var led3Air2: Double? = null,
-    var led4Air2: Double? = null,
    var deviceRatio: Double? = null,
    var calculatedRatio: Double? = null,
    var predictedDenovixRatio: Double? = null,
@@ -92,7 +70,6 @@ data class HemoCubeTestData(
    var prdClassification: String = "",
    var deviceRatioClass: String = "",
    var slopeRatioClass: String = "",
-    var borderlineMethod2Class: String = "",
    var errorMessages: String = "",
    var batteryLevel: String = "",
    var batteryCapacity: String = "",
@@ -103,13 +80,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?= ""
+    var isCSVCreated: Boolean = false
 )
--- a/app/src/main/java/com/example/hpostesting/data/model/patient/PatientData.kt
+++ b/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
@@ -31,7 +18,7 @@ data class PatientDetails(
    var address: Address?,
    var category: Category?,
    var registerDate: Date?,
-    var uploadDate: Date?,
+    var uploadDate: Date?
 ) {
    constructor() : this(
        "",
@@ -58,6 +45,7 @@ data class PatientDetails(
        OTHER
    }

+
    data class Address(
        var house: String?,
        val street: String?,
--- a/app/src/main/java/com/example/hpostesting/data/model/patient/UserData.kt
+++ b/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 = "",
@@ -42,8 +29,7 @@ data class UserData(
    var reportPath: String = "",
    var result: TestRightResultType? = null,
    var resultRatio: Double? = null,
-    var prdClassification: String = "",
-    var sampleid: Int = 0
+    var prdClassification: String = ""
 ) {
    enum class Gender {
        MALE,
@@ -53,17 +39,15 @@ data class UserData(

    data class Location(
        var latitude: Double? = null,
-        var longitude: Double? = null,
+        var longitude: Double? = null
    )
 }

 fun UserData.toHemoCubeTestData() = HemoCubeTestData(
    _id = _id,
    name = name,
-    sampleid = sampleid,
    bloodGroup = bloodGroup,
-    incubationTime = incubationTime,
-    age = age,
+    birthYear = birthYear,
    gender = gender,
    state = state,
    abhaId = abhaId,
--- a/app/src/main/java/com/example/hpostesting/data/model/test/TestRightCalculationData.kt
+++ b/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(
--- a/app/src/main/java/com/example/hpostesting/data/model/test/TestRightDeviceConstants.kt
+++ b/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(
--- a/app/src/main/java/com/example/hpostesting/data/model/test/TestRightResultType.kt
+++ b/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 {
--- a/app/src/main/java/com/example/hpostesting/data/model/test/TestType.kt
+++ b/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,
-    HB_EST
+    SICKLEFIND
 }
--- a/app/src/main/java/com/example/hpostesting/data/model/test/ViewModelModule.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/test/ViewModelModule.kt
@@ -0,0 +1,29 @@
+package com.example.hpostesting.di
+
+import android.content.Context
+import com.example.hpostesting.data.repository.DatabaseRepository
+import com.example.hpostesting.data.dao.UserDao
+import com.example.hpostesting.domain.SaveRawData
+import com.example.hpostesting.domain.SaveRawDataTest
+import com.example.hpostesting.presentation.testRight.TestRightViewModel
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ViewModelComponent
+import dagger.hilt.android.qualifiers.ApplicationContext
+
+@Module
+@InstallIn(ViewModelComponent::class)
+object ViewModelModule {
+
+    @Provides
+    fun provideTestRightViewModel(
+        saveRawData: SaveRawData,
+        saveRawDataTest: SaveRawDataTest,
+        databaseRepository: DatabaseRepository,
+        userDao: UserDao,
+        context: Context
+    ): TestRightViewModel {
+        return TestRightViewModel(saveRawData, saveRawDataTest, databaseRepository, userDao, context)
+    }
+}
--- a/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateData.kt
@@ -1,18 +1,5 @@
-/*
- * // 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(
-    val version: String? = "",
+    val version: String? = ""
 )
--- a/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateRequest.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateRequest.kt
@@ -1,18 +1,5 @@
-/*
- * // 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(
-    val currentVersion: String? = "",
+    val currentVersion: String? = ""
 )
--- a/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateResponse.kt
+++ b/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
@@ -21,5 +8,5 @@ data class CheckUpdateResponse(
    @SerializedName("Message")
    val message: String? = "",
    @SerializedName("Result")
-    val result: String? = "",
+    val result: String? = ""
 )
--- a/app/src/main/java/com/example/hpostesting/data/model/updates/DeviceUpdateRequest.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/updates/DeviceUpdateRequest.kt
@@ -1,18 +1,5 @@
-/*
- * // 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(
-    val serial_no: String? = "",
+    val serial_no: String? = ""
 )
--- a/app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt
+++ b/app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt
@@ -1,30 +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.repository

 import android.net.Uri
-import com.example.hpostesting.util.Result
+import com.example.hpostesting.data.Result
 import com.example.hpostesting.data.api.MolbioAuthApi
 import com.example.hpostesting.data.api.MolbioResultApi
 import com.example.hpostesting.data.model.PendingUploads
 import com.example.hpostesting.data.model.Response
-import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
-import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsResponse
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
 import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
-import com.example.hpostesting.data.model.jig.JigData
 import com.example.hpostesting.data.model.log.UploadLogsResponse
 import com.example.hpostesting.data.model.login.LoginRequest
 import com.example.hpostesting.data.model.login.LoginResponse
@@ -53,8 +37,8 @@ import javax.inject.Named

 class NetworkException(message: String, cause: Throwable) : Exception(message, cause)
 class DatabaseRepository @Inject constructor(
-    @Named("Auth") private val molbioAuthApi: MolbioAuthApi,
-    private val molbioResultApi: MolbioResultApi,
+    @Named("Auth")private val molbioAuthApi: MolbioAuthApi,
+    private val molbioResultApi: MolbioResultApi
 ) : Repository {

    private val db: FirebaseFirestore = Firebase.firestore
@@ -73,7 +57,7 @@ class DatabaseRepository @Inject constructor(
        }
    }

-    override suspend fun deviceProvision(deviceProvisionRequest: DeviceProvisionRequest): Result<DeviceProvisionResponse> {
+    suspend fun deviceProvision(deviceProvisionRequest: DeviceProvisionRequest): Result<DeviceProvisionResponse> {
        return safeApiCall { molbioAuthApi.deviceProvision(deviceProvisionRequest) }
    }

@@ -89,16 +73,8 @@ class DatabaseRepository @Inject constructor(
        return safeApiCall { molbioResultApi.checkUpdate(checkUpdateRequest) }
    }

-    override suspend fun deviceUpdate(deviceUpdateRequest: DeviceUpdateRequest): retrofit2.Response<ResponseBody> {
-        return molbioResultApi.deviceUpdate(deviceUpdateRequest)
-    }
-
-    override suspend fun deviceDiagnostics(deviceDiagnosticsRequest: DeviceDiagnosticsRequest): Result<DeviceDiagnosticsResponse> {
-        return safeApiCall { molbioResultApi.deviceDiagnostics(deviceDiagnosticsRequest) }
-    }
-
-    override suspend fun downloadClientCertificate(): Result<ResponseBody> {
-        return safeApiCall { molbioResultApi.downloadClientCertificate() }
+    override suspend fun deviceUpdate(deviceUpdateRequest: DeviceUpdateRequest): Result<ResponseBody> {
+        return safeApiCall { molbioResultApi.deviceUpdate(deviceUpdateRequest) }
    }

    override suspend fun uploadLogs(logFile: MultipartBody.Part): Result<UploadLogsResponse> {
@@ -120,19 +96,22 @@ class DatabaseRepository @Inject constructor(
            Response.Error(e)
        }
    }
-    override suspend fun addQcTestToDatabase(data: HemoCubeTestData?): Response<String> {
-        return try {
-
-            db.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")
+        return try {
+            val userdata =
+                db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
+            if (userdata.documents.isNotEmpty()) {
+                userdata.documents.forEach {
+                    db.collection("patientData").document(it.id).update("testStatus", true)
+                }
+            }
+            db.collection("testData").add(data).await()
+            Response.Success(data._id)
+        } catch (e: Exception) {
+            Firebase.crashlytics.recordException(e)
+            Response.Error(e)
+        }
    }

    override suspend fun addTestToDatabaseforBufferCheck(data: BufferCheckData?): Response<String> {
@@ -155,19 +134,8 @@ class DatabaseRepository @Inject constructor(
        }
    }

-
-    override suspend fun addTestJigData(data: JigData?): Response<String> {
-        return try {
-            db.collection("jigs").add(data!!).await()
-            Response.Success(data.deviceId)
-        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
-            Response.Error(e)
-        }
-    }
-
    override suspend fun uploadFileToStorage(
-        patientID: String, filePath: String,
+        patientID: String, filePath: String
    ): Response<Boolean> {
        try {

@@ -235,45 +203,7 @@ class DatabaseRepository @Inject constructor(
        return allDeviceDataList.find { it.deviceId == deviceId }
    }

-    override suspend fun getDeviceResponse(data: DeviceData?): Response<String> {
-        return try {
-            db.collection("devices").add(data!!).await()
-            Response.Success(data.deviceProvisionResponse)
-        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
-            Response.Error(e)
-        }
-    }
-
-    override suspend fun uploadDeviceId(data: DeviceData): Response<String>? {
-        return try {
-            db.collection("devices").add(data!!).await()
-            Response.Success(data.deviceId)
-        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
-            Response.Error(e)
-        }
-    }
-
    override fun <UserData> addTestToDatabase(testDetails: UserData): Any {
        TODO("Not yet implemented")
    }
-
-    override suspend fun addTestToDatabasefornew(data: HemoCubeTestData?): Response<String> {
-            return try {
-                val userdata =
-                    db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
-                if (userdata.documents.isNotEmpty()) {
-                    userdata.documents.forEach {
-                        db.collection("patientData").document(it.id).update("testStatus", true)
-                    }
-                }
-                db.collection("testData").add(data).await()
-                Response.Success(data._id)
-            } catch (e: Exception) {
-                Firebase.crashlytics.recordException(e)
-                Response.Error(e)
-            }
-        }
-
 }
--- a/app/src/main/java/com/example/hpostesting/data/repository/LocalFileRepository.kt
+++ b/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
--- a/app/src/main/java/com/example/hpostesting/data/repository/Repository.kt
+++ b/app/src/main/java/com/example/hpostesting/data/repository/Repository.kt
@@ -1,26 +1,8 @@
-/*
- * // 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
-import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
-import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
 import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
-import com.example.hpostesting.data.model.jig.JigData
 import com.example.hpostesting.data.model.log.UploadLogsResponse
 import com.example.hpostesting.data.model.login.LoginRequest
 import com.example.hpostesting.data.model.login.LoginResponse
@@ -38,8 +20,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>

@@ -47,26 +27,19 @@ interface Repository {

    suspend fun addDiagnostics(data: DiagnosticsData?): Response<String>

-    suspend fun addTestJigData(data: JigData?): Response<String>
-
    suspend fun uploadFileToStorage(patientID: String, filePath: String): Response<Boolean>

    suspend fun getDeviceDataById(deviceId: String): DeviceData?
-    suspend fun getDeviceResponse(data: DeviceData?): Response<String>
-    suspend fun uploadDeviceId(data: DeviceData): Response<String>?
    abstract fun <UserData> addTestToDatabase(testDetails: UserData): Any
 //    suspend fun addToDatabase(data: PatientDetails)

-    suspend fun deviceProvision(deviceProvisionRequest: DeviceProvisionRequest): Result<DeviceProvisionResponse>
-
    suspend fun login(loginRequest: LoginRequest): Result<LoginResponse>

    suspend fun uploadResults(molbioV2ResultRequest: MolbioV2ResultRequest): Result<MolbioV2ResultResponse>

    suspend fun checkUpdate(checkUpdateRequest: CheckUpdateRequest): Result<CheckUpdateResponse>

-    suspend fun deviceUpdate(deviceUpdateRequest: DeviceUpdateRequest): retrofit2.Response<ResponseBody>
-    suspend fun deviceDiagnostics(deviceDiagnosticsRequest: DeviceDiagnosticsRequest): Result<DeviceDiagnosticsResponse>
-    suspend fun downloadClientCertificate(): Result<ResponseBody>
+    suspend fun deviceUpdate(deviceUpdateRequest: DeviceUpdateRequest): Result<ResponseBody>
+
    suspend fun uploadLogs(logFile: MultipartBody.Part): Result<UploadLogsResponse>
 }
--- a/app/src/main/java/com/example/hpostesting/domain/AuthInterceptor.kt
+++ b/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
--- a/app/src/main/java/com/example/hpostesting/domain/CheckUpdateWorker.kt
+++ b/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
--- a/app/src/main/java/com/example/hpostesting/domain/LogFileManager.kt
+++ b/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
--- a/app/src/main/java/com/example/hpostesting/domain/LogFileManagerImpl.kt
+++ b/app/src/main/java/com/example/hpostesting/domain/LogFileManagerImpl.kt
@@ -1,19 +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.domain

 import android.content.Context
+import android.util.Log
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
@@ -44,7 +32,7 @@ class LogFileManagerImpl @Inject constructor(private val context: Context) : Log

            file
        } catch (e: IOException) {
-//            Log.e("LogFileManager", "Error creating log file: ${e.message}")
+            Log.e("LogFileManager", "Error creating log file: ${e.message}")
            null
        }
    }
--- a/app/src/main/java/com/example/hpostesting/domain/ResultCalculationWithMaxImpl.kt
+++ b/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
--- a/app/src/main/java/com/example/hpostesting/domain/SaveRawData.kt
+++ b/app/src/main/java/com/example/hpostesting/domain/SaveRawData.kt
@@ -1,23 +1,10 @@
-/*
- * // 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
+import com.example.hpostesting.data.repository.LocalFileRepository
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.data.model.test.TestRightCalculationData
-import com.example.hpostesting.data.repository.LocalFileRepository
 import java.util.Collections.sort

 class SaveRawData(private val localFileRepository: LocalFileRepository) {
@@ -111,7 +98,7 @@ class SaveRawData(private val localFileRepository: LocalFileRepository) {
        folderPath: String,
        fileName: String,
        calculationData: TestRightCalculationData,
-        testDetails: UserData?,
+        testDetails: UserData?
    ) {
 //        val fileObj = File(folderPath, fileName)
 //        val writer = FileWriter(fileObj)
@@ -129,7 +116,7 @@ class SaveRawData(private val localFileRepository: LocalFileRepository) {

    private fun getLogStringFromObjWithPatientData(
        calculationData: TestRightCalculationData,
-        testDetails: UserData?,
+        testDetails: UserData?
    ): String {
        var outputString = "Test calculation logs ==>\n"
        outputString += "Name = ${testDetails?.name}\n"
--- a/app/src/main/java/com/example/hpostesting/domain/SaveRawDataTest.kt
+++ b/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
--- a/app/src/main/java/com/example/hpostesting/domain/SickleFindResultCaluculationWithMaxImpl.kt
+++ b/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
--- a/app/src/main/java/com/example/hpostesting/domain/TestRightResultCalculation.kt
+++ b/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
--- a/app/src/main/java/com/example/hpostesting/domain/di/AppModule.kt
+++ b/app/src/main/java/com/example/hpostesting/domain/di/AppModule.kt
@@ -1,17 +1,4 @@
-/*
- * // 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
+package com.example.hpostesting.domain.di

 import android.app.Application
 import android.content.Context
@@ -20,8 +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.util.PropertyProvider
+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
@@ -36,16 +22,12 @@ import com.example.hpostesting.domain.LogFileManager
 import com.example.hpostesting.domain.LogFileManagerImpl
 import com.example.hpostesting.domain.SaveRawData
 import com.example.hpostesting.domain.SaveRawDataTest
-import com.example.hpostesting.presentation.utils.UsbServiceListener
-import com.example.hpostesting.presentation.utils.UsbServiceListenerImpl
 import com.example.hpostesting.util.PropertyProviderImpl
 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
@@ -60,12 +42,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
@@ -166,7 +145,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()
@@ -200,10 +179,4 @@ object AppModule {
    fun provideLocalFileDataSource(): LocalFileDataSource {
        return LocalFileDataSourceImpl()
    }
-
-    @Provides
-    @Singleton
-    fun provideUsbServiceListener(context: Context): UsbServiceListener {
-        return UsbServiceListenerImpl(context)
-    }
 }
--- a/app/src/main/java/com/example/hpostesting/encryption/Encryption.kt
+++ b/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)
-    }
-}
--- a/Show More
+++ b/Show More