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=c39ec9ae4e4664f493dc9e34042c84cd078ca51a;hp=310232d2057a6fc9585d5f29ec0118adfce629b9;hb=a9f669055c4458c54e3ece1d2896e5ce0c28b920;hpb=c4d80cd461385af945cd3e599ad2307ad5adcfe6

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 310232d2..c39ec9ae 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
@@ -24,7 +24,6 @@ import android.os.Bundle;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.Menu;
@@ -44,6 +43,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.BaseTransientBottomBar;
 import com.google.android.material.snackbar.Snackbar;
 
+import net.ktnx.mobileledger.App;
 import net.ktnx.mobileledger.BuildConfig;
 import net.ktnx.mobileledger.R;
 import net.ktnx.mobileledger.async.DescriptionSelectedCallback;
@@ -67,6 +67,8 @@ import java.util.Objects;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.DialogFragment;
 
+import static net.ktnx.mobileledger.utils.Logger.debug;
+
 /*
  * TODO: nicer progress while transaction is submitted
  * TODO: reports
@@ -100,7 +102,7 @@ public class NewTransactionActivity extends ProfileThemedActivity
         });
         tvDescription = findViewById(R.id.new_transaction_description);
         MLDB.hookAutocompletionAdapter(this, tvDescription, MLDB.DESCRIPTION_HISTORY_TABLE,
-                "description", false, findViewById(R.id.new_transaction_acc_1), this);
+                "description", false, findViewById(R.id.new_transaction_acc_1), this, mProfile);
         hookTextChangeListener(tvDescription);
 
         progress = findViewById(R.id.save_transaction_progress);
@@ -115,10 +117,10 @@ public class NewTransactionActivity extends ProfileThemedActivity
             TextView tvAmount = (TextView) row.getChildAt(1);
             hookSwipeListener(row);
             MLDB.hookAutocompletionAdapter(this, tvAccountName, MLDB.ACCOUNTS_TABLE, "name", true,
-                    tvAmount, null);
+                    tvAmount, null, mProfile);
             hookTextChangeListener(tvAccountName);
             hookTextChangeListener(tvAmount);
-//            Log.d("swipe", "hooked to row "+i);
+//            debug("swipe", "hooked to row "+i);
         }
     }
     @Override
@@ -163,7 +165,7 @@ public class NewTransactionActivity extends ProfileThemedActivity
             Date date;
             if (dateString.isEmpty()) date = new Date();
             else date = Globals.parseLedgerDate(dateString);
-            LedgerTransaction tr = new LedgerTransaction(date, tvDescription.getText().toString());
+            LedgerTransaction tr = new LedgerTransaction(null, date, tvDescription.getText().toString(), mProfile);
 
             TableLayout table = findViewById(R.id.new_transaction_accounts_table);
             LedgerTransactionAccount emptyAmountAccount = null;
@@ -193,7 +195,7 @@ public class NewTransactionActivity extends ProfileThemedActivity
             saver.execute(tr);
         }
         catch (ParseException e) {
-            Log.d("new-transaction", "Parse error", e);
+            debug("new-transaction", "Parse error", e);
             Toast.makeText(this, getResources().getString(R.string.error_invalid_date),
                     Toast.LENGTH_LONG).show();
             tvDate.requestFocus();
@@ -203,7 +205,7 @@ public class NewTransactionActivity extends ProfileThemedActivity
             if (fab != null) fab.setEnabled(true);
         }
         catch (Exception e) {
-            Log.d("new-transaction", "Unknown error", e);
+            debug("new-transaction", "Unknown error", e);
 
             progress.setVisibility(View.GONE);
             toggleAllEditing(true);
@@ -273,10 +275,9 @@ public class NewTransactionActivity extends ProfileThemedActivity
         });
     }
 
-    public boolean simulateCrash(MenuItem item) {
-        Log.d("crash", "Will crash intentionally");
+    public void simulateCrash(MenuItem item) {
+        debug("crash", "Will crash intentionally");
         new AsyncCrasher().execute();
-        return true;
     }
     public boolean onCreateOptionsMenu(Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.
@@ -313,7 +314,7 @@ public class NewTransactionActivity extends ProfileThemedActivity
 
             @Override
             public void afterTextChanged(Editable s) {
-//                Log.d("input", "text changed");
+//                debug("input", "text changed");
                 check_transaction_submittable();
             }
         });
@@ -361,7 +362,8 @@ public class NewTransactionActivity extends ProfileThemedActivity
         if (focus) acc.requestFocus();
 
         hookSwipeListener(row);
-        MLDB.hookAutocompletionAdapter(this, acc, MLDB.ACCOUNTS_TABLE, "name", true, amt, null);
+        MLDB.hookAutocompletionAdapter(this, acc, MLDB.ACCOUNTS_TABLE, "name", true, amt, null,
+                mProfile);
         hookTextChangeListener(acc);
         hookTextChangeListener(amt);
 
@@ -440,7 +442,7 @@ public class NewTransactionActivity extends ProfileThemedActivity
                 doAddAccountRow(false);
             }
 
-            Log.d("submittable", String.format("accounts=%d, accounts_with_values=%s, " +
+            debug("submittable", String.format("accounts=%d, accounts_with_values=%s, " +
                                                "amounts_with_accounts=%d, amounts=%d, running_total=%1.2f, " +
                                                "single_empty_with_acc=%s", accounts,
                     accounts_with_values, amounts_with_accounts, amounts, running_total,
@@ -477,7 +479,7 @@ public class NewTransactionActivity extends ProfileThemedActivity
     @Override
     public void done(String error) {
         progress.setVisibility(View.INVISIBLE);
-        Log.d("visuals", "hiding progress");
+        debug("visuals", "hiding progress");
 
         if (error == null) resetForm();
         else Snackbar.make(findViewById(R.id.new_transaction_accounts_table), error,
@@ -506,7 +508,7 @@ public class NewTransactionActivity extends ProfileThemedActivity
     }
     @Override
     public void descriptionSelected(String description) {
-        Log.d("descr selected", description);
+        debug("descr selected", description);
         if (!inputStateIsInitial()) return;
 
         String accFilter = mProfile.getPreferredAccountsFilter();
@@ -526,10 +528,10 @@ public class NewTransactionActivity extends ProfileThemedActivity
         sb.append(" ORDER BY date desc limit 1");
 
         final String sql = sb.toString();
-        Log.d("descr", sql);
-        Log.d("descr", params.toString());
+        debug("descr", sql);
+        debug("descr", params.toString());
 
-        try (Cursor c = MLDB.getDatabase().rawQuery(sql, params.toArray(new String[]{}))) {
+        try (Cursor c = App.getDatabase().rawQuery(sql, params.toArray(new String[]{}))) {
             if (!c.moveToNext()) return;
 
             String profileUUID = c.getString(0);