From 2e748a9f358ee5564990c4e1806ca8b1ecf2a4da Mon Sep 17 00:00:00 2001
From: Jarno Rankinen <jarno@oranki.net>
Date: Sat, 26 Aug 2023 22:36:52 +0300
Subject: [PATCH] Renamed package to net.oranki.volfram and added extra version
 number .vfrm.X

---
 vector-app/build.gradle                           | 12 +++++++-----
 vector-app/src/gplay/debug/google-services.json   |  4 ++--
 vector-app/src/gplay/nightly/google-services.json |  2 +-
 vector-app/src/gplay/release/google-services.json |  4 ++--
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/vector-app/build.gradle b/vector-app/build.gradle
index 36f1979531..0b33113df1 100644
--- a/vector-app/build.gradle
+++ b/vector-app/build.gradle
@@ -38,6 +38,8 @@ ext.versionMinor = 6
 // When creating a hotfix, you should decrease the value, since the current value
 // is the value for the next regular release.
 ext.versionPatch = 5
+// Volfram specific version number
+ext.versionVfrm = 1
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'
@@ -145,7 +147,7 @@ android {
     compileSdk versions.compileSdk
 
     defaultConfig {
-        applicationId "im.vector.app"
+        applicationId "net.oranki.volfram"
         // Set to API 21: see #405
         minSdk versions.minSdk
         targetSdk versions.targetSdk
@@ -249,7 +251,7 @@ android {
         debug {
             applicationIdSuffix ".debug"
             signingConfig signingConfigs.debug
-            resValue "string", "app_name", "Element - dbg"
+            resValue "string", "app_name", "Volfram - dbg"
 
             if (project.hasProperty("coverage")) {
                 testCoverageEnabled = coverage == "true"
@@ -257,7 +259,7 @@ android {
         }
 
         release {
-            resValue "string", "app_name", "Element"
+            resValue "string", "app_name", "Volfram"
             postprocessing {
                 // FIXME Set to true.
                 removeUnusedCode false
@@ -320,14 +322,14 @@ android {
 
             dimension "store"
             isDefault = true
-            versionName "${versionMajor}.${versionMinor}.${versionPatch}${getGplayVersionSuffix()}"
+            versionName "${versionMajor}.${versionMinor}.${versionPatch}${getGplayVersionSuffix()}.vfrm.${versionVfrm}"
             buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"G\""
             buildConfigField "String", "FLAVOR_DESCRIPTION", "\"GooglePlay\""
         }
 
         fdroid {
             dimension "store"
-            versionName "${versionMajor}.${versionMinor}.${versionPatch}${getFdroidVersionSuffix()}"
+            versionName "${versionMajor}.${versionMinor}.${versionPatch}${getFdroidVersionSuffix()}.vfrm.${versionVfrm}"
             buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"F\""
             buildConfigField "String", "FLAVOR_DESCRIPTION", "\"FDroid\""
         }
diff --git a/vector-app/src/gplay/debug/google-services.json b/vector-app/src/gplay/debug/google-services.json
index 713c1d4e03..06e6385e7f 100644
--- a/vector-app/src/gplay/debug/google-services.json
+++ b/vector-app/src/gplay/debug/google-services.json
@@ -10,7 +10,7 @@
       "client_info": {
         "mobilesdk_app_id": "1:912726360885:android:4ef8f3a0021e774d",
         "android_client_info": {
-          "package_name": "im.vector.app.debug"
+          "package_name": "net.oranki.volfram.debug"
         }
       },
       "oauth_client": [
@@ -37,4 +37,4 @@
     }
   ],
   "configuration_version": "1"
-}
\ No newline at end of file
+}
diff --git a/vector-app/src/gplay/nightly/google-services.json b/vector-app/src/gplay/nightly/google-services.json
index 4cfa4dc036..f5bb250ff8 100644
--- a/vector-app/src/gplay/nightly/google-services.json
+++ b/vector-app/src/gplay/nightly/google-services.json
@@ -10,7 +10,7 @@
       "client_info": {
         "mobilesdk_app_id": "1:912726360885:android:4ef8f3a0021e774d",
         "android_client_info": {
-          "package_name": "im.vector.app.nightly"
+          "package_name": "net.oranki.volfram.nightly"
         }
       },
       "oauth_client": [
diff --git a/vector-app/src/gplay/release/google-services.json b/vector-app/src/gplay/release/google-services.json
index fb8f769f45..528e756ad2 100644
--- a/vector-app/src/gplay/release/google-services.json
+++ b/vector-app/src/gplay/release/google-services.json
@@ -10,7 +10,7 @@
       "client_info": {
         "mobilesdk_app_id": "1:912726360885:android:4ef8f3a0021e774d",
         "android_client_info": {
-          "package_name": "im.vector.app"
+          "package_name": "net.oranki.volfram"
         }
       },
       "oauth_client": [
@@ -37,4 +37,4 @@
     }
   ],
   "configuration_version": "1"
-}
\ No newline at end of file
+}