Extract initialization of service in a dedicated service lifecycle manager

publisher-sdk/src/androidTest/java/com/criteo/publisher/BidManagerFunctionalTest.java

@@ -44,6 +44,8 @@
 import androidx.annotation.NonNull;
 import com.criteo.publisher.bid.BidLifecycleListener;
 import com.criteo.publisher.cache.SdkCache;
+import com.criteo.publisher.config.Config;
+import com.criteo.publisher.config.RemoteConfigResponse;
 import com.criteo.publisher.context.ContextData;
 import com.criteo.publisher.context.ContextProvider;
 import com.criteo.publisher.csm.MetricSendingQueueConsumer;
@@ -62,10 +64,8 @@
 import com.criteo.publisher.model.CdbRequestSlot;
 import com.criteo.publisher.model.CdbResponse;
 import com.criteo.publisher.model.CdbResponseSlot;
-import com.criteo.publisher.model.Config;
 import com.criteo.publisher.model.DeviceInfo;
 import com.criteo.publisher.model.Publisher;
-import com.criteo.publisher.model.RemoteConfigResponse;
 import com.criteo.publisher.model.RewardedAdUnit;
 import com.criteo.publisher.model.User;
 import com.criteo.publisher.network.LiveBidRequestSender;

publisher-sdk/src/androidTest/java/com/criteo/publisher/CriteoInterstitialEventControllerIntegrationTest.java

@@ -35,13 +35,13 @@
 import static org.mockito.Mockito.when;
 
 import com.criteo.publisher.concurrent.DirectMockRunOnUiThreadExecutor;
+import com.criteo.publisher.config.Config;
 import com.criteo.publisher.context.ContextData;
 import com.criteo.publisher.interstitial.InterstitialActivityHelper;
 import com.criteo.publisher.mock.MockedDependenciesRule;
 import com.criteo.publisher.mock.SpyBean;
 import com.criteo.publisher.model.AdUnit;
 import com.criteo.publisher.model.CdbResponseSlot;
-import com.criteo.publisher.model.Config;
 import com.criteo.publisher.model.DeviceInfo;
 import com.criteo.publisher.model.WebViewData;
 import com.criteo.publisher.network.PubSdkApi;

publisher-sdk/src/androidTest/java/com/criteo/publisher/model/ConfigIntegrationTests.java → publisher-sdk/src/androidTest/java/com/criteo/publisher/config/ConfigIntegrationTests.java

@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-package com.criteo.publisher.model;
+package com.criteo.publisher.config;
 
 import static com.criteo.publisher.CriteoUtil.clearCriteo;
 import static com.criteo.publisher.CriteoUtil.givenInitializedCriteo;

publisher-sdk/src/androidTest/java/com/criteo/publisher/integration/CriteoFunctionalTest.java

@@ -20,36 +20,30 @@
 import static com.criteo.publisher.CriteoUtil.givenInitializedCriteo;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.AdditionalAnswers.answerVoid;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.app.Application;
 import android.content.Intent;
-import android.os.Looper;
 import android.util.Log;
 import androidx.test.rule.ActivityTestRule;
 import com.criteo.publisher.BidManager;
 import com.criteo.publisher.Criteo;
+import com.criteo.publisher.config.Config;
 import com.criteo.publisher.context.UserData;
 import com.criteo.publisher.context.UserDataHolder;
 import com.criteo.publisher.logging.Logger;
 import com.criteo.publisher.mock.MockedDependenciesRule;
 import com.criteo.publisher.mock.SpyBean;
-import com.criteo.publisher.model.Config;
 import com.criteo.publisher.network.PubSdkApi;
 import com.criteo.publisher.test.activity.DummyActivity;
 import com.criteo.publisher.util.BuildConfigWrapper;
 import java.util.ArrayList;
-import java.util.List;
 import javax.inject.Inject;
 import org.junit.Rule;
 import org.junit.Test;

publisher-sdk/src/androidTest/java/com/criteo/publisher/integration/DfpHeaderBiddingFunctionalTest.java

@@ -48,6 +48,7 @@
 import com.criteo.publisher.CriteoInitException;
 import com.criteo.publisher.CriteoUtil;
 import com.criteo.publisher.TestAdUnits;
+import com.criteo.publisher.config.Config;
 import com.criteo.publisher.context.ContextData;
 import com.criteo.publisher.integration.DfpHeaderBiddingFunctionalTest.DfpSync.SyncInterstitialAdListener;
 import com.criteo.publisher.logging.LoggerFactory;
@@ -57,7 +58,6 @@
 import com.criteo.publisher.model.AdUnit;
 import com.criteo.publisher.model.BannerAdUnit;
 import com.criteo.publisher.model.CdbResponse;
-import com.criteo.publisher.model.Config;
 import com.criteo.publisher.model.InterstitialAdUnit;
 import com.criteo.publisher.model.NativeAdUnit;
 import com.criteo.publisher.model.nativeads.NativeAssets;

publisher-sdk/src/androidTest/java/com/criteo/publisher/integration/InHouseFunctionalTest.java

@@ -44,6 +44,7 @@
 import com.criteo.publisher.CriteoInterstitial;
 import com.criteo.publisher.CriteoInterstitialAdListener;
 import com.criteo.publisher.TestAdUnits;
+import com.criteo.publisher.config.Config;
 import com.criteo.publisher.context.ContextData;
 import com.criteo.publisher.interstitial.InterstitialActivityHelper;
 import com.criteo.publisher.logging.Logger;
@@ -53,7 +54,6 @@
 import com.criteo.publisher.model.AdUnit;
 import com.criteo.publisher.model.BannerAdUnit;
 import com.criteo.publisher.model.CacheAdUnit;
-import com.criteo.publisher.model.Config;
 import com.criteo.publisher.model.InterstitialAdUnit;
 import com.criteo.publisher.model.RewardedAdUnit;
 import com.criteo.publisher.network.PubSdkApi;

publisher-sdk/src/androidTest/java/com/criteo/publisher/integration/StandaloneFunctionalTest.java

@@ -56,14 +56,14 @@
 import com.criteo.publisher.CriteoInterstitialAdListener;
 import com.criteo.publisher.LiveCdbCallListener;
 import com.criteo.publisher.TestAdUnits;
+import com.criteo.publisher.config.Config;
 import com.criteo.publisher.context.ContextData;
 import com.criteo.publisher.mock.MockBean;
 import com.criteo.publisher.mock.MockedDependenciesRule;
 import com.criteo.publisher.mock.SpyBean;
 import com.criteo.publisher.model.AdSize;
 import com.criteo.publisher.model.BannerAdUnit;
 import com.criteo.publisher.model.CdbRequest;
-import com.criteo.publisher.model.Config;
 import com.criteo.publisher.model.InterstitialAdUnit;
 import com.criteo.publisher.network.LiveBidRequestSender;
 import com.criteo.publisher.network.PubSdkApi;

publisher-sdk/src/androidTest/java/com/criteo/publisher/logging/RemoteLoggingFunctionalTest.kt

@@ -21,9 +21,9 @@ import com.criteo.publisher.CriteoUtil.givenInitializedCriteo
 import com.criteo.publisher.SafeRunnable
 import com.criteo.publisher.TestAdUnits
 import com.criteo.publisher.concurrent.ThreadingUtil.runOnMainThreadAndWait
+import com.criteo.publisher.config.Config
 import com.criteo.publisher.mock.MockedDependenciesRule
 import com.criteo.publisher.mock.SpyBean
-import com.criteo.publisher.model.Config
 import com.criteo.publisher.network.PubSdkApi
 import com.criteo.publisher.privacy.ConsentData
 import com.criteo.publisher.util.BuildConfigWrapper

publisher-sdk/src/androidTest/java/com/criteo/publisher/network/PubSdkApiIntegrationTest.java

@@ -33,6 +33,10 @@
 import android.util.Log;
 import androidx.annotation.NonNull;
 import com.criteo.publisher.StubConstants;
+import com.criteo.publisher.config.Config.DefaultConfig;
+import com.criteo.publisher.config.RemoteConfigRequest;
+import com.criteo.publisher.config.RemoteConfigRequestFactory;
+import com.criteo.publisher.config.RemoteConfigResponse;
 import com.criteo.publisher.context.ContextData;
 import com.criteo.publisher.csm.MetricRequest;
 import com.criteo.publisher.logging.LogMessage;
@@ -46,10 +50,6 @@
 import com.criteo.publisher.model.CdbRequest;
 import com.criteo.publisher.model.CdbRequestFactory;
 import com.criteo.publisher.model.CdbResponse;
-import com.criteo.publisher.model.Config.DefaultConfig;
-import com.criteo.publisher.model.RemoteConfigRequest;
-import com.criteo.publisher.model.RemoteConfigRequestFactory;
-import com.criteo.publisher.model.RemoteConfigResponse;
 import com.criteo.publisher.util.DeviceUtil;
 import com.criteo.publisher.util.SharedPreferencesFactory;
 import javax.inject.Inject;

publisher-sdk/src/main/java/com/criteo/publisher/BidManager.java

@@ -22,6 +22,7 @@
 import androidx.annotation.VisibleForTesting;
 import com.criteo.publisher.bid.BidLifecycleListener;
 import com.criteo.publisher.cache.SdkCache;
+import com.criteo.publisher.config.Config;
 import com.criteo.publisher.context.ContextData;
 import com.criteo.publisher.csm.MetricSendingQueueConsumer;
 import com.criteo.publisher.logging.Logger;
@@ -33,7 +34,6 @@
 import com.criteo.publisher.model.CdbRequest;
 import com.criteo.publisher.model.CdbResponse;
 import com.criteo.publisher.model.CdbResponseSlot;
-import com.criteo.publisher.model.Config;
 import com.criteo.publisher.network.BidRequestSender;
 import com.criteo.publisher.network.LiveBidRequestSender;
 import com.criteo.publisher.privacy.ConsentData;

publisher-sdk/src/main/java/com/criteo/publisher/Criteo.java

@@ -29,13 +29,13 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+import com.criteo.publisher.config.Config;
 import com.criteo.publisher.context.ContextData;
 import com.criteo.publisher.context.UserData;
 import com.criteo.publisher.interstitial.InterstitialActivityHelper;
 import com.criteo.publisher.logging.Logger;
 import com.criteo.publisher.logging.LoggerFactory;
 import com.criteo.publisher.model.AdUnit;
-import com.criteo.publisher.model.Config;
 import com.criteo.publisher.model.DeviceInfo;
 import com.criteo.publisher.util.DeviceUtil;
 import java.util.List;
@@ -102,18 +102,15 @@ private static Criteo init(@NonNull Builder builder) throws CriteoInitException
           DependencyProvider dependencyProvider = DependencyProvider.getInstance();
           dependencyProvider.setApplication(builder.application);
           dependencyProvider.setCriteoPublisherId(builder.criteoPublisherId);
+          dependencyProvider.setInputUsPrivacyOptOut(builder.usPrivacyOptOut);
 
           if (builder.isDebugLogsEnabled) {
             dependencyProvider.provideConsoleHandler().setMinLogLevel(Log.INFO);
           }
 
           DeviceUtil deviceUtil = dependencyProvider.provideDeviceUtil();
           if (deviceUtil.isVersionSupported()) {
-            criteo = new CriteoInternal(
-                builder.application,
-                builder.usPrivacyOptOut,
-                dependencyProvider
-            );
+            criteo = new CriteoInternal(dependencyProvider);
 
             logger.log(onSdkInitialized(builder.criteoPublisherId, getVersion()));
           } else {

publisher-sdk/src/main/java/com/criteo/publisher/CriteoInternal.java

@@ -18,18 +18,16 @@
 
 import static com.criteo.publisher.ErrorLogMessage.onUncaughtErrorAtPublicApi;
 
-import android.app.Application;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import com.criteo.publisher.bid.BidLifecycleListener;
+import com.criteo.publisher.config.Config;
 import com.criteo.publisher.context.ContextData;
 import com.criteo.publisher.context.UserData;
 import com.criteo.publisher.headerbidding.HeaderBidding;
 import com.criteo.publisher.interstitial.InterstitialActivityHelper;
 import com.criteo.publisher.logging.Logger;
 import com.criteo.publisher.logging.LoggerFactory;
 import com.criteo.publisher.model.AdUnit;
-import com.criteo.publisher.model.Config;
 import com.criteo.publisher.model.DeviceInfo;
 import com.criteo.publisher.privacy.UserPrivacyUtil;
 
@@ -62,41 +60,18 @@ class CriteoInternal extends Criteo {
   @NonNull
   private final InterstitialActivityHelper interstitialActivityHelper;
 
-  CriteoInternal(
-      Application application,
-      @Nullable Boolean usPrivacyOptout,
-      @NonNull DependencyProvider dependencyProvider
-  ) {
+  CriteoInternal(@NonNull DependencyProvider dependencyProvider) {
     this.dependencyProvider = dependencyProvider;
 
-    dependencyProvider.provideSession();
+    dependencyProvider.provideSdkServiceLifecycleManager().onSdkInitialized(dependencyProvider.provideSdkInput());
 
     deviceInfo = dependencyProvider.provideDeviceInfo();
-    deviceInfo.initialize();
-
-    dependencyProvider.provideAdvertisingInfo().prefetchAsync();
-
     config = dependencyProvider.provideConfig();
-
     bidManager = dependencyProvider.provideBidManager();
     consumableBidLoader = dependencyProvider.provideConsumableBidLoader();
     headerBidding = dependencyProvider.provideHeaderBidding();
-
     interstitialActivityHelper = dependencyProvider.provideInterstitialActivityHelper();
-
     userPrivacyUtil = dependencyProvider.provideUserPrivacyUtil();
-    if (usPrivacyOptout != null) {
-      userPrivacyUtil.storeUsPrivacyOptout(usPrivacyOptout);
-    }
-
-    application.registerActivityLifecycleCallbacks(dependencyProvider.provideAppLifecycleUtil());
-
-    dependencyProvider.provideTopActivityFinder().registerActivityLifecycleFor(application);
-
-    BidLifecycleListener bidLifecycleListener = dependencyProvider.provideBidLifecycleListener();
-    bidLifecycleListener.onSdkInitialized();
-
-    dependencyProvider.provideBidRequestSender().sendRemoteConfigRequest(config);
   }
 
   @Override