diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java index 609edd870..cae5e5cf4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java @@ -2161,7 +2161,9 @@ public class ConversationParentFragment extends Fragment int toolbarTextAndIconColor = getResources().getColor(R.color.signal_colorOnSurface); toolbar.setTitleTextColor(toolbarTextAndIconColor); setToolbarActionItemTint(toolbar, toolbarTextAndIconColor); - WindowUtil.setNavigationBarColor(requireActivity(), getResources().getColor(R.color.signal_colorBackground)); + if (!releaseChannelUnmute.resolved()) { + WindowUtil.setNavigationBarColor(requireActivity(), getResources().getColor(R.color.signal_colorBackground)); + } } fragment.onWallpaperChanged(chatWallpaper); messageRequestBottomView.setWallpaperEnabled(chatWallpaper != null); @@ -2719,8 +2721,10 @@ public class ConversationParentFragment extends Fragment unmuteBanner.setVisibility(View.VISIBLE); unmuteBanner.findViewById(R.id.conversation_activity_unmute_button) .setOnClickListener(v -> handleUnmuteNotifications()); + WindowUtil.setNavigationBarColor(requireActivity(), getResources().getColor(R.color.signal_colorSurface2)); } else if (releaseChannelUnmute.resolved()) { releaseChannelUnmute.get().setVisibility(View.GONE); + WindowUtil.setNavigationBarColor(requireActivity(), getResources().getColor(R.color.signal_colorBackground)); } } else { boolean inactivePushGroup = isPushGroupConversation() && !recipient.isActiveGroup(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java index d0567e2cf..2158ed7d1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java @@ -1046,6 +1046,8 @@ public class Recipient { public @Nullable ChatWallpaper getWallpaper() { if (wallpaper != null) { return wallpaper; + } else if (isReleaseNotes()) { + return null; } else { return SignalStore.wallpaper().getWallpaper(); }