Don't show donate or research megaphones on new app installs.

greyson-signal · greyson-signal · commit fe6ae7e1425b · 2020-11-19T08:42:35.000-05:00
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/RatingManager.java b/app/src/main/java/org/thoughtcrime/securesms/components/RatingManager.java
@@ -12,6 +12,7 @@
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.VersionTracker;
 
 import java.util.concurrent.TimeUnit;
 
@@ -25,7 +26,7 @@ public class RatingManager {
   public static void showRatingDialogIfNecessary(Context context) {
     if (!TextSecurePreferences.isRatingEnabled(context)) return;
 
-    long daysSinceInstall = getDaysSinceInstalled(context);
+    long daysSinceInstall = VersionTracker.getDaysSinceFirstInstalled(context);
     long laterTimestamp   = TextSecurePreferences.getRatingLaterTimestamp(context);
 
     if (daysSinceInstall >= DAYS_SINCE_INSTALL_THRESHOLD &&
@@ -72,17 +73,4 @@ private static void startPlayStore(Context context) {
     }
   }
 
-  private static long getDaysSinceInstalled(Context context) {
-    try {
-      long installTimestamp = context.getPackageManager()
-                                     .getPackageInfo(context.getPackageName(), 0)
-                                     .firstInstallTime;
-
-      return TimeUnit.MILLISECONDS.toDays(System.currentTimeMillis() - installTimestamp);
-    } catch (PackageManager.NameNotFoundException e) {
-      Log.w(TAG, e);
-      return 0;
-    }
-  }
-
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java
@@ -26,6 +26,7 @@
 import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.PopulationFeatureFlags;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.VersionTracker;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -89,8 +90,8 @@ private static Map<Event, MegaphoneSchedule> buildDisplayOrder(@NonNull Context
       put(Event.MESSAGE_REQUESTS, shouldShowMessageRequestsMegaphone() ? ALWAYS : NEVER);
       put(Event.LINK_PREVIEWS, shouldShowLinkPreviewsMegaphone(context) ? ALWAYS : NEVER);
       put(Event.CLIENT_DEPRECATED, SignalStore.misc().isClientDeprecated() ? ALWAYS : NEVER);
-      put(Event.RESEARCH, shouldShowResearchMegaphone() ? ShowForDurationSchedule.showForDays(7) : NEVER);
-      put(Event.DONATE, shouldShowDonateMegaphone() ? ShowForDurationSchedule.showForDays(7) : NEVER);
+      put(Event.RESEARCH, shouldShowResearchMegaphone(context) ? ShowForDurationSchedule.showForDays(7) : NEVER);
+      put(Event.DONATE, shouldShowDonateMegaphone(context) ? ShowForDurationSchedule.showForDays(7) : NEVER);
     }};
   }
 
@@ -242,12 +243,12 @@ private static boolean shouldShowMessageRequestsMegaphone() {
     return Recipient.self().getProfileName() == ProfileName.EMPTY;
   }
 
-  private static boolean shouldShowResearchMegaphone() {
-    return PopulationFeatureFlags.isInResearchMegaphone();
+  private static boolean shouldShowResearchMegaphone(@NonNull Context context) {
+    return VersionTracker.getDaysSinceFirstInstalled(context) > 7 && PopulationFeatureFlags.isInResearchMegaphone();
   }
 
-  private static boolean shouldShowDonateMegaphone() {
-    return PopulationFeatureFlags.isInDonateMegaphone();
+  private static boolean shouldShowDonateMegaphone(@NonNull Context context) {
+    return VersionTracker.getDaysSinceFirstInstalled(context) > 7 && PopulationFeatureFlags.isInDonateMegaphone();
   }
 
   private static boolean shouldShowLinkPreviewsMegaphone(@NonNull Context context) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/VersionTracker.java b/app/src/main/java/org/thoughtcrime/securesms/util/VersionTracker.java
@@ -1,12 +1,15 @@
 package org.thoughtcrime.securesms.util;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
+
 import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.logging.Log;
 
 import java.io.IOException;
+import java.util.concurrent.TimeUnit;
 
 public class VersionTracker {
 
@@ -30,4 +33,17 @@ public static void updateLastSeenVersion(@NonNull Context context) {
       throw new AssertionError(ioe);
     }
   }
+
+  public static long getDaysSinceFirstInstalled(Context context) {
+    try {
+      long installTimestamp = context.getPackageManager()
+                                     .getPackageInfo(context.getPackageName(), 0)
+                                     .firstInstallTime;
+
+      return TimeUnit.MILLISECONDS.toDays(System.currentTimeMillis() - installTimestamp);
+    } catch (PackageManager.NameNotFoundException e) {
+      Log.w(TAG, e);
+      return 0;
+    }
+  }
 }
