Rename WARNING to MALICIOUS

duckduckgo · Feb 6, 2025 · 879d87e · 879d87e
1 parent e3ba2bb
commit 879d87e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/...a/com/duckduckgo/app/browser/omnibar/animations/LottiePrivacyShieldAnimationHelperTest.kt b/...a/com/duckduckgo/app/browser/omnibar/animations/LottiePrivacyShieldAnimationHelperTest.kt
@@ -18,9 +18,9 @@ package com.duckduckgo.app.browser.omnibar.animations
 
 import com.airbnb.lottie.LottieAnimationView
 import com.duckduckgo.app.browser.R
+import com.duckduckgo.app.global.model.PrivacyShield.MALICIOUS
 import com.duckduckgo.app.global.model.PrivacyShield.PROTECTED
 import com.duckduckgo.app.global.model.PrivacyShield.UNPROTECTED
-import com.duckduckgo.app.global.model.PrivacyShield.WARNING
 import com.duckduckgo.common.ui.store.AppTheme
 import org.junit.Test
 import org.mockito.kotlin.mock
@@ -86,7 +86,7 @@ class LottiePrivacyShieldAnimationHelperTest {
         whenever(appTheme.isLightModeEnabled()).thenReturn(true)
         val testee = LottiePrivacyShieldAnimationHelper(appTheme)
 
-        testee.setAnimationView(holder, WARNING)
+        testee.setAnimationView(holder, MALICIOUS)
 
         verify(holder).setAnimation(R.raw.unprotected_shield)
         verify(holder).progress = 1.0f
@@ -99,7 +99,7 @@ class LottiePrivacyShieldAnimationHelperTest {
         whenever(appTheme.isLightModeEnabled()).thenReturn(false)
         val testee = LottiePrivacyShieldAnimationHelper(appTheme)
 
-        testee.setAnimationView(holder, WARNING)
+        testee.setAnimationView(holder, MALICIOUS)
 
         verify(holder).setAnimation(R.raw.dark_unprotected_shield)
         verify(holder).progress = 1.0f

diff --git a/.../java/com/duckduckgo/app/browser/omnibar/animations/LottiePrivacyShieldAnimationHelper.kt b/.../java/com/duckduckgo/app/browser/omnibar/animations/LottiePrivacyShieldAnimationHelper.kt
@@ -19,10 +19,10 @@ package com.duckduckgo.app.browser.omnibar.animations
 import com.airbnb.lottie.LottieAnimationView
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.global.model.PrivacyShield
+import com.duckduckgo.app.global.model.PrivacyShield.MALICIOUS
 import com.duckduckgo.app.global.model.PrivacyShield.PROTECTED
 import com.duckduckgo.app.global.model.PrivacyShield.UNKNOWN
 import com.duckduckgo.app.global.model.PrivacyShield.UNPROTECTED
-import com.duckduckgo.app.global.model.PrivacyShield.WARNING
 import com.duckduckgo.common.ui.store.AppTheme
 import com.duckduckgo.di.scopes.AppScope
 import com.squareup.anvil.annotations.ContributesBinding
@@ -54,7 +54,7 @@ class LottiePrivacyShieldAnimationHelper @Inject constructor(val appTheme: AppTh
             UNKNOWN -> {
                 Timber.i("Shield: UNKNOWN")
             }
-            WARNING -> {
+            MALICIOUS -> {
                 val res = R.raw.alert_red
                 holder.setAnimation(res)
                 holder.progress = 0.0f

diff --git a/app/src/main/java/com/duckduckgo/app/global/model/SiteMonitor.kt b/app/src/main/java/com/duckduckgo/app/global/model/SiteMonitor.kt
@@ -22,10 +22,10 @@ import androidx.annotation.WorkerThread
 import androidx.core.net.toUri
 import com.duckduckgo.app.browser.UriString
 import com.duckduckgo.app.browser.certificates.BypassedSSLCertificatesRepository
+import com.duckduckgo.app.global.model.PrivacyShield.MALICIOUS
 import com.duckduckgo.app.global.model.PrivacyShield.PROTECTED
 import com.duckduckgo.app.global.model.PrivacyShield.UNKNOWN
 import com.duckduckgo.app.global.model.PrivacyShield.UNPROTECTED
-import com.duckduckgo.app.global.model.PrivacyShield.WARNING
 import com.duckduckgo.app.privacy.db.UserAllowListRepository
 import com.duckduckgo.app.privacy.model.HttpsStatus
 import com.duckduckgo.app.surrogates.SurrogateResponse
@@ -168,7 +168,7 @@ class SiteMonitor(
         userAllowList = domain?.let { isAllowListed(it) } ?: false
         if (duckPlayer.isDuckPlayerUri(url)) return UNKNOWN
         if (userAllowList || !isHttps) return UNPROTECTED
-        if (maliciousSiteStatus != null) return WARNING
+        if (maliciousSiteStatus != null) return MALICIOUS
 
         if (!fullSiteDetailsAvailable) {
             Timber.i("Shield: not fullSiteDetailsAvailable for $domain")

diff --git a/app/src/test/java/com/duckduckgo/app/browser/omnibar/OmnibarLayoutViewModelTest.kt b/app/src/test/java/com/duckduckgo/app/browser/omnibar/OmnibarLayoutViewModelTest.kt
@@ -423,7 +423,7 @@ class OmnibarLayoutViewModelTest {
 
     @Test
     fun whenPrivacyShieldChangedToWarningThenViewStateCorrect() = runTest {
-        val privacyShield = PrivacyShield.WARNING
+        val privacyShield = PrivacyShield.MALICIOUS
         testee.onPrivacyShieldChanged(privacyShield)
 
         testee.viewState.test {

diff --git a/browser-api/src/main/java/com/duckduckgo/app/global/model/PrivacyShield.kt b/browser-api/src/main/java/com/duckduckgo/app/global/model/PrivacyShield.kt
@@ -19,6 +19,6 @@ package com.duckduckgo.app.global.model
 enum class PrivacyShield {
     PROTECTED,
     UNPROTECTED,
-    WARNING,
+    MALICIOUS,
     UNKNOWN,
 }