From 3dc749b22b26ce1e5a63b464dd382b8e222cda8d Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 29 Mar 2018 16:23:36 +0200 Subject: [PATCH] remove duplicate call to onConversationArchived() --- .../java/eu/siacs/conversations/ui/ConversationFragment.java | 4 +--- .../siacs/conversations/ui/ConversationsOverviewFragment.java | 3 --- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index ea6184b6d..e5fb96445 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -159,7 +159,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke @Override public void onClick(View v) { activity.xmppConnectionService.archiveConversation(conversation); - activity.onConversationArchived(conversation); } }; private OnClickListener joinMuc = new OnClickListener() { @@ -1130,7 +1129,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke break; case R.id.action_archive: activity.xmppConnectionService.archiveConversation(conversation); - activity.onConversationArchived(conversation); break; case R.id.action_contact_details: activity.switchToContactDetails(conversation.getContact()); @@ -1806,7 +1804,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke stopScrolling(); Log.d(Config.LOGTAG, "reInit(hasExtras=" + Boolean.toString(hasExtras) + ")"); - + if (this.conversation.isRead() && hasExtras) { Log.d(Config.LOGTAG, "trimming conversation"); this.conversation.trim(); diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java index 3a96718a2..d67bb13ee 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java @@ -227,9 +227,6 @@ public class ConversationsOverviewFragment extends XmppFragment implements Enhan if (position == 0 && this.conversationsAdapter.getCount() == 0) { final Conversation c = swipedConversation.pop(); activity.xmppConnectionService.archiveConversation(c); - if (activity instanceof OnConversationArchived) { - ((OnConversationArchived) activity).onConversationArchived(c); - } return null; } final boolean formerlySelected = ConversationFragment.getConversation(getActivity()) == swipedConversation.peek();