From 061252a1b13c3bf130c57d330e1ae6e423f1ced2 Mon Sep 17 00:00:00 2001
From: Evan Perry Grove <evan@4grove.com>
Date: Tue, 24 Jan 2023 15:51:14 -0600
Subject: [PATCH] Make isClientDeprecated always return false Make
 getTimeUntilBuildExpiry ignore SignalStore deprecation value

---
 .../thoughtcrime/securesms/keyvalue/MiscellaneousValues.java  | 3 ++-
 app/src/main/java/org/thoughtcrime/securesms/util/Util.java   | 4 ----
 gradle/wrapper/gradle-wrapper.properties                      | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/MiscellaneousValues.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/MiscellaneousValues.java
index a41a65f37..6df4c1dea 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/MiscellaneousValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/MiscellaneousValues.java
@@ -75,7 +75,8 @@ public final class MiscellaneousValues extends SignalStoreValues {
   }
 
   public boolean isClientDeprecated() {
-    return getBoolean(CLIENT_DEPRECATED, false);
+//    return getBoolean(CLIENT_DEPRECATED, false);
+    return false;
   }
 
   public void markClientDeprecated() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/Util.java b/app/src/main/java/org/thoughtcrime/securesms/util/Util.java
index f6ec2f18c..a50e2cf0b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/Util.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/Util.java
@@ -376,10 +376,6 @@ public class Util {
    *         Takes into account both the build age as well as any remote deprecation values.
    */
   public static long getTimeUntilBuildExpiry() {
-    if (SignalStore.misc().isClientDeprecated()) {
-      return 0;
-    }
-
     long buildAge                   = System.currentTimeMillis() - BuildConfig.BUILD_TIMESTAMP;
     long timeUntilBuildDeprecation  = BUILD_LIFESPAN - buildAge;
     long timeUntilRemoteDeprecation = RemoteDeprecation.getTimeUntilDeprecation();
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f7189a776..5c255945f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=db9c8211ed63f61f60292c69e80d89196f9eb36665e369e7f00ac4cc841c2219
+#distributionSha256Sum=db9c8211ed63f61f60292c69e80d89196f9eb36665e369e7f00ac4cc841c2219
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists