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

Distinguish clear copy between global and single recipient wallpapers.

Browse source
This commit is contained in:
Alex Hart 2021-01-22 09:40:05 -04:00
parent dbac9bf9f6
commit 4bf59a55da
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperFragment.java
View file

@ -81,7 +81,8 @@ public class ChatWallpaperFragment extends Fragment {
updateDividerVisibility();
clearWallpaper.setOnClickListener(unused -> {
confirmAction(R.string.ChatWallpaperFragment__clear_wallpaper_question_mark,
confirmAction(viewModel.isGlobal() ? R.string.ChatWallpaperFragment__clear_wallpaper_this_will_not
: R.string.ChatWallpaperFragment__clear_wallpaper_for_this_chat,
R.string.ChatWallpaperFragment__clear,
() -> {
viewModel.setWallpaper(null);

3
app/src/main/res/values/strings.xml
View file

@ -2834,7 +2834,8 @@
<string name="ChatWallpaperFragment__set_wallpaper">Set wallpaper</string>
<string name="ChatWallpaperFragment__dark_theme_dims_wallpaper">Dark theme dims wallpaper</string>
<string name="ChatWallpaperFragment__clear_wallpaper">Clear wallpaper</string>
<string name="ChatWallpaperFragment__clear_wallpaper_question_mark">Clear wallpaper?</string>
<string name="ChatWallpaperFragment__clear_wallpaper_for_this_chat">Clear wallpaper for this chat?</string>
<string name="ChatWallpaperFragment__clear_wallpaper_this_will_not">Clear wallpaper? This will not clear custom wallpapers you’ve set for your chats.</string>
<string name="ChatWallpaperFragment__reset_all_wallpapers">Reset all wallpapers</string>
<string name="ChatWallpaperFragment__reset_all_wallpapers_question_mark">Reset all wallpapers?</string>
<string name="ChatWallpaperFragment__contact_name">Contact name</string>