NT model/setDate: replace empty dates with null

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / activity / NewTransactionModel.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionModel.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionModel.java
index 9017973998da8c39efaf91b110d640de1b22decf..39b9ac8ad60f09dd3b44eae84995870f9158ccf1 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionModel.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionModel.java
@@ -295,9 +295,6 @@ public class NewTransactionModel extends ViewModel {
         private MutableLiveData<String> amountHint = new MutableLiveData<>(null);
         private NewTransactionModel model;
         private MutableLiveData<Boolean> editable = new MutableLiveData<>(true);
-        public boolean focusIsOnAmount() {
-            return focusIsOnAmount;
-        }
         private boolean focusIsOnAmount = false;
         public Item(NewTransactionModel model) {
             this.model = model;
@@ -317,6 +314,9 @@ public class NewTransactionModel extends ViewModel {
             this.account = account;
             this.editable.setValue(true);
         }
+        public boolean focusIsOnAmount() {
+            return focusIsOnAmount;
+        }
         public NewTransactionModel getModel() {
             return model;
         }
@@ -378,6 +378,13 @@ public class NewTransactionModel extends ViewModel {
             this.date.setValue(date);
         }
         public void setDate(String text) {
+            if ((text == null) || text.trim()
+                                      .isEmpty())
+            {
+                setDate((Date) null);
+                return;
+            }
+
             int year, month, day;
             final Calendar c = GregorianCalendar.getInstance();
             Matcher m = reYMD.matcher(text);