Closes #24305: Remove false wallpaper NPE Sentry report

upstream-sync
Arturo Mejia 2 years ago committed by mergify[bot]
parent f3a63c4a60
commit 55c707a412

@ -159,8 +159,7 @@ class Components(private val context: Context) {
WallpaperManager( WallpaperManager(
settings, settings,
WallpaperDownloader(context, core.client), WallpaperDownloader(context, core.client),
WallpaperFileManager(context.filesDir), WallpaperFileManager(context.filesDir)
analytics.crashReporter,
) )
} }
} }

@ -17,7 +17,6 @@ import android.view.View
import android.widget.ImageView import android.widget.ImageView
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import mozilla.components.lib.crash.CrashReporter
import mozilla.components.support.base.log.logger.Logger import mozilla.components.support.base.log.logger.Logger
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.perf.runBlockingIncrement import org.mozilla.fenix.perf.runBlockingIncrement
@ -33,7 +32,6 @@ class WallpaperManager(
private val settings: Settings, private val settings: Settings,
private val downloader: WallpaperDownloader, private val downloader: WallpaperDownloader,
private val fileManager: WallpaperFileManager, private val fileManager: WallpaperFileManager,
private val crashReporter: CrashReporter,
allWallpapers: List<Wallpaper> = availableWallpapers allWallpapers: List<Wallpaper> = availableWallpapers
) { ) {
val logger = Logger("WallpaperManager") val logger = Logger("WallpaperManager")
@ -63,7 +61,6 @@ class WallpaperManager(
if (bitmap == null) { if (bitmap == null) {
val message = "Could not load wallpaper bitmap. Resetting to default." val message = "Could not load wallpaper bitmap. Resetting to default."
logger.error(message) logger.error(message)
crashReporter.submitCaughtException(NullPointerException(message))
currentWallpaper = defaultWallpaper currentWallpaper = defaultWallpaper
wallpaperContainer.visibility = View.GONE wallpaperContainer.visibility = View.GONE
return return

@ -42,7 +42,7 @@ class WallpaperManagerTest {
val updatedName = "new name" val updatedName = "new name"
val updatedWallpaper = Wallpaper.Local.Firefox(updatedName, drawableId = 0) val updatedWallpaper = Wallpaper.Local.Firefox(updatedName, drawableId = 0)
val wallpaperManager = WallpaperManager(mockSettings, mockk(), mockFileManager, mockk(), listOf()) val wallpaperManager = WallpaperManager(mockSettings, mockk(), mockFileManager, listOf())
wallpaperManager.currentWallpaper = updatedWallpaper wallpaperManager.currentWallpaper = updatedWallpaper
assertEquals(updatedWallpaper.name, currentCaptureSlot.captured) assertEquals(updatedWallpaper.name, currentCaptureSlot.captured)
@ -58,7 +58,6 @@ class WallpaperManagerTest {
mockSettings, mockSettings,
mockDownloader, mockDownloader,
mockFileManager, mockFileManager,
mockk(),
allWallpapers = fakeRemoteWallpapers allWallpapers = fakeRemoteWallpapers
) )
wallpaperManager.downloadAllRemoteWallpapers() wallpaperManager.downloadAllRemoteWallpapers()
@ -77,7 +76,6 @@ class WallpaperManagerTest {
mockSettings, mockSettings,
mockDownloader, mockDownloader,
mockFileManager, mockFileManager,
mockk(),
allWallpapers = listOf(expiredRemoteWallpaper, activeRemoteWallpaper) allWallpapers = listOf(expiredRemoteWallpaper, activeRemoteWallpaper)
) )
@ -98,7 +96,6 @@ class WallpaperManagerTest {
mockSettings, mockSettings,
mockDownloader, mockDownloader,
mockFileManager, mockFileManager,
mockk(),
allWallpapers = listOf(expiredRemoteWallpaper) allWallpapers = listOf(expiredRemoteWallpaper)
) )
@ -118,7 +115,6 @@ class WallpaperManagerTest {
mockSettings, mockSettings,
mockDownloader, mockDownloader,
mockFileManager, mockFileManager,
mockk(),
allWallpapers = listOf() allWallpapers = listOf()
) )

Loading…
Cancel
Save