do some performance optimizations on jid host suggestions. fixes #3174
This commit is contained in:
parent
e0266d0efb
commit
63f203c1d1
|
@ -7,7 +7,6 @@ import android.widget.Filter;
|
|||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
public class KnownHostsAdapter extends ArrayAdapter<String> {
|
||||
|
@ -16,22 +15,22 @@ public class KnownHostsAdapter extends ArrayAdapter<String> {
|
|||
|
||||
@Override
|
||||
protected FilterResults performFiltering(CharSequence constraint) {
|
||||
if (constraint != null) {
|
||||
ArrayList<String> suggestions = new ArrayList<>();
|
||||
final String[] split = constraint.toString().split("@");
|
||||
final ArrayList<String> suggestions = new ArrayList<>();
|
||||
final String[] split = constraint == null ? new String[0] : constraint.toString().split("@");
|
||||
if (split.length == 1) {
|
||||
final String local = split[0].toLowerCase(Locale.ENGLISH);
|
||||
for (String domain : domains) {
|
||||
suggestions.add(split[0].toLowerCase(Locale
|
||||
.getDefault()) + "@" + domain);
|
||||
suggestions.add(local + "@" + domain);
|
||||
}
|
||||
} else if (split.length == 2) {
|
||||
final String localPart = split[0].toLowerCase(Locale.ENGLISH);
|
||||
final String domainPart = split[1].toLowerCase(Locale.ENGLISH);
|
||||
if (domains.contains(domainPart)) {
|
||||
return new FilterResults();
|
||||
}
|
||||
for (String domain : domains) {
|
||||
if (domain.contentEquals(split[1])) {
|
||||
suggestions.clear();
|
||||
break;
|
||||
} else if (domain.contains(split[1])) {
|
||||
suggestions.add(split[0].toLowerCase(Locale
|
||||
.getDefault()) + "@" + domain);
|
||||
if (domain.contains(domainPart)) {
|
||||
suggestions.add(localPart + "@" + domain);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
@ -41,9 +40,6 @@ public class KnownHostsAdapter extends ArrayAdapter<String> {
|
|||
filterResults.values = suggestions;
|
||||
filterResults.count = suggestions.size();
|
||||
return filterResults;
|
||||
} else {
|
||||
return new FilterResults();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -51,9 +47,7 @@ public class KnownHostsAdapter extends ArrayAdapter<String> {
|
|||
ArrayList filteredList = (ArrayList) results.values;
|
||||
if (results.count > 0) {
|
||||
clear();
|
||||
for (Object c : filteredList) {
|
||||
add((String) c);
|
||||
}
|
||||
addAll(filteredList);
|
||||
notifyDataSetChanged();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue