sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

show error messages in text layout not edittext

This commit is contained in:
Daniel Gultsch 2019-05-22 17:31:11 +02:00
parent c965049605
commit 10653df164
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java
View File

@ -15,6 +15,7 @@ import android.widget.ArrayAdapter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.List; import java.util.List;
import eu.siacs.conversations.Config; import eu.siacs.conversations.Config;
@ -41,6 +42,7 @@ public class EnterJidDialog extends DialogFragment implements OnBackendConnected
private static final String SANITY_CHECK_JID = "sanity_check_jid"; private static final String SANITY_CHECK_JID = "sanity_check_jid";
private KnownHostsAdapter knownHostsAdapter; private KnownHostsAdapter knownHostsAdapter;
private Collection<String> whitelistedDomains = Collections.emptyList();
private EnterJidDialogBinding binding; private EnterJidDialogBinding binding;
private AlertDialog dialog; private AlertDialog dialog;
@ -155,19 +157,19 @@ public class EnterJidDialog extends DialogFragment implements OnBackendConnected
try { try {
contactJid = Jid.of(binding.jid.getText().toString()); contactJid = Jid.of(binding.jid.getText().toString());
} catch (final IllegalArgumentException e) { } catch (final IllegalArgumentException e) {
binding.jid.setError(getActivity().getString(R.string.invalid_jid)); binding.jidLayout.setError(getActivity().getString(R.string.invalid_jid));
return; return;
} }
if (!issuedWarning && sanityCheckJid) { if (!issuedWarning && sanityCheckJid) {
if (contactJid.isDomainJid()) { if (contactJid.isDomainJid()) {
binding.jid.setError(getActivity().getString(R.string.this_looks_like_a_domain)); binding.jidLayout.setError(getActivity().getString(R.string.this_looks_like_a_domain));
dialog.getButton(AlertDialog.BUTTON_POSITIVE).setText(R.string.add_anway); dialog.getButton(AlertDialog.BUTTON_POSITIVE).setText(R.string.add_anway);
issuedWarning = true; issuedWarning = true;
return; return;
} }
if (suspiciousSubDomain(contactJid.getDomain())) { if (suspiciousSubDomain(contactJid.getDomain())) {
binding.jid.setError(getActivity().getString(R.string.this_looks_like_channel)); binding.jidLayout.setError(getActivity().getString(R.string.this_looks_like_channel));
dialog.getButton(AlertDialog.BUTTON_POSITIVE).setText(R.string.add_anway); dialog.getButton(AlertDialog.BUTTON_POSITIVE).setText(R.string.add_anway);
issuedWarning = true; issuedWarning = true;
return; return;
@ -180,7 +182,9 @@ public class EnterJidDialog extends DialogFragment implements OnBackendConnected
dialog.dismiss(); dialog.dismiss();
} }
} catch (JidError error) { } catch (JidError error) {
binding.jid.setError(error.toString()); binding.jidLayout.setError(error.toString());
dialog.getButton(AlertDialog.BUTTON_POSITIVE).setText(R.string.add);
issuedWarning = false;
} }
} }
} }
@ -199,6 +203,7 @@ public class EnterJidDialog extends DialogFragment implements OnBackendConnected
if (activity instanceof XmppActivity) { if (activity instanceof XmppActivity) {
Collection<String> hosts = ((XmppActivity) activity).xmppConnectionService.getKnownHosts(); Collection<String> hosts = ((XmppActivity) activity).xmppConnectionService.getKnownHosts();
this.knownHostsAdapter.refresh(hosts); this.knownHostsAdapter.refresh(hosts);
this.whitelistedDomains = hosts;
} }
} }
@ -216,6 +221,7 @@ public class EnterJidDialog extends DialogFragment implements OnBackendConnected
public void afterTextChanged(Editable s) { public void afterTextChanged(Editable s) {
if (issuedWarning) { if (issuedWarning) {
dialog.getButton(AlertDialog.BUTTON_POSITIVE).setText(R.string.add); dialog.getButton(AlertDialog.BUTTON_POSITIVE).setText(R.string.add);
binding.jidLayout.setError(null);
issuedWarning = false; issuedWarning = false;
} }
} }
@ -245,7 +251,10 @@ public class EnterJidDialog extends DialogFragment implements OnBackendConnected
super.onDestroyView(); super.onDestroyView();
} }
private static boolean suspiciousSubDomain(String domain) { private boolean suspiciousSubDomain(String domain) {
if (this.whitelistedDomains.contains(domain)) {
return false;
}
final String[] parts = domain.split("\\."); final String[] parts = domain.split("\\.");
return parts.length >= 3 && SUSPICIOUS_DOMAINS.contains(parts[0]); return parts.length >= 3 && SUSPICIOUS_DOMAINS.contains(parts[0]);
} }

2
src/main/res/layout/enter_jid_dialog.xml
View File

@ -23,7 +23,7 @@
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/account_jid_layout" android:id="@+id/jid_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/account_settings_jabber_id" android:hint="@string/account_settings_jabber_id"