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=c6dbc6a587c1799244b6656de63d95c4bba9cf5f;hp=470a3eaee682e99ae0c436e28466059ef90f207e;hb=a4295cb43de54dd0428563d46e66a89320f6afef;hpb=009c99ccf74f20d9ba1a7804eefe766ede0c020e 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 470a3eae..c6dbc6a5 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 @@ -46,6 +46,8 @@ import net.ktnx.mobileledger.utils.Colors; import org.jetbrains.annotations.NotNull; +import java.net.MalformedURLException; +import java.net.URL; import java.util.ArrayList; import java.util.Objects; @@ -108,7 +110,7 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue String.format("[fragment] removing profile %s", mProfile.getUuid())); mProfile.removeFromDB(); ArrayList oldList = Data.profiles.getValue(); - assert oldList != null; + if (oldList == null) throw new AssertionError(); ArrayList newList = (ArrayList) oldList.clone(); newList.remove(mProfile); @@ -144,8 +146,12 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue int index = Data.getProfileIndex(mProfile); MobileLedgerProfile newProfile = new MobileLedgerProfile(mProfile); final ArrayList 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 @@ -193,7 +199,7 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue updateProfileFromUI(); mProfile.storeInDB(); final ArrayList profiles = Data.profiles.getValue(); - assert profiles != null; + if (profiles == null) throw new AssertionError(); ArrayList newList = (ArrayList) profiles.clone(); newList.add(mProfile); @@ -317,11 +323,20 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue profileNameLayout.setError(getResources().getText(R.string.err_profile_name_empty)); } - val = String.valueOf(url.getText()); - if (val.trim().isEmpty()) { + 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) { + valid = false; + urlLayout.setError(getResources().getText(R.string.err_invalid_url)); + } if (useAuthentication.isChecked()) { val = String.valueOf(userName.getText()); if (val.trim().isEmpty()) {