import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
+import android.widget.PopupMenu;
import android.widget.Switch;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+
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.ui.activity.ProfileDetailActivity;
import net.ktnx.mobileledger.utils.Colors;
+import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Objects;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-
import static net.ktnx.mobileledger.utils.Logger.debug;
/**
* 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.
private TextView preferredAccountsFilter;
private TextInputLayout preferredAccountsFilterLayout;
private View huePickerView;
+ private View insecureWarningText;
+ private TextView futureDatesText;
+ private MobileLedgerProfile.FutureDates futureDates;
+ private View futureDatesLayout;
/**
* Mandatory empty constructor for the fragment manager to instantiate the
String.format("[fragment] removing profile %s", mProfile.getUuid()));
mProfile.removeFromDB();
ArrayList<MobileLedgerProfile> oldList = Data.profiles.getValue();
- assert oldList != null;
- ArrayList<MobileLedgerProfile> newList =
- (ArrayList<MobileLedgerProfile>) oldList.clone();
+ if (oldList == null) throw new AssertionError();
+ ArrayList<MobileLedgerProfile> newList = new ArrayList<>(oldList);
newList.remove(mProfile);
Data.profiles.setValue(newList);
if (mProfile.equals(Data.profile.getValue())) {
int index = Data.getProfileIndex(mProfile);
MobileLedgerProfile newProfile = new MobileLedgerProfile(mProfile);
final ArrayList<MobileLedgerProfile> profiles = Data.profiles.getValue();
- assert profiles != null;
+ if (profiles == null) throw new AssertionError();
profiles.set(index, newProfile);
+
+ ProfilesRecyclerViewAdapter prva = ProfilesRecyclerViewAdapter.getInstance();
+ if (prva != null) prva.notifyItemChanged(index);
+
if (mProfile.equals(Data.profile.getValue())) Data.profile.setValue(newProfile);
}
@Override
updateProfileFromUI();
mProfile.storeInDB();
final ArrayList<MobileLedgerProfile> profiles = Data.profiles.getValue();
- assert profiles != null;
- ArrayList<MobileLedgerProfile> newList =
- (ArrayList<MobileLedgerProfile>) profiles.clone();
+ if (profiles == null) throw new AssertionError();
+ ArrayList<MobileLedgerProfile> newList = new ArrayList<>(profiles);
newList.add(mProfile);
Data.profiles.setValue(newList);
MobileLedgerProfile.storeProfilesOrder();
mProfile.setAuthUserName(userName.getText());
mProfile.setAuthPassword(password.getText());
mProfile.setThemeId(huePickerView.getTag());
+ mProfile.setFutureDates(futureDates);
}
@Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
url = rootView.findViewById(R.id.url);
urlLayout = rootView.findViewById(R.id.url_layout);
postingPermitted = rootView.findViewById(R.id.profile_permit_posting);
+ futureDatesLayout = rootView.findViewById(R.id.future_dates_layout);
+ futureDatesText = rootView.findViewById(R.id.future_dates_text);
+ rootView.findViewById(R.id.future_dates_layout)
+ .setOnClickListener(v -> {
+ MenuInflater mi = new MenuInflater(getContext());
+ PopupMenu menu = new PopupMenu(getContext(), 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();
+ });
authParams = rootView.findViewById(R.id.auth_params);
useAuthentication = rootView.findViewById(R.id.enable_http_auth);
userName = rootView.findViewById(R.id.auth_user_name);
preferredAccountsFilter = rootView.findViewById(R.id.preferred_accounts_filter_filter);
preferredAccountsFilterLayout =
rootView.findViewById(R.id.preferred_accounts_accounts_filter_layout);
+ insecureWarningText = rootView.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();
+ 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);
if (mProfile != null) {
profileName.setText(mProfile.getName());
postingPermitted.setChecked(mProfile.isPostingPermitted());
+ futureDates = mProfile.getFutureDates();
+ futureDatesText.setText(futureDates.getText(getResources()));
url.setText(mProfile.getUrl());
useAuthentication.setChecked(mProfile.isAuthEnabled());
authParams.setVisibility(mProfile.isAuthEnabled() ? View.VISIBLE : View.GONE);
}
else {
profileName.setText("");
- url.setText("https://");
+ url.setText(HTTPS_URL_START);
postingPermitted.setChecked(true);
+ futureDates = MobileLedgerProfile.FutureDates.None;
+ futureDatesText.setText(futureDates.getText(getResources()));
useAuthentication.setChecked(false);
authParams.setVisibility(View.GONE);
userName.setText("");
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);
});
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);
profileNameLayout.setError(getResources().getText(R.string.err_profile_name_empty));
}
- val = String.valueOf(url.getText());
- if (val.trim().isEmpty()) {
- valid = false;
- urlLayout.setError(getResources().getText(R.string.err_profile_url_empty));
- }
+ if (!checkUrlValidity()) valid = false;
+
if (useAuthentication.isChecked()) {
val = String.valueOf(userName.getText());
if (val.trim().isEmpty()) {
projects / mobile-ledger.git / blobdiff