From e4c948c139d1e5a068ac3950224a06fa88ed9dae Mon Sep 17 00:00:00 2001 From: Jono Sligh Date: Tue, 4 Jun 2024 09:58:06 -0500 Subject: [PATCH 1/5] Changing order. --- .../prebid/mobile/rendering/sdk/InitializationNotifier.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/sdk/InitializationNotifier.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/sdk/InitializationNotifier.java index 669586bb4..ead78656d 100644 --- a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/sdk/InitializationNotifier.java +++ b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/sdk/InitializationNotifier.java @@ -38,11 +38,14 @@ public void initializationCompleted(@Nullable String statusRequesterError) { LogUtil.debug(TAG, "Prebid SDK " + PrebidMobile.SDK_VERSION + " initialized"); if (listener != null) { + //allows placing of bids to occur in InitializationListener + tasksCompletedSuccessfully = true; listener.onInitializationComplete(InitializationStatus.SUCCEEDED); listener.onSdkInit(); } } else { + tasksCompletedSuccessfully = true; LogUtil.error(TAG, statusRequesterError); if (listener != null) { @@ -53,8 +56,6 @@ public void initializationCompleted(@Nullable String statusRequesterError) { listener.onSdkFailedToInit(new InitError(statusRequesterError)); } } - - tasksCompletedSuccessfully = true; initializationInProgress = false; listener = null; }); From 976031de049e9a713b130f319c5f9a2f9920bfcf Mon Sep 17 00:00:00 2001 From: Jono Sligh Date: Mon, 10 Jun 2024 09:57:13 -0500 Subject: [PATCH 2/5] Changing SDK to 17, Kotlin doesnt support 21. --- .../src/test/java/org/prebid/mobile/UtilTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PrebidMobile/PrebidMobile-gamEventHandlers/src/test/java/org/prebid/mobile/UtilTest.java b/PrebidMobile/PrebidMobile-gamEventHandlers/src/test/java/org/prebid/mobile/UtilTest.java index 5c67200da..8678023c6 100644 --- a/PrebidMobile/PrebidMobile-gamEventHandlers/src/test/java/org/prebid/mobile/UtilTest.java +++ b/PrebidMobile/PrebidMobile-gamEventHandlers/src/test/java/org/prebid/mobile/UtilTest.java @@ -476,7 +476,7 @@ public void onPrebidNativeNotValid() { class BaseSetup { - public static final int testSDK = 21; + public static final int testSDK = 17; protected MockWebServer server; protected Scheduler uiScheduler, bgScheduler; From 846ce86235713164d674a1adbe07535b46383fbb Mon Sep 17 00:00:00 2001 From: Jono Sligh Date: Mon, 10 Jun 2024 09:58:11 -0500 Subject: [PATCH 3/5] Revert "Changing SDK to 17, Kotlin doesnt support 21." This reverts commit 976031de049e9a713b130f319c5f9a2f9920bfcf. --- .../src/test/java/org/prebid/mobile/UtilTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PrebidMobile/PrebidMobile-gamEventHandlers/src/test/java/org/prebid/mobile/UtilTest.java b/PrebidMobile/PrebidMobile-gamEventHandlers/src/test/java/org/prebid/mobile/UtilTest.java index 8678023c6..5c67200da 100644 --- a/PrebidMobile/PrebidMobile-gamEventHandlers/src/test/java/org/prebid/mobile/UtilTest.java +++ b/PrebidMobile/PrebidMobile-gamEventHandlers/src/test/java/org/prebid/mobile/UtilTest.java @@ -476,7 +476,7 @@ public void onPrebidNativeNotValid() { class BaseSetup { - public static final int testSDK = 17; + public static final int testSDK = 21; protected MockWebServer server; protected Scheduler uiScheduler, bgScheduler; From 696dc3728688add4dedc073164eb9e52c5860837 Mon Sep 17 00:00:00 2001 From: Jono Sligh Date: Tue, 11 Jun 2024 08:40:51 -0500 Subject: [PATCH 4/5] Queued up the initialization listener on the main thread so it executes after "tasksCompletedSuccessfully" is set to true. --- .../rendering/sdk/InitializationNotifier.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/sdk/InitializationNotifier.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/sdk/InitializationNotifier.java index ead78656d..fa4b398c5 100644 --- a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/sdk/InitializationNotifier.java +++ b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/sdk/InitializationNotifier.java @@ -39,23 +39,25 @@ public void initializationCompleted(@Nullable String statusRequesterError) { if (listener != null) { //allows placing of bids to occur in InitializationListener - tasksCompletedSuccessfully = true; - listener.onInitializationComplete(InitializationStatus.SUCCEEDED); - - listener.onSdkInit(); + postOnMainThread(() -> { + listener.onInitializationComplete(InitializationStatus.SUCCEEDED); + listener.onSdkInit(); + }); } } else { - tasksCompletedSuccessfully = true; LogUtil.error(TAG, statusRequesterError); if (listener != null) { InitializationStatus serverStatusWarning = InitializationStatus.SERVER_STATUS_WARNING; serverStatusWarning.setDescription(statusRequesterError); - listener.onInitializationComplete(serverStatusWarning); - - listener.onSdkFailedToInit(new InitError(statusRequesterError)); + postOnMainThread(() -> { + listener.onInitializationComplete(serverStatusWarning); + listener.onSdkFailedToInit(new InitError(statusRequesterError)); + }); } } + + tasksCompletedSuccessfully = true; initializationInProgress = false; listener = null; }); From 177e497477286deac2e2382efd302446fdc86a0a Mon Sep 17 00:00:00 2001 From: Jono Sligh Date: Tue, 11 Jun 2024 08:50:16 -0500 Subject: [PATCH 5/5] listener was set to null before execution. --- .../mobile/rendering/sdk/InitializationNotifier.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/sdk/InitializationNotifier.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/sdk/InitializationNotifier.java index fa4b398c5..8e5eebc6e 100644 --- a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/sdk/InitializationNotifier.java +++ b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/sdk/InitializationNotifier.java @@ -42,24 +42,25 @@ public void initializationCompleted(@Nullable String statusRequesterError) { postOnMainThread(() -> { listener.onInitializationComplete(InitializationStatus.SUCCEEDED); listener.onSdkInit(); + listener = null; }); } } else { LogUtil.error(TAG, statusRequesterError); if (listener != null) { - InitializationStatus serverStatusWarning = InitializationStatus.SERVER_STATUS_WARNING; - serverStatusWarning.setDescription(statusRequesterError); postOnMainThread(() -> { + InitializationStatus serverStatusWarning = InitializationStatus.SERVER_STATUS_WARNING; + serverStatusWarning.setDescription(statusRequesterError); listener.onInitializationComplete(serverStatusWarning); listener.onSdkFailedToInit(new InitError(statusRequesterError)); + listener = null; }); } } tasksCompletedSuccessfully = true; initializationInProgress = false; - listener = null; }); }