Skip to content

Commit

Permalink
refactor(UserSettingDataSourceImpl): Removed isInitialized field and …
Browse files Browse the repository at this point in the history
…all corresponding methods.
  • Loading branch information
looee1q committed Dec 25, 2024
1 parent a405ba7 commit ebc2402
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 41 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ import com.personalization.sdk.domain.usecases.preferences.GetPreferencesValueUs
import com.personalization.sdk.domain.usecases.preferences.SavePreferencesValueUseCase
import com.personalization.sdk.domain.usecases.userSettings.GetUserSettingsValueUseCase
import com.personalization.sdk.domain.usecases.userSettings.UpdateUserSettingsValueUseCase
import java.security.SecureRandom
import java.util.Date
import java.util.TimeZone
import javax.inject.Inject
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import org.json.JSONObject
import java.security.SecureRandom
import java.util.Date
import java.util.TimeZone
import javax.inject.Inject

class RegisterManager @Inject constructor(
private val getPreferencesValueUseCase: GetPreferencesValueUseCase,
Expand Down Expand Up @@ -121,7 +121,7 @@ class RegisterManager @Inject constructor(
lastUpdate: Long
): Boolean {
return autoSendPushToken &&
(savedToken.isEmpty() || savedToken != newToken || (currentDate - lastUpdate >= ONE_WEEK_MILLISECONDS))
(savedToken.isEmpty() || savedToken != newToken || (currentDate - lastUpdate >= ONE_WEEK_MILLISECONDS))
}

private fun sendPushTokenToServer(token: String, currentDate: Long) {
Expand Down Expand Up @@ -223,7 +223,6 @@ class RegisterManager @Inject constructor(
}

private fun initializeSdk(seance: String?) {
updateUserSettingsValueUseCase.updateIsInitialized(value = true)
val finalSeance = seance ?: generateOrRetrieveSeance()
updateUserSettingsValueUseCase.updateSid(value = finalSeance)
executeQueueTasksUseCase.invoke()
Expand Down
13 changes: 3 additions & 10 deletions personalization-sdk/src/main/kotlin/com/personalization/SDK.kt
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ import com.personalization.sdk.domain.usecases.userSettings.InitUserSettingsUseC
import com.personalization.stories.StoriesManager
import com.personalization.stories.views.StoriesView
import com.personalization.utils.DomainFormattingUtils.formatApiDomain
import java.util.Locale
import javax.inject.Inject
import org.json.JSONException
import org.json.JSONObject
import java.util.Locale
import javax.inject.Inject

open class SDK {

Expand Down Expand Up @@ -230,14 +230,7 @@ open class SDK {
replaceWith = ReplaceWith("getSid(): String")
)
fun getSid(listener: Consumer<String?>) {
val thread = Thread {
listener.accept(getSid())
}
if (getUserSettingsValueUseCase.getIsInitialized()) {
thread.start()
} else {
addTaskToQueueUseCase.invoke(thread)
}
listener.accept(getSid())
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ class NetworkRepositoryImpl @Inject constructor(
private fun sendAsync(sendFunction: () -> Unit) {
val thread = Thread(sendFunction)
if (userSettingsRepository.getDid()
.isNotEmpty() && userSettingsRepository.getIsInitialized()
.isNotEmpty()
) {
thread.start()
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,4 @@ interface UserSettingsDataSource {
fun getDid(): String
fun saveDid(value: String)
fun removeDid()

fun getIsInitialized(): Boolean
fun setIsInitialized(value: Boolean)
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ class UserSettingsDataSourceImpl @AssistedInject constructor(
@Assisted("stream") private val stream: String
) : UserSettingsDataSource {

private var isInitialized: Boolean = false

override fun addParams(
params: JSONObject,
notificationSource: NotificationSource?,
Expand Down Expand Up @@ -57,9 +55,4 @@ class UserSettingsDataSourceImpl @AssistedInject constructor(
override fun getDid(): String = preferencesDataSource.getValue(DID_KEY, DEFAULT_DID)
override fun saveDid(value: String) = preferencesDataSource.saveValue(DID_KEY, value)
override fun removeDid() = preferencesDataSource.removeValue(DID_KEY)

override fun getIsInitialized(): Boolean = isInitialized
override fun setIsInitialized(value: Boolean) {
isInitialized = value
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,6 @@ class UserSettingsRepositoryImpl @Inject constructor(
override fun getSidLastActTime(): Long =
userSettingsDataSource.getSidLastActTime()

override fun getIsInitialized(): Boolean =
userSettingsDataSource.getIsInitialized()

override fun updateIsInitialized(value: Boolean) {
userSettingsDataSource.setIsInitialized(value)
}

override fun addParams(
params: JSONObject,
notificationSource: NotificationSource?
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ interface UserSettingsRepository {
fun updateSidLastActTime()
fun getSidLastActTime(): Long

fun getIsInitialized(): Boolean
fun updateIsInitialized(value: Boolean)

fun addParams(
params: JSONObject,
notificationSource: NotificationSource?,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,4 @@ class GetUserSettingsValueUseCase @Inject constructor(
fun getSid(): String = userSettingsRepository.getSid()

fun getSidLastActTime(): Long = userSettingsRepository.getSidLastActTime()

fun getIsInitialized(): Boolean = userSettingsRepository.getIsInitialized()
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,4 @@ class UpdateUserSettingsValueUseCase @Inject constructor(
fun updateSid(value: String) = userSettingsRepository.updateSid(value)

fun updateSidLastActTime() = userSettingsRepository.updateSidLastActTime()

fun updateIsInitialized(value: Boolean) = userSettingsRepository.updateIsInitialized(value)
}

0 comments on commit ebc2402

Please sign in to comment.