- FIX: Fixed a bug where deleting the first barcode of a plant in phe…

…notyping mode would delete the last recorded trait value of the previous plant.
germinateplatform · Aug 3, 2020 · dd88879 · dd88879
1 parent 39fdda0
commit dd88879
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,13 +11,13 @@ android {
         enabled = true
     }
 
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         applicationId "uk.ac.hutton.android.germinatescan"
         minSdkVersion 24
-        targetSdkVersion 28
-        versionCode 43
-        versionName "1.20.06.02"
+        targetSdkVersion 29
+        versionCode 45
+        versionName "1.20.08.03"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
     }

diff --git a/app/src/main/java/uk/ac/hutton/android/germinatescan/activity/BarcodeReader.java b/app/src/main/java/uk/ac/hutton/android/germinatescan/activity/BarcodeReader.java
@@ -1028,13 +1028,17 @@ public void deleteBarcode()
 						}
 						else if (index == 1)
 						{
-							// If it's a trait, remove everything including the value of the previous trait.
+							// If it's a trait, remove everything.
 							BarcodeReader.this.deleteItem(adapter.getItem(adapter.getItemCount() - 1));
 							BarcodeReader.this.deleteItem(adapter.getItem(adapter.getItemCount() - 1));
-							BarcodeReader.this.deleteItem(adapter.getItem(adapter.getItemCount() - 1));
-							if (adapter.getItemCount() > 0)
-								currentPhenotype--;
-							dataset.setCurrentPhenotype(currentPhenotype);
+							// If it's not the first one, remove the value of the previous trait.
+							if (currentPhenotype != 0)
+							{
+								BarcodeReader.this.deleteItem(adapter.getItem(adapter.getItemCount() - 1));
+								if (adapter.getItemCount() > 0)
+									currentPhenotype--;
+								dataset.setCurrentPhenotype(currentPhenotype);
+							}
 						}
 						else if (index == 0)
 						{

diff --git a/app/src/main/res/raw-de/changelog.xml b/app/src/main/res/raw-de/changelog.xml
@@ -16,6 +16,11 @@
   -->
 
 <changelog bulletedList="true">
+	<changelogversion
+		changeDate="03/08/2020"
+		versionName="1.20.08.03">
+		<changelogbug>Fehler behoben beim Löschen des ersten Barcodes eine Pflanze im Phänotypisierungsmodus wo der letzte Wert des vorherigen Merkmals gelöscht wurde.</changelogbug>
+	</changelogversion>
 	<changelogversion
 		changeDate="02/06/2020"
 		versionName="1.20.06.02">

diff --git a/app/src/main/res/raw/changelog.xml b/app/src/main/res/raw/changelog.xml
@@ -16,6 +16,11 @@
   -->
 
 <changelog bulletedList="true">
+	<changelogversion
+		changeDate="03/08/2020"
+		versionName="1.20.08.03">
+		<changelogbug>Fixed a bug where deleting the first barcode of a plant in phenotyping mode would delete the last recorded trait value of the previous plant.</changelogbug>
+	</changelogversion>
 	<changelogversion
 		changeDate="02/06/2020"
 		versionName="1.20.06.02">