From 49a57f11766d0fd3c519afb7a13422e1c0be9a1b 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/build.gradle                     | 2 +-
 ui/src/debug/res/values/strings.xml | 2 +-
 ui/src/main/res/values/strings.xml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/build.gradle b/ui/build.gradle
index abd71827..8f8f147a 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -18,7 +18,7 @@ android {
     }
     namespace = 'com.wireguard.android'
     defaultConfig {
-        applicationId 'com.wireguard.android'
+        applicationId 'eu.m7n.wireguard.android'
         minSdkVersion 21
         targetSdkVersion 33
         versionCode wireguardVersionCode
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 bc85bdbf..7710a879 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 feb0b922f48ce5763fed735be3aa68a4e8036f95 Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikma@users.sourceforge.net>
Date: Sat, 11 Feb 2023 22:54:46 +0100
Subject: ui: add debug keystore

Allow sharing between machines.
---
 keystore/debug.keystore | Bin 0 -> 2107 bytes
 ui/build.gradle         |   8 ++++++++
 2 files changed, 8 insertions(+)
 create mode 100644 keystore/debug.keystore

diff --git a/keystore/debug.keystore b/keystore/debug.keystore
new file mode 100644
index 00000000..c2655107
Binary files /dev/null and b/keystore/debug.keystore differ
diff --git a/ui/build.gradle b/ui/build.gradle
index 8f8f147a..35abacf8 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -30,6 +30,14 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
         coreLibraryDesugaringEnabled = true
     }
+    signingConfigs {
+        debug {
+            storeFile file('../keystore/debug.keystore')
+            storePassword "android"
+            keyAlias "androiddebugkey"
+            keyPassword "android"
+        }
+    }
     buildTypes {
         release {
             minifyEnabled true
-- 
cgit v1.2.3


From c2b703e3c4019ca2d0cec16972b34bb5c8820a08 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>
---
 version.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/version.gradle b/version.gradle
index 256ceb80..51eb2aad 100644
--- a/version.gradle
+++ b/version.gradle
@@ -1,6 +1,7 @@
+
 buildscript {
     ext {
         wireguardVersionCode = 501
-        wireguardVersionName = '1.0.20230502'
+        wireguardVersionName = 'git describe --tags HEAD'.execute().text.trim()
     }
 }
-- 
cgit v1.2.3