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

Commit 09f1a837 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch '3775-main-sentry' into 'main' 

Add sentry support

See merge request !191
parents 385df0c9 1ef50ebc

.gitlab-ci.yml

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ before_script: 
  - echo MURENA_DISCOVERY_END_POINT_PRODUCTION=$MURENA_DISCOVERY_END_POINT_PRODUCTION >> local.properties

  - echo MURENA_BASE_URL_STAGING=$MURENA_BASE_URL_STAGING >> local.properties

  - echo MURENA_DISCOVERY_END_POINT_STAGING=$MURENA_DISCOVERY_END_POINT_STAGING >> local.properties

  - echo SENTRY_DSN=$SENTRY_DSN >> local.properties

  - export GRADLE_USER_HOME=$(pwd)/.gradle

  - chmod +x ./gradlew
@@ -44,7 +45,7 @@ build: 
        exit 1

      fi

      cd "release"

      unsigned_build=$(ls *.apk | grep "release")

      unsigned_build=$(ls *.apk | grep "universal-release")

      mv $unsigned_build $UNSIGNED_APK

  artifacts:

    paths:

app/build.gradle

+15 −0
Original line number Diff line number Diff line
@@ -111,6 +111,15 @@ android { 
        }

    }



    splits {

        abi {

            enable true

            reset()

            include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'

            universalApk true

        }

    }



    buildTypes {

        debug {

            signingConfig = signingConfigs.debug
@@ -152,6 +161,8 @@ android { 


        buildConfigField "String", "YAHOO_CLIENT_ID", "\"${retrieveKey("YAHOO_CLIENT_ID")}\""



        buildConfigField("String", "SENTRY_DSN", "\"${retrieveKey("SENTRY_DSN")}\"")



	    manifestPlaceholders = [

                'appAuthRedirectScheme':  applicationId,

                "googleAuthRedirectScheme": retrieveKey("GOOGLE_REDIRECT_URI"),
@@ -263,6 +274,10 @@ dependencies { 
        exclude group: 'com.squareup.okhttp3'

    }



    // Telemetry

    implementation "com.jakewharton.timber:timber:5.0.1"

    implementation 'foundation.e.lib:telemetry:0.0.10-alpha'



    // ez-vcard to parse/generate vCards

    api("com.googlecode.ez-vcard:ez-vcard:0.12.0")

app/src/main/kotlin/at/bitfire/davdroid/App.kt

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import at.bitfire.davdroid.ui.DebugInfoActivity 
import at.bitfire.davdroid.ui.NotificationUtils

import at.bitfire.davdroid.ui.UiUtils

import dagger.hilt.android.HiltAndroidApp

import foundation.e.lib.telemetry.Telemetry

import java.util.logging.Level

import javax.inject.Inject

import kotlin.concurrent.thread
@@ -72,6 +73,11 @@ class App: Application(), Thread.UncaughtExceptionHandler, Configuration.Provide 
        super.onCreate()

        Logger.initialize(this)



        // Allow enabling telemetry only for release builds.

        if (!BuildConfig.DEBUG) {

            Telemetry.init(BuildConfig.SENTRY_DSN, this)

        }



        if (BuildConfig.DEBUG)

            // debug builds

            StrictMode.setVmPolicy(StrictMode.VmPolicy.Builder()