awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

fix ConversationListActivity

Browse Source
This commit is contained in:
adbenitez
2026-01-22 18:43:54 +01:00
parent fcd16d9e32
commit 9e1b9775e2
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java
+18 -5
View File
@@ -123,6 +123,9 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
@Override
protected void onCreate(Bundle icicle, boolean ready) {
addDeviceMessages(getIntent().getBooleanExtra(FROM_WELCOME, false));
if (getIntent().getIntExtra(ACCOUNT_ID_EXTRA, -1) <= 0) {
getIntent().putExtra(ACCOUNT_ID_EXTRA, DcHelper.getContext(this).getAccountId());
}
// create view
setContentView(R.layout.conversation_list_activity);
@@ -254,6 +257,9 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
}
super.onNewIntent(intent);
setIntent(intent);
if (getIntent().getIntExtra(ACCOUNT_ID_EXTRA, -1) <= 0) {
getIntent().putExtra(ACCOUNT_ID_EXTRA, DcHelper.getContext(this).getAccountId());
}
refresh();
conversationListFragment.onNewIntent();
invalidateOptionsMenu();
@@ -266,12 +272,14 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
DcHelper.getNotificationCenter(this).removeAllNotifications(accountId);
}
if (accountId != dcContext.getAccountId()) {
AccountManager.getInstance().switchAccountAndStartActivity(this, accountId);
AccountManager.getInstance().switchAccount(this, accountId);
onProfileSwitched(accountId);
} else {
refreshAvatar();
refreshUnreadIndicator();
refreshTitle();
}
refreshAvatar();
refreshUnreadIndicator();
refreshTitle();
handleOpenpgp4fpr();
if (isDirectSharing(this)) {
openConversation(getDirectSharingChatId(this), -1);
@@ -625,7 +633,12 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
accounts.removeAccount(profileId);
if (selected) {
DcContext selAcc = accounts.getSelectedAccount();
AccountManager.getInstance().switchAccountAndStartActivity(this, selAcc.isOk()? selAcc.getAccountId() : 0);
if (selAcc.isOk()) {
AccountManager.getInstance().switchAccount(this, selAcc.getAccountId());
onProfileSwitched(selAcc.getAccountId());
} else {
AccountManager.getInstance().switchAccountAndStartActivity(this, 0);
}
} else {
AccountManager.getInstance().showSwitchAccountMenu(this, false);
}