X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionActivity.java;h=5b28e4b0ac30ce35586c8d5cedbe27721dbcbf60;hp=0856bb543b0b199df26d498d832aab841d784de9;hb=7f9646b0d028b20de43f77802f5d7cf7f2373a66;hpb=bde37d0aa472d31606b53491240c79af3374f09b

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionActivity.java
index 0856bb54..5b28e4b0 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionActivity.java
@@ -41,16 +41,20 @@ import android.widget.ProgressBar;
 import android.widget.TableLayout;
 import android.widget.TableRow;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import net.ktnx.mobileledger.R;
 import net.ktnx.mobileledger.async.SaveTransactionTask;
 import net.ktnx.mobileledger.async.TaskCallback;
+import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.LedgerTransaction;
 import net.ktnx.mobileledger.model.LedgerTransactionAccount;
 import net.ktnx.mobileledger.ui.DatePickerFragment;
 import net.ktnx.mobileledger.ui.OnSwipeTouchListener;
+import net.ktnx.mobileledger.utils.Globals;
 import net.ktnx.mobileledger.utils.MLDB;
 
+import java.text.ParseException;
 import java.util.Date;
 import java.util.Objects;
 
@@ -81,6 +85,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
         setContentView(R.layout.activity_new_transaction);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
+        toolbar.setSubtitle(Data.profile.get().getName());
 
         tvDate = findViewById(R.id.new_transaction_date);
         tvDate.setOnFocusChangeListener((v, hasFocus) -> {
@@ -132,25 +137,46 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
         if (mSave != null) mSave.setVisible(false);
         toggleAllEditing(false);
         progress.setVisibility(View.VISIBLE);
+        try {
 
-        saver = new SaveTransactionTask(this);
+            saver = new SaveTransactionTask(this);
 
-        String date = tvDate.getText().toString();
-        if (date.isEmpty()) date = String.valueOf(new Date().getDate());
-        LedgerTransaction tr = new LedgerTransaction(date, tvDescription.getText().toString());
+            String dateString = tvDate.getText().toString();
+            Date date;
+            if (dateString.isEmpty()) date = new Date();
+            else date = Globals.parseLedgerDate(dateString);
+            LedgerTransaction tr = new LedgerTransaction(date, tvDescription.getText().toString());
 
-        TableLayout table = findViewById(R.id.new_transaction_accounts_table);
-        for (int i = 0; i < table.getChildCount(); i++) {
-            TableRow row = (TableRow) table.getChildAt(i);
-            String acc = ((TextView) row.getChildAt(0)).getText().toString();
-            String amt = ((TextView) row.getChildAt(1)).getText().toString();
-            LedgerTransactionAccount item =
-                    amt.length() > 0 ? new LedgerTransactionAccount(acc, Float.parseFloat(amt))
-                                     : new LedgerTransactionAccount(acc);
+            TableLayout table = findViewById(R.id.new_transaction_accounts_table);
+            for (int i = 0; i < table.getChildCount(); i++) {
+                TableRow row = (TableRow) table.getChildAt(i);
+                String acc = ((TextView) row.getChildAt(0)).getText().toString();
+                String amt = ((TextView) row.getChildAt(1)).getText().toString();
+                LedgerTransactionAccount item =
+                        amt.length() > 0 ? new LedgerTransactionAccount(acc, Float.parseFloat(amt))
+                                         : new LedgerTransactionAccount(acc);
+
+                tr.addAccount(item);
+            }
+            saver.execute(tr);
+        }
+        catch (ParseException e) {
+            Log.d("new-transaction", "Parse error", e);
+            Toast.makeText(this, getResources().getString(R.string.error_invalid_date),
+                    Toast.LENGTH_LONG).show();
+            tvDate.requestFocus();
+
+            progress.setVisibility(View.GONE);
+            toggleAllEditing(true);
+            if (mSave != null) mSave.setVisible(true);
+        }
+        catch (Exception e) {
+            Log.d("new-transaction", "Unknown error", e);
 
-            tr.addAccount(item);
+            progress.setVisibility(View.GONE);
+            toggleAllEditing(true);
+            if (mSave != null) mSave.setVisible(true);
         }
-        saver.execute(tr);
     }
     private void toggleAllEditing(boolean enabled) {
         tvDate.setEnabled(enabled);