gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-08-04 10:35:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

spotbugs: use literal as comparison base

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2021-06-30 10:49:30 +02:00
parent 7bca54373f
commit 78cc0df7bd
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
2 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.java
View File

@ -45,13 +45,16 @@ import eu.davidea.flexibleadapter.utils.FlexibleUtils;
public class MentionAutocompleteItem extends AbstractFlexibleItem<UserItem.UserItemViewHolder> public class MentionAutocompleteItem extends AbstractFlexibleItem<UserItem.UserItemViewHolder>
implements IFilterable<String> { implements IFilterable<String> {
public static final String SOURCE_CALLS = "calls";
public static final String SOURCE_GUESTS = "guests";
private String objectId; private String objectId;
private String displayName; private String displayName;
private String source; private String source;
private UserEntity currentUser; private UserEntity currentUser;
private Context context; private Context context;
public MentionAutocompleteItem(String objectId, public MentionAutocompleteItem(
String objectId,
String displayName, String displayName,
String source, String source,
UserEntity currentUser, UserEntity currentUser,
@ -102,18 +105,26 @@ public class MentionAutocompleteItem extends AbstractFlexibleItem<UserItem.UserI
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")
@Override @Override
public void bindViewHolder(FlexibleAdapter<IFlexible> adapter, UserItem.UserItemViewHolder holder, int position, List<Object> payloads) { public void bindViewHolder(
FlexibleAdapter<IFlexible> adapter,
UserItem.UserItemViewHolder holder,
int position,
List<Object> payloads) {
holder.contactDisplayName.setTextColor(ResourcesCompat.getColor(context.getResources(), holder.contactDisplayName.setTextColor(ResourcesCompat.getColor(context.getResources(),
R.color.conversation_item_header, R.color.conversation_item_header,
null)); null));
if (adapter.hasFilter()) { if (adapter.hasFilter()) {
FlexibleUtils.highlightText(holder.contactDisplayName, displayName, FlexibleUtils.highlightText(holder.contactDisplayName,
String.valueOf(adapter.getFilter(String.class)), NextcloudTalkApplication.Companion.getSharedApplication() displayName,
String.valueOf(adapter.getFilter(String.class)),
NextcloudTalkApplication.Companion.getSharedApplication()
.getResources().getColor(R.color.colorPrimary)); .getResources().getColor(R.color.colorPrimary));
if (holder.contactMentionId != null) { if (holder.contactMentionId != null) {
FlexibleUtils.highlightText(holder.contactMentionId, "@" + objectId, FlexibleUtils.highlightText(holder.contactMentionId,
String.valueOf(adapter.getFilter(String.class)), NextcloudTalkApplication.Companion.getSharedApplication() "@" + objectId,
String.valueOf(adapter.getFilter(String.class)),
NextcloudTalkApplication.Companion.getSharedApplication()
.getResources().getColor(R.color.colorPrimary)); .getResources().getColor(R.color.colorPrimary));
} }
} else { } else {
@ -123,16 +134,19 @@ public class MentionAutocompleteItem extends AbstractFlexibleItem<UserItem.UserI
} }
} }
if (source.equals("calls")) { if (SOURCE_CALLS.equals(source)) {
holder.simpleDraweeView.setImageResource(R.drawable.ic_circular_group); holder.simpleDraweeView.setImageResource(R.drawable.ic_circular_group);
} else { } else {
String avatarId = objectId; String avatarId = objectId;
String avatarUrl = ApiUtils.getUrlForAvatarWithName(currentUser.getBaseUrl(), String avatarUrl = ApiUtils.getUrlForAvatarWithName(currentUser.getBaseUrl(),
avatarId, R.dimen.avatar_size_big); avatarId, R.dimen.avatar_size_big);
if (source.equals("guests")) { if (SOURCE_GUESTS.equals(source)) {
avatarId = displayName; avatarId = displayName;
avatarUrl = ApiUtils.getUrlForAvatarWithNameForGuests(currentUser.getBaseUrl(), avatarId, R.dimen.avatar_size_big); avatarUrl = ApiUtils.getUrlForAvatarWithNameForGuests(
currentUser.getBaseUrl(),
avatarId,
R.dimen.avatar_size_big);
} }
holder.simpleDraweeView.setController(null); holder.simpleDraweeView.setController(null);
@ -147,8 +161,15 @@ public class MentionAutocompleteItem extends AbstractFlexibleItem<UserItem.UserI
@Override @Override
public boolean filter(String constraint) { public boolean filter(String constraint) {
return objectId != null && Pattern.compile(constraint, return objectId != null &&
Pattern.CASE_INSENSITIVE | Pattern.LITERAL).matcher(objectId).find() Pattern
|| displayName != null && Pattern.compile(constraint, Pattern.CASE_INSENSITIVE | Pattern.LITERAL).matcher(displayName).find(); .compile(constraint, Pattern.CASE_INSENSITIVE | Pattern.LITERAL)
.matcher(objectId)
.find() ||
displayName != null &&
Pattern
.compile(constraint, Pattern.CASE_INSENSITIVE | Pattern.LITERAL)
.matcher(displayName)
.find();
} }
} }

2
scripts/analysis/findbugs-results.txt
View File

@ -1 +1 @@
441 439