X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fnew_transaction%2FNewTransactionFragment.java;h=ec9fb39c7331fcb3fe6ed845258c9a0539cfb693;hb=HEAD;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..ec9fb39c 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
@@ -20,7 +20,6 @@ package net.ktnx.mobileledger.ui.new_transaction;
 import android.content.Context;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.renderscript.RSInvalidStateException;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -41,12 +40,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 +64,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);
@@ -127,7 +127,7 @@ public class NewTransactionFragment extends Fragment {
         super.onViewCreated(view, savedInstanceState);
         FragmentActivity activity = getActivity();
         if (activity == null)
-            throw new RSInvalidStateException(
+            throw new IllegalStateException(
                     "getActivity() returned null within onActivityCreated()");
 
         viewModel = new ViewModelProvider(activity).get(NewTransactionModel.class);
@@ -159,18 +159,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);
@@ -190,11 +191,18 @@ public class NewTransactionFragment extends Fragment {
         if (savedInstanceState != null) {
             keep |= savedInstanceState.getBoolean("keep", true);
             focused = savedInstanceState.getInt("focused-item", 0);
-            element = FocusedElement.valueOf(savedInstanceState.getString("focused-element"));
+            final String focusedElementString = savedInstanceState.getString("focused-element");
+            if (focusedElementString != null)
+                element = FocusedElement.valueOf(focusedElementString);
         }
 
-        if (!keep)
-            viewModel.reset();
+        if (!keep) {
+            // we need the DB up and running
+            Data.observeProfile(getViewLifecycleOwner(), p -> {
+                if (p != null)
+                    viewModel.reset();
+            });
+        }
         else {
             viewModel.noteFocusChanged(focused, element);
         }
@@ -224,10 +232,13 @@ public class NewTransactionFragment extends Fragment {
         outState.putBoolean("keep", true);
         final NewTransactionModel.FocusInfo focusInfo = viewModel.getFocusInfo()
                                                                  .getValue();
-        final int focusedItem = focusInfo.position;
-        if (focusedItem >= 0)
-            outState.putInt("focused-item", focusedItem);
-        outState.putString("focused-element", focusInfo.element.toString());
+        if (focusInfo != null) {
+            final int focusedItem = focusInfo.position;
+            if (focusedItem >= 0)
+                outState.putInt("focused-item", focusedItem);
+            if (focusInfo.element != null)
+                outState.putString("focused-element", focusInfo.element.toString());
+        }
     }
 
     @Override