Skip to content

Commit 7ea52e0

Browse files
nonelsenonelse
authored
Merge pull request #319 from adjust/v4123
Version 4.12.3
2 parents d0f04cf + da32360 commit 7ea52e0

File tree

17 files changed

+61
-23
lines changed

17 files changed

+61
-23
lines changed

‎Adjust/adjust/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'com.android.library'
22

33
def getVersionName() {
4-
return "4.12.2"
4+
return "4.12.3"
55
}
66

77
android {

‎Adjust/adjust/src/main/java/com/adjust/sdk/Constants.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public interface Constants {
2929
String BASE_URL = "https://app.adjust.com";
3030
String SCHEME = "https";
3131
String AUTHORITY = "app.adjust.com";
32-
String CLIENT_SDK = "android4.12.2";
32+
String CLIENT_SDK = "android4.12.3";
3333
String LOGTAG = "Adjust";
3434
String REFTAG = "reftag";
3535
String INSTALL_REFERRER = "install_referrer";

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

Lines changed: 39 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ public class SharedPreferencesManager {
4949
*/
5050
private static final int INDEX_IS_SENDING = 2;
5151

52+
/**
53+
* Number of persisted referrers.
54+
*/
55+
private static final int REFERRERS_COUNT = 10;
56+
5257
/**
5358
* Shared preferences of the app.
5459
*/
@@ -71,14 +76,18 @@ public SharedPreferencesManager(final Context context) {
7176
*/
7277
public synchronized void saveRawReferrer(final String rawReferrer, final long clickTime) {
7378
try {
79+
if (getRawReferrer(rawReferrer, clickTime) != null) {
80+
return;
81+
}
82+
7483
JSONArray rawReferrerArray = getRawReferrerArray();
7584

76-
if (getRawReferrer(rawReferrer, clickTime) != null) {
85+
// There are exactly REFERRERS_COUNT saved referrers, do nothing.
86+
if (rawReferrerArray.length() == REFERRERS_COUNT) {
7787
return;
7888
}
7989

8090
JSONArray newRawReferrer = new JSONArray();
81-
8291
newRawReferrer.put(INDEX_RAW_REFERRER, rawReferrer);
8392
newRawReferrer.put(INDEX_CLICK_TIME, clickTime);
8493
newRawReferrer.put(INDEX_IS_SENDING, 0);
@@ -95,7 +104,11 @@ public synchronized void saveRawReferrer(final String rawReferrer, final long cl
95104
* @param rawReferrerArray Array of referrers to be saved
96105
*/
97106
public synchronized void saveRawReferrerArray(final JSONArray rawReferrerArray) {
98-
saveString(PREFS_KEY_RAW_REFERRERS, rawReferrerArray.toString());
107+
try {
108+
saveString(PREFS_KEY_RAW_REFERRERS, rawReferrerArray.toString());
109+
} catch (Throwable t) {
110+
remove(PREFS_KEY_RAW_REFERRERS);
111+
}
99112
}
100113

101114
/**
@@ -160,13 +173,27 @@ public synchronized JSONArray getRawReferrer(final String rawReferrer, final lon
160173
* @return JSONArray of saved referrers. Defaults to empty JSONArray if none found.
161174
*/
162175
public synchronized JSONArray getRawReferrerArray() {
163-
try {
164-
String referrerQueueString = getString(PREFS_KEY_RAW_REFERRERS);
176+
String referrerQueueString = getString(PREFS_KEY_RAW_REFERRERS);
177+
178+
if (referrerQueueString != null) {
179+
try {
180+
JSONArray rawReferrerArray = new JSONArray(referrerQueueString);
181+
182+
// Initial move for those who have more than REFERRERS_COUNT stored already.
183+
// Cut the array and leave it with only REFERRERS_COUNT elements.
184+
if (rawReferrerArray.length() > REFERRERS_COUNT) {
185+
JSONArray tempReferrerArray = new JSONArray();
186+
for (int i = 0; i < REFERRERS_COUNT; i += 1) {
187+
tempReferrerArray.put(rawReferrerArray.get(i));
188+
}
189+
saveRawReferrerArray(tempReferrerArray);
190+
return tempReferrerArray;
191+
}
165192

166-
if (referrerQueueString != null) {
167193
return new JSONArray(referrerQueueString);
194+
} catch (JSONException e) {
195+
} catch (Throwable t) {
168196
}
169-
} catch (JSONException e) {
170197
}
171198

172199
return new JSONArray();
@@ -306,6 +333,11 @@ private synchronized String getString(final String key) {
306333
return this.sharedPreferences.getString(key, null);
307334
} catch (ClassCastException e) {
308335
return null;
336+
} catch (Throwable t) {
337+
if (key.equals(PREFS_KEY_RAW_REFERRERS)) {
338+
remove(PREFS_KEY_RAW_REFERRERS);
339+
}
340+
return null;
309341
}
310342
}
311343

‎Adjust/example/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies {
2727
// running mvn package
2828
//compile fileTree(dir: '../target', include: ['*.jar'])
2929
// using maven repository
30-
//compile 'com.adjust.sdk:adjust-android:4.12.2'
30+
//compile 'com.adjust.sdk:adjust-android:4.12.3'
3131

3232
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.4'
3333
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'

‎Adjust/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<artifactId>adjust-android</artifactId>
77
<groupId>com.adjust.sdk</groupId>
8-
<version>4.12.2</version>
8+
<version>4.12.3</version>
99
<packaging>jar</packaging>
1010
<name>Adjust Android SDK</name>
1111
<url>https://github.com/adjust/android_sdk</url>

‎Adjust/pom_criteo.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<artifactId>adjust-android-criteo</artifactId>
77
<groupId>com.adjust.sdk</groupId>
8-
<version>4.12.2</version>
8+
<version>4.12.3</version>
99
<packaging>jar</packaging>
1010
<name>Adjust Android SDK</name>
1111
<url>https://github.com/adjust/android_sdk</url>

‎Adjust/pom_sociomantic.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<artifactId>adjust-android-sociomantic</artifactId>
77
<groupId>com.adjust.sdk</groupId>
8-
<version>4.12.2</version>
8+
<version>4.12.3</version>
99
<packaging>jar</packaging>
1010
<name>Adjust Android SDK</name>
1111
<url>https://github.com/adjust/android_sdk</url>

‎Adjust/pom_trademob.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<artifactId>adjust-android-trademob</artifactId>
77
<groupId>com.adjust.sdk</groupId>
8-
<version>4.12.2</version>
8+
<version>4.12.3</version>
99
<packaging>jar</packaging>
1010
<name>Adjust Android SDK</name>
1111
<url>https://github.com/adjust/android_sdk</url>

‎Adjust/test/src/androidTest/java/com/adjust/sdk/TestActivityPackage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public TestActivityPackage(ActivityPackage activityPackage) {
5353
// default values
5454
appToken = "123456789012";
5555
environment = "sandbox";
56-
clientSdk = "android4.12.2";
56+
clientSdk = "android4.12.3";
5757
suffix = "";
5858
attribution = new AdjustAttribution();
5959
playServices = true;

‎Adjust/testapp/src/main/java/com/adjust/testapp/MainActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ private void startTestSession() {
3434
//testLibrary.addTestDirectory("current/sdkInfo");
3535
//testLibrary.addTest("current/appSecret/Test_AppSecret_no_secret");
3636

37-
testLibrary.startTestSession("android4.12.2");
37+
testLibrary.startTestSession("android4.12.3");
3838
}
3939
}

0 commit comments

Comments
 (0)