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: rudder preference manager refactor #467

Open
wants to merge 6 commits into
base: feature/sdk-2150-refactor-rudderpreferencemanager-class
Choose a base branch
from
Open

fix: rudder preference manager refactor #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
339f5b0
fix: use custom getter for all fields in Storage
1abhishekpandey Jul 19, 2024
1cb2057
fix: correct the logic to set the previousVersionName
1abhishekpandey Jul 19, 2024
077df39
fix: import the `utilities.empty` in SharedPrefsStore
1abhishekpandey Jul 19, 2024
eaf82d5
chore: remove redundant field in LifecycleObserverPlugin
1abhishekpandey Jul 19, 2024
a2ef853
fix: pass userId as null if it's empty
1abhishekpandey Jul 19, 2024
684b470
fix: return -1 as default value for getInt in SharedPrefsStore
1abhishekpandey Jul 19, 2024
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
4 changes: 1 addition & 3 deletions ...ain/java/com/rudderstack/android/internal/infrastructure/AppInstallUpdateTrackerPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,7 @@ class AppInstallUpdateTrackerPlugin : Plugin {
} else {
DEFAULT_BUILD
}
val previousVersionName: String = if (analytics.androidStorage.versionName.isEmpty()) {
analytics.androidStorage.versionName
} else {
val previousVersionName: String = analytics.androidStorage.versionName.ifEmpty {
DEFAULT_VERSION_NAME
}
var currentBuild: Int? = null
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/com/rudderstack/android/internal/infrastructure/LifecycleObserverPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ internal class LifecycleObserverPlugin(
_isFirstLaunch.getAndSet(false).also { isFirstLaunch ->
add("from_background" to !isFirstLaunch)
}.takeIf { it }?.let {
add("version" to (analytics.androidStorage.versionName ?: ""))
add("version" to (analytics.androidStorage.versionName))
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion android/src/main/java/com/rudderstack/android/internal/plugins/FillDefaultsPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ internal class FillDefaultsPlugin : Plugin {
return (this.copy(
context = newContext,
anonymousId = anonId,
userId = userId
userId = userId.ifEmpty { null }
) as T)
}

Expand Down
3 changes: 2 additions & 1 deletion android/src/main/java/com/rudderstack/android/internal/prefs/SharedPrefsStore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import android.content.Context
import android.content.SharedPreferences
import android.os.Build
import androidx.core.content.edit
import com.rudderstack.android.utilities.empty
import java.io.File

class SharedPrefsStore(
Expand All @@ -14,7 +15,7 @@ class SharedPrefsStore(
private val preferences: SharedPreferences = applicationContext.getSharedPreferences(prefsName, Context.MODE_PRIVATE)

override fun getInt(key: String): Int {
return preferences.getInt(key, 0)
return preferences.getInt(key, -1)
}

override fun getBoolean(key: String): Boolean {
Expand Down
65 changes: 43 additions & 22 deletions android/src/main/java/com/rudderstack/android/storage/AndroidStorageImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,30 +298,51 @@ class AndroidStorageImpl(
}
}

override val startupQueue: List<Message> = startupQ
override val optOutTime: Long = _optOutTime.get()
override val optInTime: Long = _optInTime.get()
override val anonymousId: String = rudderPrefsRepo.getString(RUDDER_ANONYMOUS_ID_KEY)
override val userId: String = rudderPrefsRepo.getString(RUDDER_USER_ID_KEY)
override val sessionId: Long = rudderPrefsRepo.getLong(RUDDER_SESSION_ID_KEY)
override val lastActiveTimestamp: Long = rudderPrefsRepo.getLong(RUDDER_SESSION_LAST_ACTIVE_TIMESTAMP_KEY)
override val advertisingId: String = rudderPrefsRepo.getString(RUDDER_ADVERTISING_ID_KEY)
override val trackAutoSession: Boolean = rudderPrefsRepo.getBoolean(RUDDER_TRACK_AUTO_SESSION_KEY)
override val build: Int = rudderPrefsRepo.getInt(RUDDER_APPLICATION_BUILD_KEY)
override val versionName: String = rudderPrefsRepo.getString(RUDDER_APPLICATION_VERSION_KEY)
override val isOptedOut: Boolean = rudderPrefsRepo.getBoolean(RUDDER_OPT_STATUS_KEY)

override val v1AnonymousId: String = oldRudderPrefs.getString(RUDDER_ANONYMOUS_ID_KEY)
override val v1SessionId: Long = oldRudderPrefs.getLong(RUDDER_SESSION_ID_KEY)
override val v1LastActiveTimestamp: Long = oldRudderPrefs.getLong(RUDDER_SESSION_LAST_ACTIVE_TIMESTAMP_KEY)
override val v1AdvertisingId: String = oldRudderPrefs.getString(RUDDER_ADVERTISING_ID_KEY)
override val v1Build: Int = oldRudderPrefs.getInt(RUDDER_APPLICATION_BUILD_KEY)
override val v1VersionName: String = oldRudderPrefs.getString(RUDDER_APPLICATION_VERSION_KEY)
override val v1OptOut: Boolean = oldRudderPrefs.getBoolean(RUDDER_OPT_STATUS_KEY)
override val v1Traits: Map<String, Any?>? = oldRudderPrefs.getString(RUDDER_TRAITS_KEY).let {
override val startupQueue: List<Message>
get() = startupQ
override val optOutTime: Long
get() = _optOutTime.get()
override val optInTime: Long
get() = _optInTime.get()
override val anonymousId: String
get() = rudderPrefsRepo.getString(RUDDER_ANONYMOUS_ID_KEY)
override val userId: String
get() = rudderPrefsRepo.getString(RUDDER_USER_ID_KEY)
override val sessionId: Long
get() = rudderPrefsRepo.getLong(RUDDER_SESSION_ID_KEY)
override val lastActiveTimestamp: Long
get() = rudderPrefsRepo.getLong(RUDDER_SESSION_LAST_ACTIVE_TIMESTAMP_KEY)
override val advertisingId: String
get() = rudderPrefsRepo.getString(RUDDER_ADVERTISING_ID_KEY)
override val trackAutoSession: Boolean
get() = rudderPrefsRepo.getBoolean(RUDDER_TRACK_AUTO_SESSION_KEY)
override val build: Int
get() = rudderPrefsRepo.getInt(RUDDER_APPLICATION_BUILD_KEY)
override val versionName: String
get() = rudderPrefsRepo.getString(RUDDER_APPLICATION_VERSION_KEY)
override val isOptedOut: Boolean
get() = rudderPrefsRepo.getBoolean(RUDDER_OPT_STATUS_KEY)

override val v1AnonymousId: String
get() = oldRudderPrefs.getString(RUDDER_ANONYMOUS_ID_KEY)
override val v1SessionId: Long
get() = oldRudderPrefs.getLong(RUDDER_SESSION_ID_KEY)
override val v1LastActiveTimestamp: Long
get() = oldRudderPrefs.getLong(RUDDER_SESSION_LAST_ACTIVE_TIMESTAMP_KEY)
override val v1AdvertisingId: String
get() = oldRudderPrefs.getString(RUDDER_ADVERTISING_ID_KEY)
override val v1Build: Int
get() = oldRudderPrefs.getInt(RUDDER_APPLICATION_BUILD_KEY)
override val v1VersionName: String
get() = oldRudderPrefs.getString(RUDDER_APPLICATION_VERSION_KEY)
override val v1OptOut: Boolean
get() = oldRudderPrefs.getBoolean(RUDDER_OPT_STATUS_KEY)
override val v1Traits: Map<String, Any?>?
get() = oldRudderPrefs.getString(RUDDER_TRAITS_KEY).let {
jsonAdapter?.readJson(it, object : RudderTypeAdapter<Map<String, Any?>>() {})
}
override val v1ExternalIds: List<Map<String, String>>? = oldRudderPrefs.getString(RUDDER_EXTERNAL_ID_KEY).let {
override val v1ExternalIds: List<Map<String, String>>?
get() = oldRudderPrefs.getString(RUDDER_EXTERNAL_ID_KEY).let {
jsonAdapter?.readJson(it, object : RudderTypeAdapter<List<Map<String, String>>>() {})
}

Expand Down