kopia lustrzana https://github.com/ryukoposting/Signal-Android
Fix possible NPE on wallpaper change.
rodzic
18ede2e900
commit
d844fa0fb5
|
@ -394,8 +394,12 @@ public class ConversationFragment extends LoggingFragment {
|
||||||
|
|
||||||
public void onWallpaperChanged(@Nullable ChatWallpaper wallpaper) {
|
public void onWallpaperChanged(@Nullable ChatWallpaper wallpaper) {
|
||||||
if (list != null) {
|
if (list != null) {
|
||||||
Log.d(TAG, "Notifying adapter that wallpaper state has changed.");
|
ConversationAdapter adapter = getListAdapter();
|
||||||
getListAdapter().onHasWallpaperChanged(wallpaper != null);
|
|
||||||
|
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());
|
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();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue