Skip to content
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

Fix for 680 NullPointerException in Requester.sendAdException #692

Merged
merged 5 commits into from
Sep 29, 2023
Merged

Fix for 680 NullPointerException in Requester.sendAdException #692

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fb62e63
Response Callback could be null so surrounding with Null checks.
jsligh Sep 19, 2023
4bf6710
Adding an isDestroyed flag as well as a warning. Leaving the null ch…
jsligh Sep 20, 2023
a157b79
Removed destroyed state and included a weakReference.
jsligh Sep 20, 2023
5d31a14
Implemented proposed fix similar to the way Network Task is handled i…
jsligh Sep 21, 2023
53c8582
Requested change to remove race condition.
jsligh Sep 26, 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
16 changes: 8 additions & 8 deletions ...core/src/main/java/org/prebid/mobile/rendering/networking/modelcontrollers/Requester.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public abstract class Requester {
protected URLBuilder urlBuilder;
protected ResponseHandler adResponseCallBack;
protected BaseNetworkTask networkTask;
protected AdIdManager.FetchAdIdInfoTask fetchAdIdInfoTask;

Requester(
AdUnitConfiguration config,
Expand Down Expand Up @@ -88,6 +89,10 @@ public void destroy() {
}
networkTask = null;
adResponseCallBack = null;
if (fetchAdIdInfoTask != null) {
fetchAdIdInfoTask.cancel(true);
}
fetchAdIdInfoTask = null;
jsligh marked this conversation as resolved.
Show resolved Hide resolved
}

protected List<ParameterBuilder> getParameterBuilders() {
Expand Down Expand Up @@ -125,23 +130,18 @@ protected void getAdId() {
}

UserConsentManager userConsentManager = ManagersResolver.getInstance().getUserConsentManager();
WeakReference<Requester> weakRequester = new WeakReference<>(this);
if (userConsentManager.canAccessDeviceData()) {
AdIdManager.initAdId(context, new AdIdFetchListener() {
fetchAdIdInfoTask = AdIdManager.initAdId(context, new AdIdFetchListener() {
@Override
public void adIdFetchCompletion() {
LogUtil.info(TAG, "Advertising id was received");
if (weakRequester.get() != null) {
weakRequester.get().makeAdRequest();
}
makeAdRequest();
}

@Override
public void adIdFetchFailure() {
LogUtil.warning(TAG, "Can't get advertising id");
if (weakRequester.get() != null) {
weakRequester.get().makeAdRequest();
}
makeAdRequest();
}
});
} else {
Expand Down
6 changes: 4 additions & 2 deletions ...rebidMobile-core/src/main/java/org/prebid/mobile/rendering/utils/helpers/AdIdManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ private AdIdManager() {
}

// Wrap method execution in try / catch to avoid crashes in runtime if publisher didn't include identifier dependencies
public static void initAdId(final Context context, final AdIdFetchListener listener) {
public static FetchAdIdInfoTask initAdId(final Context context, final AdIdFetchListener listener) {
try {
GoogleApiAvailability apiAvailability = GoogleApiAvailability.getInstance();
int resultCode = apiAvailability.isGooglePlayServicesAvailable(context);
Expand All @@ -67,6 +67,7 @@ public static void initAdId(final Context context, final AdIdFetchListener liste
listener.adIdFetchFailure();
}
}, AD_ID_TIMEOUT_MS);
return getAdIdInfoTask;
}
else {
listener.adIdFetchCompletion();
Expand All @@ -75,6 +76,7 @@ public static void initAdId(final Context context, final AdIdFetchListener liste
catch (Throwable throwable) {
LogUtil.error(TAG, "Failed to initAdId: " + Log.getStackTraceString(throwable) + "\nDid you add necessary dependencies?");
}
return null;
}

/**
Expand All @@ -97,7 +99,7 @@ public static void setAdId(String adId) {
sAdId = adId;
}

private static class FetchAdIdInfoTask extends AsyncTask<Void, Void, Void> {
public static class FetchAdIdInfoTask extends AsyncTask<Void, Void, Void> {

private final WeakReference<Context> contextWeakReference;
private final AdIdFetchListener adIdFetchListener;
Expand Down