Do potential trimming of JSONArray at earliest possible moment

Author: uerceg

Adjust/adjust/src/main/java/com/adjust/sdk/SharedPreferencesManager.java

@@ -82,17 +82,6 @@ public synchronized void saveRawReferrer(final String rawReferrer, final long cl
 
             JSONArray rawReferrerArray = getRawReferrerArray();
 
-            // Initial move for those who have more than REFERRERS_COUNT stored already.
-            // Cut the array and leave it with only REFERRERS_COUNT elements.
-            if (rawReferrerArray.length() > REFERRERS_COUNT) {
-                JSONArray tempReferrerArray = new JSONArray();
-                for (int i = 0; i < REFERRERS_COUNT; i += 1) {
-                    tempReferrerArray.put(rawReferrerArray.get(i));
-                }
-                saveRawReferrerArray(tempReferrerArray);
-                return;
-            }
-
             // There are exactly REFERRERS_COUNT saved referrers, do nothing.
             if (rawReferrerArray.length() == REFERRERS_COUNT) {
                 return;
@@ -188,6 +177,19 @@ public synchronized JSONArray getRawReferrerArray() {
 
         if (referrerQueueString != null) {
             try {
+                JSONArray rawReferrerArray = new JSONArray(referrerQueueString);
+
+                // Initial move for those who have more than REFERRERS_COUNT stored already.
+                // Cut the array and leave it with only REFERRERS_COUNT elements.
+                if (rawReferrerArray.length() > REFERRERS_COUNT) {
+                    JSONArray tempReferrerArray = new JSONArray();
+                    for (int i = 0; i < REFERRERS_COUNT; i += 1) {
+                        tempReferrerArray.put(rawReferrerArray.get(i));
+                    }
+                    saveRawReferrerArray(tempReferrerArray);
+                    return tempReferrerArray;
+                }
+
                 return new JSONArray(referrerQueueString);
             } catch (JSONException e) {
             } catch (Throwable t) {