From afca480e03f62a495c0ad339a46a177471d07ad9 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Tue, 19 Dec 2017 14:31:12 +0100 Subject: [PATCH] Various stuff * search improves * trust existing client certs * translation issue fix Signed-off-by: Mario Danic --- app/build.gradle | 3 ++- .../java/com/nextcloud/talk/adapters/items/CallItem.java | 5 +++-- .../java/com/nextcloud/talk/adapters/items/UserItem.java | 5 ++++- .../java/com/nextcloud/talk/utils/ssl/MagicTrustManager.java | 2 +- .../main/res/{values-es_419 => values-es-rUS}/strings.xml | 0 5 files changed, 10 insertions(+), 5 deletions(-) rename app/src/main/res/{values-es_419 => values-es-rUS}/strings.xml (100%) diff --git a/app/build.gradle b/app/build.gradle index da79e27a6..5f95e0a03 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -113,7 +113,8 @@ dependencies { implementation 'com.github.HITGIF:TextFieldBoxes:1.3.7' - implementation 'eu.davidea:flexible-adapter:5.0.0-rc3' + implementation 'eu.davidea:flexible-adapter:5.0.0-rc4' + implementation 'eu.davidea:flexible-adapter-ui:1.0.0-b1' implementation 'cn.carbs.android:AvatarImageView:1.0.4' diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java index 3d1a71579..015a442d5 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java @@ -38,6 +38,7 @@ import com.nextcloud.talk.persistence.entities.UserEntity; import com.nextcloud.talk.utils.ColorUtils; import com.nextcloud.talk.utils.glide.GlideApp; +import org.apache.commons.lang3.StringUtils; import org.greenrobot.eventbus.EventBus; import java.util.List; @@ -158,8 +159,8 @@ public class CallItem extends AbstractFlexibleItem @Override public boolean filter(String constraint) { - return room.getDisplayName() != null && room.getDisplayName().toLowerCase().trim().contains( - constraint.toLowerCase()); + return room.getDisplayName() != null && + StringUtils.containsIgnoreCase(room.getDisplayName().trim(), constraint); } diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java index 360ef5ecb..ada1ae54e 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java @@ -34,6 +34,8 @@ import com.nextcloud.talk.persistence.entities.UserEntity; import com.nextcloud.talk.utils.ColorUtils; import com.nextcloud.talk.utils.glide.GlideApp; +import org.apache.commons.lang3.StringUtils; + import java.util.List; import butterknife.BindView; @@ -121,7 +123,8 @@ public class UserItem extends AbstractFlexibleItem @Override public boolean filter(String constraint) { - return participant.getName() != null && participant.getName().toLowerCase().trim().contains(constraint.toLowerCase()); + return participant.getName() != null && + StringUtils.containsIgnoreCase(participant.getName().trim(), constraint); } diff --git a/app/src/main/java/com/nextcloud/talk/utils/ssl/MagicTrustManager.java b/app/src/main/java/com/nextcloud/talk/utils/ssl/MagicTrustManager.java index 16670a89a..781afe05c 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/ssl/MagicTrustManager.java +++ b/app/src/main/java/com/nextcloud/talk/utils/ssl/MagicTrustManager.java @@ -145,7 +145,7 @@ public class MagicTrustManager implements X509TrustManager { @Override public void checkClientTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException { - Log.d(TAG, "We don't validate client certificates just yet"); + systemTrustManager.checkClientTrusted(x509Certificates, s); } @Override diff --git a/app/src/main/res/values-es_419/strings.xml b/app/src/main/res/values-es-rUS/strings.xml similarity index 100% rename from app/src/main/res/values-es_419/strings.xml rename to app/src/main/res/values-es-rUS/strings.xml