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

Commit 703b871b authored by Hasib Prince's avatar Hasib Prince
Browse files

refactor: refactored telemetry reporting

parent 4acee27f

app/src/main/java/foundation/e/apps/data/DownloadManager.kt

+3 −3
Original line number Diff line number Diff line
@@ -167,8 +167,8 @@ class DownloadManager @Inject constructor( 
    }



    private fun getDownloadStatus(downloadId: Long): Int {

        var status: Int = -1

        var reason: Int = -1

        var status = -1

        var reason = -1

        try {

            downloadManager.query(downloadManagerQuery.setFilterById(downloadId))

                .use { cursor ->
@@ -190,7 +190,7 @@ class DownloadManager @Inject constructor( 
        return status

    }



    fun getDownloadReason(downloadId: Long): Int {

    fun getDownloadFailureReason(downloadId: Long): Int {

        var reason = -1

        try {

            downloadManager.query(downloadManagerQuery.setFilterById(downloadId))

app/src/main/java/foundation/e/apps/data/blockedApps/BlockedAppRepository.kt

+1 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 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 timber.log.Timber
@@ -71,8 +70,7 @@ class BlockedAppRepository @Inject constructor( 
                Timber.i("Blocked list file contents: $blockedAppInfoJson")

                gson.fromJson(blockedAppInfoJson, AppWarningInfo::class.java)

            } catch (exception: Exception) {

                exception.printStackTrace()

                Telemetry.reportException(exception)

                Timber.e(exception.localizedMessage ?: "", exception)

                AppWarningInfo(listOf())

            }

        }

app/src/main/java/foundation/e/apps/install/download/DownloadManagerUtils.kt

+2 −3
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import foundation.e.apps.data.enums.Origin 
import foundation.e.apps.data.enums.Status

import foundation.e.apps.data.fusedDownload.FusedManagerRepository

import foundation.e.apps.data.fusedDownload.models.FusedDownload

import foundation.e.lib.telemetry.Telemetry

import kotlinx.coroutines.DelicateCoroutinesApi

import kotlinx.coroutines.GlobalScope

import kotlinx.coroutines.delay
@@ -66,9 +65,9 @@ class DownloadManagerUtils @Inject constructor( 


                    if (downloadManager.hasDownloadFailed(downloadId)) {

                        handleDownloadFailed(fusedDownload)

                        Telemetry.reportMessage(

                        Timber.e(

                            "Download failed for ${fusedDownload.packageName}, " +

                                "reason: ${downloadManager.getDownloadReason(downloadId)}"

                                "reason: ${downloadManager.getDownloadFailureReason(downloadId)}"

                        )

                        return@launch

                    }

app/src/main/java/foundation/e/apps/install/pkg/InstallerService.kt

+1 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import foundation.e.apps.data.fused.UpdatesDao 
import foundation.e.apps.data.fusedDownload.FusedManagerRepository

import foundation.e.apps.utils.eventBus.AppEvent

import foundation.e.apps.utils.eventBus.EventBus

import foundation.e.lib.telemetry.Telemetry

import kotlinx.coroutines.DelicateCoroutinesApi

import kotlinx.coroutines.GlobalScope

import kotlinx.coroutines.MainScope
@@ -78,7 +77,7 @@ class InstallerService : Service() { 
            return

        }



        Telemetry.reportMessage("App install is failed for: $packageName status: $status extra: $extra")

        Timber.e("App install is failed for: $packageName status: $status extra: $extra")

        updateInstallationIssue(packageName ?: "")

        if (status == PackageInstaller.STATUS_FAILURE_CONFLICT && extra?.contains(

                INSTALL_FAILED_UPDATE_INCOMPATIBLE

app/src/main/java/foundation/e/apps/install/pkg/PkgManagerModule.kt

+1 −3
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import foundation.e.apps.data.enums.Status 
import foundation.e.apps.data.enums.Type

import foundation.e.apps.data.fused.FusedApi

import foundation.e.apps.data.fusedDownload.models.FusedDownload

import foundation.e.lib.telemetry.Telemetry

import kotlinx.coroutines.DelicateCoroutinesApi

import timber.log.Timber

import java.io.File
@@ -190,8 +189,7 @@ class PkgManagerModule @Inject constructor( 
            )

            session.commit(servicePendingIntent.intentSender)

        } catch (e: Exception) {

            Timber.e("$packageName: \n${e.stackTraceToString()}")

            Telemetry.reportMessage("Initiating Install Failed for $packageName exception: ${e.localizedMessage}")

            Timber.e("Initiating Install Failed for $packageName exception: ${e.localizedMessage}", e)

            val pendingIntent = PendingIntent.getBroadcast(

                context,

                sessionId,