fixed issues while merging

app/src/main/AndroidManifest.xml

@@ -65,12 +65,14 @@
         <activity
             android:name="com.example.hpostesting.presentation.assurance.AssuranceControlsActivity"
             android:exported="false"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.HPOS.NoActionBar"/>
 
         <activity
             android:name="com.example.hpostesting.presentation.hemocube.HemocubeActivity"
             android:exported="false"
             android:noHistory="true"
+            android:screenOrientation="portrait"
             android:parentActivityName="com.example.hpostesting.presentation.MainActivity"
             android:theme="@style/Theme.HPOS.NoActionBar"
             android:windowSoftInputMode="adjustPan" />
@@ -148,6 +150,7 @@
         <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" />

app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt

@@ -14,13 +14,13 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.MutableLiveData
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.encryption.Encryption
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.google.android.gms.ads.identifier.AdvertisingIdClient
 import com.google.firebase.crashlytics.ktx.crashlytics

app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt

@@ -160,8 +160,8 @@ class HemoCubeViewModel @Inject constructor(
         val resultList = MolbioV2ResultRequest(mutableListOf())
         val pendingData = hemoCubeDao.getMolbioPending()
         Log.d("molbio","pending size"+pendingData.size)
-        pendingData.forEach{
-                userData ->
+        pendingData.forEach { userData ->
+            if (userData.testStatus == true) {
                 val currentTimeFormatted = SimpleDateFormat(
                     "yyyy-MM-dd'T'HH:mm:ssZZZZZ",
                     Locale.getDefault()
@@ -186,6 +186,7 @@ class HemoCubeViewModel @Inject constructor(
                     )
                 )
             }
+        }
 
         resultList.results?.forEach { result ->
             result.rawData?.let { sanitizeDoubleValues(it) }
@@ -226,7 +227,7 @@ class HemoCubeViewModel @Inject constructor(
         pendingData.forEach{
                 userData ->
             if (userData != null) {
-                if (!userData.localFlag) {
+                if (!userData.localFlag && userData.testStatus == true) {
                     bulkAddResultTestToDb(userData)
                 }
             }