diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java index 93be149b..47e31299 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java @@ -26,6 +26,7 @@ import com.moez.QKSMS.R; import com.moez.QKSMS.common.BlockedConversationHelper; import com.moez.QKSMS.common.DialogHelper; import com.moez.QKSMS.common.LiveViewManager; +import com.moez.QKSMS.data.Contact; import com.moez.QKSMS.ui.dialog.conversationdetails.ConversationDetailsDialog; import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.common.utils.ColorUtils; @@ -282,6 +283,21 @@ public class ConversationListFragment extends QKFragment implements LoaderManage public void onDestroy() { super.onDestroy(); BlockedConversationHelper.FutureBlockedConversationObservable.getInstance().deleteObserver(this); + + if (null == mRecyclerView) { + return; + } + try { + for (int i = 0; i < mRecyclerView.getChildCount(); i++) { + View child = mRecyclerView.getChildAt(i); + RecyclerView.ViewHolder holder = mRecyclerView.getChildViewHolder(child); + if (holder instanceof ConversationListViewHolder) { + Contact.removeListener((ConversationListViewHolder) holder); + } + } + } catch (Exception ignored) { + // + } } public Loader onCreateLoader(int id, Bundle args) { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListViewHolder.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListViewHolder.java index ae2a9519..2e7d3712 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListViewHolder.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListViewHolder.java @@ -85,13 +85,10 @@ public class ConversationListViewHolder extends ClickyViewHolder i final ConversationLegacy conversationLegacy = new ConversationLegacy(mContext, mData.getThreadId()); if (shouldUpdate) { - ((MainActivity) mContext).runOnUiThread(new Runnable() { - @Override - public void run() { - mAvatarView.setImageDrawable(drawable); - mAvatarView.setContactName(name); - fromView.setText(formatMessage(mData, conversationLegacy)); - } + mContext.runOnUiThread(() -> { + mAvatarView.setImageDrawable(drawable); + mAvatarView.setContactName(name); + fromView.setText(formatMessage(mData, conversationLegacy)); }); } }