From e42513396c7550e1f64b6b2892080417eaba81ab Mon Sep 17 00:00:00 2001
From: David Cook <dcook@divviup.org>
Date: Wed, 15 Nov 2023 16:53:03 -0600
Subject: [PATCH] Include version in User-Agent via BuildConfig (#23)

---
 divviup/build.gradle.kts                              | 8 ++++++++
 divviup/src/main/java/org/divviup/android/Client.java | 7 +------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/divviup/build.gradle.kts b/divviup/build.gradle.kts
index 683bc84..0bcc2b8 100644
--- a/divviup/build.gradle.kts
+++ b/divviup/build.gradle.kts
@@ -9,11 +9,19 @@ android {
 
     ndkVersion = "26.1.10909125"
 
+    buildFeatures {
+        buildConfig = true
+    }
+
     defaultConfig {
         minSdk = 21
 
+        version = "0.1.0-SNAPSHOT"
+
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
+
+        buildConfigField("String", "VERSION", "\"" + version.toString() + "\"")
     }
 
     buildTypes {
diff --git a/divviup/src/main/java/org/divviup/android/Client.java b/divviup/src/main/java/org/divviup/android/Client.java
index 01f0771..14c0531 100644
--- a/divviup/src/main/java/org/divviup/android/Client.java
+++ b/divviup/src/main/java/org/divviup/android/Client.java
@@ -166,12 +166,7 @@ private HpkeConfigList fetchHPKEConfigList(URI aggregatorEndpoint, TaskId taskId
     }
 
     private static String getUserAgent() {
-        Package pkg = Client.class.getPackage();
-        if (pkg != null) {
-            return "divviup-android/" + pkg.getImplementationVersion();
-        } else {
-            return "divviup-android";
-        }
+        return "divviup-android/" + BuildConfig.VERSION;
     }
 
     private long reportTimestamp() {