[android] #5186 - Starting rotateSessionId before Telemetry Starts an…

…d ensuring that mapboxSessionId is initialized
mapbox · Jun 6, 2016 · f4a82bd · f4a82bd
1 parent 65330bd
commit f4a82bd
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/...d/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java b/...d/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java
@@ -128,6 +128,9 @@ public void initialize(@NonNull Context context, @NonNull String accessToken) {
             Log.w(TAG, "Error getting Encryption Algorithm: " + e);
         }
 
+        // Create Initial Session Id
+        rotateSessionId();
+
         SharedPreferences prefs = context.getSharedPreferences(MapboxConstants.MAPBOX_SHARED_PREFERENCES_FILE, Context.MODE_PRIVATE);
 
         // Determine if Telemetry Should Be Enabled
@@ -147,9 +150,6 @@ public void initialize(@NonNull Context context, @NonNull String accessToken) {
             editor.commit();
         }
 
-        // Create Initial Session Id
-        rotateSessionId();
-
         // Get DisplayMetrics Setup
         displayMetrics = new DisplayMetrics();
         ((WindowManager)context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getMetrics(displayMetrics);
@@ -444,7 +444,7 @@ private String encodeString(String string) {
      */
     private void rotateSessionId() {
         long now = System.currentTimeMillis();
-        if (now - mapboxSessionIdLastSet > (SESSION_ID_ROTATION_HOURS * hourInMillis)) {
+        if ((TextUtils.isEmpty(mapboxSessionId)) || (now - mapboxSessionIdLastSet > (SESSION_ID_ROTATION_HOURS * hourInMillis))) {
             mapboxSessionId = UUID.randomUUID().toString();
             mapboxSessionIdLastSet = System.currentTimeMillis();
         }