Roster: get rid of duplicate startup dialogs, hopefully

tinelix · Feb 3, 2020 · 9498e71 · 9498e71
1 parent fecae86
commit 9498e71
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/org/yaxim/androidclient/MainWindow.java b/src/org/yaxim/androidclient/MainWindow.java
@@ -87,6 +87,7 @@ public class MainWindow extends ThemedActivity implements ExpandableListView.OnC
 	private HashMap<String, Boolean> mGroupsExpanded = new HashMap<String, Boolean>();
 
 	private boolean mHandledIntent = false;
+	FirstStartDialog mFirstStartDialog;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -995,7 +996,9 @@ private void showFirstStartUpDialog() {
 			}
 			preauth = data.getQueryParameter("preauth");
 		}
-		FirstStartDialog mFirstStartDialog = new FirstStartDialog(this, serviceAdapter);
+		if (mFirstStartDialog != null)
+			mFirstStartDialog.dismiss();
+		mFirstStartDialog = new FirstStartDialog(this, serviceAdapter);
 		mFirstStartDialog.show();
 		if (!TextUtils.isEmpty(jid))
 			mFirstStartDialog.setJID(jid, preauth);