From 5c285b4ac69bd906461190ce8d8f58a9675e4042 Mon Sep 17 00:00:00 2001 From: Alan Evans Date: Thu, 10 Sep 2020 18:47:36 -0300 Subject: [PATCH 1/4] Cycle groups v2 feature flag. --- .../java/org/thoughtcrime/securesms/util/FeatureFlags.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java index 6f2dc9e70..16081f41a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java @@ -54,7 +54,8 @@ public final class FeatureFlags { private static final String REMOTE_DELETE = "android.remoteDelete"; private static final String GROUPS_V2_OLD_1 = "android.groupsv2"; private static final String GROUPS_V2_OLD_2 = "android.groupsv2.2"; - private static final String GROUPS_V2 = "android.groupsv2.3"; + private static final String GROUPS_V2_OLD_3 = "android.groupsv2.3"; + private static final String GROUPS_V2 = "android.groupsv2.4"; private static final String GROUPS_V2_CREATE_VERSION = "android.groupsv2.createVersion"; private static final String GROUPS_V2_JOIN_VERSION = "android.groupsv2.joinVersion"; private static final String GROUPS_V2_LINKS_VERSION = "android.groupsv2.manageGroupLinksVersion"; @@ -120,6 +121,7 @@ public final class FeatureFlags { GROUPS_V2, GROUPS_V2_OLD_1, GROUPS_V2_OLD_2, + GROUPS_V2_OLD_3, VERIFY_V2 ); @@ -228,7 +230,8 @@ public final class FeatureFlags { /** Clients that previously saw these flags as true must continue to respect that */ private static boolean groupsV2OlderStickyFlags() { return getBoolean(GROUPS_V2_OLD_1, false) || - getBoolean(GROUPS_V2_OLD_2, false); + getBoolean(GROUPS_V2_OLD_2, false) || + getBoolean(GROUPS_V2_OLD_3, false); } /** From 88e12c78fa1cf2333fa7bd569badefdcf30f2911 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Thu, 10 Sep 2020 17:54:57 -0400 Subject: [PATCH 2/4] Disable mentions megaphone. --- .../java/org/thoughtcrime/securesms/megaphone/Megaphones.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java index 4f5766a62..e792b5a34 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java +++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java @@ -218,7 +218,8 @@ public final class Megaphones { } private static boolean shouldShowMentionsMegaphone() { - return FeatureFlags.mentions(); + return false; +// return FeatureFlags.mentions(); } private static boolean shouldShowLinkPreviewsMegaphone(@NonNull Context context) { From 3619993e682863131c642094d0eacfbd3c73142f Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Thu, 10 Sep 2020 18:03:28 -0400 Subject: [PATCH 3/4] Updated language translations. --- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d6e383936..5ed6e839f 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -404,7 +404,7 @@ Quiconque Tous les membres - Seulement les administrateurs + Les administrateurs Personne diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 836b0744c..bc49aefcd 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1212,7 +1212,7 @@ Tot slot moet Signal de telefoonstatus kunnen lezen om te voorkomen dat Signal-o Gebruikersnamen in Signal zijn optioneel. Als je een gebruikersnaam aanmaakt zullen andere Signal gebruikers je kunnen vinden met deze naam en contact met je kunnen opnemen zonder je telefoonnummer te kennen. Deze contactpersoon gebruikt een oude versie van Signal. Vraag hem om eerst Signal bij te werken, alvorens je het veiligheidsnummer verifieert. - Deze contactpersoon gebruikt een nieuwere versie van Signal met een incompatibel QR-codeformaat. Werk Signal bij om te vergelijken. + Je contact gebruikt een nieuwere versie van Signal met een incompatibel QR-codeformaat. Werk Signal bij om te vergelijken. De gescande QR-code is geen goed geformatteerd veiligheidsnummer-verificatiecode. Probeer de code opnieuw te scannen. Veiligheidsnummer doorsturen via … Ons Signal-veiligheidsnummer: From a5a6fb590a9799e6ebb24e7303c755d6209c04d8 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Thu, 10 Sep 2020 18:03:51 -0400 Subject: [PATCH 4/4] Bump version to 4.71.4 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 961d62f9f..7c4402c2e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -80,8 +80,8 @@ protobuf { } } -def canonicalVersionCode = 706 -def canonicalVersionName = "4.71.3" +def canonicalVersionCode = 707 +def canonicalVersionName = "4.71.4" def postFixSize = 10 def abiPostFix = ['universal' : 0,