narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

dont crash when fields names in caps are null

Browse source
This commit is contained in:
Daniel Gultsch 2020-04-20 15:53:52 +02:00
parent 62934e6487
commit c5da699afe
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java
View file

@ -6,6 +6,8 @@ import android.support.annotation.NonNull;
import android.util.Base64; import android.util.Base64;
import android.util.Log; import android.util.Log;
import com.google.common.base.Strings;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.lang.Comparable; import java.lang.Comparable;
import java.security.MessageDigest; import java.security.MessageDigest;
@ -222,9 +224,9 @@ public class ServiceDiscoveryResult {
for (Data form : forms) { for (Data form : forms) {
s.append(clean(form.getFormType())).append("<"); s.append(clean(form.getFormType())).append("<");
List<Field> fields = form.getFields(); List<Field> fields = form.getFields();
Collections.sort(fields, (lhs, rhs) -> lhs.getFieldName().compareTo(rhs.getFieldName())); Collections.sort(fields, (lhs, rhs) -> Strings.nullToEmpty(lhs.getFieldName()).compareTo(Strings.nullToEmpty(rhs.getFieldName())));
for (Field field : fields) { for (Field field : fields) {
s.append(clean(field.getFieldName())).append("<"); s.append(Strings.nullToEmpty(field.getFieldName())).append("<");
List<String> values = field.getValues(); List<String> values = field.getValues();
Collections.sort(values); Collections.sort(values);
for (String value : values) { for (String value : values) {