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=e43e20e35a4d7585fa6c84d37c6173ddf4e13c10;hp=ee01017e792eac8fc26d3fdbaf24a7797c34b347;hb=HEAD;hpb=c27aa72c2c641bcd568692b4a20b125605cfb3b5 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 ee01017e..99934543 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 @@ -1,5 +1,5 @@ /* - * Copyright © 2020 Damyan Ivanov. + * Copyright © 2021 Damyan Ivanov. * This file is part of MoLe. * MoLe is free software: you can distribute it and/or modify it * under the term of the GNU General Public License as published by @@ -19,17 +19,18 @@ package net.ktnx.mobileledger.ui.profiles; import android.app.Activity; import android.app.AlertDialog; +import android.app.backup.BackupManager; import android.graphics.Typeface; import android.os.Bundle; import android.text.Editable; import android.text.TextWatcher; +import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; -import android.widget.LinearLayout; +import android.view.ViewGroup; import android.widget.PopupMenu; -import android.widget.Switch; import android.widget.TextView; import androidx.annotation.NonNull; @@ -40,18 +41,21 @@ import androidx.fragment.app.FragmentActivity; import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.ViewModelProvider; -import com.google.android.material.appbar.CollapsingToolbarLayout; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.textfield.TextInputLayout; import net.ktnx.mobileledger.BuildConfig; import net.ktnx.mobileledger.R; -import net.ktnx.mobileledger.async.SendTransactionTask; +import net.ktnx.mobileledger.dao.BaseDAO; +import net.ktnx.mobileledger.dao.ProfileDAO; +import net.ktnx.mobileledger.databinding.ProfileDetailBinding; +import net.ktnx.mobileledger.db.DB; +import net.ktnx.mobileledger.db.Profile; +import net.ktnx.mobileledger.json.API; import net.ktnx.mobileledger.model.Data; -import net.ktnx.mobileledger.model.MobileLedgerProfile; +import net.ktnx.mobileledger.model.FutureDates; import net.ktnx.mobileledger.ui.CurrencySelectorFragment; import net.ktnx.mobileledger.ui.HueRingDialog; -import net.ktnx.mobileledger.ui.activity.ProfileDetailActivity; import net.ktnx.mobileledger.utils.Colors; import net.ktnx.mobileledger.utils.Misc; @@ -60,8 +64,8 @@ import org.jetbrains.annotations.NotNull; import java.net.MalformedURLException; import java.net.URL; -import java.util.ArrayList; -import java.util.UUID; +import java.util.List; +import java.util.Objects; import static net.ktnx.mobileledger.utils.Logger.debug; @@ -79,28 +83,9 @@ public class ProfileDetailFragment extends Fragment { public static final String ARG_HUE = "hue"; @NonNls - private MobileLedgerProfile mProfile; - private TextView url; - private TextView defaultCommodity; - private View defaultCommodityLayout; private boolean defaultCommoditySet; - private TextInputLayout urlLayout; - private LinearLayout authParams; - private Switch useAuthentication; - private TextView userName; - private TextInputLayout userNameLayout; - private TextView password; - private TextInputLayout passwordLayout; - private TextView profileName; - private TextInputLayout profileNameLayout; - private TextView preferredAccountsFilter; - private TextInputLayout preferredAccountsFilterLayout; - private View huePickerView; - private View insecureWarningText; - private TextView futureDatesText; - private View futureDatesLayout; - private TextView apiVersionText; private boolean syncingModelFromUI = false; + private ProfileDetailBinding binding; /** * Mandatory empty constructor for the fragment manager to instantiate the * fragment (e.g. upon screen orientation changes). @@ -114,64 +99,60 @@ public class ProfileDetailFragment extends Fragment { super.onCreateOptionsMenu(menu, inflater); inflater.inflate(R.menu.profile_details, menu); final MenuItem menuDeleteProfile = menu.findItem(R.id.menuDelete); - menuDeleteProfile.setOnMenuItemClickListener(item -> { - AlertDialog.Builder builder = new AlertDialog.Builder(getContext()); - builder.setTitle(mProfile.getName()); - builder.setMessage(R.string.remove_profile_dialog_message); - builder.setPositiveButton(R.string.Remove, (dialog, which) -> { - debug("profiles", - String.format("[fragment] removing profile %s", mProfile.getUuid())); - mProfile.removeFromDB(); - ArrayList oldList = Data.profiles.getValue(); - if (oldList == null) - throw new AssertionError(); - ArrayList newList = new ArrayList<>(oldList); - newList.remove(mProfile); - Data.profiles.setValue(newList); - if (mProfile.equals(Data.getProfile())) { - debug("profiles", "[fragment] setting current profile to 0"); - Data.setCurrentProfile(newList.get(0)); - } - - final FragmentActivity activity = getActivity(); - if (activity != null) - activity.finish(); - }); - builder.show(); - return false; - }); - final ArrayList profiles = Data.profiles.getValue(); - menuDeleteProfile.setVisible( - (mProfile != null) && (profiles != null) && (profiles.size() > 1)); + menuDeleteProfile.setOnMenuItemClickListener(item -> onDeleteProfile()); + final List profiles = Data.profiles.getValue(); - if (BuildConfig.DEBUG) { - final MenuItem menuWipeProfileData = menu.findItem(R.id.menuWipeData); + final MenuItem menuWipeProfileData = menu.findItem(R.id.menuWipeData); + if (BuildConfig.DEBUG) menuWipeProfileData.setOnMenuItemClickListener(ignored -> onWipeDataMenuClicked()); - menuWipeProfileData.setVisible(mProfile != null); - } + + getModel().getProfileId() + .observe(getViewLifecycleOwner(), id -> { + menuDeleteProfile.setVisible(id > 0); + if (BuildConfig.DEBUG) + menuWipeProfileData.setVisible(id > 0); + }); + } + private boolean onDeleteProfile() { + AlertDialog.Builder builder = new AlertDialog.Builder(getContext()); + @NotNull ProfileDetailModel model = getModel(); + builder.setTitle(model.getProfileName()); + builder.setMessage(R.string.remove_profile_dialog_message); + builder.setPositiveButton(R.string.Remove, (dialog, which) -> { + final long profileId = Objects.requireNonNull(model.getProfileId() + .getValue()); + debug("profiles", String.format("[fragment] removing profile %s", profileId)); + ProfileDAO dao = DB.get() + .getProfileDAO(); + dao.getById(profileId) + .observe(getViewLifecycleOwner(), profile -> { + if (profile != null) + BaseDAO.runAsync(() -> DB.get() + .runInTransaction(() -> { + dao.deleteSync(profile); + dao.updateOrderSync(dao.getAllOrderedSync()); + })); + }); + + final FragmentActivity activity = getActivity(); + if (activity != null) + activity.finish(); + }); + builder.show(); + return false; } private boolean onWipeDataMenuClicked() { // this is a development option, so no confirmation - mProfile.wipeAllData(); - if (mProfile.equals(Data.getProfile())) - triggerProfileChange(); + DB.get() + .getProfileDAO() + .getById(Objects.requireNonNull(getModel().getProfileId() + .getValue())) + .observe(getViewLifecycleOwner(), profile -> { + if (profile != null) + profile.wipeAllData(); + }); return true; } - private void triggerProfileChange() { - int index = Data.getProfileIndex(mProfile); - MobileLedgerProfile newProfile = new MobileLedgerProfile(mProfile); - final ArrayList profiles = Data.profiles.getValue(); - if (profiles == null) - throw new AssertionError(); - profiles.set(index, newProfile); - - ProfilesRecyclerViewAdapter viewAdapter = ProfilesRecyclerViewAdapter.getInstance(); - if (viewAdapter != null) - viewAdapter.notifyItemChanged(index); - - if (mProfile.equals(Data.getProfile())) - Data.setCurrentProfile(newProfile); - } private void hookTextChangeSyncRoutine(TextView view, TextChangeSyncRoutine syncRoutine) { view.addTextChangedListener(new TextWatcher() { @Override @@ -182,64 +163,47 @@ public class ProfileDetailFragment extends Fragment { public void afterTextChanged(Editable s) { syncRoutine.onTextChanged(s.toString());} }); } + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { + binding = ProfileDetailBinding.inflate(inflater, container, false); + + return binding.getRoot(); + } @Override - public void onActivityCreated(@Nullable Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); + public void onViewCreated(@NotNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); Activity context = getActivity(); if (context == null) return; - if ((getArguments() != null) && getArguments().containsKey(ARG_ITEM_ID)) { - int index = getArguments().getInt(ARG_ITEM_ID, -1); - ArrayList profiles = Data.profiles.getValue(); - if ((profiles != null) && (index != -1) && (index < profiles.size())) - mProfile = 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 (mProfile != null) - appBarLayout.setTitle(mProfile.getName()); - else - appBarLayout.setTitle(getResources().getString(R.string.new_profile_title)); - } - } - final LifecycleOwner viewLifecycleOwner = getViewLifecycleOwner(); final ProfileDetailModel model = getModel(); model.observeDefaultCommodity(viewLifecycleOwner, c -> { if (c != null) - setDefaultCommodity(c.getName()); + setDefaultCommodity(c); else resetDefaultCommodity(); }); - FloatingActionButton fab = context.findViewById(R.id.fab); + FloatingActionButton fab = context.findViewById(R.id.fabAdd); fab.setOnClickListener(v -> onSaveFabClicked()); - profileName = context.findViewById(R.id.profile_name); - hookTextChangeSyncRoutine(profileName, model::setProfileName); + hookTextChangeSyncRoutine(binding.profileName, model::setProfileName); model.observeProfileName(viewLifecycleOwner, pn -> { - if (!Misc.equalStrings(pn, profileName.getText())) - profileName.setText(pn); + if (!Misc.equalStrings(pn, Misc.nullIsEmpty(binding.profileName.getText()))) + binding.profileName.setText(pn); }); - profileNameLayout = context.findViewById(R.id.profile_name_layout); - - url = context.findViewById(R.id.url); - hookTextChangeSyncRoutine(url, model::setUrl); + hookTextChangeSyncRoutine(binding.url, model::setUrl); model.observeUrl(viewLifecycleOwner, u -> { - if (!Misc.equalStrings(u, url.getText())) - url.setText(u); + if (!Misc.equalStrings(u, Misc.nullIsEmpty(binding.url.getText()))) + binding.url.setText(u); }); - urlLayout = context.findViewById(R.id.url_layout); - - defaultCommodityLayout = context.findViewById(R.id.default_commodity_layout); - defaultCommodityLayout.setOnClickListener(v -> { + binding.defaultCommodityLayout.setOnClickListener(v -> { CurrencySelectorFragment cpf = CurrencySelectorFragment.newInstance( CurrencySelectorFragment.DEFAULT_COLUMN_COUNT, false); cpf.setOnCurrencySelectedListener(model::setDefaultCommodity); @@ -247,134 +211,105 @@ public class ProfileDetailFragment extends Fragment { cpf.show(activity.getSupportFragmentManager(), "currency-selector"); }); - Switch showCommodityByDefault = context.findViewById(R.id.profile_show_commodity); - showCommodityByDefault.setOnCheckedChangeListener( + binding.profileShowCommodity.setOnCheckedChangeListener( (buttonView, isChecked) -> model.setShowCommodityByDefault(isChecked)); - model.observeShowCommodityByDefault(viewLifecycleOwner, showCommodityByDefault::setChecked); - - View postingSubItems = context.findViewById(R.id.posting_sub_items); + model.observeShowCommodityByDefault(viewLifecycleOwner, + binding.profileShowCommodity::setChecked); - Switch postingPermitted = context.findViewById(R.id.profile_permit_posting); model.observePostingPermitted(viewLifecycleOwner, isChecked -> { - postingPermitted.setChecked(isChecked); - postingSubItems.setVisibility(isChecked ? View.VISIBLE : View.GONE); + binding.profilePermitPosting.setChecked(isChecked); + binding.postingSubItems.setVisibility(isChecked ? View.VISIBLE : View.GONE); }); - postingPermitted.setOnCheckedChangeListener( + binding.profilePermitPosting.setOnCheckedChangeListener( ((buttonView, isChecked) -> model.setPostingPermitted(isChecked))); - Switch showCommentsByDefault = context.findViewById(R.id.profile_show_comments); - model.observeShowCommentsByDefault(viewLifecycleOwner, showCommentsByDefault::setChecked); - showCommentsByDefault.setOnCheckedChangeListener( + model.observeShowCommentsByDefault(viewLifecycleOwner, + binding.profileShowComments::setChecked); + binding.profileShowComments.setOnCheckedChangeListener( ((buttonView, isChecked) -> model.setShowCommentsByDefault(isChecked))); - defaultCommodity = context.findViewById(R.id.default_commodity_text); - - futureDatesLayout = context.findViewById(R.id.future_dates_layout); - futureDatesText = context.findViewById(R.id.future_dates_text); - context.findViewById(R.id.future_dates_layout) - .setOnClickListener(v -> { - MenuInflater mi = new MenuInflater(context); - PopupMenu menu = new PopupMenu(context, v); - menu.inflate(R.menu.future_dates); - menu.setOnMenuItemClickListener(item -> { - model.setFutureDates(futureDatesSettingFromMenuItemId(item.getItemId())); - return true; - }); - menu.show(); - }); + binding.futureDatesLayout.setOnClickListener(v -> { + MenuInflater mi = new MenuInflater(context); + PopupMenu menu = new PopupMenu(context, v); + menu.inflate(R.menu.future_dates); + menu.setOnMenuItemClickListener(item -> { + model.setFutureDates(futureDatesSettingFromMenuItemId(item.getItemId())); + return true; + }); + menu.show(); + }); model.observeFutureDates(viewLifecycleOwner, - v -> futureDatesText.setText(v.getText(getResources()))); + v -> binding.futureDatesText.setText(v.getText(getResources()))); - apiVersionText = context.findViewById(R.id.api_version_text); model.observeApiVersion(viewLifecycleOwner, - apiVer -> apiVersionText.setText(apiVer.getDescription(getResources()))); - context.findViewById(R.id.api_version_layout) - .setOnClickListener(v -> { - MenuInflater mi = new MenuInflater(context); - PopupMenu menu = new PopupMenu(context, v); - menu.inflate(R.menu.api_version); - menu.setOnMenuItemClickListener(item -> { - SendTransactionTask.API apiVer; - switch (item.getItemId()) { - case R.id.api_version_menu_html: - apiVer = SendTransactionTask.API.html; - break; - case R.id.api_version_menu_post_1_14: - apiVer = SendTransactionTask.API.post_1_14; - break; - case R.id.api_version_menu_pre_1_15: - apiVer = SendTransactionTask.API.pre_1_15; - break; - case R.id.api_version_menu_auto: - default: - apiVer = SendTransactionTask.API.auto; - } - model.setApiVersion(apiVer); - apiVersionText.setText(apiVer.getDescription(getResources())); - return true; - }); - menu.show(); - }); - authParams = context.findViewById(R.id.auth_params); - - useAuthentication = context.findViewById(R.id.enable_http_auth); - useAuthentication.setOnCheckedChangeListener((buttonView, isChecked) -> { + apiVer -> binding.apiVersionText.setText(apiVer.getDescription(getResources()))); + binding.apiVersionLabel.setOnClickListener(this::chooseAPIVersion); + binding.apiVersionText.setOnClickListener(this::chooseAPIVersion); + + binding.serverVersionLabel.setOnClickListener(v -> model.triggerVersionDetection()); + model.observeDetectedVersion(viewLifecycleOwner, ver -> { + if (ver == null) + binding.detectedServerVersionText.setText(context.getResources() + .getString( + R.string.server_version_unknown_label)); + else if (ver.isPre_1_20_1()) + binding.detectedServerVersionText.setText(context.getResources() + .getString( + R.string.detected_server_pre_1_20_1)); + else + binding.detectedServerVersionText.setText(ver.toString()); + }); + binding.detectedServerVersionText.setOnClickListener(v -> model.triggerVersionDetection()); + binding.serverVersionDetectButton.setOnClickListener(v -> model.triggerVersionDetection()); + model.observeDetectingHledgerVersion(viewLifecycleOwner, + running -> binding.serverVersionDetectButton.setVisibility( + running ? View.VISIBLE : View.INVISIBLE)); + + binding.enableHttpAuth.setOnCheckedChangeListener((buttonView, isChecked) -> { + boolean wasOn = model.getUseAuthentication(); model.setUseAuthentication(isChecked); - if (isChecked) - userName.requestFocus(); + if (!wasOn && isChecked) + binding.authUserName.requestFocus(); }); model.observeUseAuthentication(viewLifecycleOwner, isChecked -> { - useAuthentication.setChecked(isChecked); - authParams.setVisibility(isChecked ? View.VISIBLE : View.GONE); + binding.enableHttpAuth.setChecked(isChecked); + binding.authParams.setVisibility(isChecked ? View.VISIBLE : View.GONE); checkInsecureSchemeWithAuth(); }); - userName = context.findViewById(R.id.auth_user_name); model.observeUserName(viewLifecycleOwner, text -> { - if (!Misc.equalStrings(text, userName.getText())) - userName.setText(text); + if (!Misc.equalStrings(text, Misc.nullIsEmpty(binding.authUserName.getText()))) + binding.authUserName.setText(text); }); - hookTextChangeSyncRoutine(userName, model::setAuthUserName); - userNameLayout = context.findViewById(R.id.auth_user_name_layout); + hookTextChangeSyncRoutine(binding.authUserName, model::setAuthUserName); - password = context.findViewById(R.id.password); model.observePassword(viewLifecycleOwner, text -> { - if (!Misc.equalStrings(text, password.getText())) - password.setText(text); + if (!Misc.equalStrings(text, Misc.nullIsEmpty(binding.password.getText()))) + binding.password.setText(text); }); - hookTextChangeSyncRoutine(password, model::setAuthPassword); - passwordLayout = context.findViewById(R.id.password_layout); + hookTextChangeSyncRoutine(binding.password, model::setAuthPassword); - huePickerView = context.findViewById(R.id.btn_pick_ring_color); model.observeThemeId(viewLifecycleOwner, themeId -> { final int hue = (themeId == -1) ? Colors.DEFAULT_HUE_DEG : themeId; final int profileColor = Colors.getPrimaryColorForHue(hue); - huePickerView.setBackgroundColor(profileColor); - huePickerView.setTag(hue); + binding.btnPickRingColor.setBackgroundColor(profileColor); + binding.btnPickRingColor.setTag(hue); }); - preferredAccountsFilter = context.findViewById(R.id.preferred_accounts_filter_filter); model.observePreferredAccountsFilter(viewLifecycleOwner, text -> { - if (!Misc.equalStrings(text, preferredAccountsFilter.getText())) - preferredAccountsFilter.setText(text); + if (!Misc.equalStrings(text, + Misc.nullIsEmpty(binding.preferredAccountsFilter.getText()))) + binding.preferredAccountsFilter.setText(text); }); - hookTextChangeSyncRoutine(preferredAccountsFilter, model::setPreferredAccountsFilter); - preferredAccountsFilterLayout = - context.findViewById(R.id.preferred_accounts_accounts_filter_layout); - - insecureWarningText = context.findViewById(R.id.insecure_scheme_text); - - hookClearErrorOnFocusListener(profileName, profileNameLayout); - hookClearErrorOnFocusListener(url, urlLayout); - hookClearErrorOnFocusListener(userName, userNameLayout); - hookClearErrorOnFocusListener(password, passwordLayout); + hookTextChangeSyncRoutine(binding.preferredAccountsFilter, + model::setPreferredAccountsFilter); - if (savedInstanceState == null) { - model.setValuesFromProfile(mProfile, getArguments().getInt(ARG_HUE, -1)); - } - checkInsecureSchemeWithAuth(); + hookClearErrorOnFocusListener(binding.profileName, binding.profileNameLayout); + hookClearErrorOnFocusListener(binding.url, binding.urlLayout); + hookClearErrorOnFocusListener(binding.authUserName, binding.authUserNameLayout); + hookClearErrorOnFocusListener(binding.password, binding.passwordLayout); - url.addTextChangedListener(new TextWatcher() { + binding.url.addTextChangedListener(new TextWatcher() { @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) {} @Override @@ -385,36 +320,74 @@ public class ProfileDetailFragment extends Fragment { } }); - huePickerView.setOnClickListener(v -> { + binding.btnPickRingColor.setOnClickListener(v -> { HueRingDialog d = new HueRingDialog(ProfileDetailFragment.this.requireContext(), model.initialThemeHue, (Integer) v.getTag()); d.show(); d.setColorSelectedListener(model::setThemeId); }); - profileName.requestFocus(); + binding.profileName.requestFocus(); + } + private void chooseAPIVersion(View v) { + Activity context = getActivity(); + ProfileDetailModel model = getModel(); + MenuInflater mi = new MenuInflater(context); + PopupMenu menu = new PopupMenu(context, v); + menu.inflate(R.menu.api_version); + menu.setOnMenuItemClickListener(item -> { + API apiVer; + int itemId = item.getItemId(); + if (itemId == R.id.api_version_menu_html) { + apiVer = API.html; + } + else if (itemId == R.id.api_version_menu_1_23) { + apiVer = API.v1_23; + } + else if (itemId == R.id.api_version_menu_1_19_1) { + apiVer = API.v1_19_1; + } + else if (itemId == R.id.api_version_menu_1_15) { + apiVer = API.v1_15; + } + else if (itemId == R.id.api_version_menu_1_14) { + apiVer = API.v1_14; + } + else { + apiVer = API.auto; + } + model.setApiVersion(apiVer); + binding.apiVersionText.setText(apiVer.getDescription(getResources())); + return true; + }); + menu.show(); } - private MobileLedgerProfile.FutureDates futureDatesSettingFromMenuItemId(int itemId) { - switch (itemId) { - case R.id.menu_future_dates_7: - return MobileLedgerProfile.FutureDates.OneWeek; - case R.id.menu_future_dates_14: - return MobileLedgerProfile.FutureDates.TwoWeeks; - case R.id.menu_future_dates_30: - return MobileLedgerProfile.FutureDates.OneMonth; - case R.id.menu_future_dates_60: - return MobileLedgerProfile.FutureDates.TwoMonths; - case R.id.menu_future_dates_90: - return MobileLedgerProfile.FutureDates.ThreeMonths; - case R.id.menu_future_dates_180: - return MobileLedgerProfile.FutureDates.SixMonths; - case R.id.menu_future_dates_365: - return MobileLedgerProfile.FutureDates.OneYear; - case R.id.menu_future_dates_all: - return MobileLedgerProfile.FutureDates.All; - default: - return MobileLedgerProfile.FutureDates.None; + private FutureDates futureDatesSettingFromMenuItemId(int itemId) { + if (itemId == R.id.menu_future_dates_7) { + return FutureDates.OneWeek; + } + else if (itemId == R.id.menu_future_dates_14) { + return FutureDates.TwoWeeks; + } + else if (itemId == R.id.menu_future_dates_30) { + return FutureDates.OneMonth; + } + else if (itemId == R.id.menu_future_dates_60) { + return FutureDates.TwoMonths; + } + else if (itemId == R.id.menu_future_dates_90) { + return FutureDates.ThreeMonths; } + else if (itemId == R.id.menu_future_dates_180) { + return FutureDates.SixMonths; + } + else if (itemId == R.id.menu_future_dates_365) { + return FutureDates.OneYear; + } + else if (itemId == R.id.menu_future_dates_all) { + return FutureDates.All; + } + return FutureDates.None; } @NotNull private ProfileDetailModel getModel() { @@ -425,31 +398,22 @@ public class ProfileDetailFragment extends Fragment { return; ProfileDetailModel model = getModel(); + ProfileDAO dao = DB.get() + .getProfileDAO(); - if (mProfile != null) { - model.updateProfile(mProfile); -// debug("profiles", String.format("Selected item is %d", mProfile.getThemeHue())); - mProfile.storeInDB(); + Profile profile = new Profile(); + model.updateProfile(profile); + if (profile.getId() > 0) { + dao.update(profile); debug("profiles", "profile stored in DB"); - triggerProfileChange(); +// debug("profiles", String.format("Selected item is %d", mProfile.getThemeHue())); } else { - mProfile = new MobileLedgerProfile(String.valueOf(UUID.randomUUID())); - model.updateProfile(mProfile); - mProfile.storeInDB(); - final ArrayList profiles = Data.profiles.getValue(); - if (profiles == null) - throw new AssertionError(); - ArrayList newList = new ArrayList<>(profiles); - newList.add(mProfile); - Data.profiles.setValue(newList); - MobileLedgerProfile.storeProfilesOrder(); - - // first profile ever? - if (newList.size() == 1) - Data.setCurrentProfile(mProfile); + dao.insertLast(profile, null); } + BackupManager.dataChanged(BuildConfig.APPLICATION_ID); + Activity activity = getActivity(); if (activity != null) activity.finish(); @@ -463,7 +427,7 @@ public class ProfileDetailFragment extends Fragment { .trim(); if (val.isEmpty()) { valid = false; - urlLayout.setError(getResources().getText(R.string.err_profile_url_empty)); + binding.urlLayout.setError(getResources().getText(R.string.err_profile_url_empty)); } try { URL url = new URL(val); @@ -474,12 +438,12 @@ public class ProfileDetailFragment extends Fragment { .toUpperCase(); if (!protocol.equals("HTTP") && !protocol.equals("HTTPS")) { valid = false; - urlLayout.setError(getResources().getText(R.string.err_invalid_url)); + binding.urlLayout.setError(getResources().getText(R.string.err_invalid_url)); } } catch (MalformedURLException e) { valid = false; - urlLayout.setError(getResources().getText(R.string.err_invalid_url)); + binding.urlLayout.setError(getResources().getText(R.string.err_invalid_url)); } return valid; @@ -491,14 +455,15 @@ public class ProfileDetailFragment extends Fragment { if (model.getUseAuthentication()) { String urlText = model.getUrl(); - if (urlText.startsWith("http") && !urlText.startsWith("https")) + if (urlText.startsWith("http://") || + urlText.length() >= 8 && !urlText.startsWith("https://")) showWarning = true; } if (showWarning) - insecureWarningText.setVisibility(View.VISIBLE); + binding.insecureSchemeText.setVisibility(View.VISIBLE); else - insecureWarningText.setVisibility(View.GONE); + binding.insecureSchemeText.setVisibility(View.GONE); } private void hookClearErrorOnFocusListener(TextView view, TextInputLayout layout) { view.setOnFocusChangeListener((v, hasFocus) -> { @@ -527,11 +492,11 @@ public class ProfileDetailFragment extends Fragment { try { ProfileDetailModel model = getModel(); - model.setProfileName(profileName.getText()); - model.setUrl(url.getText()); - model.setPreferredAccountsFilter(preferredAccountsFilter.getText()); - model.setAuthUserName(userName.getText()); - model.setAuthPassword(password.getText()); + model.setProfileName(binding.profileName.getText()); + model.setUrl(binding.url.getText()); + model.setPreferredAccountsFilter(binding.preferredAccountsFilter.getText()); + model.setAuthUserName(binding.authUserName.getText()); + model.setAuthPassword(binding.password.getText()); } finally { syncingModelFromUI = false; @@ -540,33 +505,34 @@ public class ProfileDetailFragment extends Fragment { private boolean checkValidity() { boolean valid = true; - String val = String.valueOf(profileName.getText()); + String val = String.valueOf(binding.profileName.getText()); if (val.trim() .isEmpty()) { valid = false; - profileNameLayout.setError(getResources().getText(R.string.err_profile_name_empty)); + binding.profileNameLayout.setError( + getResources().getText(R.string.err_profile_name_empty)); } if (!checkUrlValidity()) valid = false; - if (useAuthentication.isChecked()) { - val = String.valueOf(userName.getText()); + if (binding.enableHttpAuth.isChecked()) { + val = String.valueOf(binding.authUserName.getText()); if (val.trim() .isEmpty()) { valid = false; - userNameLayout.setError( + binding.authUserNameLayout.setError( getResources().getText(R.string.err_profile_user_name_empty)); } - val = String.valueOf(password.getText()); + val = String.valueOf(binding.password.getText()); if (val.trim() .isEmpty()) { valid = false; - passwordLayout.setError( + binding.passwordLayout.setError( getResources().getText(R.string.err_profile_password_empty)); } } @@ -575,13 +541,14 @@ public class ProfileDetailFragment extends Fragment { } private void resetDefaultCommodity() { defaultCommoditySet = false; - defaultCommodity.setText(R.string.btn_no_currency); - defaultCommodity.setTypeface(defaultCommodity.getTypeface(), Typeface.ITALIC); + binding.defaultCommodityText.setText(R.string.btn_no_currency); + binding.defaultCommodityText.setTypeface(binding.defaultCommodityText.getTypeface(), + Typeface.ITALIC); } private void setDefaultCommodity(@NonNull @NotNull String name) { defaultCommoditySet = true; - defaultCommodity.setText(name); - defaultCommodity.setTypeface(Typeface.DEFAULT); + binding.defaultCommodityText.setText(name); + binding.defaultCommodityText.setTypeface(Typeface.DEFAULT); } interface TextChangeSyncRoutine { void onTextChanged(String text);