Skip to content

Version 4.33.3 #568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 16, 2023
Merged

Version 4.33.3 #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01b3252
fix: avoid npe when referrer is null
shashanksu Feb 13, 2023
0af9dd6
feat: catch exception thrown from install referrer service
shashanksu Feb 13, 2023
2d6876a
feat: update version number to 4.33.3
shashanksu Feb 16, 2023
f56e20a
docs: upate CHANGELOG
shashanksu Feb 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Adjust/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ext {
coreMinSdkVersion = 9
coreCompileSdkVersion = 33
coreTargetSdkVersion = 33
coreVersionName = '4.33.2'
coreVersionName = '4.33.3'
defaultVersionCode = 1
webbridgeMinSdkVersion = 17
samsungReferrerMinSdkVersion = 18
Expand Down
2 changes: 1 addition & 1 deletion Adjust/sdk-core/src/main/java/com/adjust/sdk/Adjust.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ private Adjust() {
*/
public static synchronized AdjustInstance getDefaultInstance() {
@SuppressWarnings("unused")
String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:4.33.2";
String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:4.33.3";

if (defaultInstance == null) {
defaultInstance = new AdjustInstance();
Expand Down
2 changes: 1 addition & 1 deletion Adjust/sdk-core/src/main/java/com/adjust/sdk/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public interface Constants {

String SCHEME = "https";
String AUTHORITY = "app.adjust.com";
String CLIENT_SDK = "android4.33.2";
String CLIENT_SDK = "android4.33.3";
String LOGTAG = "Adjust";
String REFTAG = "reftag";
String INSTALL_REFERRER = "install_referrer";
Expand Down
2 changes: 1 addition & 1 deletion Adjust/sdk-plugin-criteo/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {
// Add SDK via module.
compileOnly project(':sdk-core')
// Add SDK via Maven.
// implementation 'com.adjust.sdk:adjust-android:4.33.2'
// implementation 'com.adjust.sdk:adjust-android:4.33.3'
}

// read local properties
Expand Down
2 changes: 1 addition & 1 deletion Adjust/sdk-plugin-imei/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies {
// Add SDK via module.
compileOnly project(':sdk-core')
// Add SDK via Maven.
// implementation 'com.adjust.sdk:adjust-android:4.33.2'
// implementation 'com.adjust.sdk:adjust-android:4.33.3'
}

// read local properties
Expand Down
2 changes: 1 addition & 1 deletion Adjust/sdk-plugin-oaid/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies {
// Add SDK via module.
compileOnly project(':sdk-core')
// Add SDK via Maven.
// implementation 'com.adjust.sdk:adjust-android:4.33.2'
// implementation 'com.adjust.sdk:adjust-android:4.33.3'
implementation 'com.huawei.hms:ads-identifier:3.4.56.300'
}

Expand Down
2 changes: 1 addition & 1 deletion Adjust/sdk-plugin-samsung-referrer/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {
// Add SDK via module.
compileOnly project(':sdk-core')
// Add SDK via Maven.
// implementation 'com.adjust.sdk:adjust-android:4.33.2'
// implementation 'com.adjust.sdk:adjust-android:4.33.3'

// Add Samsung referrer lib via Maven.
}
Expand Down
64 changes: 34 additions & 30 deletions ...k-plugin-samsung-referrer/src/main/java/com/adjust/sdk/samsung/SamsungReferrerClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,42 +14,46 @@
public class SamsungReferrerClient {

public static ReferrerDetails getReferrer(Context context, final ILogger logger, long maxWaitTimeInMilli) {
final InstallReferrerClient referrerClient = InstallReferrerClient.newBuilder(context).build();
final BlockingQueue<ReferrerDetails> referrerDetailsHolder = new LinkedBlockingQueue<ReferrerDetails>(1);
referrerClient.startConnection(new InstallReferrerStateListener() {
@Override
public void onInstallReferrerSetupFinished(int responseCode) {
switch (responseCode) {
case InstallReferrerClient.InstallReferrerResponse.OK:
try {
ReferrerDetails details = referrerClient.getInstallReferrer();
referrerDetailsHolder.offer(details);
} catch (Exception e) {
logger.error("SamsungReferrer getInstallReferrer: " + e.getMessage());
referrerDetailsHolder.offer(null);
} finally {
referrerClient.endConnection();
try {
final InstallReferrerClient referrerClient = InstallReferrerClient.newBuilder(context).build();
final BlockingQueue<ReferrerDetails> referrerDetailsHolder = new LinkedBlockingQueue<ReferrerDetails>(1);
referrerClient.startConnection(new InstallReferrerStateListener() {
@Override
public void onInstallReferrerSetupFinished(int responseCode) {
try {
switch (responseCode) {
case InstallReferrerClient.InstallReferrerResponse.OK:
try {
ReferrerDetails details = referrerClient.getInstallReferrer();
referrerDetailsHolder.offer(details);
} catch (Exception e) {
logger.error("SamsungReferrer getInstallReferrer: " + e.getMessage());
} finally {
referrerClient.endConnection();
}
break;
case InstallReferrerClient.InstallReferrerResponse.FEATURE_NOT_SUPPORTED:
logger.info("SamsungReferrer onInstallReferrerSetupFinished: FEATURE_NOT_SUPPORTED");
break;
case InstallReferrerClient.InstallReferrerResponse.SERVICE_UNAVAILABLE:
logger.info("SamsungReferrer onInstallReferrerSetupFinished: SERVICE_UNAVAILABLE");
break;
}
break;
case InstallReferrerClient.InstallReferrerResponse.FEATURE_NOT_SUPPORTED:
logger.info("SamsungReferrer onInstallReferrerSetupFinished: FEATURE_NOT_SUPPORTED");
break;
case InstallReferrerClient.InstallReferrerResponse.SERVICE_UNAVAILABLE:
logger.info("SamsungReferrer onInstallReferrerSetupFinished: SERVICE_UNAVAILABLE");
break;
} catch (Exception e) {
logger.error("SamsungReferrer onInstallReferrerSetupFinished: " + e.getMessage());
}
}
}

@Override
public void onInstallReferrerServiceDisconnected() {
referrerClient.endConnection();
}
});
@Override
public void onInstallReferrerServiceDisconnected() {
referrerClient.endConnection();
}
});

try {
return referrerDetailsHolder.poll(maxWaitTimeInMilli, TimeUnit.MILLISECONDS);

} catch (Exception e) {
logger.error("Exception while waiting to get referrer: ", e.getMessage());
logger.error("Exception while getting referrer: ", e.getMessage());
}

return null;
Expand Down
2 changes: 1 addition & 1 deletion Adjust/sdk-plugin-sociomantic/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies {
// Add SDK via module.
compileOnly project(':sdk-core')
// Add SDK via Maven.
// implementation 'com.adjust.sdk:adjust-android:4.33.2'
// implementation 'com.adjust.sdk:adjust-android:4.33.3'
}

// read local properties
Expand Down
2 changes: 1 addition & 1 deletion Adjust/sdk-plugin-trademob/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies {
// Add SDK via module.
compileOnly project(':sdk-core')
// Add SDK via Maven.
// implementation 'com.adjust.sdk:adjust-android:4.33.2'
// implementation 'com.adjust.sdk:adjust-android:4.33.3'
}

// read local properties
Expand Down
2 changes: 1 addition & 1 deletion Adjust/sdk-plugin-vivo-referrer/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {
// Add SDK via module.
compileOnly project(':sdk-core')
// Add SDK via Maven.
// implementation 'com.adjust.sdk:adjust-android:4.33.2'
// implementation 'com.adjust.sdk:adjust-android:4.33.3'
}

// read local properties
Expand Down
2 changes: 1 addition & 1 deletion Adjust/sdk-plugin-webbridge/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies {
// Add SDK via module.
compileOnly project(':sdk-core')
// Add SDK via Maven.
// implementation 'com.adjust.sdk:adjust-android:4.33.2'
// implementation 'com.adjust.sdk:adjust-android:4.33.3'
}

// read local properties
Expand Down
2 changes: 1 addition & 1 deletion Adjust/sdk-plugin-webbridge/src/main/assets/adjust.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ var Adjust = {
if (this.adjustConfig) {
return this.adjustConfig.getSdkPrefix();
} else {
return 'web-bridge4.33.2';
return 'web-bridge4.33.3';
}
},

Expand Down
2 changes: 1 addition & 1 deletion Adjust/sdk-plugin-xiaomi-referrer/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {
// Add SDK via module.
compileOnly project(':sdk-core')
// Add SDK via Maven.
// implementation 'com.adjust.sdk:adjust-android:4.33.2'
// implementation 'com.adjust.sdk:adjust-android:4.33.3'

// Add xiaomi referrer lib via Maven.
implementation 'com.miui.referrer:homereferrer:1.0.0.6'
Expand Down
60 changes: 31 additions & 29 deletions .../sdk-plugin-xiaomi-referrer/src/main/java/com/adjust/sdk/xiaomi/XiaomiReferrerClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,41 +15,43 @@
public class XiaomiReferrerClient {

public static GetAppsReferrerDetails getReferrer(Context context, final ILogger logger, long maxWaitTimeInMilli) {
final GetAppsReferrerClient referrerClient = new GetAppsReferrerClient.Builder(context).build();
final BlockingQueue<GetAppsReferrerDetails> referrerDetailsHolder = new LinkedBlockingQueue<GetAppsReferrerDetails>(1);
referrerClient.startConnection(new GetAppsReferrerStateListener() {
@Override
public void onGetAppsReferrerSetupFinished(int responseCode) {
switch(responseCode) {
case GetAppsReferrerResponse.OK:
try {
GetAppsReferrerDetails getAppsReferrerDetails = referrerClient.getInstallReferrer();
referrerDetailsHolder.offer(getAppsReferrerDetails);
} catch (Exception e) {
logger.error("XiaomiReferrer getInstallReferrer: " + e.getMessage());
referrerDetailsHolder.offer(null);
try {
final GetAppsReferrerClient referrerClient = new GetAppsReferrerClient.Builder(context).build();
final BlockingQueue<GetAppsReferrerDetails> referrerDetailsHolder = new LinkedBlockingQueue<GetAppsReferrerDetails>(1);
referrerClient.startConnection(new GetAppsReferrerStateListener() {
@Override
public void onGetAppsReferrerSetupFinished(int responseCode) {
try {
switch (responseCode) {
case GetAppsReferrerResponse.OK:
try {
GetAppsReferrerDetails getAppsReferrerDetails = referrerClient.getInstallReferrer();
referrerDetailsHolder.offer(getAppsReferrerDetails);
} catch (Exception e) {
logger.error("XiaomiReferrer getInstallReferrer: " + e.getMessage());
}
break;
case GetAppsReferrerResponse.FEATURE_NOT_SUPPORTED:
logger.info("XiaomiReferrer onGetAppsReferrerSetupFinished: FEATURE_NOT_SUPPORTED");
break;
case GetAppsReferrerResponse.SERVICE_UNAVAILABLE:
logger.info("XiaomiReferrer onGetAppsReferrerSetupFinished: SERVICE_UNAVAILABLE");
break;
}
break;
case GetAppsReferrerResponse.FEATURE_NOT_SUPPORTED:
logger.info("XiaomiReferrer onGetAppsReferrerSetupFinished: FEATURE_NOT_SUPPORTED");
referrerDetailsHolder.offer(null);
break;
case GetAppsReferrerResponse.SERVICE_UNAVAILABLE:
logger.info("XiaomiReferrer onGetAppsReferrerSetupFinished: SERVICE_UNAVAILABLE");
referrerDetailsHolder.offer(null);
break;
} catch (Exception e) {
logger.error("XiaomiReferrer onGetAppsReferrerSetupFinished: " + e.getMessage());
}
}
}

@Override
public void onGetAppsServiceDisconnected() {
}
});
@Override
public void onGetAppsServiceDisconnected() {
}
});

try {
return referrerDetailsHolder.poll(maxWaitTimeInMilli, TimeUnit.MILLISECONDS);

} catch (Exception e) {
logger.error("Exception while waiting to get referrer: ", e.getMessage());
logger.error("Exception while getting referrer: ", e.getMessage());
}

return null;
Expand Down
2 changes: 1 addition & 1 deletion Adjust/test-unit/src/androidTest/java/com/adjust/sdk/TestActivityPackage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public TestActivityPackage(ActivityPackage activityPackage) {
// default values
appToken = "123456789012";
environment = "sandbox";
clientSdk = "android4.33.2";
clientSdk = "android4.33.3";
suffix = "";
attribution = new AdjustAttribution();
playServices = true;
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
### Version 4.33.3 (16th February 2023)
#### Fixed
- Added catching of exceptions in referrer plugins when thrown anytime while retrieving referrer.

---

### Version 4.33.2 (7th December 2022)
#### Fixed
- Fixed Duplicate class error caused by compiler generating package `a.a`.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.33.2
4.33.3