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 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -453,6 +465,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
-
+
-
+
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 файла