owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A bunch of crash fixes

Browse Source
This commit is contained in:
Grishka
2023-07-02 12:03:21 +03:00
parent 66489d79be
commit 85d4c1fc24
10 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
View File

@@ -255,7 +255,8 @@ public class AccountSwitcherSheet extends BottomSheet{
}
return;
}
AccountSessionManager.getInstance().setLastActiveAccountID(item.getID());
if(AccountSessionManager.getInstance().tryGetAccount(item.getID())!=null)
AccountSessionManager.getInstance().setLastActiveAccountID(item.getID());
activity.finish();
activity.startActivity(new Intent(activity, MainActivity.class));
}

4
mastodon/src/main/java/org/joinmastodon/android/ui/SearchViewHelper.java
View File

@@ -126,4 +126,8 @@ public class SearchViewHelper{
public View getDivider(){
return divider;
}
public EditText getSearchEdit(){
return searchEdit;
}
}

2
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
View File

@@ -280,6 +280,8 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
}
private void updateOptionsMenu(){
if(item.parentFragment.getActivity()==null)
return;
Account account=item.user;
Menu menu=optionsMenu.getMenu();
boolean isOwnPost=AccountSessionManager.getInstance().isSelf(item.parentFragment.getAccountID(), account);