Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
388 changes: 171 additions & 217 deletions sdk/ktlint-baseline.xml

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions sdk/src/main/java/io/radar/sdk/RadarVerifiedReceiver.kt
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,4 @@ abstract class RadarVerifiedReceiver {
* @param[sharing] The current screen sharing state.
*/
open fun onSharingChanged(context: Context, sharing: Boolean) {}

}
}
2 changes: 1 addition & 1 deletion sdk/src/main/java/io/radar/sdk/model/RadarConfig.kt
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ internal data class RadarConfig(
res?.optString(NONCE)
)
}
}
}
1 change: 0 additions & 1 deletion sdk/src/main/java/io/radar/sdk/model/RadarContext.kt
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,4 @@ class RadarContext(
obj.putOpt(FIELD_POSTAL_CODE, this.postalCode?.toJson())
return obj
}

}
3 changes: 1 addition & 2 deletions sdk/src/main/java/io/radar/sdk/model/RadarCoordinate.kt
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,4 @@ class RadarCoordinate(
obj.putOpt(FIELD_COORDINATES, coordinatesObj)
return obj
}

}
}
1 change: 0 additions & 1 deletion sdk/src/main/java/io/radar/sdk/model/RadarRegion.kt
Original file line number Diff line number Diff line change
Expand Up @@ -128,5 +128,4 @@ class RadarRegion(
obj.putOpt(FIELD_EXPECTED, this.expected)
return obj
}

}
3 changes: 1 addition & 2 deletions sdk/src/main/java/io/radar/sdk/model/RadarRoute.kt
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,4 @@ class RadarRoute(
obj.putOpt(FIELD_GEOMETRY, this.geometry?.toJson())
return obj
}

}
}
3 changes: 1 addition & 2 deletions sdk/src/main/java/io/radar/sdk/model/RadarRouteDistance.kt
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,4 @@ class RadarRouteDistance(
obj.putOpt(FIELD_TEXT, this.text)
return obj
}

}
}
3 changes: 1 addition & 2 deletions sdk/src/main/java/io/radar/sdk/model/RadarRouteDuration.kt
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,4 @@ class RadarRouteDuration(
obj.putOpt(FIELD_TEXT, this.text)
return obj
}

}
}
4 changes: 1 addition & 3 deletions sdk/src/main/java/io/radar/sdk/model/RadarRouteGeometry.kt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.radar.sdk.model

import org.json.JSONArray
import org.json.JSONException
import org.json.JSONObject

/**
Expand Down Expand Up @@ -53,5 +52,4 @@ class RadarRouteGeometry(
obj.putOpt(FIELD_COORDINATES, coordinatesArr)
return obj
}

}
}
1 change: 0 additions & 1 deletion sdk/src/main/java/io/radar/sdk/model/RadarRouteMatrix.kt
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,4 @@ class RadarRouteMatrix(
}
return rows
}

}
1 change: 0 additions & 1 deletion sdk/src/main/java/io/radar/sdk/model/RadarRoutes.kt
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,4 @@ class RadarRoutes(
obj.putOpt(FIELD_MOTORBIKE, this.motorbike?.toJson())
return obj
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ internal data class RadarSdkConfiguration(

fun fromJson(json: JSONObject?): RadarSdkConfiguration {
// set json as empty object if json is null, which uses fallback values
val config = json ?: JSONObject();
val config = json ?: JSONObject()

val maxReplayBufferSize = config.optInt(MAX_REPLAY_BUFFER_SIZE, DEFAULT_MAX_REPLAY_BUFFER_SIZE)
val validatedMaxReplayBufferSize = if (maxReplayBufferSize > 0 && maxReplayBufferSize <= DEFAULT_MAX_REPLAY_BUFFER_SIZE) {
Expand Down
4 changes: 1 addition & 3 deletions sdk/src/test/java/io/radar/sdk/RadarTestUtils.kt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,5 @@ internal class RadarTestUtils {
val str = RadarTest::class.java.getResource(resource)!!.readText()
return JSONObject(str)
}

}

}
}
92 changes: 37 additions & 55 deletions sdk/src/test/java/io/radar/sdk/RadarVerifiedHostOverrideTest.kt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package io.radar.sdk

import android.content.Context
import android.location.Location
import android.os.Build
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import org.json.JSONObject
import android.location.Location
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertNull
Expand Down Expand Up @@ -46,16 +46,12 @@ class RadarVerifiedHostOverrideTest {
@Test
fun `trackVerifiedAutoFailover persists through initialize`() {
Radar.initialize(
context,
publishableKey,
RadarInitializeOptions(trackVerifiedAutoFailover = true)
context, publishableKey, RadarInitializeOptions(trackVerifiedAutoFailover = true)
)
assertTrue(RadarSettings.getTrackVerifiedAutoFailover(context))

Radar.initialize(
context,
publishableKey,
RadarInitializeOptions(trackVerifiedAutoFailover = false)
context, publishableKey, RadarInitializeOptions(trackVerifiedAutoFailover = false)
)
assertFalse(RadarSettings.getTrackVerifiedAutoFailover(context))
}
Expand All @@ -67,9 +63,10 @@ class RadarVerifiedHostOverrideTest {

@Test
fun `getConfig verified with no override passes null through`() {
Radar.apiClient.getConfig("verify", true, null, object : RadarApiClient.RadarGetConfigApiCallback {
override fun onComplete(status: Radar.RadarStatus, config: io.radar.sdk.model.RadarConfig?) {}
})
Radar.apiClient.getConfig(
"verify", true, null, object : RadarApiClient.RadarGetConfigApiCallback {
override fun onComplete(status: Radar.RadarStatus, config: io.radar.sdk.model.RadarConfig?) {}
})

assertTrue(apiHelperMock.lastCapturedVerified)
assertNull(apiHelperMock.lastCapturedVerifiedHostOverride)
Expand All @@ -78,9 +75,10 @@ class RadarVerifiedHostOverrideTest {
@Test
fun `getConfig verified with override propagates to helper`() {
val secondary = RadarSettings.getDefaultVerifiedHostSecondary()
Radar.apiClient.getConfig("verify", true, secondary, object : RadarApiClient.RadarGetConfigApiCallback {
override fun onComplete(status: Radar.RadarStatus, config: io.radar.sdk.model.RadarConfig?) {}
})
Radar.apiClient.getConfig(
"verify", true, secondary, object : RadarApiClient.RadarGetConfigApiCallback {
override fun onComplete(status: Radar.RadarStatus, config: io.radar.sdk.model.RadarConfig?) {}
})

assertTrue(apiHelperMock.lastCapturedVerified)
assertEquals(secondary, apiHelperMock.lastCapturedVerifiedHostOverride)
Expand All @@ -93,12 +91,13 @@ class RadarVerifiedHostOverrideTest {

var observedConfig: io.radar.sdk.model.RadarConfig? = JSONObject().let { _ -> null }
var called = false
Radar.apiClient.getConfig("verify", true, null, object : RadarApiClient.RadarGetConfigApiCallback {
override fun onComplete(status: Radar.RadarStatus, config: io.radar.sdk.model.RadarConfig?) {
observedConfig = config
called = true
}
})
Radar.apiClient.getConfig(
"verify", true, null, object : RadarApiClient.RadarGetConfigApiCallback {
override fun onComplete(status: Radar.RadarStatus, config: io.radar.sdk.model.RadarConfig?) {
observedConfig = config
called = true
}
})

assertTrue(called)
assertNull(observedConfig)
Expand All @@ -109,11 +108,12 @@ class RadarVerifiedHostOverrideTest {
apiHelperMock.mockResponse = JSONObject().put("meta", JSONObject())

var observedConfig: io.radar.sdk.model.RadarConfig? = null
Radar.apiClient.getConfig("verify", true, null, object : RadarApiClient.RadarGetConfigApiCallback {
override fun onComplete(status: Radar.RadarStatus, config: io.radar.sdk.model.RadarConfig?) {
observedConfig = config
}
})
Radar.apiClient.getConfig(
"verify", true, null, object : RadarApiClient.RadarGetConfigApiCallback {
override fun onComplete(status: Radar.RadarStatus, config: io.radar.sdk.model.RadarConfig?) {
observedConfig = config
}
})

assertTrue(observedConfig != null)
}
Expand All @@ -125,21 +125,23 @@ class RadarVerifiedHostOverrideTest {
apiHelperMock.mockResponse = JSONObject().put("meta", JSONObject().put("code", 503))

var observedConfig: io.radar.sdk.model.RadarConfig? = null
Radar.apiClient.getConfig("verify", true, null, object : RadarApiClient.RadarGetConfigApiCallback {
override fun onComplete(status: Radar.RadarStatus, config: io.radar.sdk.model.RadarConfig?) {
observedConfig = config
}
})
Radar.apiClient.getConfig(
"verify", true, null, object : RadarApiClient.RadarGetConfigApiCallback {
override fun onComplete(status: Radar.RadarStatus, config: io.radar.sdk.model.RadarConfig?) {
observedConfig = config
}
})

assertTrue(observedConfig != null)
}

@Test
fun `getConfig non-verified ignores override`() {
val secondary = RadarSettings.getDefaultVerifiedHostSecondary()
Radar.apiClient.getConfig("verify", false, secondary, object : RadarApiClient.RadarGetConfigApiCallback {
override fun onComplete(status: Radar.RadarStatus, config: io.radar.sdk.model.RadarConfig?) {}
})
Radar.apiClient.getConfig(
"verify", false, secondary, object : RadarApiClient.RadarGetConfigApiCallback {
override fun onComplete(status: Radar.RadarStatus, config: io.radar.sdk.model.RadarConfig?) {}
})

assertFalse(apiHelperMock.lastCapturedVerified)
assertFalse(apiHelperMock.lastUrl?.startsWith(secondary) ?: false)
Expand All @@ -150,14 +152,7 @@ class RadarVerifiedHostOverrideTest {
fun `track verified with override propagates to helper`() {
val secondary = RadarSettings.getDefaultVerifiedHostSecondary()
Radar.apiClient.track(
location = Location("test"),
stopped = false,
foreground = true,
source = Radar.RadarLocationSource.FOREGROUND_LOCATION,
replayed = false,
beacons = null,
verified = true,
verifiedHostOverride = secondary,
location = Location("test"), stopped = false, foreground = true, source = Radar.RadarLocationSource.FOREGROUND_LOCATION, replayed = false, beacons = null, verified = true, verifiedHostOverride = secondary
)

assertTrue(apiHelperMock.lastCapturedVerified)
Expand All @@ -168,13 +163,7 @@ class RadarVerifiedHostOverrideTest {
@Test
fun `track verified with no override passes null through`() {
Radar.apiClient.track(
location = Location("test"),
stopped = false,
foreground = true,
source = Radar.RadarLocationSource.FOREGROUND_LOCATION,
replayed = false,
beacons = null,
verified = true,
location = Location("test"), stopped = false, foreground = true, source = Radar.RadarLocationSource.FOREGROUND_LOCATION, replayed = false, beacons = null, verified = true
)

assertTrue(apiHelperMock.lastCapturedVerified)
Expand All @@ -186,14 +175,7 @@ class RadarVerifiedHostOverrideTest {
fun `track non-verified ignores override`() {
val secondary = RadarSettings.getDefaultVerifiedHostSecondary()
Radar.apiClient.track(
location = Location("test"),
stopped = false,
foreground = true,
source = Radar.RadarLocationSource.FOREGROUND_LOCATION,
replayed = false,
beacons = null,
verified = false,
verifiedHostOverride = secondary,
location = Location("test"), stopped = false, foreground = true, source = Radar.RadarLocationSource.FOREGROUND_LOCATION, replayed = false, beacons = null, verified = false, verifiedHostOverride = secondary
)

assertFalse(apiHelperMock.lastCapturedVerified)
Expand Down
Loading