Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62b3d115 authored by Guillaume Jacquart's avatar Guillaume Jacquart
Browse files

Merge branch '0000-fix_timber_exception_param' into 'main'

fix: put exception at the right place in Timber calls.

See merge request !633
parents ec1dfcc6 ac9f07d8
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ class BlockedAppRepository @Inject constructor(
            Timber.d("Blocked list file contents: $blockedAppInfoJson")
            json.decodeFromString<AppWarningInfo>(blockedAppInfoJson)
        } catch (exception: Exception) {
            Timber.e(exception.localizedMessage ?: "", exception)
            Timber.e(exception, exception.localizedMessage ?: "")
            AppWarningInfo(listOf(), listOf(), listOf())
        }
    }
+2 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ class PlayStoreRepository @Inject constructor(
        } catch (e: CancellationException) {
            throw e
        } catch (e: GplayHttpRequestException) {
            Timber.w("Couldn't fetch search results.", e)
            Timber.w(e, "Couldn't fetch search results.")
            emptyList()
        }

@@ -119,7 +119,7 @@ class PlayStoreRepository @Inject constructor(
        } catch (e: CancellationException) {
            throw e
        } catch (e: GplayHttpRequestException) {
            Timber.w("Couldn't fetch search suggestions.", e)
            Timber.w(e, "Couldn't fetch search suggestions.")
            emptyList()
        }
    }
+1 −4
Original line number Diff line number Diff line
@@ -196,10 +196,7 @@ class AppLoungePackageManager @Inject constructor(
            )
            session.commit(servicePendingIntent.intentSender)
        } catch (e: Exception) {
            Timber.e(
                "Initiating Install Failed for $packageName exception: ${e.localizedMessage}",
                e
            )
            Timber.e(e, "Initiating Install Failed for $packageName exception: ${e.localizedMessage}")
            val pendingIntent = PendingIntent.getBroadcast(
                context,
                sessionId,
+4 −4
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ class AppInstallProcessor @Inject constructor(
        message: String,
        e: Exception
    ) {
        Timber.e("Updating download Urls failed for $message", e)
        Timber.e(e, "Updating download Urls failed for $message")
        EventBus.invokeEvent(
            AppEvent.UpdateEvent(
                ResultSupreme.WorkError(
@@ -308,8 +308,8 @@ class AppInstallProcessor @Inject constructor(
            }
        } catch (e: Exception) {
            Timber.e(
                "Install worker is failed for ${appInstall?.packageName} exception: ${e.localizedMessage}",
                e
                e,
                "Install worker is failed for ${appInstall?.packageName} exception: ${e.localizedMessage}"
            )
            appInstall?.let {
                appInstallComponents.appManagerWrapper.cancelDownload(appInstall)
@@ -427,7 +427,7 @@ class AppInstallProcessor @Inject constructor(
        } catch (e: Exception) {
            val message =
                "Handling install status is failed for ${download.packageName} exception: ${e.localizedMessage}"
            Timber.e(message, e)
            Timber.e(e, message)
            appInstallComponents.appManagerWrapper.installationIssue(download)
            finishInstallation(download)
        }
+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ class AgeRatingProvider : ContentProvider() {
                    ensureAgeGroupDataExists()
                    compileAppBlockList(cursor, pagedPackageNames)
                } catch (e: Exception) {
                    Timber.e("AgeRatingProvider", "Error fetching age ratings", e)
                    Timber.e(e, "Error fetching age ratings")
                }
            }