put updating of profile data from the UI in a method

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

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 6f15fa7fb6fc2ec5b673d3f3f00d56c8107eee3d..2d58e40b76b861ccbe91755d6446415e7b7e29e8 100644 (file)
--- 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,6 +18,8 @@
 package net.ktnx.mobileledger.ui.profiles;
 
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -91,13 +93,23 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue
         inflater.inflate(R.menu.profile_details, menu);
         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));
-            }
+            AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+            builder.setTitle(mProfile.getName());
+            builder.setMessage(R.string.remove_profile_dialog_message);
+            builder.setPositiveButton(R.string.Remove, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    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));
+                    }
+                    getActivity().finish();
+                }
+            });
+            builder.show();
             return false;
         });
         menuDeleteProfile.setVisible((mProfile != null) && (Data.profiles.size() > 1));
@@ -130,13 +142,7 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue
             if (!checkValidity()) return;
 
             if (mProfile != null) {
-                mProfile.setName(profileName.getText());
-                mProfile.setUrl(url.getText());
-                mProfile.setPostingPermitted(postingPermitted.isChecked());
-                mProfile.setAuthEnabled(useAuthentication.isChecked());
-                mProfile.setAuthUserName(userName.getText());
-                mProfile.setAuthPassword(password.getText());
-                mProfile.setThemeId(huePickerView.getTag());
+                updateProfileFromUI();
 //                Log.d("profiles", String.format("Selected item is %d", mProfile.getThemeId()));
                 mProfile.storeInDB();
                 Log.d("profiles", "profile stored in DB");
@@ -158,7 +164,7 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue
                 MobileLedgerProfile.storeProfilesOrder();
 
                 // first profile ever?
-                if (Data.profiles.getList().size() == 1) Data.profile.set(mProfile);
+                if (Data.profiles.size() == 1) Data.profile.set(mProfile);
             }
 
             Activity activity = getActivity();
@@ -167,6 +173,14 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue
 
         profileName.requestFocus();
     }
+    private void updateProfileFromUI() {
+        mProfile.setName(profileName.getText());
+        mProfile.setUrl(url.getText());
+        mProfile.setPostingPermitted(postingPermitted.isChecked());
+        mProfile.setAuthEnabled(useAuthentication.isChecked());
+        mProfile.setAuthUserName(userName.getText());
+        mProfile.setAuthPassword(password.getText());
+        mProfile.setThemeId(huePickerView.getTag());
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -209,7 +223,7 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue
         }
         else {
             profileName.setText("");
-            url.setText("");
+            url.setText("https://");
             postingPermitted.setChecked(true);
             useAuthentication.setChecked(false);
             authParams.setVisibility(View.GONE);