Skip to content

Commit 47e523f

Browse files
authored
Merge pull request #477 from adjust/v4261
Version 4.26.1
2 parents 503fd49 + bd13670 commit 47e523f

File tree

29 files changed

+87
-44
lines changed

29 files changed

+87
-44
lines changed

Adjust/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ ext {
99
coreMinSdkVersion = 9
1010
coreCompileSdkVersion = 30
1111
coreTargetSdkVersion = 30
12-
coreVersionName = '4.26.0'
12+
coreVersionName = '4.26.1'
1313
defaultVersionCode = 1
14+
webbridgeMinSdkVersion = 17
1415

1516
// POM.
1617
adjustGroupId = 'com.adjust.sdk'

Adjust/example-app-fbpixel/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ android {
55

66
defaultConfig {
77
applicationId "com.adjust.examples"
8-
minSdkVersion 14
8+
minSdkVersion 17
99
targetSdkVersion 30
1010
versionCode 1
1111
versionName "1.0"

Adjust/example-app-webbridge/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ android {
55

66
defaultConfig {
77
applicationId "com.example.examples"
8-
minSdkVersion 14
8+
minSdkVersion 17
99
targetSdkVersion 30
1010
versionCode 1
1111
versionName "1.0"

Adjust/sdk-core/src/main/java/com/adjust/sdk/Adjust.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ private Adjust() {
3232
*/
3333
public static synchronized AdjustInstance getDefaultInstance() {
3434
@SuppressWarnings("unused")
35-
String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:4.26.0";
35+
String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:4.26.1";
3636

3737
if (defaultInstance == null) {
3838
defaultInstance = new AdjustInstance();

Adjust/sdk-core/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

3030
String SCHEME = "https";
3131
String AUTHORITY = "app.adjust.com";
32-
String CLIENT_SDK = "android4.26.0";
32+
String CLIENT_SDK = "android4.26.1";
3333
String LOGTAG = "Adjust";
3434
String REFTAG = "reftag";
3535
String INSTALL_REFERRER = "install_referrer";

Adjust/sdk-core/src/main/java/com/adjust/sdk/InstallReferrer.java

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import android.content.Context;
44

5+
import com.adjust.sdk.scheduler.SingleThreadCachedScheduler;
6+
import com.adjust.sdk.scheduler.ThreadExecutor;
57
import com.adjust.sdk.scheduler.TimerOnce;
68

79
import java.lang.reflect.InvocationHandler;
@@ -94,6 +96,8 @@ public class InstallReferrer implements InvocationHandler {
9496

9597
private Object playInstallReferrer;
9698

99+
private ThreadExecutor executor;
100+
97101
/**
98102
* Default constructor.
99103
*
@@ -113,6 +117,7 @@ public void run() {
113117
}
114118
}, "InstallReferrer");
115119
this.referrerCallback = referrerCallback;
120+
this.executor = new SingleThreadCachedScheduler("InstallReferrer");
116121
}
117122

118123
private Object createInstallReferrer(Context context, InstallReferrerReadListener referrerCallback, ILogger logger) {
@@ -258,8 +263,29 @@ private void startConnection(final Class listenerClass, final Object listenerPro
258263
* {@inheritDoc}
259264
*/
260265
@Override
261-
public Object invoke(final Object proxy, final Method method, Object[] args)
262-
throws Throwable {
266+
public Object invoke(final Object proxy, final Method method, final Object[] args)
267+
throws Throwable
268+
{
269+
executor.submit(new Runnable() {
270+
@Override
271+
public
272+
void run() {
273+
try {
274+
invokeI(proxy, method, args);
275+
} catch (Throwable throwable) {
276+
logger.error("invoke error (%s) thrown by (%s)",
277+
throwable.getMessage(),
278+
throwable.getClass().getCanonicalName());
279+
}
280+
}
281+
});
282+
283+
return null;
284+
}
285+
286+
private Object invokeI(final Object proxy, final Method method, Object[] args)
287+
throws Throwable
288+
{
263289
if (method == null) {
264290
logger.error("InstallReferrer invoke method null");
265291
return null;
@@ -298,10 +324,10 @@ public Object invoke(final Object proxy, final Method method, Object[] args)
298324
return null;
299325
}
300326

301-
onInstallReferrerSetupFinishedInt(responseCode);
327+
onInstallReferrerSetupFinishedIntI(responseCode);
302328
} else if (methodName.equals("onInstallReferrerServiceDisconnected")) {
303329
logger.debug("Connection to install referrer service was lost. Retrying ...");
304-
retry();
330+
retryI();
305331
}
306332
return null;
307333
}
@@ -311,7 +337,7 @@ public Object invoke(final Object proxy, final Method method, Object[] args)
311337
*
312338
* @param responseCode Response code from install referrer service
313339
*/
314-
private void onInstallReferrerSetupFinishedInt(final int responseCode) {
340+
private void onInstallReferrerSetupFinishedIntI(final int responseCode) {
315341
boolean retryAtEnd = false;
316342
switch (responseCode) {
317343
/** Success. */
@@ -381,7 +407,7 @@ private void onInstallReferrerSetupFinishedInt(final int responseCode) {
381407
break;
382408
}
383409
if (retryAtEnd) {
384-
retry();
410+
retryI();
385411
} else {
386412
shouldTryToRead.set(false);
387413
closeReferrerClient();
@@ -557,7 +583,7 @@ private Boolean getBooleanGooglePlayInstantParam(final Object referrerDetails) {
557583
/**
558584
* Retry connection to install referrer service.
559585
*/
560-
private void retry() {
586+
private void retryI() {
561587
if (!shouldTryToRead.get()) {
562588
logger.debug("Should not try to read Install referrer");
563589
closeReferrerClient();

Adjust/sdk-plugin-criteo/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies {
2525
// Add SDK via module.
2626
compileOnly project(':sdk-core')
2727
// Add SDK via Maven.
28-
// implementation 'com.adjust.sdk:adjust-android:4.26.0'
28+
// implementation 'com.adjust.sdk:adjust-android:4.26.1'
2929
}
3030

3131
task adjustCriteoAndroidAar (type: Copy) {

Adjust/sdk-plugin-imei/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dependencies {
2424
// Add SDK via module.
2525
compileOnly project(':sdk-core')
2626
// Add SDK via Maven.
27-
// implementation 'com.adjust.sdk:adjust-android:4.26.0'
27+
// implementation 'com.adjust.sdk:adjust-android:4.26.1'
2828
}
2929

3030
task adjustImeiAndroidAar (type: Copy) {

Adjust/sdk-plugin-oaid/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies {
2727
// Add SDK via module.
2828
compileOnly project(':sdk-core')
2929
// Add SDK via Maven.
30-
// implementation 'com.adjust.sdk:adjust-android:4.26.0'
30+
// implementation 'com.adjust.sdk:adjust-android:4.26.1'
3131
}
3232

3333
task adjustOaidAndroidAar (type: Copy) {

Adjust/sdk-plugin-sociomantic/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dependencies {
2424
// Add SDK via module.
2525
compileOnly project(':sdk-core')
2626
// Add SDK via Maven.
27-
// implementation 'com.adjust.sdk:adjust-android:4.26.0'
27+
// implementation 'com.adjust.sdk:adjust-android:4.26.1'
2828
}
2929

3030
task adjustSociomanticAndroidAar (type: Copy) {

0 commit comments

Comments
 (0)