Skip to content

[Maybe] use lambdas internally #416

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

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

[Maybe] use lambdas internally #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0031026
api getConfig to lambda
ShiCheng-Lu Nov 19, 2024
49bc77c
convert replay + log
ShiCheng-Lu Nov 19, 2024
944f8d7
convert track
ShiCheng-Lu Nov 19, 2024
bdba110
convert rest
ShiCheng-Lu Nov 19, 2024
2a12c26
convert api helper to use lambdas
ShiCheng-Lu Nov 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
9 changes: 4 additions & 5 deletions example/src/main/java/io/radar/example/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,12 @@ import io.radar.sdk.Radar
import io.radar.sdk.RadarTrackingOptions
import io.radar.sdk.RadarTripOptions
import io.radar.sdk.RadarVerifiedReceiver
import io.radar.sdk.model.RadarAddress
import io.radar.sdk.model.RadarCoordinate
import io.radar.sdk.model.RadarVerifiedLocationToken
import org.json.JSONObject
import java.util.Date
import java.util.EnumSet
import androidx.core.content.edit
import io.radar.sdk.model.RadarAddress
import io.radar.sdk.model.RadarCoordinate
import java.util.*

class MainActivity : AppCompatActivity() {

Expand All @@ -33,7 +32,7 @@ class MainActivity : AppCompatActivity() {
setContentView(R.layout.activity_main)

val receiver = MyRadarReceiver()
Radar.initialize(this, "prj_test_pk_000000000000000000000000000000000000", receiver, Radar.RadarLocationServicesProvider.GOOGLE, true)
Radar.initialize(this, "prj_test_pk_0000000000000000000000000000000000000000", receiver, Radar.RadarLocationServicesProvider.GOOGLE, true)
Radar.sdkVersion().let { Log.i("version", it) }

val verifiedReceiver = object : RadarVerifiedReceiver() {
Expand Down
686 changes: 321 additions & 365 deletions sdk/src/main/java/io/radar/sdk/Radar.kt
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 14 additions & 16 deletions sdk/src/main/java/io/radar/sdk/RadarActivityLifecycleCallbacks.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,26 +50,24 @@ internal class RadarActivityLifecycleCallbacks(
val updated = RadarSettings.updateSessionId(activity.applicationContext)
if (updated) {
val usage = "resume"
Radar.apiClient.getConfig(usage, false, object : RadarApiClient.RadarGetConfigApiCallback {
override fun onComplete(status: Radar.RadarStatus, config: RadarConfig?) {
if (config == null) {
return
}
Radar.apiClient.getConfig(usage, false) { status: Radar.RadarStatus, config: RadarConfig? ->
if (config == null) {
return@getConfig
}

if (status == Radar.RadarStatus.SUCCESS) {
Radar.locationManager.updateTrackingFromMeta(config.meta)
RadarSettings.setSdkConfiguration(activity.applicationContext, config.meta.sdkConfiguration)
}
if (status == Radar.RadarStatus.SUCCESS) {
Radar.locationManager.updateTrackingFromMeta(config.meta)
RadarSettings.setSdkConfiguration(activity.applicationContext, config.meta.sdkConfiguration)
}

val sdkConfiguration = RadarSettings.getSdkConfiguration(activity.applicationContext)
if (sdkConfiguration.trackOnceOnAppOpen || sdkConfiguration.startTrackingOnInitialize) {
Radar.trackOnce()
if (sdkConfiguration.startTrackingOnInitialize && !RadarSettings.getTracking(activity.applicationContext)) {
Radar.startTracking(Radar.getTrackingOptions())
}
val sdkConfiguration = RadarSettings.getSdkConfiguration(activity.applicationContext)
if (sdkConfiguration.trackOnceOnAppOpen || sdkConfiguration.startTrackingOnInitialize) {
Radar.trackOnce()
if (sdkConfiguration.startTrackingOnInitialize && !RadarSettings.getTracking(activity.applicationContext)) {
Radar.startTracking(Radar.getTrackingOptions())
}
}
})
}
} else {
val sdkConfiguration = RadarSettings.getSdkConfiguration(activity.applicationContext)
if (sdkConfiguration.trackOnceOnAppOpen || sdkConfiguration.startTrackingOnInitialize) {
Expand Down
Loading