diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 1993f71e..61f519bb 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -15,6 +15,7 @@ jobs: RVX_ANALYSIS_ENABLED: ${{ vars.RVX_ANALYSIS_ENABLED }} RVX_ANALYSIS_BASEURL: ${{ vars.RVX_ANALYSIS_BASEURL }} RVX_DEBUG_APP_NAME: ${{ vars.RVX_DEBUG_APP_NAME }} + RVX_BUILD_FLAVOUR_ID: ${{ vars.RVX_BUILD_FLAVOUR_ID }} steps: - uses: actions/checkout@v3 diff --git a/app/build.gradle b/app/build.gradle index 0107a590..b958d5c8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -115,6 +115,7 @@ android { shrinkResources true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' buildConfigField "String", "SENTRY_DSN", "\"${buildproperty('sentry.dsn', 'RVX_SENTRY_DSN')}\"" + buildConfigField "String", "FLAVOUR_ID", "\"${buildproperty('build.flavour_id', 'RVX_BUILD_FLAVOUR_ID')}\"" } debug { @@ -125,6 +126,7 @@ android { resValue "string", "app_name", buildproperty('build.debug.app_name', 'RVX_DEBUG_APP_NAME') buildConfigField "String", "SENTRY_DSN", "\"${buildproperty('sentry.dsn', 'RVX_SENTRY_DSN')}\"" + buildConfigField "String", "FLAVOUR_ID", "\"${buildproperty('build.flavour_id', 'RVX_BUILD_FLAVOUR_ID')}\"" } } compileOptions { diff --git a/app/src/main/java/chat/revolt/screens/about/AboutScreen.kt b/app/src/main/java/chat/revolt/screens/about/AboutScreen.kt index 1308071d..17df33fe 100644 --- a/app/src/main/java/chat/revolt/screens/about/AboutScreen.kt +++ b/app/src/main/java/chat/revolt/screens/about/AboutScreen.kt @@ -72,6 +72,7 @@ class AboutViewModel : ViewModel() { return mapOf( "App ID" to BuildConfig.APPLICATION_ID, "App Version" to BuildConfig.VERSION_NAME, + "App Type" to BuildConfig.FLAVOUR_ID, "API Host" to URI(REVOLT_BASE).host, "API Version" to (root?.revolt ?: "Unknown"), "Runtime SDK" to Build.VERSION.SDK_INT.toString(), diff --git a/revoltbuild.properties.example b/revoltbuild.properties.example index b3071f3a..ea6a101c 100644 --- a/revoltbuild.properties.example +++ b/revoltbuild.properties.example @@ -1,3 +1,4 @@ sentry.dsn= sentry.upload_mappings=true -build.debug.app_name= \ No newline at end of file +build.debug.app_name= +build.flavour_id=ZZUU \ No newline at end of file