X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fnew_transaction%2FNewTransactionFragment.java;h=7741d18ac6656902485662583ba02d924078761c;hb=5df10dc0b58df4d4be4e9ab34f1e0f477ca46766;hp=ca147dd262d8f74dd3801c61f71639c24a7ed115;hpb=abc2cfe2c435d10ade2533d09eccab9a32f5bba6;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionFragment.java index ca147dd2..7741d18a 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionFragment.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionFragment.java @@ -41,12 +41,13 @@ import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.snackbar.Snackbar; import net.ktnx.mobileledger.R; +import net.ktnx.mobileledger.db.Profile; import net.ktnx.mobileledger.json.API; import net.ktnx.mobileledger.model.Data; import net.ktnx.mobileledger.model.LedgerTransaction; -import net.ktnx.mobileledger.model.MobileLedgerProfile; import net.ktnx.mobileledger.ui.FabManager; import net.ktnx.mobileledger.ui.QR; +import net.ktnx.mobileledger.ui.profiles.ProfileDetailActivity; import net.ktnx.mobileledger.utils.Logger; import org.jetbrains.annotations.NotNull; @@ -64,7 +65,7 @@ public class NewTransactionFragment extends Fragment { private NewTransactionItemsAdapter listAdapter; private NewTransactionModel viewModel; private OnNewTransactionFragmentInteractionListener mListener; - private MobileLedgerProfile mProfile; + private Profile mProfile; public NewTransactionFragment() { // Required empty public constructor setHasOptionsMenu(true); @@ -159,18 +160,19 @@ public class NewTransactionFragment extends Fragment { AlertDialog.Builder builder = new AlertDialog.Builder(context); final Resources resources = context.getResources(); final StringBuilder message = new StringBuilder(); - message.append(resources.getString(R.string.err_json_send_error_head)); - message.append("\n\n"); - message.append(error); - if (mProfile.getApiVersion() - .equals(API.auto)) + message.append(resources.getString(R.string.err_json_send_error_head)) + .append("\n\n") + .append(error) + .append("\n\n"); + if (API.valueOf(mProfile.getApiVersion()) + .equals(API.auto)) message.append( resources.getString(R.string.err_json_send_error_unsupported)); else { message.append(resources.getString(R.string.err_json_send_error_tail)); builder.setPositiveButton(R.string.btn_profile_options, (dialog, which) -> { Logger.debug("error", "will start profile editor"); - MobileLedgerProfile.startEditProfileActivity(context, mProfile); + ProfileDetailActivity.start(context, mProfile); }); } builder.setMessage(message);