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

Jump to bottom

Fix Bug #10

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Bug #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ...ads/src/main/java/com/unity3d/services/ads/operation/load/LoadModuleDecoratorTimeout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import com.unity3d.ads.UnityAds;
import com.unity3d.services.core.configuration.ConfigurationReader;
import com.unity3d.services.core.misc.Utilities;
import com.unity3d.services.core.request.metrics.AdOperationError;
import com.unity3d.services.core.request.metrics.AdOperationMetric;
import com.unity3d.services.core.timer.BaseTimer;
Expand Down Expand Up @@ -44,7 +45,7 @@ public void onTimerFinished() {
});
loadOperationState.timeoutTimer.start(Executors.newSingleThreadScheduledExecutor());
} else {
_executorService.submit(new Runnable() {
_executorService.execute(new Runnable() {
@Override
public void run() {
if (!loadOperationState.timeoutCV.block(loadOperationState.configuration.getLoadTimeout())) {
Expand Down Expand Up @@ -87,7 +88,12 @@ private void onOperationTimeout(final LoadOperationState state) {
if (state != null) {
getMetricSender().sendMetricWithInitState(AdOperationMetric.newAdLoadFailure(AdOperationError.timeout, state.duration()));
remove(state.id);
state.onUnityAdsFailedToLoad(UnityAds.UnityAdsLoadError.TIMEOUT, errorMsgTimeoutLoading + state.placementId);
Utilities.runOnUiThread(new Runnable() {
@Override
public void run() {
state.onUnityAdsFailedToLoad(UnityAds.UnityAdsLoadError.TIMEOUT, errorMsgTimeoutLoading + state.placementId);
}
});
}
}
}
12 changes: 9 additions & 3 deletions ...ads/src/main/java/com/unity3d/services/ads/operation/show/ShowModuleDecoratorTimeout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import com.unity3d.ads.UnityAds;
import com.unity3d.services.core.configuration.ConfigurationReader;
import com.unity3d.services.core.misc.Utilities;
import com.unity3d.services.core.request.metrics.AdOperationError;
import com.unity3d.services.core.request.metrics.AdOperationMetric;
import com.unity3d.services.core.timer.BaseTimer;
Expand Down Expand Up @@ -44,7 +45,7 @@ public void onTimerFinished() {
});
showOperationState.timeoutTimer.start(Executors.newSingleThreadScheduledExecutor());
} else {
_executorService.submit(new Runnable() {
_executorService.execute(new Runnable() {
@Override
public void run() {
if (!showOperationState.timeoutCV.block(showOperationState.configuration.getShowTimeout())) {
Expand Down Expand Up @@ -89,11 +90,16 @@ private void releaseOperationTimeoutLock(String operationId) {
}
}

private void onOperationTimeout(final ShowOperationState state, UnityAds.UnityAdsShowError error, String message) {
private void onOperationTimeout(final ShowOperationState state, final UnityAds.UnityAdsShowError error,final String message) {
if (state != null) {
getMetricSender().sendMetricWithInitState(AdOperationMetric.newAdShowFailure(AdOperationError.timeout, state.duration()));
remove(state.id);
state.onUnityAdsShowFailure(error, message);
Utilities.runOnUiThread(new Runnable() {
@Override
public void run() {
state.onUnityAdsShowFailure(error, message);
}
});
}
}
}
2 changes: 1 addition & 1 deletion unity-ads/src/main/java/com/unity3d/services/core/request/metrics/MetricSender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public void sendMetrics(final List<Metric> metrics) {
return;
}

_executorService.submit(new Runnable() {
_executorService.execute(new Runnable() {
@Override
public void run() {
try {
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/com/unity3d/services/core/webview/bridge/invocation/WebViewBridgeInvocation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public WebViewBridgeInvocation(ExecutorService _executorService, IWebViewBridgeI

@Override
public synchronized void invoke(final String className, final String methodName, final int timeoutLengthInMilliSeconds, final Object... invocationParameters) {
_executorService.submit(
_executorService.execute(
new WebViewBridgeInvocationRunnable(invocationCallback, _webViewBridgeInvoker, className, methodName, timeoutLengthInMilliSeconds, invocationParameters));
}
}