mirror of
https://github.com/nextcloud/talk-android
synced 2025-06-19 19:49:33 +01:00
Various stuff
* search improves * trust existing client certs * translation issue fix Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
parent
fe956853aa
commit
afca480e03
@ -113,7 +113,8 @@ dependencies {
|
|||||||
|
|
||||||
implementation 'com.github.HITGIF:TextFieldBoxes:1.3.7'
|
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'
|
implementation 'cn.carbs.android:AvatarImageView:1.0.4'
|
||||||
|
|
||||||
|
@ -38,6 +38,7 @@ import com.nextcloud.talk.persistence.entities.UserEntity;
|
|||||||
import com.nextcloud.talk.utils.ColorUtils;
|
import com.nextcloud.talk.utils.ColorUtils;
|
||||||
import com.nextcloud.talk.utils.glide.GlideApp;
|
import com.nextcloud.talk.utils.glide.GlideApp;
|
||||||
|
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.greenrobot.eventbus.EventBus;
|
import org.greenrobot.eventbus.EventBus;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -158,8 +159,8 @@ public class CallItem extends AbstractFlexibleItem<CallItem.RoomItemViewHolder>
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean filter(String constraint) {
|
public boolean filter(String constraint) {
|
||||||
return room.getDisplayName() != null && room.getDisplayName().toLowerCase().trim().contains(
|
return room.getDisplayName() != null &&
|
||||||
constraint.toLowerCase());
|
StringUtils.containsIgnoreCase(room.getDisplayName().trim(), constraint);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -34,6 +34,8 @@ import com.nextcloud.talk.persistence.entities.UserEntity;
|
|||||||
import com.nextcloud.talk.utils.ColorUtils;
|
import com.nextcloud.talk.utils.ColorUtils;
|
||||||
import com.nextcloud.talk.utils.glide.GlideApp;
|
import com.nextcloud.talk.utils.glide.GlideApp;
|
||||||
|
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import butterknife.BindView;
|
import butterknife.BindView;
|
||||||
@ -121,7 +123,8 @@ public class UserItem extends AbstractFlexibleItem<UserItem.UserItemViewHolder>
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean filter(String constraint) {
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -145,7 +145,7 @@ public class MagicTrustManager implements X509TrustManager {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void checkClientTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
|
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
|
@Override
|
||||||
|
Loading…
Reference in New Issue
Block a user