From 845fcf086429019f6f66e1581dc03572c04397a6 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Thu, 12 Jul 2018 12:28:11 -0700 Subject: [PATCH] Remove ability to set group conversation colors (for now). --- build.gradle | 6 +++--- .../securesms/RecipientPreferenceActivity.java | 11 ++--------- .../securesms/jobs/MultiDeviceGroupUpdateJob.java | 2 +- .../thoughtcrime/securesms/recipients/Recipient.java | 3 ++- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index f3fb18d1ae..8c66b93f2f 100644 --- a/build.gradle +++ b/build.gradle @@ -78,7 +78,7 @@ dependencies { compile('org.whispersystems:libpastelog:1.1.2') { exclude group: 'com.squareup.okhttp3', module: 'okhttp' } - compile 'org.whispersystems:signal-service-android:2.7.7' + compile 'org.whispersystems:signal-service-android:2.7.6' compile 'org.whispersystems:webrtc-android:M67' compile "me.leolin:ShortcutBadger:1.1.16" @@ -171,7 +171,7 @@ dependencyVerification { 'com.google.android.gms:play-services-maps:45e8021e7ddac4a44a82a0e9698991389ded3023d35c58f38dbd86d54211ec0e', 'com.google.android.exoplayer:exoplayer:955085aa611a8f7cf6c61b88ae03d1a392f4ad94c9bfbc153f3dedb9ffb14718', 'org.whispersystems:libpastelog:fe56b4db9ec743c8b565e3e4caa9228fafe132dc0bf82000d6e359b97a81177c', - 'org.whispersystems:signal-service-android:066a2d2f8309eb1e098345fb543cbb6f03b3f5975820b50892719a93a61e68c0', + 'org.whispersystems:signal-service-android:823eed29e64fb0aa30d2078cb5ec0245e2a0713a4028121329c5c28788ef27f8', 'org.whispersystems:webrtc-android:235b3b79f0ea917e4cda447a9919cb8e17a74ae59da6fb8252503b787fe0828f', 'me.leolin:ShortcutBadger:e3cb3e7625892129b0c92dd5e4bc649faffdd526d5af26d9c45ee31ff8851774', 'se.emilsjolander:stickylistheaders:a08ca948aa6b220f09d82f16bbbac395f6b78897e9eeac6a9f0b0ba755928eeb', @@ -218,7 +218,7 @@ dependencyVerification { 'com.github.bumptech.glide:gifdecoder:59ccf3bb0cec11dab4b857382cbe0b171111b6fc62bf141adce4e1180889af15', 'com.android.support:support-annotations:af05330d997eb92a066534dbe0a3ea24347d26d7001221092113ae02a8f233da', 'org.whispersystems:signal-protocol-android:5b8acded7f2a40178eb90ab8e8cbfec89d170d91b3ff5e78487d1098df6185a1', - 'org.whispersystems:signal-service-java:f9ce6971988c38403f982014188bfce094742a507c17c54641ce842b7a973cbc', + 'org.whispersystems:signal-service-java:6169643c65dcba8c784744006fc3afd9b6f309041b310a33a624121e3577433a', 'com.github.bumptech.glide:disklrucache:c1b1b6f5bbd01e2fcdc9d7f60913c8d338bdb65ed4a93bfa02b56f19daaade4b', 'com.github.bumptech.glide:annotations:bede99ef9f71517a4274bac18fd3e483e9f2b6108d7d6fe8f4949be4aa4d9512', 'com.nineoldandroids:library:68025a14e3e7673d6ad2f95e4b46d78d7d068343aa99256b686fe59de1b3163a', diff --git a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java index 60da6746c5..a42ee799ca 100644 --- a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java +++ b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java @@ -51,7 +51,6 @@ import org.thoughtcrime.securesms.database.RecipientDatabase.VibrateState; import org.thoughtcrime.securesms.database.loaders.ThreadMediaLoader; import org.thoughtcrime.securesms.jobs.MultiDeviceBlockedUpdateJob; import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob; -import org.thoughtcrime.securesms.jobs.MultiDeviceGroupUpdateJob; import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.permissions.Permissions; @@ -348,10 +347,8 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi vibrateCallPreference.setSummary(vibrateCallSummary.first); vibrateCallPreference.setValueIndex(vibrateCallSummary.second); - colorPreference.setColors(MaterialColors.CONVERSATION_PALETTE.asConversationColorArray(getActivity())); - colorPreference.setColor(recipient.getColor().toActionBarColor(getActivity())); - if (recipient.isGroupRecipient()) { + if (colorPreference != null) colorPreference.setVisible(false); if (blockPreference != null) blockPreference.setVisible(false); if (identityPreference != null) identityPreference.setVisible(false); if (privacyCategory != null) privacyCategory.setVisible(false); @@ -543,11 +540,7 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi protected Void doInBackground(Void... params) { DatabaseFactory.getRecipientDatabase(context).setColor(recipient, selectedColor); - if (recipient.resolve().isGroupRecipient()) { - ApplicationContext.getInstance(context) - .getJobManager() - .add(new MultiDeviceGroupUpdateJob(context)); - } else if (recipient.resolve().getRegistered() == RecipientDatabase.RegisteredState.REGISTERED) { + if (recipient.resolve().getRegistered() == RecipientDatabase.RegisteredState.REGISTERED) { ApplicationContext.getInstance(context) .getJobManager() .add(new MultiDeviceContactUpdateJob(context, recipient.getAddress())); diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java index 9af1d5a800..0dca950b5b 100644 --- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java +++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java @@ -75,7 +75,7 @@ public class MultiDeviceGroupUpdateJob extends MasterSecretJob implements Inject out.write(new DeviceGroup(record.getId(), Optional.fromNullable(record.getTitle()), members, getAvatar(record.getAvatar()), - record.isActive(), expirationTimer, Optional.of(recipient.getColor().serialize()))); + record.isActive(), expirationTimer)); } } diff --git a/src/org/thoughtcrime/securesms/recipients/Recipient.java b/src/org/thoughtcrime/securesms/recipients/Recipient.java index 5336229726..f56221b725 100644 --- a/src/org/thoughtcrime/securesms/recipients/Recipient.java +++ b/src/org/thoughtcrime/securesms/recipients/Recipient.java @@ -286,7 +286,8 @@ public class Recipient implements RecipientModifiedListener { } public synchronized @NonNull MaterialColor getColor() { - if (color != null) return color; + if (isGroupRecipient()) return MaterialColor.BLUE; + else if (color != null) return color; else if (name != null) return ContactColors.generateFor(name); else return ContactColors.UNKNOWN_COLOR; }