diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataBindingAdapters.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataBindingAdapters.kt index 470055bbe0f7a1cbc89defe6c7367b3a9b2141c0..66e55ff3c21a93b75b4d9fe48302a8bf333de330 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataBindingAdapters.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataBindingAdapters.kt @@ -24,11 +24,11 @@ fun setChecked(switch: Switch, status: Boolean?) { @BindingAdapter("animation") fun setAnimation(view: LottieAnimationView, animation: Int?) { if (animation != null) { - val appContext = view.context.applicationContext - val type = appContext.resources.getResourceTypeName(animation) + val context = view.context + val type = context.resources.getResourceTypeName(animation) if (type == DRAWABLE_TYPE) { - view.setImageDrawable(appContext.getDrawable(animation)) + view.setImageDrawable(context.getDrawable(animation)) } else { view.setAnimation(animation) view.repeatCount = LottieDrawable.INFINITE diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/DataBindingAdaptersTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/DataBindingAdaptersTest.kt index 456f008a62b21ce880b13259b9a72e32fd68834f..3612eb9a38fd3ff0e7952a1307bd26678d29291d 100644 --- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/DataBindingAdaptersTest.kt +++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/DataBindingAdaptersTest.kt @@ -1,6 +1,7 @@ package de.rki.coronawarnapp.util import android.content.Context +import android.content.res.Resources import android.graphics.drawable.Drawable import android.widget.Switch import com.airbnb.lottie.LottieAnimationView @@ -67,8 +68,8 @@ class DataBindingAdaptersTest { private fun setAnimation(animation: Int?) { val animationView = mockk<LottieAnimationView>(relaxUnitFun = true).apply { every { context } returns mockk<Context>().apply { - every { applicationContext } returns mockk<Context>().apply { - every { resources.getResourceTypeName(any()) } returns "raw" + every { resources } returns mockk<Resources>().apply { + every { getResourceTypeName(any()) } returns "raw" } } } @@ -110,10 +111,10 @@ class DataBindingAdaptersTest { private fun setDrawable(drawableId: Int?) { val animationView = mockk<LottieAnimationView>(relaxUnitFun = true).apply { every { context } returns mockk<Context>().apply { - every { applicationContext } returns mockk<Context>().apply { - every { resources.getResourceTypeName(any()) } returns DRAWABLE_TYPE - every { getDrawable(any()) } returns this@DataBindingAdaptersTest.drawable + every { resources } returns mockk<Resources>().apply { + every { getResourceTypeName(any()) } returns DRAWABLE_TYPE } + every { getDrawable(any()) } returns this@DataBindingAdaptersTest.drawable } }