call StartConversationActivity in init mode only after adding the first account

Daniel Gultsch created 10 years ago

Change summary

src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java           | 4 
src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java | 4 
2 files changed, 6 insertions(+), 2 deletions(-)

Detailed changes

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

@@ -223,7 +223,9 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 				if (avatar != null) {
 					intent = new Intent(getApplicationContext(),
 							StartConversationActivity.class);
-					intent.putExtra("init",true);
+					if (xmppConnectionService != null && xmppConnectionService.getAccounts().size() == 1) {
+						intent.putExtra("init", true);
+					}
 				} else {
 					intent = new Intent(getApplicationContext(),
 							PublishProfilePictureActivity.class);

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

@@ -116,7 +116,9 @@ public class PublishProfilePictureActivity extends XmppActivity {
 				if (mInitialAccountSetup) {
 					Intent intent = new Intent(getApplicationContext(),
 							StartConversationActivity.class);
-					intent.putExtra("init",true);
+					if (xmppConnectionService != null && xmppConnectionService.getAccounts().size() == 1) {
+						intent.putExtra("init", true);
+					}
 					startActivity(intent);
 				}
 				finish();