From 8877ad2f5045f7aab63dfea24544501e80ff1650 Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikma@users.sourceforge.net>
Date: Wed, 10 Apr 2019 00:04:04 +0200
Subject: m7n: local build modifications
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use custom application id: eu.m7n.wireguard.android
Set app names to (m7n.eu) WireGuard and (m7n.eu) WireGuard β
---
 ui/src/debug/res/values/strings.xml | 2 +-
 ui/src/main/res/values/strings.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'ui/src')

diff --git a/ui/src/debug/res/values/strings.xml b/ui/src/debug/res/values/strings.xml
index 947b7381..af58a39d 100644
--- a/ui/src/debug/res/values/strings.xml
+++ b/ui/src/debug/res/values/strings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name" translatable="false">WireGuard β</string>
+    <string name="app_name" translatable="false">(m7n.eu) WireGuard β</string>
 </resources>
diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml
index 66e35c98..c9e230db 100644
--- a/ui/src/main/res/values/strings.xml
+++ b/ui/src/main/res/values/strings.xml
@@ -63,7 +63,7 @@
     <string name="allow_remote_control_intents_summary_on">External apps may toggle tunnels (advanced)</string>
     <string name="allow_remote_control_intents_title">Allow remote control apps</string>
     <string name="allowed_ips">Allowed IPs</string>
-    <string name="app_name" translatable="false">WireGuard</string>
+    <string name="app_name" translatable="false">(m7n.eu) WireGuard</string>
     <string name="bad_config_context">%1$s\'s %2$s</string>
     <string name="bad_config_context_top_level">%s</string>
     <string name="bad_config_error">%1$s in %2$s</string>
-- 
cgit v1.2.3


From 1b99edd898eed993cf8d72dd594d4b25bfdcd34e Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikma@users.sourceforge.net>
Date: Sat, 11 Dec 2021 20:29:42 +0100
Subject: version: automatically generate version string from tag

Signed-off-by: Mikael Magnusson <mikma@users.sourceforge.net>
---
 gradle/libs.versions.toml                                 | 2 ++
 ui/build.gradle.kts                                       | 6 +++++-
 ui/src/main/java/com/wireguard/android/updater/Updater.kt | 5 ++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'ui/src')

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 21adde36..8d4e15da 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,6 @@
 [versions]
 agp = "8.1.0-beta03"
+grgit = "5.2.0"
 kotlin = "1.8.21"
 
 [libraries]
@@ -25,5 +26,6 @@ zxing-android-embedded = "com.journeyapps:zxing-android-embedded:4.3.0"
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
+ajoberstar-grgit = { id = "org.ajoberstar.grgit", version.ref = "grgit" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts
index 136c636a..77e3b9fd 100644
--- a/ui/build.gradle.kts
+++ b/ui/build.gradle.kts
@@ -13,6 +13,7 @@ plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.kapt)
+    alias(libs.plugins.ajoberstar.grgit)
 }
 
 android {
@@ -28,7 +29,10 @@ android {
         minSdk = 21
         targetSdk = 33
         versionCode = providers.gradleProperty("wireguardVersionCode").get().toInt()
-        versionName = providers.gradleProperty("wireguardVersionName").get()
+        versionName = grgit.describe {
+            tags = true
+            always = true
+        }.replace('-', '.')
         buildConfigField("int", "MIN_SDK_VERSION", minSdk.toString())
     }
     compileOptions {
diff --git a/ui/src/main/java/com/wireguard/android/updater/Updater.kt b/ui/src/main/java/com/wireguard/android/updater/Updater.kt
index dbdbacfe..adcb3836 100644
--- a/ui/src/main/java/com/wireguard/android/updater/Updater.kt
+++ b/ui/src/main/java/com/wireguard/android/updater/Updater.kt
@@ -152,7 +152,10 @@ object Updater {
                 throw InvalidParameterException("Version has no parts")
             parts = ULongArray(strParts.size)
             for (i in parts.indices) {
-                parts[i] = strParts[i].toULong()
+                if (strParts[i][0] == 'g')
+                    parts[i] = strParts[i].substring(1).toULong(16)
+                else
+                    parts[i] = strParts[i].toULong()
             }
         }
 
-- 
cgit v1.2.3