From f39bce5786927c40df828c2d9531e678ccf56eac Mon Sep 17 00:00:00 2001
From: Mariya <mariya@sminnovations.in>
Date: Fri, 8 Dec 2023 23:11:21 +0530
Subject: [PATCH] TestRight related issues fixed

---
 .../hpostesting/presentation/testRight/TestRightActivity.kt   | 2 +-
 .../presentation/testRight/TestRightExpReference.kt           | 2 +-
 .../hpostesting/presentation/testRight/TestRightExpSample.kt  | 2 +-
 .../hpostesting/presentation/testRight/TestRightResults.kt    | 4 ++--
 .../hpostesting/presentation/testRight/TestRightViewModel.kt  | 1 -
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightActivity.kt b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightActivity.kt
index 9ff7cea..2a75ac8 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightActivity.kt
@@ -32,7 +32,7 @@ import `in`.sminnovations.hpostesting.databinding.ActivityTestRightBinding
 class TestRightActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityTestRightBinding
-    private val viewModel by viewModels<TestRightViewModel<Any?>>()
+    private val viewModel by viewModels<TestRightViewModel>()
     private var myMenu: Menu? = null
 
     private lateinit var mDriver: UsbSerialDriver
diff --git a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpReference.kt b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpReference.kt
index 92bbe6b..a9d0536 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpReference.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpReference.kt
@@ -25,7 +25,7 @@ import `in`.sminnovations.hpostesting.databinding.FragmentTestRightExpReferenceB
 @AndroidEntryPoint
 class TestRightExpReference : Fragment() {
     private lateinit var binding: FragmentTestRightExpReferenceBinding
-    private val viewModel: TestRightViewModel<Any?> by activityViewModels()
+    private val viewModel: TestRightViewModel by activityViewModels()
     private val TAG = "TestRightExpReference"
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
diff --git a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpSample.kt b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpSample.kt
index 369fb33..33f79ce 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpSample.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpSample.kt
@@ -27,7 +27,7 @@ import `in`.sminnovations.hpostesting.databinding.FragmentTestRightExpSampleBind
 class TestRightExpSample : Fragment() {
 
     private lateinit var binding: FragmentTestRightExpSampleBinding
-    private val viewModel: TestRightViewModel<Any?> by activityViewModels()
+    private val viewModel: TestRightViewModel by activityViewModels()
 
     private val TAG = "TestRightExpSample"
 
diff --git a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt
index 9bb27e8..ea0b909 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt
@@ -32,7 +32,7 @@ import kotlinx.coroutines.withContext
 class TestRightResults : Fragment() {
 
     private lateinit var binding: FragmentTestRightResultsBinding
-    private val viewModel: TestRightViewModel<Any?> by activityViewModels()
+    private val viewModel: TestRightViewModel by activityViewModels()
     private lateinit var sharedPreference: SharedPreferences
 
     override fun onCreateView(
@@ -135,7 +135,7 @@ class TestRightResults : Fragment() {
                 }
             }
         }
-        viewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isNetworkAvailable ->
+        viewModel.networkStatusLiveData?.observe(viewLifecycleOwner) { isNetworkAvailable ->
             val deviceStaticId = sharedPreference.getString(Constants.USER_ID, "")
             if (isNetworkAvailable) {
                 viewModel.uploadResultToDatabase(requireContext(), true, deviceStaticId!!)
diff --git a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt
index b6b5266..19af4da 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt
@@ -39,7 +39,6 @@ import kotlin.math.log10
 import kotlin.math.pow
 
 @HiltViewModel
-@ViewModelScoped
 class TestRightViewModel @Inject constructor(
     private val saveRawData: SaveRawData,
     private val saveRawDataTest: SaveRawDataTest,