From d4408f84462e1754e310668e1fa6afe074c84f4b Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Thu, 12 Jan 2023 14:24:13 -0500
Subject: [PATCH] [fenix] Address comments

---
 .../dialog/CookieBannerReEngagementDialogUtils.kt           | 2 +-
 app/src/main/java/org/mozilla/fenix/utils/Settings.kt       | 6 +++---
 app/src/main/res/values/preference_keys.xml                 | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/dialog/CookieBannerReEngagementDialogUtils.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/dialog/CookieBannerReEngagementDialogUtils.kt
index 488d3dc3d8..154b7eca8c 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/dialog/CookieBannerReEngagementDialogUtils.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/dialog/CookieBannerReEngagementDialogUtils.kt
@@ -84,7 +84,7 @@ object CookieBannerReEngagementDialogUtils {
         if (status == CookieBannerHandlingStatus.DETECTED &&
             settings.shouldCookieBannerReEngagementDialog()
         ) {
-            settings.lastInteractionWithReEngageCookieBannerDialogInMS = System.currentTimeMillis()
+            settings.lastInteractionWithReEngageCookieBannerDialogInMs = System.currentTimeMillis()
             settings.cookieBannerDetectedPreviously = true
             val directions =
                 BrowserFragmentDirections.actionBrowserFragmentToCookieBannerDialogFragment()
diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
index 2715924c17..1e271e09ad 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -552,9 +552,9 @@ class Settings(private val appContext: Context) : PreferencesHolder {
         default = false,
     )
 
-    var lastInteractionWithReEngageCookieBannerDialogInMS by longPreference(
+    var lastInteractionWithReEngageCookieBannerDialogInMs by longPreference(
         appContext.getPreferenceKey(
-            R.string.pref_key_cookie_banner_re_engage_dialog_last_interaction_with_dialog_in_ms,
+            R.string.pref_key_cookie_banner_re_engage_dialog_last_interaction_in_ms,
         ),
         default = 0L,
     )
@@ -584,7 +584,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
             shouldShowCookieBannerUI && !userOptOutOfReEngageCookieBannerDialog && !shouldUseCookieBanner
         return if (!shouldShowTotalCookieProtectionCFR && shouldShowDialog) {
             !cookieBannerDetectedPreviously ||
-                timeNowInMillis() - lastInteractionWithReEngageCookieBannerDialogInMS >= timerForCookieBannerDialog
+                timeNowInMillis() - lastInteractionWithReEngageCookieBannerDialogInMs >= timerForCookieBannerDialog
         } else {
             false
         }
diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml
index ac72ffbbb7..053fa543bb 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -151,7 +151,7 @@
 
     <!-- Cookie Banner Reduction Settings-->
     <string name="pref_key_cookie_banner_settings" translatable="false">pref_key_cookie_banner_settings</string>
-    <string name="pref_key_cookie_banner_re_engage_dialog_last_interaction_with_dialog_in_ms" translatable="false">pref_key_cookie_banner_re_engage_dialog_last_interaction_with_dialog_in_ms</string>
+    <string name="pref_key_cookie_banner_re_engage_dialog_last_interaction_in_ms" translatable="false">pref_key_cookie_banner_re_engage_dialog_last_interaction_with_dialog_in_ms</string>
     <string name="pref_key_cookie_banner_re_engage_dialog_dismissed" translatable="false">pref_key_cookie_banner_re_engage_dialog_dismissed</string>
     <string name="pref_key_cookie_banner_first_banner_detected" translatable="false">pref_key_cookie_banner_first_banner_detected</string>
     <string name="pref_key_cookie_banner_v1" translatable="false">pref_key_cookie_banner_v1</string>