sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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

14
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
View File

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