Fix potential crashes

This commit is contained in:
tom79 2019-11-21 17:52:33 +01:00
parent 0609721c96
commit 25fa08d8a8
2 changed files with 3 additions and 6 deletions

View File

@ -165,9 +165,6 @@ public class PeertubeActivity extends BaseActivity implements OnRetrievePeertube
case Helper.THEME_LIGHT: case Helper.THEME_LIGHT:
setTheme(R.style.AppTheme_Fedilab); setTheme(R.style.AppTheme_Fedilab);
break; break;
case Helper.THEME_DARK:
setTheme(R.style.AppThemeDark);
break;
case Helper.THEME_BLACK: case Helper.THEME_BLACK:
setTheme(R.style.AppThemeBlack); setTheme(R.style.AppThemeBlack);
break; break;

View File

@ -361,7 +361,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
return; return;
final List<Account> accounts = apiResponse.getAccounts(); final List<Account> accounts = apiResponse.getAccounts();
if (accounts != null && accounts.size() > 0) { if (accounts != null && accounts.size() > 0 && toot_content != null) {
int currentCursorPosition = toot_content.getSelectionStart(); int currentCursorPosition = toot_content.getSelectionStart();
AccountsSearchAdapter accountsListAdapter = new AccountsSearchAdapter(context, accounts); AccountsSearchAdapter accountsListAdapter = new AccountsSearchAdapter(context, accounts);
toot_content.setThreshold(1); toot_content.setThreshold(1);
@ -415,9 +415,9 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
@Override @Override
public void onRetrieveSearchEmoji(List<Emojis> emojis) { public void onRetrieveSearchEmoji(List<Emojis> emojis) {
int currentCursorPosition = toot_content.getSelectionStart();
if (emojis != null && emojis.size() > 0) { if (emojis != null && emojis.size() > 0 && toot_content != null) {
int currentCursorPosition = toot_content.getSelectionStart();
EmojisSearchAdapter emojisSearchAdapter = new EmojisSearchAdapter(context, emojis); EmojisSearchAdapter emojisSearchAdapter = new EmojisSearchAdapter(context, emojis);
toot_content.setThreshold(1); toot_content.setThreshold(1);
toot_content.setAdapter(emojisSearchAdapter); toot_content.setAdapter(emojisSearchAdapter);