From 41d7f6b4d11fe3e6bf2d7074ad96af83b959ba29 Mon Sep 17 00:00:00 2001
From: Igor I <ivanov.i@istt.kz>
Date: Thu, 27 Feb 2025 13:12:53 +0500
Subject: [PATCH] 3.0.6

---
 .idea/caches/deviceStreaming.xml              | 24 +++++++++++++++++++
 .idea/deploymentTargetSelector.xml            |  4 ++--
 app/build.gradle                              |  4 ++--
 .../kz/istt/locust/LocustHealthActivity.java  |  3 ++-
 .../kz/istt/locust/MySynchronizationOld.java  |  2 ++
 5 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/.idea/caches/deviceStreaming.xml b/.idea/caches/deviceStreaming.xml
index cf29a49..f37d0c5 100644
--- a/.idea/caches/deviceStreaming.xml
+++ b/.idea/caches/deviceStreaming.xml
@@ -64,6 +64,18 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2340" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a35x" />
+          <option name="id" value="a35x" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="A35" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="31" />
           <option name="brand" value="samsung" />
@@ -453,6 +465,18 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2400" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="t2q" />
+          <option name="id" value="t2q" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S21 Plus" />
+          <option name="screenDensity" value="394" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="google" />
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 8e08898..6e06526 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-08-18T18:04:19.981174300Z">
+        <DropdownSelection timestamp="2025-02-20T05:47:11.559097100Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=0123456789ABCDEF" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\ivanov.i\.android\avd\Pixel_3a_API_34_extension_level_7_x86_64.avd" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/build.gradle b/app/build.gradle
index ef4eab1..31a240a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
     defaultConfig {
         applicationId "kz.istt.locust"
         minSdkVersion 15
-        versionCode 108
-        versionName "3.0.5"
+        versionCode 109
+        versionName "3.0.6"
         targetSdkVersion 34
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
diff --git a/app/src/main/java/kz/istt/locust/LocustHealthActivity.java b/app/src/main/java/kz/istt/locust/LocustHealthActivity.java
index b68fa02..827eb93 100644
--- a/app/src/main/java/kz/istt/locust/LocustHealthActivity.java
+++ b/app/src/main/java/kz/istt/locust/LocustHealthActivity.java
@@ -3073,7 +3073,8 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 			eFields = true;
 		}
 
-		if(((selectDB)spiEffControl2).getValue().equals("1")){
+		String value=((selectDB)spiEffControl2).getValue();
+		if(value!=null && value.equals("1")){
 			if (!eFields && !isGONE(edtEffMortality2) && edtEffMortality2.getText().toString().isBlank())
 			{
 				scrollTo(edtEffMortality2);
diff --git a/app/src/main/java/kz/istt/locust/MySynchronizationOld.java b/app/src/main/java/kz/istt/locust/MySynchronizationOld.java
index 4fc5eb7..619f084 100644
--- a/app/src/main/java/kz/istt/locust/MySynchronizationOld.java
+++ b/app/src/main/java/kz/istt/locust/MySynchronizationOld.java
@@ -663,6 +663,8 @@ public class MySynchronizationOld
 				TCTable tbl=new TCTable("",0);
 				if(tbl.OpenTableH(is))
 				{
+					if(tbl.name.equals("terminals"))
+						Log.d("igor", "tbl.name = " + tbl.name);
 					result = dbOpenHelper.updateTable(tbl);
 				}
 			}else if(type.equals("xml")) //Данные в виде XML файла