From 5d66f240195b5872fb66adc5c11c980afa8512e3 Mon Sep 17 00:00:00 2001 From: Sayantan Roychowdhury Date: Tue, 20 Jun 2023 09:29:41 +0530 Subject: [PATCH 1/3] update telemetry lib version --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 953dda657..764d03f35 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -150,7 +150,7 @@ dependencies { // TODO: Add splitinstall-lib to a repo https://gitlab.e.foundation/e/os/backlog/-/issues/628 api files('libs/splitinstall-lib.jar') - implementation 'foundation.e.lib:telemetry:0.0.8-alpha' + implementation 'foundation.e.lib:telemetry:0.0.9-alpha' implementation 'foundation.e:gplayapi:3.0.1' implementation 'androidx.core:core-ktx:1.9.0' -- GitLab From 672b5809b38d3c7a576f725f33ed7b6cbeddf1aa Mon Sep 17 00:00:00 2001 From: Sayantan Roychowdhury Date: Tue, 20 Jun 2023 09:28:48 +0530 Subject: [PATCH 2/3] surround parsing block and capture exception --- .../data/blockedApps/BlockedAppRepository.kt | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 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 e09202ea6..8977589c6 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 @@ -20,12 +20,14 @@ package foundation.e.apps.data.blockedApps import com.google.gson.Gson import foundation.e.apps.data.DownloadManager import foundation.e.apps.data.fusedDownload.FileManager +import foundation.e.lib.telemetry.Telemetry import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import java.io.File import javax.inject.Inject import javax.inject.Named import javax.inject.Singleton +import timber.log.Timber @Singleton class BlockedAppRepository @Inject constructor( @@ -60,11 +62,19 @@ class BlockedAppRepository @Inject constructor( private fun parseBlockedAppDataFromFile() { coroutineScope.launch { - val outputPath = "$cacheDir/warning_list/" - FileManager.moveFile("$cacheDir/", WARNING_LIST_FILE_NAME, outputPath) - val downloadedFile = File(outputPath + WARNING_LIST_FILE_NAME) - val blockedAppInfoJson = String(downloadedFile.inputStream().readBytes()) - blockedAppInfoList = gson.fromJson(blockedAppInfoJson, AppWarningInfo::class.java) + blockedAppInfoList = try { + val outputPath = "$cacheDir/warning_list/" + FileManager.moveFile("$cacheDir/", WARNING_LIST_FILE_NAME, outputPath) + val downloadedFile = File(outputPath + WARNING_LIST_FILE_NAME) + Timber.i("Blocked list file exists: ${downloadedFile.exists()}") + val blockedAppInfoJson = String(downloadedFile.inputStream().readBytes()) + Timber.i("Blocked list file contents: $blockedAppInfoJson") + gson.fromJson(blockedAppInfoJson, AppWarningInfo::class.java) + } catch (e: Exception) { + e.printStackTrace() + Telemetry.reportException(e) + AppWarningInfo(listOf()) + } } } } -- GitLab From 686d6b2cad9114ad9e164f52fb4bdbe31b294c91 Mon Sep 17 00:00:00 2001 From: Sayantan Roychowdhury Date: Tue, 20 Jun 2023 12:47:33 +0530 Subject: [PATCH 3/3] change exception variable name --- .../e/apps/data/blockedApps/BlockedAppRepository.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 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 8977589c6..0fcf41404 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 @@ -70,9 +70,9 @@ class BlockedAppRepository @Inject constructor( val blockedAppInfoJson = String(downloadedFile.inputStream().readBytes()) Timber.i("Blocked list file contents: $blockedAppInfoJson") gson.fromJson(blockedAppInfoJson, AppWarningInfo::class.java) - } catch (e: Exception) { - e.printStackTrace() - Telemetry.reportException(e) + } catch (exception: Exception) { + exception.printStackTrace() + Telemetry.reportException(exception) AppWarningInfo(listOf()) } } -- GitLab