From 25fa08d8a871904584be38204025d96428d1e5a6 Mon Sep 17 00:00:00 2001 From: tom79 Date: Thu, 21 Nov 2019 17:52:33 +0100 Subject: [PATCH] Fix potential crashes --- .../app/fedilab/android/activities/PeertubeActivity.java | 3 --- .../java/app/fedilab/android/drawers/StatusListAdapter.java | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java b/app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java index 99bb0048f..6a8612f02 100644 --- a/app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java @@ -165,9 +165,6 @@ public class PeertubeActivity extends BaseActivity implements OnRetrievePeertube case Helper.THEME_LIGHT: setTheme(R.style.AppTheme_Fedilab); break; - case Helper.THEME_DARK: - setTheme(R.style.AppThemeDark); - break; case Helper.THEME_BLACK: setTheme(R.style.AppThemeBlack); break; diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java index c898109cc..38b7ffb31 100644 --- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java @@ -361,7 +361,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct return; final List accounts = apiResponse.getAccounts(); - if (accounts != null && accounts.size() > 0) { + if (accounts != null && accounts.size() > 0 && toot_content != null) { int currentCursorPosition = toot_content.getSelectionStart(); AccountsSearchAdapter accountsListAdapter = new AccountsSearchAdapter(context, accounts); toot_content.setThreshold(1); @@ -415,9 +415,9 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct @Override public void onRetrieveSearchEmoji(List 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); toot_content.setThreshold(1); toot_content.setAdapter(emojisSearchAdapter);