mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge pull request #1228 from backspace/support-commas-in-contact-names 

Remove commas in names in recipient list string
fork-5.53.8
Moxie Marlinspike 2014-03-31 08:39:15 -07:00
rodzic 24a38985cf bc143059f6
commit c414334059
1 zmienionych plików z 5 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
src/org/thoughtcrime/securesms/components/RecipientsPanel.java
Wyświetl plik

@ -69,7 +69,7 @@ public class RecipientsPanel extends RelativeLayout {
} }
public void addRecipient(String name, String number) { public void addRecipient(String name, String number) {
if (name != null) recipientsText.append(name + "< " + number + ">, "); if (name != null) recipientsText.append(sanitizeRecipientName(name) + "< " + number + ">, ");
else recipientsText.append(number + ", "); else recipientsText.append(number + ", ");
} }
@ -149,6 +149,10 @@ public class RecipientsPanel extends RelativeLayout {
recipientsText.setOnFocusChangeListener(new FocusChangedListener()); recipientsText.setOnFocusChangeListener(new FocusChangedListener());
} }
private static String sanitizeRecipientName(String name) {
return name.replaceAll("[,<>]", "");
}
private class FocusChangedListener implements View.OnFocusChangeListener { private class FocusChangedListener implements View.OnFocusChangeListener {
public void onFocusChange(View v, boolean hasFocus) { public void onFocusChange(View v, boolean hasFocus) {
if (!hasFocus && (panelChangeListener != null)) { if (!hasFocus && (panelChangeListener != null)) {