From 919dec4a5645d2ee97ae5ae7ed18f9dbef8f802f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 11 Jul 2019 17:59:07 +0200
Subject: [PATCH] Add ".debug" to the applicationId to be able to install the
 app along with the prod version

---
 vector/build.gradle                         |  5 +++
 vector/src/gplay/debug/google-services.json | 40 +++++++++++++++++++++
 vector/src/main/res/values/config.xml       |  2 +-
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 vector/src/gplay/debug/google-services.json

diff --git a/vector/build.gradle b/vector/build.gradle
index eaba03e1..ace3135a 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -96,6 +96,9 @@ android {
 
     buildTypes {
         debug {
+            applicationIdSuffix ".debug"
+            resValue "string", "app_name", "RiotX dbg"
+
             resValue "bool", "debug_mode", "true"
             buildConfigField "boolean", "LOW_PRIVACY_LOG_ENABLE", "false"
 
@@ -103,6 +106,8 @@ android {
         }
 
         release {
+            resValue "string", "app_name", "RiotX"
+
             resValue "bool", "debug_mode", "false"
             buildConfigField "boolean", "LOW_PRIVACY_LOG_ENABLE", "false"
 
diff --git a/vector/src/gplay/debug/google-services.json b/vector/src/gplay/debug/google-services.json
new file mode 100644
index 00000000..185f7afb
--- /dev/null
+++ b/vector/src/gplay/debug/google-services.json
@@ -0,0 +1,40 @@
+{
+  "project_info": {
+    "project_number": "912726360885",
+    "firebase_url": "https://vector-alpha.firebaseio.com",
+    "project_id": "vector-alpha",
+    "storage_bucket": "vector-alpha.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:912726360885:android:4ef8f3a0021e774d",
+        "android_client_info": {
+          "package_name": "im.vector.riotx.debug"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "912726360885-e87n3jva9uoj4vbidvijq78ebg02asv2.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAFZX8IhIfgzdOZvxDP_ISO5WYoU7jmQ5c"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "912726360885-rsae0i66rgqt6ivnudu1pv4tksg9i8b2.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
\ No newline at end of file
diff --git a/vector/src/main/res/values/config.xml b/vector/src/main/res/values/config.xml
index f3904499..508b942a 100755
--- a/vector/src/main/res/values/config.xml
+++ b/vector/src/main/res/values/config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name" translatable="false">"RiotX"</string>
+    <!-- "app_name" is now defined in build.gradle -->
 
     <!-- server urls -->
     <string name="vector_im_server_url" translatable="false">https://vector.im</string>