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

Commit 80cea693 authored by Yash Garg's avatar Yash Garg 💬
Browse files

Merge branch '856-master-sentry_integration' into 'master' 

Integration with Sentry

See merge request !141
parents ab57dd72 15a2fe84

.gitlab-ci.yml

+5 −2
Original line number Diff line number Diff line 
image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:latest"



variables:

  SENTRY_DSN: "${SENTRY_DSN}"



stages:

  - check

  - build

app/build.gradle.kts

+10 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ plugins { 


// Manifest version information

val versionMajor = 1

val versionMinor = 7

val versionMinor = 8

val versionPatch = 0



val localProps = Properties()
@@ -65,6 +65,10 @@ android { 
            matchingFallbacks += listOf("release")

            isDebuggable = false

        }



        configureEach {

            buildConfigField("String", "SENTRY_DSN", "\"${System.getenv("SENTRY_DSN")}\"")

        }

    }



    signingConfigs {
@@ -110,7 +114,10 @@ android { 


    kotlinOptions { jvmTarget = "1.8" }



    buildFeatures { viewBinding = true }

    buildFeatures {

        viewBinding = true

        buildConfig = true

    }



    lint {

        abortOnError = false
@@ -170,4 +177,5 @@ dependencies { 


    // elib

    implementation(libs.elib)

    implementation(libs.telemetry)

}

app/src/main/AndroidManifest.xml

+5 −3
Original line number Diff line number Diff line
@@ -172,13 +172,15 @@ 
            android:name="android.nfc.disable_beam_default"

            android:value="true" />



        <receiver android:name="foundation.e.blisslauncher.features.weather.WeatherAppWidgetProvider"

        <receiver

            android:name="foundation.e.blisslauncher.features.weather.WeatherAppWidgetProvider"

            android:exported="false"

            android:label="@string/weather">

            <intent-filter>

                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />

            </intent-filter>

            <meta-data android:name="android.appwidget.provider"

            <meta-data

                android:name="android.appwidget.provider"

                android:resource="@xml/weather_appwidget_info" />

        </receiver>

    </application>

app/src/main/java/foundation/e/blisslauncher/BlissLauncher.java

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ import foundation.e.blisslauncher.core.blur.BlurWallpaperProvider; 
import foundation.e.blisslauncher.core.customviews.WidgetHost;

import foundation.e.blisslauncher.features.launcher.AppProvider;

import foundation.e.blisslauncher.features.notification.NotificationService;

import foundation.e.lib.telemetry.Telemetry;



public class BlissLauncher extends Application {

    public static final Uri NOTIFICATION_BADGING_URI = Settings.Secure.getUriFor("notification_badging");
@@ -45,6 +46,7 @@ public class BlissLauncher extends Application { 
        };

        getContentResolver().registerContentObserver(NOTIFICATION_BADGING_URI, false, notificationSettingsObserver);



        Telemetry.INSTANCE.init(BuildConfig.SENTRY_DSN, this);

    }



    private void onNotificationSettingsChanged() {

gradle/libs.versions.toml

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ tools-leakcanary = "com.squareup.leakcanary:leakcanary-android:2.10" 
timber = "com.jakewharton.timber:timber:4.7.1"

restriction-bypass = "com.github.ChickenHook:RestrictionBypass:2.2"

elib = "foundation.e:elib:0.0.1-alpha11"

telemetry = "foundation.e.lib:telemetry:0.0.3-alpha"



[plugins]

android-application = { id = "com.android.application", version.ref = "agp" }