Skip to content

Commit 971e7fe

Browse files
committed
RUM-9631: Use resources from appContext
1 parent bb1ce7c commit 971e7fe

File tree

5 files changed

+12
-38
lines changed

5 files changed

+12
-38
lines changed

detekt_custom.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,6 @@ datadog:
562562
- "androidx.compose.ui.text.AnnotatedString.getStringAnnotations(kotlin.Int, kotlin.Int)"
563563
- "android.content.ContentResolver.registerContentObserver(android.net.Uri, kotlin.Boolean, android.database.ContentObserver)"
564564
- "android.content.ContentResolver.unregisterContentObserver(android.database.ContentObserver)"
565-
- "android.content.res.Resources.getSystem()"
566565
- "androidx.core.view.GestureDetectorCompat.constructor(android.content.Context, android.view.GestureDetector.OnGestureListener)"
567566
- "androidx.core.view.GestureDetectorCompat.onTouchEvent(android.view.MotionEvent)"
568567
- "androidx.fragment.app.FragmentManager.FragmentLifecycleCallbacks.onFragmentActivityCreated(androidx.fragment.app.FragmentManager, androidx.fragment.app.Fragment, android.os.Bundle?)"

features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/internal/domain/accessibility/DatadogAccessibilityReader.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicLong
2828
internal class DatadogAccessibilityReader(
2929
private val internalLogger: InternalLogger,
3030
private val applicationContext: Context,
31-
private val resources: Resources? = Resources.getSystem(),
31+
private val resources: Resources = applicationContext.resources,
3232
private val activityManager: ActivityManager? =
3333
applicationContext.getSystemService(Context.ACTIVITY_SERVICE) as? ActivityManager,
3434
private val accessibilityManager: AccessibilityManager? =
@@ -190,8 +190,8 @@ internal class DatadogAccessibilityReader(
190190
)
191191
}
192192

193-
private fun getTextSize(): Float? {
194-
return resources?.configuration?.fontScale
193+
private fun getTextSize(): Float {
194+
return resources.configuration.fontScale
195195
}
196196

197197
private fun isScreenReaderEnabled(accessibilityManager: AccessibilityManager?): Boolean? {

features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/RumTest.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,10 @@ internal class RumTest {
8080
verify(mockSdkCore).registerFeature(capture())
8181

8282
lastValue.onInitialize(
83-
appContext = mock { whenever(it.packageName) doReturn fakePackageName }
83+
appContext = mock {
84+
whenever(it.packageName) doReturn fakePackageName
85+
whenever(it.resources) doReturn mock()
86+
}
8487
)
8588
assertThat(lastValue.sampleRate)
8689
.isEqualTo(fakeRumConfiguration.featureConfiguration.sampleRate)
@@ -126,7 +129,10 @@ internal class RumTest {
126129
whenever(mockSdkCore.registerFeature(any())) doAnswer {
127130
val feature = it.getArgument<RumFeature>(0)
128131
feature.onInitialize(
129-
appContext = mock { whenever(it.packageName) doReturn fakePackageName }
132+
appContext = mock {
133+
whenever(it.packageName) doReturn fakePackageName
134+
whenever(it.resources) doReturn mock()
135+
}
130136
)
131137
}
132138
// When

features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/internal/domain/accessibility/DatadogAccessibilityReaderTest.kt

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -235,38 +235,6 @@ internal class DatadogAccessibilityReaderTest {
235235
}
236236

237237
// region Text Size Tests
238-
@Test
239-
fun `M return null text size W getState { resources is null }`() {
240-
// Given
241-
testedReader = DatadogAccessibilityReader(
242-
internalLogger = mockInternalLogger,
243-
applicationContext = mockContext,
244-
resources = null,
245-
activityManager = mockActivityManager,
246-
accessibilityManager = mockAccessibilityManager,
247-
secureWrapper = mockSecureWrapper,
248-
globalWrapper = mockGlobalWrapper,
249-
handler = mockHandler
250-
)
251-
252-
// When
253-
val result = testedReader.getState()
254-
255-
// Then
256-
assertThat(result[TEXT_SIZE_KEY]).isNull()
257-
}
258-
259-
@Test
260-
fun `M return null text size W getState { resources configuration is null }`() {
261-
// Given
262-
whenever(mockResources.configuration) doReturn null
263-
264-
// When
265-
val result = testedReader.getState()
266-
267-
// Then
268-
assertThat(result[TEXT_SIZE_KEY]).isNull()
269-
}
270238

271239
@Test
272240
fun `M return text size W getState { valid font scale }`(

features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/utils/config/ApplicationContextTestConfiguration.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ internal open class ApplicationContextTestConfiguration<T : Context>(klass: Clas
4848
whenever(mockInstance.packageManager) doReturn mockPackageManager
4949
whenever(mockInstance.packageName) doReturn fakePackageName
5050
whenever(mockInstance.applicationInfo) doReturn fakeAppInfo
51+
whenever(mockInstance.resources) doReturn mock()
5152

5253
// ???
5354
whenever(mockInstance.getSystemService(Context.ACTIVITY_SERVICE)) doReturn mock()

0 commit comments

Comments
 (0)