Merge remote-tracking branch 'origin/master' into release/5.4.2

Author: hborisoff

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

@@ -369,7 +369,6 @@ public void runActionNamed(String name) {
         createActionContextForMessageId(messageAction.toString(), args, messageId, name, false);
       }
     }
-    Leanplum.countAggregator().incrementCount("run_action_named");
   }
 
   /**
@@ -527,7 +526,6 @@ public void runTrackedActionNamed(String name) {
     } catch (Throwable t) {
       Log.exception(t);
     }
-    Leanplum.countAggregator().incrementCount("run_tracked_action_named");
   }
 
   /**

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

@@ -34,6 +34,7 @@
 import com.leanplum.callbacks.VariablesChangedCallback;
 import com.leanplum.internal.APIConfig;
 import com.leanplum.internal.ActionManager;
+import com.leanplum.internal.ApiConfigLoader;
 import com.leanplum.internal.Constants;
 import com.leanplum.internal.CountAggregator;
 import com.leanplum.internal.FeatureFlagManager;
@@ -277,6 +278,16 @@ public static void setAppIdForProductionMode(String appId, String accessKey) {
     APIConfig.getInstance().setAppId(appId, accessKey);
   }
 
+  /**
+   * Loads appId and accessKey from Android resources.
+   */
+  private static void loadApiConfigFromResources() {
+    ApiConfigLoader loader = new ApiConfigLoader(getContext());
+    loader.loadFromResources(
+        Leanplum::setAppIdForProductionMode,
+        Leanplum::setAppIdForDevelopmentMode);
+  }
+
   /**
    * Enable screen tracking.
    */
@@ -291,7 +302,6 @@ public static void trackAllAppScreens() {
    */
   public static void setVariantDebugInfoEnabled(boolean variantDebugInfoEnabled) {
     LeanplumInternal.setIsVariantDebugInfoEnabled(variantDebugInfoEnabled);
-    countAggregator.incrementCount("set_variant_debug_info_enabled");
   }
 
   /**
@@ -391,7 +401,6 @@ public static void syncResources() {
     } catch (Throwable t) {
       Log.exception(t);
     }
-    countAggregator.incrementCount("sync_resources");
   }
 
   /**
@@ -407,7 +416,6 @@ public static void syncResourcesAsync() {
     } catch (Throwable t) {
       Log.exception(t);
     }
-    countAggregator.incrementCount("sync_resources");
   }
 
   /**
@@ -429,7 +437,6 @@ public static void syncResources(
     } catch (Throwable t) {
       Log.exception(t);
     }
-    countAggregator.incrementCount("sync_resource_paths");
   }
 
   /**
@@ -451,7 +458,6 @@ public static void syncResourcesAsync(
     } catch (Throwable t) {
       Log.exception(t);
     }
-    countAggregator.incrementCount("sync_resource_paths");
   }
 
   /**
@@ -521,6 +527,11 @@ public static synchronized void start(final Context context, String userId,
   static synchronized void start(final Context context, final String userId,
       final Map<String, ?> attributes, StartCallback response, final Boolean isBackground) {
     try {
+      boolean appIdNotSet = TextUtils.isEmpty(APIConfig.getInstance().appId());
+      if (appIdNotSet) {
+        loadApiConfigFromResources();
+      }
+
       LeanplumActivityHelper.setCurrentActivity(context);
 
       // Detect if app is in background automatically if isBackground is not set.
@@ -616,7 +627,6 @@ public void run() {
     } catch (Throwable t) {
       Log.exception(t);
     }
-    countAggregator.incrementCount("start_with_user_id");
   }
 
   /**
@@ -750,7 +760,6 @@ public void error(Exception e) {
 
   private static void handleStartResponse(final JSONObject response) {
     boolean success = RequestUtil.isResponseSuccess(response);
-    Leanplum.countAggregator().incrementCount("on_start_response");
     if (!success) {
       try {
         LeanplumInternal.setHasStarted(true);
@@ -1455,7 +1464,6 @@ private static void defineAction(String name, int kind, ActionArgs args,
     } catch (Throwable t) {
       Log.exception(t);
     }
-    Leanplum.countAggregator().incrementCount("define_action");
   }
 
   /**
@@ -1654,7 +1662,6 @@ private static void setTrafficSourceInfoInternal(HashMap<String, Object> params)
   public static void track(final String event, double value, String info,
       Map<String, ?> params) {
     LeanplumInternal.track(event, value, info, params, null);
-    countAggregator.incrementCount("track");
   }
 
   /**
@@ -1853,9 +1860,6 @@ public static void track(String event, double value, String info) {
   public static void trackGeofence(GeofenceEventType event, String info) {
     if (featureFlagManager().isFeatureFlagEnabled("track_geofence")) {
       LeanplumInternal.trackGeofence(event, 0.0, info, null, null);
-      countAggregator().incrementCount("track_geofence");
-    } else {
-      countAggregator().incrementCount("track_geofence_disabled");
     }
   }
 
@@ -1897,7 +1901,6 @@ public void run() {
     } catch (Throwable t) {
       Log.exception(t);
     }
-    countAggregator.incrementCount("advance_to");
   }
 
   /**
@@ -2099,7 +2102,6 @@ public void error(Exception e) {
     } catch (Throwable t) {
       Log.exception(t);
     }
-    countAggregator.incrementCount("force_content_update");
   }
 
   /**
@@ -2195,7 +2197,6 @@ public static Map<String, Object> getVariantDebugInfo() {
    */
   public static void setDeviceLocation(Location location) {
     setDeviceLocation(location, LeanplumLocationAccuracyType.CELL);
-    Leanplum.countAggregator().incrementCount("setDeviceLocation");
   }
 
   /**
@@ -2211,7 +2212,6 @@ public static void setDeviceLocation(Location location, LeanplumLocationAccuracy
           "call setDeviceLocation. If you prefer to always set location manually, " +
           "then call disableLocationCollection.");
     }
-    Leanplum.countAggregator().incrementCount("setDeviceLocation_type");
     LeanplumInternal.setUserLocationAttribute(location, type,
         new LeanplumInternal.locationAttributeRequestsCallback() {
           @Override
@@ -2254,7 +2254,6 @@ private static void parseVariantDebugInfo(JSONObject response) {
    */
   public static void clearUserContent() {
     VarCache.clearUserContent();
-    countAggregator.incrementCount("clear_user_content");
   }
 
   @VisibleForTesting

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

@@ -442,7 +442,6 @@ private List<LeanplumInboxMessage> allMessages(List<LeanplumInboxMessage> messag
     } catch (Throwable t) {
       Log.exception(t);
     }
-    Leanplum.countAggregator().incrementCount("all_messages_inbox");
     return messages;
   }
 

AndroidSDKCore/src/main/java/com/leanplum/callbacks/RegisterDeviceCallback.java

@@ -47,7 +47,6 @@ public void run() {
 
   public void setResponseHandler(EmailCallback callback) {
     this.callback = callback;
-    Leanplum.countAggregator().incrementCount("init_with_callback");
   }
 
   public void run() { this.onResponse(callback);

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

@@ -55,7 +55,6 @@ public void setAppId(String appId, String accessKey) {
     if (!TextUtils.isEmpty(accessKey)) {
       this.accessKey = accessKey.trim();
     }
-    Leanplum.countAggregator().incrementCount("set_app_id");
   }
 
   public void loadToken(String token) {
@@ -92,7 +91,6 @@ public String token() {
 
   public void setToken(String token) {
     this.token = token;
-    Leanplum.countAggregator().incrementCount("set_token");
   }
 
   public void loadToken() {
@@ -104,7 +102,6 @@ public void loadToken() {
       return;
     }
     setToken(token);
-    Leanplum.countAggregator().incrementCount("load_token");
   }
 
   public void saveToken() {

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

@@ -47,7 +47,6 @@ private static <T> ActionArg<T> argNamed(String name, T defaultValue, String kin
     arg.name = name;
     arg.kind = kind;
     arg.defaultValue = defaultValue;
-    Leanplum.countAggregator().incrementCount("arg_named");
     return arg;
   }
 

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

@@ -450,7 +450,6 @@ public void recordMessageTrigger(String messageId) {
     int occurrences = getMessageTriggerOccurrences(messageId);
     occurrences++;
     saveMessageTriggerOccurrences(occurrences, messageId);
-    Leanplum.countAggregator().incrementCount("record_message_trigger");
   }
 
   /**

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

@@ -0,0 +1,83 @@
+/*
+ * Copyright 2020, Leanplum, Inc. All rights reserved.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.leanplum.internal;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+/**
+ * Loads appId, accessKey and type of environment from the Android string resources.
+ */
+public class ApiConfigLoader {
+  private static final String STRING_APPID = "leanplum_app_id";
+  private static final String STRING_PROD_KEY = "leanplum_prod_key";
+  private static final String STRING_DEV_KEY = "leanplum_dev_key";
+  private static final String STRING_ENV = "leanplum_environment";
+
+  private static final String ENV_DEV = "development";
+  private static final String ENV_PROD = "production";
+
+  private Context context;
+
+  @FunctionalInterface
+  public interface KeyListener {
+    void onKeysLoaded(String appId, String accessKey);
+  }
+
+  public ApiConfigLoader(Context context) {
+    this.context = context;
+  }
+
+  private String getStringResource(String key) {
+    try {
+      String packageName = context.getPackageName();
+      int id = context.getResources().getIdentifier(key, "string", packageName);
+      return context.getString(id);
+    } catch (Throwable t) { // Resources.NotFoundException
+      Log.e("Cannot load string for key = %s. Message = %s", key, t.getMessage());
+      return null;
+    }
+  }
+
+  public void loadFromResources(KeyListener prodKeyListener, KeyListener devKeyListener) {
+    String appId = getStringResource(STRING_APPID);
+    String prodKey = getStringResource(STRING_PROD_KEY);
+    String devKey = getStringResource(STRING_DEV_KEY);
+    String environment = getStringResource(STRING_ENV);
+
+    if (TextUtils.isEmpty(appId))
+      return;
+
+    boolean devEnv = ENV_DEV.equals(environment);
+    boolean hasProdKey = !TextUtils.isEmpty(prodKey);
+    boolean hasDevKey = !TextUtils.isEmpty(devKey);
+
+    if (devEnv && hasDevKey) {
+      devKeyListener.onKeysLoaded(appId, devKey);
+      Log.i("Using appId and accessKey from Android resources for development environment.");
+    }
+    else if (!devEnv && hasProdKey) {
+      prodKeyListener.onKeysLoaded(appId, prodKey);
+      Log.i("Using appId and accessKey from Android resources for production environment.");
+    }
+  }
+}

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

@@ -8,6 +8,10 @@
 import java.util.Map;
 import java.util.Set;
 
+/**
+ * Counter is not currently used and will be removed in the future.
+ * It is still functional both on client and server side.
+ */
 public class CountAggregator {
     private Set<String> enabledCounters = new HashSet<>();
     private final Map<String, Integer> counts = new HashMap<>();

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

@@ -24,7 +24,6 @@ public void setEnabledFeatureFlags(Set<String> enabledFeatureFlags) {
     }
 
     public Boolean isFeatureFlagEnabled(String featureFlagName) {
-        Leanplum.countAggregator().incrementCount("is_feature_flag_enabled");
         return this.enabledFeatureFlags.contains(featureFlagName);
     }
 }