From ac9f07d8123c3c5b61bf9bc7369437d0b947c3d3 Mon Sep 17 00:00:00 2001
From: jacquarg <guillaume.jacquart@hoodbrains.com>
Date: Wed, 3 Dec 2025 09:33:42 +0100
Subject: [PATCH] fix: put exception at the right place in Timber calls.

---
 .../e/apps/data/blockedApps/BlockedAppRepository.kt       | 2 +-
 .../e/apps/data/playstore/PlayStoreRepository.kt          | 4 ++--
 .../e/apps/install/pkg/AppLoungePackageManager.kt         | 5 +----
 .../e/apps/install/workmanager/AppInstallProcessor.kt     | 8 ++++----
 .../java/foundation/e/apps/provider/AgeRatingProvider.kt  | 2 +-
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/foundation/e/apps/data/blockedApps/BlockedAppRepository.kt b/app/src/main/java/foundation/e/apps/data/blockedApps/BlockedAppRepository.kt
index a296c4ee8..484e38b97 100644
--- a/app/src/main/java/foundation/e/apps/data/blockedApps/BlockedAppRepository.kt
+++ b/app/src/main/java/foundation/e/apps/data/blockedApps/BlockedAppRepository.kt
@@ -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())
         }
     }
diff --git a/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreRepository.kt b/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreRepository.kt
index 3df55edda..2775e3291 100644
--- a/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreRepository.kt
+++ b/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreRepository.kt
@@ -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()
         }
     }
diff --git a/app/src/main/java/foundation/e/apps/install/pkg/AppLoungePackageManager.kt b/app/src/main/java/foundation/e/apps/install/pkg/AppLoungePackageManager.kt
index 1f519e41a..aabd1c32c 100644
--- a/app/src/main/java/foundation/e/apps/install/pkg/AppLoungePackageManager.kt
+++ b/app/src/main/java/foundation/e/apps/install/pkg/AppLoungePackageManager.kt
@@ -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,
diff --git a/app/src/main/java/foundation/e/apps/install/workmanager/AppInstallProcessor.kt b/app/src/main/java/foundation/e/apps/install/workmanager/AppInstallProcessor.kt
index 4f911c68b..2831499ed 100644
--- a/app/src/main/java/foundation/e/apps/install/workmanager/AppInstallProcessor.kt
+++ b/app/src/main/java/foundation/e/apps/install/workmanager/AppInstallProcessor.kt
@@ -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)
         }
diff --git a/app/src/main/java/foundation/e/apps/provider/AgeRatingProvider.kt b/app/src/main/java/foundation/e/apps/provider/AgeRatingProvider.kt
index 39f0ea550..e6785d4a2 100644
--- a/app/src/main/java/foundation/e/apps/provider/AgeRatingProvider.kt
+++ b/app/src/main/java/foundation/e/apps/provider/AgeRatingProvider.kt
@@ -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")
                 }
             }
 
-- 
GitLab