Fix possible NPE on wallpaper change.

fork-5.53.8
Greyson Parrelli 2021-01-21 22:28:36 -05:00
rodzic 18ede2e900
commit d844fa0fb5
1 zmienionych plików z 7 dodań i 3 usunięć

Wyświetl plik

@ -394,10 +394,14 @@ public class ConversationFragment extends LoggingFragment {
public void onWallpaperChanged(@Nullable ChatWallpaper wallpaper) { public void onWallpaperChanged(@Nullable ChatWallpaper wallpaper) {
if (list != null) { if (list != null) {
ConversationAdapter adapter = getListAdapter();
if (adapter != null) {
Log.d(TAG, "Notifying adapter that wallpaper state has changed."); Log.d(TAG, "Notifying adapter that wallpaper state has changed.");
getListAdapter().onHasWallpaperChanged(wallpaper != null); getListAdapter().onHasWallpaperChanged(wallpaper != null);
} }
} }
}
private int getStartPosition() { private int getStartPosition() {
return conversationViewModel.getArgs().getStartingPosition(); return conversationViewModel.getArgs().getStartingPosition();
@ -624,7 +628,7 @@ public class ConversationFragment extends LoggingFragment {
menu.findItem(R.id.menu_context_copy).setVisible(menuState.shouldShowCopyAction()); menu.findItem(R.id.menu_context_copy).setVisible(menuState.shouldShowCopyAction());
} }
private ConversationAdapter getListAdapter() { private @Nullable ConversationAdapter getListAdapter() {
return (ConversationAdapter) list.getAdapter(); return (ConversationAdapter) list.getAdapter();
} }