X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fprofiles%2FProfileDetailFragment.java;h=67f28439553cf010d5e530f1d71dcd43ff52a24d;hp=f211139375b9cd21847e3d2c0e7e111ecd7af18b;hb=9e8a289a85a65d372b47ccd2c2261299972ae4dd;hpb=94aa0aa57db3dce40f31fc0321c718998d9cb48b

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java
index f2111393..67f28439 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java
@@ -18,9 +18,9 @@
 package net.ktnx.mobileledger.ui.profiles;
 
 import android.app.Activity;
-import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.design.widget.CollapsingToolbarLayout;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.app.Fragment;
@@ -56,7 +56,7 @@ public class ProfileDetailFragment extends Fragment {
     /**
      * The dummy content this fragment is presenting.
      */
-    private MobileLedgerProfile mItem;
+    private MobileLedgerProfile mProfile;
     private TextView url;
     private LinearLayout authParams;
     private Switch useAuthentication;
@@ -76,18 +76,18 @@ public class ProfileDetailFragment extends Fragment {
         Log.d("profiles", "[fragment] Creating profile details options menu");
         super.onCreateOptionsMenu(menu, inflater);
         inflater.inflate(R.menu.profile_details, menu);
-        menu.findItem(R.id.menuDelete).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
-            @Override
-            public boolean onMenuItemClick(MenuItem item) {
-                Log.d("profiles", String.format("[fragment] removing profile %s", mItem.getUuid()));
-                mItem.removeFromDB();
-                Data.profiles.remove(mItem);
-                if (Data.profile.get().getUuid().equals(mItem.getUuid())) {
-                    Data.profile.set(Data.profiles.get(0));
-                }
-                return false;
+        final MenuItem menuDeleteProfile = menu.findItem(R.id.menuDelete);
+        menuDeleteProfile.setOnMenuItemClickListener(item -> {
+            Log.d("profiles", String.format("[fragment] removing profile %s", mProfile.getUuid()));
+            mProfile.removeFromDB();
+            Data.profiles.remove(mProfile);
+            if (Data.profile.get().equals(mProfile)) {
+                Log.d("profiles", "[fragment] setting current profile to 0");
+                Data.setCurrentProfile(Data.profiles.get(0));
             }
+            return false;
         });
+        menuDeleteProfile.setVisible((mProfile != null) && (Data.profiles.size() > 1));
     }
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -97,43 +97,48 @@ public class ProfileDetailFragment extends Fragment {
             // Load the dummy content specified by the fragment
             // arguments. In a real-world scenario, use a Loader
             // to load content from a content provider.
-            String uuid = getArguments().getString(ARG_ITEM_ID);
-            if (uuid != null)
-                mItem = MobileLedgerProfile.loadUUIDFromDB(getArguments().getString(ARG_ITEM_ID));
+            int index = getArguments().getInt(ARG_ITEM_ID, -1);
+            if (index != -1) mProfile = Data.profiles.get(index);
 
             Activity activity = this.getActivity();
             if (activity == null) throw new AssertionError();
             CollapsingToolbarLayout appBarLayout = activity.findViewById(R.id.toolbar_layout);
             if (appBarLayout != null) {
-                if (mItem != null) appBarLayout.setTitle(mItem.getName());
+                if (mProfile != null) appBarLayout.setTitle(mProfile.getName());
                 else appBarLayout.setTitle(getResources().getString(R.string.new_profile_title));
             }
         }
     }
-
     @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        fab = ((Activity) context).findViewById(R.id.fab);
-        fab.setOnClickListener(v -> {
-            if (mItem != null) {
-                mItem.setName(profileName.getText());
-                mItem.setUrl(url.getText());
-                mItem.setAuthEnabled(useAuthentication.isChecked());
-                mItem.setAuthUserName(userName.getText());
-                mItem.setAuthPassword(password.getText());
-                mItem.storeInDB();
+    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        Activity context = getActivity();
+        if (context == null) return;
 
-
-                if (mItem.getUuid().equals(Data.profile.get().getUuid())) {
-                    Data.profile.set(mItem);
+        fab = context.findViewById(R.id.fab);
+        fab.setOnClickListener(v -> {
+            if (mProfile != null) {
+                mProfile.setName(profileName.getText());
+                mProfile.setUrl(url.getText());
+                mProfile.setAuthEnabled(useAuthentication.isChecked());
+                mProfile.setAuthUserName(userName.getText());
+                mProfile.setAuthPassword(password.getText());
+                mProfile.storeInDB();
+                Log.d("profiles", "profile stored in DB");
+                Data.profiles.triggerItemChangedNotification(mProfile);
+
+
+                if (mProfile.getUuid().equals(Data.profile.get().getUuid())) {
+                    // dummy update to notify the observers of the possibly new name/URL
+                    Data.profile.set(mProfile);
                 }
             }
             else {
-                mItem = new MobileLedgerProfile(profileName.getText(), url.getText(),
+                mProfile = new MobileLedgerProfile(profileName.getText(), url.getText(),
                         useAuthentication.isChecked(), userName.getText(), password.getText());
-                mItem.storeInDB();
-                Data.profiles.add(mItem);
+                mProfile.storeInDB();
+                Data.profiles.add(mProfile);
+                MobileLedgerProfile.storeProfilesOrder();
             }
 
             Activity activity = getActivity();
@@ -157,13 +162,13 @@ public class ProfileDetailFragment extends Fragment {
             authParams.setVisibility(isChecked ? View.VISIBLE : View.GONE);
         });
 
-        if (mItem != null) {
-            profileName.setText(mItem.getName());
-            url.setText(mItem.getUrl());
-            useAuthentication.setChecked(mItem.isAuthEnabled());
-            authParams.setVisibility(mItem.isAuthEnabled() ? View.VISIBLE : View.GONE);
-            userName.setText(mItem.isAuthEnabled() ? mItem.getAuthUserName() : "");
-            password.setText(mItem.isAuthEnabled() ? mItem.getAuthPassword() : "");
+        if (mProfile != null) {
+            profileName.setText(mProfile.getName());
+            url.setText(mProfile.getUrl());
+            useAuthentication.setChecked(mProfile.isAuthEnabled());
+            authParams.setVisibility(mProfile.isAuthEnabled() ? View.VISIBLE : View.GONE);
+            userName.setText(mProfile.isAuthEnabled() ? mProfile.getAuthUserName() : "");
+            password.setText(mProfile.isAuthEnabled() ? mProfile.getAuthPassword() : "");
         }
         else {
             profileName.setText("");