From 34eeec4a39fd80ca01c81b2ddf6d4f25e8254606 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Tue, 22 Apr 2025 23:02:57 +0200 Subject: [PATCH] fix some linter warnings --- .../org/thoughtcrime/securesms/ConversationItem.java | 11 +++++------ .../thoughtcrime/securesms/search/SearchFragment.java | 3 +-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationItem.java b/src/main/java/org/thoughtcrime/securesms/ConversationItem.java index 9686528df..ca91a36f4 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationItem.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationItem.java @@ -269,11 +269,10 @@ public class ConversationItem extends BaseConversationItem R.attr.conversation_item_incoming_bubble_color, R.attr.conversation_item_outgoing_bubble_color, }; - final TypedArray attrs = context.obtainStyledAttributes(attributes); - - incomingBubbleColor = attrs.getColor(0, Color.WHITE); - outgoingBubbleColor = attrs.getColor(1, Color.WHITE); - attrs.recycle(); + try (TypedArray attrs = context.obtainStyledAttributes(attributes)) { + incomingBubbleColor = attrs.getColor(0, Color.WHITE); + outgoingBubbleColor = attrs.getColor(1, Color.WHITE); + } } @Override @@ -900,7 +899,7 @@ public class ConversationItem extends BaseConversationItem .setPositiveButton(android.R.string.ok, (dialog, which) -> { try { List contactIds = rpc.importVcard(dcContext.getAccountId(), path); - if (contactIds.size() > 0) { + if (!contactIds.isEmpty()) { int chatId = dcContext.createChatByContactId(contactIds.get(0)); if (chatId != 0) { Intent intent = new Intent(context, ConversationActivity.class); diff --git a/src/main/java/org/thoughtcrime/securesms/search/SearchFragment.java b/src/main/java/org/thoughtcrime/securesms/search/SearchFragment.java index 5f88ab463..486c3451d 100644 --- a/src/main/java/org/thoughtcrime/securesms/search/SearchFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/search/SearchFragment.java @@ -47,7 +47,6 @@ public class SearchFragment extends BaseConversationListFragment public static final String TAG = "SearchFragment"; private TextView noResultsView; - private RecyclerView listView; private StickyHeaderDecoration listDecoration; private SearchViewModel viewModel; @@ -93,7 +92,7 @@ public class SearchFragment extends BaseConversationListFragment @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { noResultsView = view.findViewById(R.id.search_no_results); - listView = view.findViewById(R.id.search_list); + RecyclerView listView = view.findViewById(R.id.search_list); fab = view.findViewById(R.id.fab); listAdapter = new SearchListAdapter(getContext(), GlideApp.with(this), this);