Fix evaluations with badged icons

Author: jonathanklee

app/src/main/java/com/klee/sapio/data/InstalledApplicationsRepository.kt

@@ -48,10 +48,18 @@ class InstalledApplicationsRepository @Inject constructor() {
         return InstalledApplication(
             packageManager.getApplicationLabel(info).toString(),
             info.packageName,
-            packageManager.getApplicationIcon(info)
+            fetchIcon(packageManager, info)
         )
     }
 
+    private fun fetchIcon(packageManager: PackageManager, info: ApplicationInfo): Drawable {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+            info.loadUnbadgedIcon(packageManager)
+        } else {
+            info.loadIcon(packageManager)
+        }
+    }
+
     @VisibleForTesting
     fun isSystemApp(info: ApplicationInfo): Boolean {
         return info.flags and ApplicationInfo.FLAG_SYSTEM != 0

app/src/test/java/com/klee/sapio/InstalledApplicationsRepositoryTest.kt

@@ -81,7 +81,7 @@ class InstalledApplicationsRepositoryTest {
         Mockito.`when`(mockedPackageManager.getApplicationLabel(eq(fakeSystemApplicationInfo)))
             .thenReturn("FakeApplicationTwo")
 
-        Mockito.`when`(mockedPackageManager.getApplicationIcon(eq(fakeRegularApplicationInfo)))
+        Mockito.`when`(fakeRegularApplicationInfo.loadUnbadgedIcon(mockedPackageManager))
             .thenReturn(mockedDrawable)
     }