feat: sdk 1008 manual session

android/src/main/java/com/rudderstack/android/ConfigurationActions.kt

@@ -0,0 +1,35 @@
+/*
+ * Creator: Debanjan Chatterjee on 07/03/24, 11:49 am Last modified: 07/03/24, 11:49 am
+ * Copyright: All rights reserved Ⓒ 2024 http://rudderstack.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain a
+ * copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+@file:JvmName("ConfigurationActions")
+package com.rudderstack.android
+
+import android.app.Application
+import com.rudderstack.android.storage.AndroidStorage
+import com.rudderstack.core.Analytics
+import com.rudderstack.core.Storage
+
+fun Analytics.applyConfigurationAndroid(androidConfigurationScope: ConfigurationAndroid.() ->
+ConfigurationAndroid){
+    applyConfiguration {
+        if (this is ConfigurationAndroid) androidConfigurationScope()
+        else this
+    }
+}
+val Analytics.currentConfigurationAndroid: ConfigurationAndroid?
+    get() = (currentConfiguration as? ConfigurationAndroid)
+
+internal fun Application.initialConfigurationAndroid(storage: AndroidStorage):
+        ConfigurationAndroid {
+    return ConfigurationAndroid(application = this, trackAutoSession = storage.trackAutoSession)
+}

android/src/main/java/com/rudderstack/android/ConfigurationAndroid.kt

@@ -84,7 +84,6 @@ interface ConfigurationAndroid : Configuration {
     companion object {
         operator fun invoke(
             application: Application,
-            jsonAdapter: JsonAdapter,
             anonymousId: String?= null,
             userId: String? = null,
             options: RudderOptions = RudderOptions.defaultOptions(),
@@ -130,7 +129,6 @@ interface ConfigurationAndroid : Configuration {
             override val advertisingIdFetchExecutor : ExecutorService? = advertisingIdFetchExecutor
             override val trackAutoSession: Boolean = trackAutoSession
             override val sessionTimeoutMillis: Long = sessionTimeoutMillis
-            override val jsonAdapter: JsonAdapter = jsonAdapter
             override val options: RudderOptions = options
             override val flushQueueSize: Int = flushQueueSize
             override val maxFlushInterval: Long = maxFlushInterval
@@ -177,7 +175,6 @@ interface ConfigurationAndroid : Configuration {
         ): ConfigurationAndroid=
             invoke(
                 application,
-                configuration.jsonAdapter,
                 anonymousId,
                 userId,
                 configuration.options,
@@ -207,7 +204,6 @@ interface ConfigurationAndroid : Configuration {
     }
 
     override fun copy(
-        jsonAdapter: JsonAdapter,
         options: RudderOptions,
         flushQueueSize: Int,
         maxFlushInterval: Long,
@@ -221,9 +217,8 @@ interface ConfigurationAndroid : Configuration {
         analyticsExecutor: ExecutorService,
         networkExecutor: ExecutorService,
         base64Generator: Base64Generator,
-    ): Configuration {
+    ): ConfigurationAndroid {
         return copy(
-            jsonAdapter,
             options,
             flushQueueSize,
             maxFlushInterval,
@@ -242,7 +237,6 @@ interface ConfigurationAndroid : Configuration {
     }
 
     fun copy(
-        jsonAdapter: JsonAdapter = this.jsonAdapter,
         options: RudderOptions = this.options,
         flushQueueSize: Int = this.flushQueueSize,
         maxFlushInterval: Long = this.maxFlushInterval,
@@ -261,12 +255,17 @@ interface ConfigurationAndroid : Configuration {
         userId: String? = this.userId,
         advertisingId: String? = this.advertisingId,
         deviceToken: String? = this.deviceToken,
+        recordScreenViews: Boolean = this.recordScreenViews,
         trackAutoSession: Boolean = this.trackAutoSession,
-        sessionTimeoutMillis: Long = this.sessionTimeoutMillis
+        sessionTimeoutMillis: Long = this.sessionTimeoutMillis,
+        trackLifecycleEvents : Boolean = this.trackLifecycleEvents,
+        isPeriodicFlushEnabled : Boolean = this.isPeriodicFlushEnabled,
+        autoCollectAdvertId : Boolean = this.autoCollectAdvertId,
+        multiProcessEnabled : Boolean = this.multiProcessEnabled,
+        defaultProcessName : String? = this.defaultProcessName,
     ) : ConfigurationAndroid{
         return ConfigurationAndroid(
             application,
-            jsonAdapter,
             anonymousId,
             userId,
             options,

android/src/main/java/com/rudderstack/android/RudderAnalytics.kt

@@ -15,6 +15,7 @@
 
 package com.rudderstack.android
 
+import android.app.Application
 import com.rudderstack.android.internal.infrastructure.ActivityBroadcasterPlugin
 import com.rudderstack.android.internal.infrastructure.AnonymousIdHeaderPlugin
 import com.rudderstack.android.internal.infrastructure.LifecycleObserverPlugin
@@ -36,6 +37,7 @@ import com.rudderstack.core.DataUploadService
 import com.rudderstack.core.holder.associateState
 import com.rudderstack.core.holder.retrieveState
 import com.rudderstack.models.MessageContext
+import com.rudderstack.rudderjsonadapter.JsonAdapter
 
 //device info and stuff
 //multi process
@@ -44,19 +46,22 @@ import com.rudderstack.models.MessageContext
 //work manager
 fun RudderAnalytics(
     writeKey: String,
-    configuration: ConfigurationAndroid,
+    jsonAdapter: JsonAdapter,
+    application: Application,
+    configurationInitializer: ConfigurationAndroid.() -> ConfigurationAndroid = { this },
     instanceName: String = DEFAULTS_ANALYTICS_INSTANCE_NAME,
     dataUploadService: DataUploadService? = null,
     configDownloadService: ConfigDownloadService? = null,
     storage: AndroidStorage = AndroidStorageImpl(
-        configuration.application,
+        application,
         instanceName = instanceName,
         useContentProvider = ConfigurationAndroid.Defaults.USE_CONTENT_PROVIDER
     ),
     initializationListener: ((success: Boolean, message: String?) -> Unit)? = null
 ): Analytics {
     return Analytics(writeKey,
-        configuration,
+        jsonAdapter,
+        configurationInitializer(application.initialConfigurationAndroid(storage)),
         instanceName,
         dataUploadService,
         configDownloadService,
@@ -172,17 +177,6 @@ internal fun Analytics.processNewContext(
     androidStorage.cacheContext(newContext)
     contextState?.update(newContext)
 }
-
-fun Analytics.applyConfigurationAndroid(androidConfigurationScope: ConfigurationAndroid.() ->
-ConfigurationAndroid){
-    applyConfiguration {
-        if (this is ConfigurationAndroid) androidConfigurationScope()
-        else this
-    }
-}
-val Analytics.currentConfigurationAndroid: ConfigurationAndroid?
-    get() = (currentConfiguration as? ConfigurationAndroid)
-
 private fun Analytics.onShutdown() {
     shutdownSessionManagement()
 }

android/src/main/java/com/rudderstack/android/compat/ConfigurationAndroidBuilder.java

@@ -19,7 +19,6 @@
 import com.rudderstack.android.AndroidUtils;
 import com.rudderstack.android.ConfigurationAndroid;
 import com.rudderstack.core.compat.ConfigurationBuilder;
-import com.rudderstack.rudderjsonadapter.JsonAdapter;
 
 import java.util.concurrent.ExecutorService;
 
@@ -40,8 +39,8 @@ public class ConfigurationAndroidBuilder extends ConfigurationBuilder {
     private boolean trackAutoSession = ConfigurationAndroid.Defaults.AUTO_SESSION_TRACKING;
     private long sessionTimeoutMillis = ConfigurationAndroid.Defaults.SESSION_TIMEOUT;
 
-    public ConfigurationAndroidBuilder(Application application, JsonAdapter jsonAdapter) {
-        super(jsonAdapter);
+    public ConfigurationAndroidBuilder(Application application) {
+        super();
         this.application = application;
         anonymousId = AndroidUtils.INSTANCE.getDeviceId(application);
     }

android/src/main/java/com/rudderstack/android/compat/RudderAnalyticsBuilderCompat.java

@@ -16,6 +16,8 @@
 
 import static com.rudderstack.core.AnalyticsKt.DEFAULTS_ANALYTICS_INSTANCE_NAME;
 
+import android.app.Application;
+
 import androidx.annotation.NonNull;
 
 import com.rudderstack.android.ConfigurationAndroid;
@@ -25,6 +27,7 @@
 import com.rudderstack.core.Analytics;
 import com.rudderstack.core.ConfigDownloadService;
 import com.rudderstack.core.DataUploadService;
+import com.rudderstack.rudderjsonadapter.JsonAdapter;
 
 import java.util.concurrent.Executors;
 
@@ -33,40 +36,60 @@
 /**
  * To be used by java projects
  */
-public final class RudderAnalyticsBuilderCompat  {
-
+public final class RudderAnalyticsBuilderCompat {
+    private final Application application;
+    private final JsonAdapter jsonAdapter;
     private @NonNull String writeKey;
-    private @NonNull ConfigurationAndroid configuration;
     private DataUploadService dataUploadService = null;
     private ConfigDownloadService configDownloadService = null;
     private InitializationListener initializationListener = null;
     private String instanceName = DEFAULTS_ANALYTICS_INSTANCE_NAME;
-    private AndroidStorage storage = new AndroidStorageImpl(configuration.getApplication(),
-            ConfigurationAndroid.Defaults.USE_CONTENT_PROVIDER,
-            instanceName = "test_instance",
-            Executors.newSingleThreadExecutor());
+    private AndroidStorage storage;
+    private InitialConfigurationGenerator initialConfigurationGenerator;
 
-    public RudderAnalyticsBuilderCompat(@NonNull String writeKey, @NonNull ConfigurationAndroid configuration) {
+
+    public RudderAnalyticsBuilderCompat(@NonNull String writeKey,
+                                        @NonNull Application application,
+                                        @NonNull JsonAdapter jsonAdapter){
         this.writeKey = writeKey;
-        this.configuration = configuration;
+        this.application = application;
+        this.jsonAdapter = jsonAdapter;
     }
+
     public RudderAnalyticsBuilderCompat withDataUploadService(DataUploadService dataUploadService) {
         this.dataUploadService = dataUploadService;
         return this;
     }
+
     public RudderAnalyticsBuilderCompat withConfigDownloadService(ConfigDownloadService configDownloadService) {
         this.configDownloadService = configDownloadService;
         return this;
     }
+
     public RudderAnalyticsBuilderCompat withInitializationListener(InitializationListener initializationListener) {
         this.initializationListener = initializationListener;
         return this;
     }
-    public Analytics build() {
 
+    public RudderAnalyticsBuilderCompat withConfigurationInitializer(InitialConfigurationGenerator initialConfigurationGenerator) {
+        this.initialConfigurationGenerator = initialConfigurationGenerator;
+        return this;
+    }
+
+    public Analytics build() {
+        if (this.storage == null) {
+            this.storage = new AndroidStorageImpl(application,
+                    ConfigurationAndroid.Defaults.USE_CONTENT_PROVIDER,
+                    instanceName,
+                    Executors.newSingleThreadExecutor());
+        }
         return RudderAnalytics.RudderAnalytics(
                 writeKey,
-                configuration,
+                jsonAdapter,
+                application,
+                configurationAndroid ->
+                        initialConfigurationGenerator == null ? configurationAndroid :
+                                initialConfigurationGenerator.generate(configurationAndroid),
                 instanceName,
                 dataUploadService,
                 configDownloadService,
@@ -89,4 +112,9 @@ public RudderAnalyticsBuilderCompat withStorage(AndroidStorage storage) {
         return this;
     }
 
+    @FunctionalInterface
+    public interface InitialConfigurationGenerator {
+        ConfigurationAndroid generate(ConfigurationAndroid initialConfiguration);
+    }
+
 }

android/src/main/java/com/rudderstack/android/internal/plugins/PlatformInputsPlugin.kt

@@ -49,7 +49,7 @@ private const val CHANNEL = "mobile"
 internal class PlatformInputsPlugin : Plugin, LifecycleListenerPlugin {
     //if true collects advertising id automatically
     private val jsonAdapter
-        get() = _analytics?.currentConfiguration?.jsonAdapter
+        get() = _analytics?.jsonAdapter
 
     private val application
         get() = _analytics?.currentConfigurationAndroid?.application

android/src/main/java/com/rudderstack/android/internal/plugins/SessionPlugin.kt

@@ -17,10 +17,9 @@ package com.rudderstack.android.internal.plugins
 import com.rudderstack.android.ConfigurationAndroid
 import com.rudderstack.android.internal.extensions.withSessionId
 import com.rudderstack.android.internal.extensions.withSessionStart
-import com.rudderstack.android.internal.states.UserSessionState
 import com.rudderstack.android.utilities.defaultLastActiveTimestamp
 import com.rudderstack.android.utilities.resetSession
-import com.rudderstack.android.utilities.startSessionIfNeeded
+import com.rudderstack.android.utilities.startAutoSessionIfNeeded
 import com.rudderstack.android.utilities.updateSessionEnd
 import com.rudderstack.android.utilities.userSessionState
 import com.rudderstack.core.Analytics
@@ -46,15 +45,15 @@ internal class SessionPlugin : Plugin {
             _analytics?.updateSessionEnd()
             return
         }
-        _analytics?.startSessionIfNeeded()
+        _analytics?.startAutoSessionIfNeeded()
     }
 
     override fun intercept(chain: Plugin.Chain): Message {
         //apply session id and session start
         // update last active timestamp
         // if difference between two events is more than session timeout, refresh session
         val message = chain.message()
-        _analytics?.startSessionIfNeeded()
+        _analytics?.startAutoSessionIfNeeded()
         val newMsg = _analytics?.userSessionState?.value?.takeIf { it.isActive }?.let {
             updateWithSession(message, it)
         } ?: message

android/src/main/java/com/rudderstack/android/storage/AndroidStorageImpl.kt

@@ -120,14 +120,14 @@ class AndroidStorageImpl(
             DB_VERSION,
             executorService = storageExecutor
         )
+        jsonAdapter = analytics.jsonAdapter
         messageDao = rudderDatabase?.getDao(MessageEntity::class.java, storageExecutor)
         messageDao?.addDataChangeListener(_messageDataListener)
 
     }
 
     override fun updateConfiguration(configuration: Configuration) {
         super.updateConfiguration(configuration)
-        jsonAdapter = configuration.jsonAdapter
         logger = configuration.logger
     }
 

android/src/main/java/com/rudderstack/android/storage/RudderEntityFactory.kt

@@ -24,7 +24,7 @@ internal class RudderEntityFactory(private val analytics: Analytics) : EntityFac
 
         //we will check the class for conversion
         return when(entity){
-            MessageEntity::class.java -> analytics.currentConfiguration?.jsonAdapter?.let {  MessageEntity.create(values, it) as? T?}
+            MessageEntity::class.java -> analytics.jsonAdapter.let {  MessageEntity.create(values, it) as? T?}
             else -> null
         }
     }