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

Fix bad logic in chat color selection.

Browse source
This commit is contained in:
Alex Hart 2021-06-02 20:30:26 -03:00 • committed by Cody Henthorne
parent 52ef4c6235
commit ad6f51901e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
View file

@ -911,13 +911,13 @@ public class Recipient {
}
public @NonNull ChatColors getChatColors() {
if (chatColors != null && chatColors.getId() instanceof ChatColors.Id.Custom) {
if (chatColors != null && !(chatColors.getId() instanceof ChatColors.Id.Auto)) {
return chatColors;
} if (chatColors != null && chatColors.getId() instanceof ChatColors.Id.Auto) {
} if (chatColors != null) {
return getAutoChatColor();
} else {
ChatColors global = SignalStore.chatColorsValues().getChatColors();
if (global != null && global.getId() instanceof ChatColors.Id.Custom) {
if (global != null && !(global.getId() instanceof ChatColors.Id.Auto)) {
return global;
} else {
return getAutoChatColor();