Fix privacy grade bugs (#836)

Author: marcosholgado

app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt

@@ -565,10 +565,6 @@ class BrowserTabViewModelTest {
     fun whenBrowsingAndViewModelGetsProgressUpdateLowerThan50ThenViewStateIsUpdatedTo50() {
         setBrowserShowing(true)
 
-        testee.progressChanged(0)
-        assertEquals(50, loadingViewState().progress)
-        assertEquals(true, loadingViewState().isLoading)
-
         testee.progressChanged(15)
         assertEquals(50, loadingViewState().progress)
         assertEquals(true, loadingViewState().isLoading)
@@ -652,6 +648,15 @@ class BrowserTabViewModelTest {
         assertFalse(privacyGradeState().showEmptyGrade)
     }
 
+    @Test
+    fun whenProgressChangesButIsTheSameAsBeforeThenDoNotUpdateState() {
+        setBrowserShowing(true)
+        testee.progressChanged(100)
+        testee.stopShowingEmptyGrade()
+        testee.progressChanged(100)
+        assertFalse(privacyGradeState().showEmptyGrade)
+    }
+
     @Test
     fun whenNotShowingEmptyGradeAndPrivacyGradeIsNotUnknownThenIsEnableIsTrue() {
         val testee = BrowserTabViewModel.PrivacyGradeViewState(PrivacyGrade.A, shouldAnimate = false, showEmptyGrade = false)

app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt

@@ -1512,7 +1512,7 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope, DaxDialogLi
 
                 if (canChangeGrade) {
                     context?.let {
-                        val drawable = if (viewState.showEmptyGrade) {
+                        val drawable = if (viewState.showEmptyGrade || viewState.shouldAnimate) {
                             ContextCompat.getDrawable(it, R.drawable.privacygrade_icon_loading)
                         } else {
                             ContextCompat.getDrawable(it, viewState.privacyGrade.icon())

app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt

@@ -615,6 +615,7 @@ class BrowserTabViewModel(
         if (!currentBrowserViewState().browserShowing) return
         val isLoading = newProgress < 100
         val progress = currentLoadingViewState()
+        if (progress.progress == newProgress) return
         val visualProgress = if (newProgress < FIXED_PROGRESS) {
             FIXED_PROGRESS
         } else {