From 4fe2489432f221b28b992654778e3868c0e4d840 Mon Sep 17 00:00:00 2001
From: Justin Bassett <bassett.justint@gmail.com>
Date: Sun, 30 Aug 2020 15:19:20 -0400
Subject: [PATCH] Sentry.io Changes (#846)

* Set the sentry.io release version explicitly.

* Include session tracking to improve crash support.

* ktlint

* Remove comments in build
---
 .github/workflows/beta.yml       | 2 +-
 .github/workflows/release.yml    | 3 ++-
 app/build.gradle.kts             | 2 ++
 app/src/full/AndroidManifest.xml | 2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
index c72088dd5..fcbbe979e 100644
--- a/.github/workflows/beta.yml
+++ b/.github/workflows/beta.yml
@@ -159,7 +159,7 @@ jobs:
           SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
           SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
         with:
-          tagName: ${{ env.VERSION }}
+          tagName: io.homeassistant.companion.android@${{ env.VERSION }}
           environment: Beta
 
   play_publish:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5a1923fba..75cd5e5f7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -151,6 +151,7 @@ jobs:
           KEYSTORE_ALIAS: ${{ secrets.ORIGINAL_KEYSTORE_ALIAS }}
           KEYSTORE_ALIAS_PASSWORD: ${{ secrets.ORIGINAL_KEYSTORE_ALIAS_PASSWORD }}
         run: ./gradlew appDistributionUploadFullRelease
+
       - name: Create a Sentry.io release
         uses: tclindner/sentry-releases-action@v1.2.0
         env:
@@ -158,7 +159,7 @@ jobs:
           SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
           SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
         with:
-          tagName: ${{ env.VERSION }}
+          tagName: io.homeassistant.companion.android@${{ env.VERSION }}
           environment: Production
 
   play_publish:
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d50add94e..59a3665e4 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -31,6 +31,8 @@ android {
 
         versionName = System.getenv("VERSION") ?: "LOCAL"
         versionCode = System.getenv("VERSION_CODE")?.toIntOrNull() ?: 1
+
+        manifestPlaceholders["sentryRelease"] = "$applicationId@$versionName"
     }
 
     buildFeatures {
diff --git a/app/src/full/AndroidManifest.xml b/app/src/full/AndroidManifest.xml
index cae5f8a93..e750932ec 100644
--- a/app/src/full/AndroidManifest.xml
+++ b/app/src/full/AndroidManifest.xml
@@ -6,6 +6,8 @@
     <application
         android:name=".HomeAssistantApplication" >
         <meta-data android:name="io.sentry.auto-init" android:value="${sentryEnabled}" />
+        <meta-data android:name="io.sentry.release" android:value="${sentryRelease}" />
+        <meta-data android:name="io.sentry.session-tracking.enable" android:value="true" />
         <meta-data android:name="io.sentry.dsn" android:value="https://2d646f40f9574e0b9579e301a69bb030@o427061.ingest.sentry.io/5372876" />
 
         <receiver