refactor: Migrate Internal Config class to kotlin#538
Open
Mansi-mParticle wants to merge 2 commits intoblackout-2024from
Open
refactor: Migrate Internal Config class to kotlin#538Mansi-mParticle wants to merge 2 commits intoblackout-2024from
Mansi-mParticle wants to merge 2 commits intoblackout-2024from
Conversation
Mansi-mParticle
force-pushed
the
blackout-2024
branch
from
35ae7c8 to
38adc3c
Compare
Mansi-mParticle
force-pushed
the
refactor/SQDSDKS-6708-Configmanager-class
branch
from
5de2f41 to
3a5292e
Compare
einsteinx2
suggested changes
Feb 6, 2025
Contributor
einsteinx2
left a comment
einsteinx2
left a comment
There was a problem hiding this comment.
Couple of questions, otherwise looks good
android-core/src/main/kotlin/com/mparticle/internal/ConfigManager.kt
Outdated
Show resolved
Hide resolved
Comment on lines
+524
to
+528
| open val apiKey: String | ||
| get() = sPreferences?.getString(Constants.PrefKeys.API_KEY, null) ?: "" | ||
|
|
||
| open val apiSecret: String | ||
| get() = sPreferences?.getString(Constants.PrefKeys.API_SECRET, null) ?: "" |
Contributor
There was a problem hiding this comment.
I notice in the original Java we return null for both of these if it's not stored. Should these properties be nullable and return null instead of an empty string? Are there any null checks in other places that assume this can return null?
Collaborator
Author
There was a problem hiding this comment.
it is returning null it breaking lot's of existing code and test cases so decide to keep this as non null
Mansi-mParticle
requested review from
BrandonStalnaker,
mmustafa-tse and
rmi22186
and removed request for
einsteinx2
BrandonStalnaker
previously approved these changes
Mar 3, 2025
Contributor
BrandonStalnaker
left a comment
BrandonStalnaker
left a comment
There was a problem hiding this comment.
LGTM but would appreciate another set of eyes to take a look
rmi22186
dismissed
BrandonStalnaker’s stale review
The base branch was changed.
thomson-t
reviewed
Jan 22, 2026
Collaborator
thomson-t
left a comment
thomson-t
left a comment
There was a problem hiding this comment.
Do we want to merge the blackout-2024 branch first and then this one to main?
thomson-t
reviewed
Jan 22, 2026
| } | ||
|
|
||
| @get:WorkerThread | ||
| open val latestKitConfiguration: JSONArray? |
Collaborator
There was a problem hiding this comment.
Can we keep it as a function, considering the read operation and side effects?
| ?.putLong(CONFIG_JSON_TIMESTAMP, if (timestamp != null) timestamp else System.currentTimeMillis()) | ||
| ?.putString(Constants.PrefKeys.ETAG, etag) | ||
| ?.putString(Constants.PrefKeys.IF_MODIFIED, lastModified) | ||
| ?.apply() |
Collaborator
There was a problem hiding this comment.
Not the ideal way in Kotlin. If we include androidx.core:core-ktx, we could use it like
sPreferences?.edit {
putString(CONFIG_JSON, coreConfig.toString())
putLong(CONFIG_JSON_TIMESTAMP, if (timestamp != null) timestamp else System.currentTimeMillis())
putString(Constants.PrefKeys.ETAG, etag)
putString(Constants.PrefKeys.IF_MODIFIED, lastModified)
}Even without that dependency, we can use kotlin features to avoid chained nullable checks, like
sPreferences?.edit()?.apply {
putString(CONFIG_JSON, coreConfig.toString())
putLong(CONFIG_JSON_TIMESTAMP, if (timestamp != null) timestamp else System.currentTimeMillis())
putString(Constants.PrefKeys.ETAG, etag)
putString(Constants.PrefKeys.IF_MODIFIED, lastModified)
apply()
}
Comment on lines
+780
to
+836
| fun shouldTrigger(message: BaseMPMessage): Boolean { | ||
| val messageMatches: JSONArray? = triggerMessageMatches | ||
| val triggerHashes: JSONArray? = triggerMessageHashes | ||
|
|
||
| var isBackgroundAst: Boolean = false | ||
| try { | ||
| isBackgroundAst = | ||
| (message.messageType == Constants.MessageType.APP_STATE_TRANSITION && message.get(Constants.MessageKey.STATE_TRANSITION_TYPE) == Constants.StateTransitionType.STATE_TRANS_BG) | ||
| } catch (ex: JSONException) { | ||
| } | ||
| var shouldTrigger: Boolean = message.messageType == Constants.MessageType.PUSH_RECEIVED || | ||
| message.messageType == Constants.MessageType.COMMERCE_EVENT || | ||
| isBackgroundAst | ||
|
|
||
| if (!shouldTrigger && messageMatches != null && messageMatches.length() > 0) { | ||
| shouldTrigger = true | ||
| var i: Int = 0 | ||
| while (shouldTrigger && i < messageMatches.length()) { | ||
| try { | ||
| val messageMatch: JSONObject = messageMatches.getJSONObject(i) | ||
| val keys: Iterator<*> = messageMatch.keys() | ||
| while (shouldTrigger && keys.hasNext()) { | ||
| val key: String = keys.next() as String | ||
| shouldTrigger = message.has(key) | ||
| if (shouldTrigger) { | ||
| try { | ||
| shouldTrigger = messageMatch.getString(key).equals(message.getString(key), ignoreCase = true) | ||
| } catch (stringex: JSONException) { | ||
| try { | ||
| shouldTrigger = message.getBoolean(key) == messageMatch.getBoolean(key) | ||
| } catch (boolex: JSONException) { | ||
| try { | ||
| shouldTrigger = message.getDouble(key) == messageMatch.getDouble(key) | ||
| } catch (doubleex: JSONException) { | ||
| shouldTrigger = false | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } catch (e: Exception) { | ||
| } | ||
| i++ | ||
| } | ||
| } | ||
| if (!shouldTrigger && triggerHashes != null) { | ||
| for (i in 0 until triggerHashes.length()) { | ||
| try { | ||
| if (triggerHashes.getInt(i) == message.typeNameHash) { | ||
| shouldTrigger = true | ||
| break | ||
| } | ||
| } catch (jse: JSONException) { | ||
| } | ||
| } | ||
| } | ||
| return shouldTrigger |
Collaborator
There was a problem hiding this comment.
This is probably the direct translation from Java to Kotlin, not an optimised Kotlin code. We can refactor it later.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Instructions
developmentSummary
Testing Plan
Reference Issue (For mParticle employees only. Ignore if you are an outside contributor)