fix: remove invalid session records

Author: jinliu9508

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventsRepository.kt

@@ -8,7 +8,7 @@ import com.onesignal.session.internal.influence.Influence
 import com.onesignal.session.internal.influence.InfluenceChannel
 import com.onesignal.session.internal.influence.InfluenceType
 import com.onesignal.session.internal.influence.InfluenceType.Companion.fromString
-import com.onesignal.session.internal.outcomes.migrations.RemoveZeroSessionTimeRecords
+import com.onesignal.session.internal.outcomes.migrations.RemoveInvalidSessionTimeRecords
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.json.JSONArray
@@ -102,7 +102,7 @@ internal class OutcomeEventsRepository(
     override suspend fun getAllEventsToSend(): List<OutcomeEventParams> {
         val events: MutableList<OutcomeEventParams> = ArrayList()
         withContext(Dispatchers.IO) {
-            RemoveZeroSessionTimeRecords.run(_databaseProvider)
+            RemoveInvalidSessionTimeRecords.run(_databaseProvider)
             _databaseProvider.os.query(OutcomeEventsTable.TABLE_NAME) { cursor ->
                 if (cursor.moveToFirst()) {
                     do {

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/migrations/RemoveZeroSessionTimeRecords.kt renamed to OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/migrations/RemoveInvalidSessionTimeRecords.kt

@@ -4,20 +4,22 @@ import com.onesignal.core.internal.database.IDatabaseProvider
 import com.onesignal.session.internal.outcomes.impl.OutcomeEventsTable
 
 /**
- * Purpose: Clean up invalid cached os__session_duration outcome records
- * with zero session_time produced in SDK versions 5.1.15 to 5.1.20 so we stop
- * sending these requests to the backend.
+ * Purpose: Clean up invalid cached os__session_duration outcome records with
+ *   1. zero session_time produced in SDK versions 5.1.15 to 5.1.20
+ *   2. missing session_time produced in SDK
+ * so we stop sending these requests to the backend.
  *
  * Issue: SessionService.backgroundRun() didn't account for it being run more
  * than one time in the background, when this happened it would create a
- * outcome record with zero time which is invalid.
+ * outcome record with zero time or null which is invalid.
  */
-object RemoveZeroSessionTimeRecords {
+object RemoveInvalidSessionTimeRecords {
     fun run(databaseProvider: IDatabaseProvider) {
         databaseProvider.os.delete(
             OutcomeEventsTable.TABLE_NAME,
             OutcomeEventsTable.COLUMN_NAME_NAME + " = \"os__session_duration\"" +
-                " AND " + OutcomeEventsTable.COLUMN_NAME_SESSION_TIME + " = 0",
+                " AND (" + OutcomeEventsTable.COLUMN_NAME_SESSION_TIME + " = 0" +
+                " OR " + OutcomeEventsTable.COLUMN_NAME_SESSION_TIME + " IS NULL)",
             null,
         )
     }