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=ebe97699176134361da2f7600034f5a8b0e89b92;hb=beeffcb40785a7d77fbea3a4f1a39750e3201eaa;hpb=df9ebf3fc3ca1730afbdc5e6de248e51cc41ba80 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 ebe97699..e43e20e3 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 @@ -29,6 +29,7 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; +import android.widget.PopupMenu; import android.widget.Switch; import android.widget.TextView; @@ -43,12 +44,14 @@ 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.model.Data; import net.ktnx.mobileledger.model.MobileLedgerProfile; import net.ktnx.mobileledger.ui.HueRingDialog; import net.ktnx.mobileledger.ui.activity.ProfileDetailActivity; import net.ktnx.mobileledger.utils.Colors; +import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import java.net.MalformedURLException; @@ -69,6 +72,8 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue * represents. */ public static final String ARG_ITEM_ID = "item_id"; + @NonNls + private static final String HTTPS_URL_START = "https://"; /** * The dummy content this fragment is presenting. @@ -88,6 +93,13 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue private TextView preferredAccountsFilter; private TextInputLayout preferredAccountsFilterLayout; private View huePickerView; + private View insecureWarningText; + private TextView futureDatesText; + private MobileLedgerProfile.FutureDates futureDates; + private View futureDatesLayout; + private TextView apiVersionText; + private View apiVersionLayout; + private SendTransactionTask.API apiVersion; /** * Mandatory empty constructor for the fragment manager to instantiate the @@ -110,9 +122,9 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue String.format("[fragment] removing profile %s", mProfile.getUuid())); mProfile.removeFromDB(); ArrayList oldList = Data.profiles.getValue(); - if (oldList == null) throw new AssertionError(); - ArrayList newList = - (ArrayList) oldList.clone(); + if (oldList == null) + throw new AssertionError(); + ArrayList newList = new ArrayList<>(oldList); newList.remove(mProfile); Data.profiles.setValue(newList); if (mProfile.equals(Data.profile.getValue())) { @@ -121,14 +133,15 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue } final FragmentActivity activity = getActivity(); - if (activity != null) activity.finish(); + 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.setVisible( + (mProfile != null) && (profiles != null) && (profiles.size() > 1)); if (BuildConfig.DEBUG) { final MenuItem menuWipeProfileData = menu.findItem(R.id.menuWipeData); @@ -139,24 +152,31 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue private boolean onWipeDataMenuClicked() { // this is a development option, so no confirmation mProfile.wipeAllData(); - if (mProfile.equals(Data.profile.getValue())) triggerProfileChange(); + if (mProfile.equals(Data.profile.getValue())) + triggerProfileChange(); 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(); + if (profiles == null) + throw new AssertionError(); profiles.set(index, newProfile); ProfilesRecyclerViewAdapter prva = ProfilesRecyclerViewAdapter.getInstance(); - if (prva != null) prva.notifyItemChanged(index); + if (prva != null) + prva.notifyItemChanged(index); - if (mProfile.equals(Data.profile.getValue())) Data.profile.setValue(newProfile); + if (mProfile.equals(Data.profile.getValue())) + Data.profile.setValue(newProfile); } @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); + public void onActivityCreated(@Nullable Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + Activity context = getActivity(); + if (context == null) + return; if ((getArguments() != null) && getArguments().containsKey(ARG_ITEM_ID)) { int index = getArguments().getInt(ARG_ITEM_ID, -1); @@ -165,94 +185,111 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue mProfile = profiles.get(index); Activity activity = this.getActivity(); - if (activity == null) throw new AssertionError(); + 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)); + if (mProfile != null) + appBarLayout.setTitle(mProfile.getName()); + else + appBarLayout.setTitle(getResources().getString(R.string.new_profile_title)); } } - } - @Override - public void onActivityCreated(@Nullable Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); - Activity context = getActivity(); - if (context == null) return; FloatingActionButton fab = context.findViewById(R.id.fab); fab.setOnClickListener(v -> onSaveFabClicked()); - - profileName.requestFocus(); - } - private void onSaveFabClicked() { - if (!checkValidity()) return; - - if (mProfile != null) { - updateProfileFromUI(); -// debug("profiles", String.format("Selected item is %d", mProfile.getThemeId())); - mProfile.storeInDB(); - debug("profiles", "profile stored in DB"); - triggerProfileChange(); - } - else { - mProfile = new MobileLedgerProfile(); - updateProfileFromUI(); - mProfile.storeInDB(); - final ArrayList profiles = Data.profiles.getValue(); - if (profiles == null) throw new AssertionError(); - ArrayList newList = - (ArrayList) profiles.clone(); - newList.add(mProfile); - Data.profiles.setValue(newList); - MobileLedgerProfile.storeProfilesOrder(); - - // first profile ever? - if (newList.size() == 1) Data.profile.setValue(mProfile); - } - - Activity activity = getActivity(); - if (activity != null) activity.finish(); - } - private void updateProfileFromUI() { - mProfile.setName(profileName.getText()); - mProfile.setUrl(url.getText()); - mProfile.setPostingPermitted(postingPermitted.isChecked()); - mProfile.setPreferredAccountsFilter(preferredAccountsFilter.getText()); - 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) { - View rootView = inflater.inflate(R.layout.profile_detail, container, false); - - profileName = rootView.findViewById(R.id.profile_name); - profileNameLayout = rootView.findViewById(R.id.profile_name_layout); - url = rootView.findViewById(R.id.url); - urlLayout = rootView.findViewById(R.id.url_layout); - postingPermitted = rootView.findViewById(R.id.profile_permit_posting); - authParams = rootView.findViewById(R.id.auth_params); - useAuthentication = rootView.findViewById(R.id.enable_http_auth); - userName = rootView.findViewById(R.id.auth_user_name); - userNameLayout = rootView.findViewById(R.id.auth_user_name_layout); - password = rootView.findViewById(R.id.password); - passwordLayout = rootView.findViewById(R.id.password_layout); - huePickerView = rootView.findViewById(R.id.btn_pick_ring_color); - preferredAccountsFilter = rootView.findViewById(R.id.preferred_accounts_filter_filter); + profileName = context.findViewById(R.id.profile_name); + profileNameLayout = context.findViewById(R.id.profile_name_layout); + url = context.findViewById(R.id.url); + urlLayout = context.findViewById(R.id.url_layout); + postingPermitted = context.findViewById(R.id.profile_permit_posting); + 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 -> { + switch (item.getItemId()) { + case R.id.menu_future_dates_30: + futureDates = MobileLedgerProfile.FutureDates.OneMonth; + break; + case R.id.menu_future_dates_60: + futureDates = MobileLedgerProfile.FutureDates.TwoMonths; + break; + case R.id.menu_future_dates_90: + futureDates = MobileLedgerProfile.FutureDates.ThreeMonths; + break; + case R.id.menu_future_dates_180: + futureDates = MobileLedgerProfile.FutureDates.SixMonths; + break; + case R.id.menu_future_dates_365: + futureDates = MobileLedgerProfile.FutureDates.OneYear; + break; + case R.id.menu_future_dates_all: + futureDates = MobileLedgerProfile.FutureDates.All; + break; + default: + futureDates = MobileLedgerProfile.FutureDates.None; + } + futureDatesText.setText(futureDates.getText(getResources())); + return true; + }); + menu.show(); + }); + apiVersionLayout = context.findViewById(R.id.api_version_layout); + apiVersionText = context.findViewById(R.id.api_version_text); + apiVersionLayout.setOnClickListener(v -> { + MenuInflater mi = new MenuInflater(context); + PopupMenu menu = new PopupMenu(context, v); + menu.inflate(R.menu.api_version); + menu.setOnMenuItemClickListener(item -> { + switch (item.getItemId()) { + case R.id.api_version_menu_auto: + apiVersion = SendTransactionTask.API.auto; + break; + case R.id.api_version_menu_html: + apiVersion = SendTransactionTask.API.html; + break; + case R.id.api_version_menu_post_1_14: + apiVersion = SendTransactionTask.API.post_1_14; + break; + case R.id.api_version_menu_pre_1_15: + apiVersion = SendTransactionTask.API.pre_1_15; + break; + default: + apiVersion = SendTransactionTask.API.auto; + } + apiVersionText.setText(apiVersion.getDescription(getResources())); + return true; + }); + menu.show(); + }); + authParams = context.findViewById(R.id.auth_params); + useAuthentication = context.findViewById(R.id.enable_http_auth); + userName = context.findViewById(R.id.auth_user_name); + userNameLayout = context.findViewById(R.id.auth_user_name_layout); + password = context.findViewById(R.id.password); + passwordLayout = context.findViewById(R.id.password_layout); + huePickerView = context.findViewById(R.id.btn_pick_ring_color); + preferredAccountsFilter = context.findViewById(R.id.preferred_accounts_filter_filter); preferredAccountsFilterLayout = - rootView.findViewById(R.id.preferred_accounts_accounts_filter_layout); + context.findViewById(R.id.preferred_accounts_accounts_filter_layout); + insecureWarningText = context.findViewById(R.id.insecure_scheme_text); useAuthentication.setOnCheckedChangeListener((buttonView, isChecked) -> { debug("profiles", isChecked ? "auth enabled " : "auth disabled"); authParams.setVisibility(isChecked ? View.VISIBLE : View.GONE); - if (isChecked) userName.requestFocus(); + if (isChecked) + userName.requestFocus(); + checkInsecureSchemeWithAuth(); }); - postingPermitted.setOnCheckedChangeListener( - ((buttonView, isChecked) -> preferredAccountsFilterLayout - .setVisibility(isChecked ? View.VISIBLE : View.GONE))); + postingPermitted.setOnCheckedChangeListener(((buttonView, isChecked) -> { + preferredAccountsFilterLayout.setVisibility(isChecked ? View.VISIBLE : View.GONE); + futureDatesLayout.setVisibility(isChecked ? View.VISIBLE : View.GONE); + })); hookClearErrorOnFocusListener(profileName, profileNameLayout); hookClearErrorOnFocusListener(url, urlLayout); @@ -263,6 +300,10 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue if (mProfile != null) { profileName.setText(mProfile.getName()); postingPermitted.setChecked(mProfile.isPostingPermitted()); + futureDates = mProfile.getFutureDates(); + futureDatesText.setText(futureDates.getText(getResources())); + apiVersion = mProfile.getApiVersion(); + apiVersionText.setText(apiVersion.getDescription(getResources())); url.setText(mProfile.getUrl()); useAuthentication.setChecked(mProfile.isAuthEnabled()); authParams.setVisibility(mProfile.isAuthEnabled() ? View.VISIBLE : View.GONE); @@ -273,8 +314,12 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue } else { profileName.setText(""); - url.setText("https://"); + url.setText(HTTPS_URL_START); postingPermitted.setChecked(true); + futureDates = MobileLedgerProfile.FutureDates.None; + futureDatesText.setText(futureDates.getText(getResources())); + apiVersion = SendTransactionTask.API.auto; + apiVersionText.setText(apiVersion.getDescription(getResources())); useAuthentication.setChecked(false); authParams.setVisibility(View.GONE); userName.setText(""); @@ -283,6 +328,23 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue profileThemeId = -1; } + checkInsecureSchemeWithAuth(); + + url.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + + } + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + + } + @Override + public void afterTextChanged(Editable s) { + checkInsecureSchemeWithAuth(); + } + }); + final int hue = (profileThemeId == -1) ? Colors.DEFAULT_HUE_DEG : profileThemeId; final int profileColor = Colors.getPrimaryColorForHue(hue); @@ -295,11 +357,107 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue d.show(); d.setColorSelectedListener(this); }); + + profileName.requestFocus(); + } + private void onSaveFabClicked() { + if (!checkValidity()) + return; + + if (mProfile != null) { + updateProfileFromUI(); +// debug("profiles", String.format("Selected item is %d", mProfile.getThemeId())); + mProfile.storeInDB(); + debug("profiles", "profile stored in DB"); + triggerProfileChange(); + } + else { + mProfile = new MobileLedgerProfile(); + updateProfileFromUI(); + 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.profile.setValue(mProfile); + } + + Activity activity = getActivity(); + if (activity != null) + activity.finish(); + } + private void updateProfileFromUI() { + mProfile.setName(profileName.getText()); + mProfile.setUrl(url.getText()); + mProfile.setPostingPermitted(postingPermitted.isChecked()); + mProfile.setPreferredAccountsFilter(preferredAccountsFilter.getText()); + mProfile.setAuthEnabled(useAuthentication.isChecked()); + mProfile.setAuthUserName(userName.getText()); + mProfile.setAuthPassword(password.getText()); + mProfile.setThemeId(huePickerView.getTag()); + mProfile.setFutureDates(futureDates); + mProfile.setApiVersion(apiVersion); + } + @Override + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + View rootView = inflater.inflate(R.layout.profile_detail, container, false); + return rootView; } + private boolean checkUrlValidity() { + boolean valid = true; + + String val = String.valueOf(url.getText()) + .trim(); + if (val.isEmpty()) { + valid = false; + urlLayout.setError(getResources().getText(R.string.err_profile_url_empty)); + } + try { + URL url = new URL(val); + String host = url.getHost(); + if (host == null || host.isEmpty()) + throw new MalformedURLException("Missing host"); + String protocol = url.getProtocol() + .toUpperCase(); + if (!protocol.equals("HTTP") && !protocol.equals("HTTPS")) { + valid = false; + urlLayout.setError(getResources().getText(R.string.err_invalid_url)); + } + } + catch (MalformedURLException e) { + valid = false; + urlLayout.setError(getResources().getText(R.string.err_invalid_url)); + } + + return valid; + } + private void checkInsecureSchemeWithAuth() { + boolean showWarning = false; + + if (useAuthentication.isChecked()) { + String urlText = url.getText() + .toString(); + if (urlText.startsWith("http") && !urlText.startsWith("https")) + showWarning = true; + } + + if (showWarning) + insecureWarningText.setVisibility(View.VISIBLE); + else + insecureWarningText.setVisibility(View.GONE); + } private void hookClearErrorOnFocusListener(TextView view, TextInputLayout layout) { view.setOnFocusChangeListener((v, hasFocus) -> { - if (hasFocus) layout.setError(null); + if (hasFocus) + layout.setError(null); }); view.addTextChangedListener(new TextWatcher() { @Override @@ -318,38 +476,33 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue boolean valid = true; String val = String.valueOf(profileName.getText()); - if (val.trim().isEmpty()) { + if (val.trim() + .isEmpty()) + { valid = false; profileNameLayout.setError(getResources().getText(R.string.err_profile_name_empty)); } - val = String.valueOf(url.getText()).trim(); - if (val.isEmpty()) { - valid = false; - urlLayout.setError(getResources().getText(R.string.err_profile_url_empty)); - } - try { - URL url = new URL(val); - String host = url.getHost(); - if (host == null || host.isEmpty()) throw new MalformedURLException("Missing host"); - } - catch (MalformedURLException e) { + if (!checkUrlValidity()) valid = false; - urlLayout.setError(getResources().getText(R.string.err_invalid_url)); - } + if (useAuthentication.isChecked()) { val = String.valueOf(userName.getText()); - if (val.trim().isEmpty()) { + if (val.trim() + .isEmpty()) + { valid = false; - userNameLayout - .setError(getResources().getText(R.string.err_profile_user_name_empty)); + userNameLayout.setError( + getResources().getText(R.string.err_profile_user_name_empty)); } val = String.valueOf(password.getText()); - if (val.trim().isEmpty()) { + if (val.trim() + .isEmpty()) + { valid = false; - passwordLayout - .setError(getResources().getText(R.string.err_profile_password_empty)); + passwordLayout.setError( + getResources().getText(R.string.err_profile_password_empty)); } }