Change summary
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 4
src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java | 3
2 files changed, 1 insertion(+), 6 deletions(-)
Detailed changes
@@ -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();
@@ -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();