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

[Fix] NPE by getScheduleBackgroundRunIn #2212

Merged
merged 1 commit into from
Nov 7, 2024
Merged

[Fix] NPE by getScheduleBackgroundRunIn #2212

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
2 changes: 2 additions & 0 deletions OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/SessionModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.onesignal.session
import com.onesignal.common.modules.IModule
import com.onesignal.common.services.ServiceBuilder
import com.onesignal.core.internal.background.IBackgroundService
import com.onesignal.core.internal.startup.IBootstrapService
import com.onesignal.core.internal.startup.IStartableService
import com.onesignal.session.internal.SessionManager
import com.onesignal.session.internal.influence.IInfluenceManager
Expand Down Expand Up @@ -39,6 +40,7 @@ internal class SessionModule : IModule {
.provides<ISessionService>()
.provides<IStartableService>()
.provides<IBackgroundService>()
.provides<IBootstrapService>()
builder.register<SessionListener>().provides<IStartableService>()
builder.register<SessionManager>().provides<ISessionManager>()
}
Expand Down
8 changes: 6 additions & 2 deletions ...nesignal/core/src/main/java/com/onesignal/session/internal/session/impl/SessionService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import com.onesignal.core.internal.application.IApplicationService
import com.onesignal.core.internal.background.IBackgroundService
import com.onesignal.core.internal.config.ConfigModel
import com.onesignal.core.internal.config.ConfigModelStore
import com.onesignal.core.internal.startup.IBootstrapService
import com.onesignal.core.internal.startup.IStartableService
import com.onesignal.core.internal.time.ITime
import com.onesignal.debug.LogLevel
Expand All @@ -32,7 +33,7 @@ internal class SessionService(
private val _configModelStore: ConfigModelStore,
private val _sessionModelStore: SessionModelStore,
private val _time: ITime,
) : ISessionService, IStartableService, IBackgroundService, IApplicationLifecycleHandler {
) : ISessionService, IBootstrapService, IStartableService, IBackgroundService, IApplicationLifecycleHandler {
override val startTime: Long
get() = session!!.startTime

Expand All @@ -50,9 +51,12 @@ internal class SessionService(
// True if app has been foregrounded at least once since the app started
private var hasFocused = false

override fun start() {
override fun bootstrap() {
session = _sessionModelStore.model
config = _configModelStore.model
}

override fun start() {
_applicationService.addApplicationLifecycleHandler(this)
}

Expand Down
9 changes: 8 additions & 1 deletion ...nesignal/core/src/test/java/com/onesignal/session/internal/session/SessionServiceTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ private class Mocks {
return mockSessionModelStore
}

val sessionService = SessionService(MockHelper.applicationService(), MockHelper.configModelStore(), mockSessionModelStore, MockHelper.time(currentTime))
val sessionService =
SessionService(MockHelper.applicationService(), MockHelper.configModelStore(), mockSessionModelStore, MockHelper.time(currentTime))

val spyCallback = spyk<ISessionLifecycleHandler>()
}
Expand All @@ -29,6 +30,7 @@ class SessionServiceTests : FunSpec({
val mocks = Mocks()
val sessionService = mocks.sessionService

sessionService.bootstrap()
sessionService.start()
val sessionModelStore = mocks.sessionModelStore { it.isValid = false }
sessionService.subscribe(mocks.spyCallback)
Expand All @@ -50,6 +52,7 @@ class SessionServiceTests : FunSpec({
val sessionModelStore = mocks.sessionModelStore()

// When
sessionService.bootstrap()
sessionService.start()
sessionService.onFocus(true)
sessionService.subscribe(mocks.spyCallback)
Expand All @@ -73,6 +76,7 @@ class SessionServiceTests : FunSpec({
val mocks = Mocks()
val sessionService = mocks.sessionService

sessionService.bootstrap()
sessionService.start()
val sessionModelStore =
mocks.sessionModelStore {
Expand Down Expand Up @@ -101,6 +105,7 @@ class SessionServiceTests : FunSpec({
val mocks = Mocks()
val sessionService = mocks.sessionService

sessionService.bootstrap()
sessionService.start()
val sessionModelStore =
mocks.sessionModelStore {
Expand All @@ -125,6 +130,7 @@ class SessionServiceTests : FunSpec({
val mocks = Mocks()
val sessionService = mocks.sessionService

sessionService.bootstrap()
sessionService.start()
val sessionModelStore =
mocks.sessionModelStore {
Expand All @@ -147,6 +153,7 @@ class SessionServiceTests : FunSpec({
mocks.sessionModelStore { it.isValid = false }
val sessionService = mocks.sessionService
sessionService.subscribe(mocks.spyCallback)
sessionService.bootstrap()
sessionService.start()

// When
Expand Down
Loading