empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix possible NPE on wallpaper change.

Browse source
This commit is contained in:
Greyson Parrelli 2021-01-21 22:28:36 -05:00
parent 18ede2e900
commit d844fa0fb5
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
View file

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