narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

launch edit account activity when starting Conversations for the first time (fixed regression)

Browse source
This commit is contained in:
iNPUTmice 2015-02-19 13:48:40 +01:00
parent 77a9ddb984
commit 2e596c0bd4
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
View file

@ -777,6 +777,7 @@ public class ConversationActivity extends XmppActivity
updateConversationList(); updateConversationList();
if (xmppConnectionService.getAccounts().size() == 0) { if (xmppConnectionService.getAccounts().size() == 0) {
startActivity(new Intent(this, EditAccountActivity.class)); startActivity(new Intent(this, EditAccountActivity.class));
finish();
} else if (conversationList.size() <= 0) { } else if (conversationList.size() <= 0) {
startActivity(new Intent(this, StartConversationActivity.class)); startActivity(new Intent(this, StartConversationActivity.class));
finish(); finish();
@ -1008,14 +1009,17 @@ public class ConversationActivity extends XmppActivity
@Override @Override
protected void refreshUiReal() { protected void refreshUiReal() {
updateConversationList(); updateConversationList();
if (conversationList.size() == 0) { if (xmppConnectionService != null && xmppConnectionService.getAccounts().size() == 0) {
startActivity(new Intent(getApplicationContext(), startActivity(new Intent(this, EditAccountActivity.class));
StartConversationActivity.class));
finish(); finish();
} } else if (conversationList.size() == 0) {
startActivity(new Intent(this, StartConversationActivity.class));
finish();
} else {
ConversationActivity.this.mConversationFragment.updateMessages(); ConversationActivity.this.mConversationFragment.updateMessages();
updateActionBarTitle(); updateActionBarTitle();
} }
}
@Override @Override
public void onAccountUpdate() { public void onAccountUpdate() {