Fix NPE

Stephen Paul Weber created 2 years ago

Change summary

src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java | 11 
1 file changed, 6 insertions(+), 5 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java

@@ -387,11 +387,6 @@ public class ConversationsOverviewFragment extends XmppFragment {
 	@Override
 	public void onBackendConnected() {
 		refresh();
-		if (activity.xmppConnectionService.isOnboarding()) {
-			binding.fab.setVisibility(View.GONE);
-		} else {
-			binding.fab.setVisibility(View.VISIBLE);
-		}
 	}
 
 	@Override
@@ -491,6 +486,12 @@ public class ConversationsOverviewFragment extends XmppFragment {
 		if (scrollState != null) {
 			setScrollPosition(scrollState);
 		}
+
+		if (activity.xmppConnectionService != null && activity.xmppConnectionService.isOnboarding()) {
+			binding.fab.setVisibility(View.GONE);
+		} else {
+			binding.fab.setVisibility(View.VISIBLE);
+		}
 	}
 
 	private void setScrollPosition(ScrollState scrollPosition) {