Skip to content

Fix: make sure requestPromise is only invoked once + crash when isLoaded() is called before requestAd() #241

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
koenpunt merged 3 commits into from
Sep 15, 2019
Merged

Fix: make sure requestPromise is only invoked once + crash when isLoaded() is called before requestAd() #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f07db69
Fix: make sure we only invoke requestPromise once
almostintuitive Dec 28, 2017
23f9ff6
Fix: check if mRewardedVideoAd is not null before calling .isLoaded()
almostintuitive Dec 29, 2017
2709405
remove newline
koenpunt Sep 15, 2019
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
10 changes: 8 additions & 2 deletions android/src/main/java/com/sbugert/rnadmob/RNAdMobInterstitialAdModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,10 @@ public void onAdFailedToLoad(int errorCode) {
WritableMap error = Arguments.createMap();
event.putString("message", errorMessage);
sendEvent(EVENT_AD_FAILED_TO_LOAD, event);
mRequestAdPromise.reject(errorString, errorMessage);
if (mRequestAdPromise != null) {
mRequestAdPromise.reject(errorString, errorMessage);
mRequestAdPromise = null;
}
}
@Override
public void onAdLeftApplication() {
Expand All @@ -90,7 +93,10 @@ public void onAdLeftApplication() {
@Override
public void onAdLoaded() {
sendEvent(EVENT_AD_LOADED, null);
mRequestAdPromise.resolve(null);
if (mRequestAdPromise != null) {
mRequestAdPromise.resolve(null);
mRequestAdPromise = null;
}
}
@Override
public void onAdOpened() {
Expand Down
18 changes: 14 additions & 4 deletions android/src/main/java/com/sbugert/rnadmob/RNAdMobRewardedVideoAdModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,10 @@ public void onRewarded(RewardItem rewardItem) {
@Override
public void onRewardedVideoAdLoaded() {
sendEvent(EVENT_AD_LOADED, null);
mRequestAdPromise.resolve(null);
if (mRequestAdPromise != null) {
mRequestAdPromise.resolve(null);
mRequestAdPromise = null;
}
}

@Override
Expand Down Expand Up @@ -111,7 +114,10 @@ public void onRewardedVideoAdFailedToLoad(int errorCode) {
WritableMap error = Arguments.createMap();
event.putString("message", errorMessage);
sendEvent(EVENT_AD_FAILED_TO_LOAD, event);
mRequestAdPromise.reject(errorString, errorMessage);
if (mRequestAdPromise != null) {
mRequestAdPromise.reject(errorString, errorMessage);
mRequestAdPromise = null;
}
}

private void sendEvent(String eventName, @Nullable WritableMap params) {
Expand Down Expand Up @@ -164,7 +170,7 @@ public void showAd(final Promise promise) {
new Handler(Looper.getMainLooper()).post(new Runnable() {
@Override
public void run() {
if (mRewardedVideoAd.isLoaded()) {
if (mRewardedVideoAd != null && mRewardedVideoAd.isLoaded()) {
mRewardedVideoAd.show();
promise.resolve(null);
} else {
Expand All @@ -179,7 +185,11 @@ public void isReady(final Callback callback) {
new Handler(Looper.getMainLooper()).post(new Runnable() {
@Override
public void run() {
callback.invoke(mRewardedVideoAd.isLoaded());
if (mRewardedVideoAd != null) {
callback.invoke(mRewardedVideoAd.isLoaded());
} else {
callback.invoke(false);
}
}
});
}
Expand Down