remove duplicate call to onConversationArchived()
This commit is contained in:
parent
f2b0a10c22
commit
3dc749b22b
|
@ -159,7 +159,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
activity.xmppConnectionService.archiveConversation(conversation);
|
activity.xmppConnectionService.archiveConversation(conversation);
|
||||||
activity.onConversationArchived(conversation);
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
private OnClickListener joinMuc = new OnClickListener() {
|
private OnClickListener joinMuc = new OnClickListener() {
|
||||||
|
@ -1130,7 +1129,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
|
||||||
break;
|
break;
|
||||||
case R.id.action_archive:
|
case R.id.action_archive:
|
||||||
activity.xmppConnectionService.archiveConversation(conversation);
|
activity.xmppConnectionService.archiveConversation(conversation);
|
||||||
activity.onConversationArchived(conversation);
|
|
||||||
break;
|
break;
|
||||||
case R.id.action_contact_details:
|
case R.id.action_contact_details:
|
||||||
activity.switchToContactDetails(conversation.getContact());
|
activity.switchToContactDetails(conversation.getContact());
|
||||||
|
|
|
@ -227,9 +227,6 @@ public class ConversationsOverviewFragment extends XmppFragment implements Enhan
|
||||||
if (position == 0 && this.conversationsAdapter.getCount() == 0) {
|
if (position == 0 && this.conversationsAdapter.getCount() == 0) {
|
||||||
final Conversation c = swipedConversation.pop();
|
final Conversation c = swipedConversation.pop();
|
||||||
activity.xmppConnectionService.archiveConversation(c);
|
activity.xmppConnectionService.archiveConversation(c);
|
||||||
if (activity instanceof OnConversationArchived) {
|
|
||||||
((OnConversationArchived) activity).onConversationArchived(c);
|
|
||||||
}
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
final boolean formerlySelected = ConversationFragment.getConversation(getActivity()) == swipedConversation.peek();
|
final boolean formerlySelected = ConversationFragment.getConversation(getActivity()) == swipedConversation.peek();
|
||||||
|
|
Loading…
Reference in New Issue