Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix an issue with account selector and same account id

This commit is contained in:
tom79 2019-06-09 11:54:48 +02:00
parent 9fc8e8e4e4
commit 165f836440
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/app/fedilab/android/helper/Helper.java
View File

@ -1309,7 +1309,8 @@ public class Helper {
SubMenu currentSubmenu = null;
if( accounts != null)
for(final Account account: accounts) {
if( !currrentUserId.equals(account.getId()) ) {
if( !currrentUserId.equals(account.getId()) || !getLiveInstance(activity).equals(account.getInstance()) ) {
if( !lastInstance.trim().toUpperCase().equals(account.getInstance().trim().toUpperCase())){
lastInstance = account.getInstance().toUpperCase();
currentSubmenu = mainMenu.addSubMenu(account.getInstance().toUpperCase());
@ -1752,7 +1753,7 @@ public class Helper {
for(final Account accountChoice: accounts) {
if( !accountChoice.getAvatar().startsWith("http"))
accountChoice.setAvatar("https://" + accountChoice.getInstance() + accountChoice.getAvatar());
if (currrentUserId != null && !currrentUserId.equals(accountChoice.getId())) {
if (currrentUserId != null && (!currrentUserId.equals(accountChoice.getId()) || !getLiveInstance(activity).equals(accountChoice.getInstance()))) {
icon = new ImageView(activity);
ImageView finalIcon = icon;
Glide.with(activity.getApplicationContext())