Remove unnecessary code (#473)

Author: hborisoff

AndroidSDKCore/src/main/java/com/leanplum/Leanplum.java

@@ -162,18 +162,6 @@ public static void setSocketConnectionSettings(String hostName, int port) {
     Constants.SOCKET_PORT = port;
   }
 
-  /**
-   * Optional. By default, Leanplum will hash file variables to determine if they're modified and
-   * need to be uploaded to the server. Use this method to override this setting.
-   *
-   * @param enabled Setting this to false will reduce startup latency in development mode, but it's
-   * possible that Leanplum will always have the most up-to-date versions of your resources.
-   * (Default: true)
-   */
-  public static void setFileHashingEnabledInDevelopmentMode(boolean enabled) {
-    Constants.hashFilesToDetermineModifications = enabled;
-  }
-
   /**
    * Optional. Whether to enable file uploading in development mode.
    *
@@ -225,15 +213,6 @@ public static void setNetworkTimeout(int seconds, int downloadSeconds) {
     Constants.NETWORK_TIMEOUT_SECONDS_FOR_DOWNLOADS = downloadSeconds;
   }
 
-  /**
-   * Advanced: Whether new variables can be downloaded mid-session. By default, this is disabled.
-   * Currently, if this is enabled, new variables can only be downloaded if a push notification is
-   * sent while the app is running, and the notification's metadata hasn't be downloaded yet.
-   */
-  public static void setCanDownloadContentMidSessionInProductionMode(boolean value) {
-    Constants.canDownloadContentMidSessionInProduction = value;
-  }
-
   /**
    * Must call either this or {@link Leanplum#setAppIdForProductionMode} before issuing any calls to
    * the API, including start.
@@ -824,7 +803,7 @@ private static void handleStartResponse(final JSONObject response) {
         APIConfig.getInstance().setToken(token);
         APIConfig.getInstance().saveToken();
 
-        applyContentInResponse(response, true);
+        applyContentInResponse(response);
 
         VarCache.saveUserAttributes();
 
@@ -947,9 +926,8 @@ public void run() {
    * Applies the variables, messages, or update rules in a start or getVars response.
    *
    * @param response The response containing content.
-   * @param alwaysApply Always apply the content regardless of whether the content changed.
    */
-  private static void applyContentInResponse(JSONObject response, boolean alwaysApply) {
+  private static void applyContentInResponse(JSONObject response) {
     Map<String, Object> values = JsonConverter.mapFromJsonOrDefault(
         response.optJSONObject(Constants.Keys.VARS));
     Map<String, Object> messages = JsonConverter.mapFromJsonOrDefault(
@@ -966,22 +944,15 @@ private static void applyContentInResponse(JSONObject response, boolean alwaysAp
     String varsJson = (varsJsonObj != null) ? varsJsonObj.toString() : null;
     String varsSignature = response.optString(Constants.Keys.VARS_SIGNATURE);
 
-    if (alwaysApply
-        || !values.equals(VarCache.getDiffs())
-        || !messages.equals(VarCache.getMessageDiffs())
-        || !variants.equals(VarCache.variants())
-        || !localCaps.equals(VarCache.localCaps())
-        || !regions.equals(VarCache.regions())) {
-      VarCache.applyVariableDiffs(
-          values,
-          messages,
-          regions,
-          variants,
-          localCaps,
-          variantDebugInfo,
-          varsJson,
-          varsSignature);
-    }
+    VarCache.applyVariableDiffs(
+        values,
+        messages,
+        regions,
+        variants,
+        localCaps,
+        variantDebugInfo,
+        varsJson,
+        varsSignature);
   }
 
   /**
@@ -2079,7 +2050,7 @@ public void response(JSONObject response) {
             if (response == null) {
               Log.e("No response received from the server. Please contact us to investigate.");
             } else {
-              applyContentInResponse(response, false);
+              applyContentInResponse(response);
               if (response.optBoolean(Constants.Keys.SYNC_INBOX, false)) {
                 LeanplumInbox.getInstance().downloadMessages();
               } else {

AndroidSDKCore/src/main/java/com/leanplum/internal/Constants.java

@@ -54,13 +54,11 @@ public class Constants {
   static final int MAX_USER_ID_LENGTH = 400;
 
   public static String defaultDeviceId = null;
-  public static boolean hashFilesToDetermineModifications = true;
   public static boolean isDevelopmentModeEnabled = false;
   public static boolean loggingEnabled = false;
   public static boolean isTestMode = false;
   public static boolean enableVerboseLoggingInDevelopmentMode = false;
   public static boolean enableFileUploadingInDevelopmentMode = true;
-  public static boolean canDownloadContentMidSessionInProduction = false;
   static boolean isInPermanentFailureState = false;
 
   public static boolean isNoop() {

AndroidSDKCore/src/main/java/com/leanplum/internal/VarCache.java

@@ -181,7 +181,7 @@ public static void registerFile(
     Map<String, Object> variationAttributes = new HashMap<>();
     Map<String, Object> attributes = new HashMap<>();
 
-    if (Constants.hashFilesToDetermineModifications && Util.isSimulator()) {
+    if (Util.isSimulator()) {
       HashResults result = FileManager.fileMD5HashCreateWithPath(defaultStream.openStream());
       if (result != null) {
         attributes.put(Constants.Keys.HASH, result.hash);

AndroidSDKPush/src/main/java/com/leanplum/LeanplumPushService.java

@@ -199,26 +199,15 @@ public void response(JSONObject response) {
                     String varsJson = (varsJsonObj != null) ? varsJsonObj.toString() : null;
                     String varsSignature = response.optString(Constants.Keys.VARS_SIGNATURE);
 
-                    if (!Constants.canDownloadContentMidSessionInProduction ||
-                        VarCache.getDiffs().equals(values)) {
-                      values = null;
-                      varsJson = null;
-                      varsSignature = null;
-                    }
-                    if (VarCache.getMessageDiffs().equals(messages)) {
-                      messages = null;
-                    }
-                    if (values != null || messages != null) {
-                      VarCache.applyVariableDiffs(
-                          values,
-                          messages,
-                          regions,
-                          variants,
-                          localCaps,
-                          null,
-                          varsJson,
-                          varsSignature);
-                    }
+                    VarCache.applyVariableDiffs(
+                        values,
+                        messages,
+                        regions,
+                        variants,
+                        localCaps,
+                        null,
+                        varsJson,
+                        varsSignature);
                   }
                   onComplete.variablesChanged();
                 } catch (Throwable t) {