X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fnew_transaction%2FNewTransactionActivity.java;h=51f872f6fef08c612c0c1d24d1b2436b1b9105fe;hb=311cb018cc9cd6be1f189e2fc674a517ff4d47fc;hp=4b1fce945e74a1788898c0b0428bd1aa963559e6;hpb=abc2cfe2c435d10ade2533d09eccab9a32f5bba6;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionActivity.java index 4b1fce94..51f872f6 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionActivity.java @@ -20,24 +20,22 @@ package net.ktnx.mobileledger.ui.new_transaction; import android.content.Context; import android.content.Intent; import android.database.AbstractCursor; -import android.database.Cursor; +import android.os.AsyncTask; import android.os.Bundle; import android.os.ParcelFormatException; -import android.text.TextUtils; import android.util.TypedValue; import android.view.Menu; import android.view.MenuItem; import android.view.View; import androidx.activity.result.ActivityResultLauncher; -import androidx.annotation.NonNull; +import androidx.core.view.MenuCompat; import androidx.lifecycle.LiveData; import androidx.lifecycle.ViewModelProvider; import androidx.navigation.NavController; import androidx.navigation.fragment.NavHostFragment; import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import com.google.android.material.snackbar.Snackbar; import net.ktnx.mobileledger.BuildConfig; import net.ktnx.mobileledger.R; @@ -45,9 +43,11 @@ import net.ktnx.mobileledger.async.AsyncCrasher; import net.ktnx.mobileledger.async.DescriptionSelectedCallback; import net.ktnx.mobileledger.async.SendTransactionTask; import net.ktnx.mobileledger.async.TaskCallback; +import net.ktnx.mobileledger.dao.TransactionDAO; import net.ktnx.mobileledger.databinding.ActivityNewTransactionBinding; import net.ktnx.mobileledger.db.DB; import net.ktnx.mobileledger.db.TemplateHeader; +import net.ktnx.mobileledger.db.TransactionWithAccounts; import net.ktnx.mobileledger.model.Data; import net.ktnx.mobileledger.model.LedgerTransaction; import net.ktnx.mobileledger.model.MatchedTemplate; @@ -56,7 +56,6 @@ import net.ktnx.mobileledger.ui.QR; import net.ktnx.mobileledger.ui.activity.ProfileThemedActivity; import net.ktnx.mobileledger.ui.templates.TemplatesActivity; import net.ktnx.mobileledger.utils.Logger; -import net.ktnx.mobileledger.utils.MLDB; import net.ktnx.mobileledger.utils.Misc; import java.util.ArrayList; @@ -71,6 +70,7 @@ public class NewTransactionActivity extends ProfileThemedActivity implements TaskCallback, NewTransactionFragment.OnNewTransactionFragmentInteractionListener, QR.QRScanTrigger, QR.QRScanResultReceiver, DescriptionSelectedCallback, FabManager.FabHandler { + final String TAG = "new-t-a"; private NavController navController; private NewTransactionModel model; private ActivityResultLauncher qrScanLauncher; @@ -114,16 +114,23 @@ public class NewTransactionActivity extends ProfileThemedActivity } @Override protected void initProfile() { - String profileUUID = getIntent().getStringExtra("profile_uuid"); + long profileId = getIntent().getLongExtra(PARAM_PROFILE_ID, 0); + int profileHue = getIntent().getIntExtra(PARAM_THEME, -1); - if (profileUUID != null) { - mProfile = Data.getProfile(profileUUID); - if (mProfile == null) - finish(); - Data.setCurrentProfile(mProfile); + if (profileHue < 0) { + Logger.debug(TAG, "Started with invalid/missing theme; quitting"); + finish(); + return; } - else - super.initProfile(); + + if (profileId <= 0) { + Logger.debug(TAG, "Started with invalid/missing profile_id; quitting"); + finish(); + return; + } + + setupProfileColors(profileHue); + initProfile(profileId); } @Override public void finish() { @@ -147,27 +154,33 @@ public class NewTransactionActivity extends ProfileThemedActivity saver.execute(tr); } catch (Exception e) { - debug("new-transaction", "Unknown error", e); + debug("new-transaction", "Unknown error: " + e); Bundle b = new Bundle(); b.putString("error", "unknown error"); navController.navigate(R.id.newTransactionFragment, b); } } - public void simulateCrash(MenuItem item) { + public boolean onSimulateCrashMenuItemClicked(MenuItem item) { debug("crash", "Will crash intentionally"); new AsyncCrasher().execute(); + return true; } public boolean onCreateOptionsMenu(Menu menu) { + super.onCreateOptionsMenu(menu); + + if (!BuildConfig.DEBUG) + return true; + // Inflate the menu; this adds items to the action bar if it is present. getMenuInflater().inflate(R.menu.new_transaction, menu); - if (BuildConfig.DEBUG) { - menu.findItem(R.id.action_simulate_crash) - .setVisible(true); - menu.findItem(R.id.action_simulate_save) - .setVisible(true); - } + MenuCompat.setGroupDividerEnabled(menu, true); + + menu.findItem(R.id.action_simulate_save) + .setOnMenuItemClickListener(this::onToggleSimulateSaveMenuItemClicked); + menu.findItem(R.id.action_simulate_crash) + .setOnMenuItemClickListener(this::onSimulateCrashMenuItemClicked); model.getSimulateSave() .observe(this, state -> { @@ -185,17 +198,27 @@ public class NewTransactionActivity extends ProfileThemedActivity getResources().getDisplayMetrics())); } @Override - public void done(String error) { + public void done(String error, Object arg) { Bundle b = new Bundle(); if (error != null) { b.putString("error", error); navController.navigate(R.id.action_newTransactionSavingFragment_Failure, b); } - else + else { navController.navigate(R.id.action_newTransactionSavingFragment_Success, b); + + AsyncTask.execute(() -> commitToDb((LedgerTransaction) arg)); + } } - public void toggleSimulateSave(MenuItem item) { + public void commitToDb(LedgerTransaction tr) { + TransactionWithAccounts dbTransaction = tr.toDBO(); + DB.get() + .getTransactionDAO() + .appendSync(dbTransaction); + } + public boolean onToggleSimulateSaveMenuItemClicked(MenuItem item) { model.toggleSimulateSave(); + return true; } @Override @@ -328,95 +351,34 @@ public class NewTransactionActivity extends ProfileThemedActivity .create() .show(); } - public void descriptionSelected(String description) { + public void onDescriptionSelected(String description) { debug("description selected", description); if (!model.accountListIsEmpty()) return; - String accFilter = mProfile.getPreferredAccountsFilter(); + AsyncTask.execute(() -> { + String accFilter = mProfile.getPreferredAccountsFilter(); - ArrayList params = new ArrayList<>(); - StringBuilder sb = new StringBuilder("select t.profile, t.id from transactions t"); + TransactionDAO trDao = DB.get() + .getTransactionDAO(); - if (!TextUtils.isEmpty(accFilter)) { - sb.append(" JOIN transaction_accounts ta") - .append(" ON ta.profile = t.profile") - .append(" AND ta.transaction_id = t.id"); - } - - sb.append(" WHERE t.description=?"); - params.add(description); - - if (!TextUtils.isEmpty(accFilter)) { - sb.append(" AND ta.account_name LIKE '%'||?||'%'"); - params.add(accFilter); - } - - sb.append(" ORDER BY t.year desc, t.month desc, t.day desc LIMIT 1"); + TransactionWithAccounts tr; - final String sql = sb.toString(); - debug("description", sql); - debug("description", params.toString()); - - // FIXME: handle exceptions? - MLDB.queryInBackground(sql, params.toArray(new String[]{}), new MLDB.CallbackHelper() { - @Override - public void onStart() { - model.incrementBusyCounter(); - } - @Override - public void onDone() { - model.decrementBusyCounter(); - } - @Override - public boolean onRow(@NonNull Cursor cursor) { - final String profileUUID = cursor.getString(0); - final int transactionId = cursor.getInt(1); - runOnUiThread(() -> model.loadTransactionIntoModel(profileUUID, transactionId)); - return false; // limit 1, by the way - } - @Override - public void onNoRows() { - if (TextUtils.isEmpty(accFilter)) + if (Misc.emptyIsNull(accFilter) != null) { + tr = trDao.getFirstByDescriptionHavingAccountSync(description, accFilter); + if (tr != null) { + model.loadTransactionIntoModel(tr); return; - - debug("description", "Trying transaction search without preferred account filter"); - - final String broaderSql = - "select t.profile, t.id from transactions t where t.description=?" + - " ORDER BY year desc, month desc, day desc LIMIT 1"; - params.remove(1); - debug("description", broaderSql); - debug("description", description); - - runOnUiThread(() -> Snackbar.make(b.newTransactionNav, - R.string.ignoring_preferred_account, Snackbar.LENGTH_INDEFINITE) - .show()); - - MLDB.queryInBackground(broaderSql, new String[]{description}, - new MLDB.CallbackHelper() { - @Override - public void onStart() { - model.incrementBusyCounter(); - } - @Override - public boolean onRow(@NonNull Cursor cursor) { - final String profileUUID = cursor.getString(0); - final int transactionId = cursor.getInt(1); - runOnUiThread(() -> model.loadTransactionIntoModel(profileUUID, - transactionId)); - return false; - } - @Override - public void onDone() { - model.decrementBusyCounter(); - } - }); + } } + + tr = trDao.getFirstByDescriptionSync(description); + if (tr != null) + model.loadTransactionIntoModel(tr); }); } private void onFabPressed() { - b.fabAdd.hide(); + fabManager.hideFab(); Misc.hideSoftKeyboard(this); LedgerTransaction tr = model.constructLedgerTransaction();