fix method signature

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

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 b4716075d1c6474905cf6ece759983f25521766a..c39ec9ae4e4664f493dc9e34042c84cd078ca51a 100644 (file)
--- 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.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;
 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 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;
 import net.ktnx.mobileledger.BuildConfig;
 import net.ktnx.mobileledger.R;
 import net.ktnx.mobileledger.async.DescriptionSelectedCallback;


@@ -56,7 +56,6 @@ import net.ktnx.mobileledger.model.MobileLedgerProfile;
 import net.ktnx.mobileledger.ui.DatePickerFragment;
 import net.ktnx.mobileledger.ui.OnSwipeTouchListener;
 import net.ktnx.mobileledger.utils.Globals;
 import net.ktnx.mobileledger.ui.DatePickerFragment;
 import net.ktnx.mobileledger.ui.OnSwipeTouchListener;
 import net.ktnx.mobileledger.utils.Globals;

-import net.ktnx.mobileledger.utils.LockHolder;

 import net.ktnx.mobileledger.utils.MLDB;
 
 import java.text.ParseException;
 import net.ktnx.mobileledger.utils.MLDB;
 
 import java.text.ParseException;


@@ -68,6 +67,8 @@ import java.util.Objects;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.DialogFragment;
 
 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
 /*
  * TODO: nicer progress while transaction is submitted
  * TODO: reports


@@ -101,7 +102,7 @@ public class NewTransactionActivity extends ProfileThemedActivity
         });
         tvDescription = findViewById(R.id.new_transaction_description);
         MLDB.hookAutocompletionAdapter(this, tvDescription, MLDB.DESCRIPTION_HISTORY_TABLE,
         });
         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);
         hookTextChangeListener(tvDescription);
 
         progress = findViewById(R.id.save_transaction_progress);


@@ -116,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,
             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);
             hookTextChangeListener(tvAccountName);
             hookTextChangeListener(tvAmount);

-//            Log.d("swipe", "hooked to row "+i);
+//            debug("swipe", "hooked to row "+i);

         }
     }
     @Override
         }
     }
     @Override


@@ -164,7 +165,7 @@ public class NewTransactionActivity extends ProfileThemedActivity
             Date date;
             if (dateString.isEmpty()) date = new Date();
             else date = Globals.parseLedgerDate(dateString);
             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;
 
             TableLayout table = findViewById(R.id.new_transaction_accounts_table);
             LedgerTransactionAccount emptyAmountAccount = null;


@@ -194,7 +195,7 @@ public class NewTransactionActivity extends ProfileThemedActivity
             saver.execute(tr);
         }
         catch (ParseException e) {
             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();
             Toast.makeText(this, getResources().getString(R.string.error_invalid_date),
                     Toast.LENGTH_LONG).show();
             tvDate.requestFocus();


@@ -204,7 +205,7 @@ public class NewTransactionActivity extends ProfileThemedActivity
             if (fab != null) fab.setEnabled(true);
         }
         catch (Exception e) {
             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);
 
             progress.setVisibility(View.GONE);
             toggleAllEditing(true);


@@ -274,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();
         new AsyncCrasher().execute();

-        return true;

     }
     public boolean onCreateOptionsMenu(Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.
     }
     public boolean onCreateOptionsMenu(Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.


@@ -314,7 +314,7 @@ public class NewTransactionActivity extends ProfileThemedActivity
 
             @Override
             public void afterTextChanged(Editable s) {
 
             @Override
             public void afterTextChanged(Editable s) {

-//                Log.d("input", "text changed");
+//                debug("input", "text changed");

                 check_transaction_submittable();
             }
         });
                 check_transaction_submittable();
             }
         });


@@ -362,7 +362,8 @@ public class NewTransactionActivity extends ProfileThemedActivity
         if (focus) acc.requestFocus();
 
         hookSwipeListener(row);
         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);
 
         hookTextChangeListener(acc);
         hookTextChangeListener(amt);
 


@@ -441,7 +442,7 @@ public class NewTransactionActivity extends ProfileThemedActivity
                 doAddAccountRow(false);
             }
 
                 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,
                                                "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,


@@ -478,7 +479,7 @@ public class NewTransactionActivity extends ProfileThemedActivity
     @Override
     public void done(String error) {
         progress.setVisibility(View.INVISIBLE);
     @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,
 
         if (error == null) resetForm();
         else Snackbar.make(findViewById(R.id.new_transaction_accounts_table), error,


@@ -507,11 +508,10 @@ public class NewTransactionActivity extends ProfileThemedActivity
     }
     @Override
     public void descriptionSelected(String description) {
     }
     @Override
     public void descriptionSelected(String description) {

-        Log.d("descr selected", description);
+        debug("descr selected", description);

         if (!inputStateIsInitial()) return;
 
         if (!inputStateIsInitial()) return;
 

-        MobileLedgerProfile currentProfile = Data.profile.get();
-        String accFilter = currentProfile.getPreferredAccountsFilter();
+        String accFilter = mProfile.getPreferredAccountsFilter();

 
         ArrayList<String> params = new ArrayList<>();
         StringBuilder sb = new StringBuilder(
 
         ArrayList<String> params = new ArrayList<>();
         StringBuilder sb = new StringBuilder(


@@ -528,37 +528,26 @@ public class NewTransactionActivity extends ProfileThemedActivity
         sb.append(" ORDER BY date desc limit 1");
 
         final String sql = sb.toString();
         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);
             int transactionId = c.getInt(1);
             LedgerTransaction tr;
             if (!c.moveToNext()) return;
 
             String profileUUID = c.getString(0);
             int transactionId = c.getInt(1);
             LedgerTransaction tr;

-            try (LockHolder lh = Data.profiles.lockForReading()) {
-                MobileLedgerProfile profile = null;
-                for (int i = 0; i < Data.profiles.size(); i++) {
-                    MobileLedgerProfile p = Data.profiles.get(i);
-                    if (p.getUuid().equals(profileUUID)) {
-                        profile = p;
-                        break;
-                    }
-                }
-                if (profile == null) throw new RuntimeException(String.format(
-                        "Unable to find profile %s, which is supposed to contain " +
-                        "transaction %d with description %s", profileUUID, transactionId,
-                        description));
+            MobileLedgerProfile profile = Data.getProfile(profileUUID);
+            if (profile == null) throw new RuntimeException(String.format(
+                    "Unable to find profile %s, which is supposed to contain " +
+                    "transaction %d with description %s", profileUUID, transactionId, description));

 
 

-                tr = profile.loadTransaction(transactionId);
-            }
-            int i = 0;
+            tr = profile.loadTransaction(transactionId);

             table = findViewById(R.id.new_transaction_accounts_table);
             ArrayList<LedgerTransactionAccount> accounts = tr.getAccounts();
             TableRow firstNegative = null;
             int negativeCount = 0;
             table = findViewById(R.id.new_transaction_accounts_table);
             ArrayList<LedgerTransactionAccount> accounts = tr.getAccounts();
             TableRow firstNegative = null;
             int negativeCount = 0;

-            for (i = 0; i < accounts.size(); i++) {
+            for (int i = 0; i < accounts.size(); i++) {

                 LedgerTransactionAccount acc = accounts.get(i);
                 TableRow row = (TableRow) table.getChildAt(i);
                 if (row == null) row = doAddAccountRow(false);
                 LedgerTransactionAccount acc = accounts.get(i);
                 TableRow row = (TableRow) table.getChildAt(i);
                 if (row == null) row = doAddAccountRow(false);