2 files changed, 7 insertions(+), 3 deletions(-)

M src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
M src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java

@@ 2431,6 2431,8 @@ public class XmppConnectionService extends Service {
     }
 
     private void archiveConversation(Conversation conversation, final boolean maySynchronizeWithBookmarks) {
+        if (isOnboarding()) return;
+
         getNotificationService().clear(conversation);
         conversation.setStatus(Conversation.STATUS_ARCHIVED);
         conversation.setNextMessage(null);

@@ 205,7 205,7 @@ public class ConversationsOverviewFragment extends XmppFragment {
 		}
 	};
 
-	private ItemTouchHelper touchHelper;
+	private ItemTouchHelper touchHelper = null;
 
 	public static Conversation getSuggestion(Activity activity) {
 		final Conversation exception;


@@ 305,8 305,6 @@ public class ConversationsOverviewFragment extends XmppFragment {
 		this.binding.list.setAdapter(this.conversationsAdapter);
 		this.binding.list.setLayoutManager(new LinearLayoutManager(getActivity(),LinearLayoutManager.VERTICAL,false));
 		registerForContextMenu(this.binding.list);
-		this.touchHelper = new ItemTouchHelper(this.callback);
-		this.touchHelper.attachToRecyclerView(this.binding.list);
 		return binding.getRoot();
 	}
 


@@ 387,6 385,10 @@ public class ConversationsOverviewFragment extends XmppFragment {
 
 	@Override
 	public void onBackendConnected() {
+		if (this.touchHelper == null && (activity.xmppConnectionService == null || !activity.xmppConnectionService.isOnboarding())) {
+			this.touchHelper = new ItemTouchHelper(this.callback);
+			this.touchHelper.attachToRecyclerView(this.binding.list);
+		}
 		refresh();
 	}