Fix several ChatColors issues.

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java

@@ -1533,6 +1533,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
 
     if (messageRecord.isOutgoing()      &&
         !hasNoBubble(messageRecord)     &&
+        !messageRecord.isRemoteDelete() &&
         bodyBubbleCorners != null)
     {
       projections.add(Projection.relativeToViewRoot(bodyBubble, bodyBubbleCorners).translateX(bodyBubble.getTranslationX()));

app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorSelectionRepository.kt

@@ -51,7 +51,7 @@ sealed class ChatColorSelectionRepository(context: Context) {
           if (wallpaper != null) {
             consumer(wallpaper.autoChatColors)
           } else {
-            consumer(ChatColorsPalette.Bubbles.default)
+            consumer(ChatColorsPalette.Bubbles.default.withId(ChatColors.Id.Auto))
           }
         }
       }

app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorSelectionState.kt

@@ -30,7 +30,7 @@ data class ChatColorSelectionState(
       )
     } else {
       ChatColorMappingModel(
-        ChatColorsPalette.Bubbles.default,
+        ChatColorsPalette.Bubbles.default.withId(ChatColors.Id.Auto),
         chatColors?.id == ChatColors.Id.Auto,
         true
       )

app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java

@@ -927,7 +927,7 @@ public class Recipient {
     } else if (getWallpaper() != null) {
       return getWallpaper().getAutoChatColors();
     } else {
-      return ChatColorsPalette.Bubbles.getDefault();
+      return ChatColorsPalette.Bubbles.getDefault().withId(ChatColors.Id.Auto.INSTANCE);
     }
   }
 

app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperFragment.java

@@ -116,13 +116,13 @@ public class ChatWallpaperFragment extends Fragment {
               viewModel.saveWallpaperSelection();
               dialog.dismiss();
             })
-            .setNeutralButton(R.string.ChatWallpaperFragment__reset_all_wallpapers, (dialog, which) -> {
+            .setNegativeButton(R.string.ChatWallpaperFragment__reset_all_wallpapers, (dialog, which) -> {
               viewModel.setWallpaper(null);
               viewModel.setDimInDarkTheme(true);
               viewModel.resetAllWallpaper();
               dialog.dismiss();
             })
-            .setNegativeButton(android.R.string.cancel, (dialog, which) -> {
+            .setNeutralButton(android.R.string.cancel, (dialog, which) -> {
               dialog.dismiss();
             })
             .show();
@@ -136,11 +136,11 @@ public class ChatWallpaperFragment extends Fragment {
               viewModel.clearChatColor();
               dialog.dismiss();
             })
-            .setNeutralButton(R.string.ChatWallpaperFragment__reset_all_colors, (dialog, which) -> {
+            .setNegativeButton(R.string.ChatWallpaperFragment__reset_all_colors, (dialog, which) -> {
               viewModel.resetAllChatColors();
               dialog.dismiss();
             })
-            .setNegativeButton(android.R.string.cancel, (dialog, which) -> {
+            .setNeutralButton(android.R.string.cancel, (dialog, which) -> {
               dialog.dismiss();
             })
             .show();

app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperRepository.java

@@ -44,7 +44,7 @@ class ChatWallpaperRepository {
     } else if (SignalStore.wallpaper().hasWallpaperSet()) {
       return Objects.requireNonNull(SignalStore.wallpaper().getWallpaper()).getAutoChatColors();
     } else {
-      return ChatColorsPalette.Bubbles.getDefault();
+      return ChatColorsPalette.Bubbles.getDefault().withId(ChatColors.Id.Auto.INSTANCE);
     }
   }