From f24f55f418a07ae60d052e1709a44fe6792b81d9 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Tue, 15 Feb 2022 14:18:16 +0100
Subject: [PATCH 1/5] [FCM] Allow system certificates for firebase domain

---
 .../withpinning/res/xml/network_security_config.xml    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/vector/src/withpinning/res/xml/network_security_config.xml b/vector/src/withpinning/res/xml/network_security_config.xml
index 5078cd149b..2a8ea127df 100644
--- a/vector/src/withpinning/res/xml/network_security_config.xml
+++ b/vector/src/withpinning/res/xml/network_security_config.xml
@@ -6,7 +6,15 @@
             <!-- Do not allow system and user certificates -->
 
             <!-- Allow only Tchap intermediate certificate authority -->
-            <certificates src="@raw/certignaservicesrootca"/>
+            <certificates src="@raw/certignaservicesrootca" />
         </trust-anchors>
     </base-config>
+
+    <!-- Allow system certificates for firebase -->
+    <domain-config cleartextTrafficPermitted="false">
+        <domain includeSubdomains="false">firebaseinstallations.googleapis.com</domain>
+        <trust-anchors>
+            <certificates src="system" />
+        </trust-anchors>
+    </domain-config>
 </network-security-config>

From 5e1d317dc4c7d0a246e6559a88808e6cf20e1b94 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Tue, 15 Feb 2022 14:34:37 +0100
Subject: [PATCH 2/5] Hide "Test Push" step from the troubleshoot notifications
 screen

---
 .../app/push/fcm/NotificationTroubleshootTestManagerFactory.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt b/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
index e96c603e60..47d8ff9128 100644
--- a/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
+++ b/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
@@ -49,7 +49,7 @@ class NotificationTroubleshootTestManagerFactory @Inject constructor(
         mgr.addTest(testPlayServices)
         mgr.addTest(testFirebaseToken)
         mgr.addTest(testTokenRegistration)
-        mgr.addTest(testPushFromPushGateway)
+//        mgr.addTest(testPushFromPushGateway)
         mgr.addTest(testNotification)
         return mgr
     }

From 6f3ce56955f2e79c899b0cf153c4cdafc853e444 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Tue, 15 Feb 2022 14:53:28 +0100
Subject: [PATCH 3/5] add changelog

---
 changelog.d/402.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/402.bugfix

diff --git a/changelog.d/402.bugfix b/changelog.d/402.bugfix
new file mode 100644
index 0000000000..0a28a56ee1
--- /dev/null
+++ b/changelog.d/402.bugfix
@@ -0,0 +1 @@
+Fix the FCM token error breaking the push notifications
\ No newline at end of file

From 258deba5ca98462ca933705bc886e9ab78b2db32 Mon Sep 17 00:00:00 2001
From: Florian Renaud <Florian14@users.noreply.github.com>
Date: Tue, 15 Feb 2022 18:07:44 +0100
Subject: [PATCH 4/5] Add tchap comment about code change

Co-authored-by: ClaireG <claire.1817@hotmail.fr>
---
 .../app/push/fcm/NotificationTroubleshootTestManagerFactory.kt   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt b/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
index 47d8ff9128..a466ebe6da 100644
--- a/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
+++ b/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
@@ -49,6 +49,7 @@ class NotificationTroubleshootTestManagerFactory @Inject constructor(
         mgr.addTest(testPlayServices)
         mgr.addTest(testFirebaseToken)
         mgr.addTest(testTokenRegistration)
+      // Tchap:  Hide this verification, we can't call tchap server.
 //        mgr.addTest(testPushFromPushGateway)
         mgr.addTest(testNotification)
         return mgr

From c1203680005d1a34f74bf0f721b70b9317a430f3 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Wed, 16 Feb 2022 11:23:40 +0100
Subject: [PATCH 5/5] Pinning: Split network security config for gplay and
 fdroid

---
 .../withpinning/res/xml/network_security_config.xml  | 12 ++++++++++++
 .../withpinning/res/xml/network_security_config.xml  |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 vector/src/fdroid/withpinning/res/xml/network_security_config.xml
 rename vector/src/{ => gplay}/withpinning/res/xml/network_security_config.xml (90%)

diff --git a/vector/src/fdroid/withpinning/res/xml/network_security_config.xml b/vector/src/fdroid/withpinning/res/xml/network_security_config.xml
new file mode 100644
index 0000000000..105c36a27a
--- /dev/null
+++ b/vector/src/fdroid/withpinning/res/xml/network_security_config.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <!-- Do not allow clearText traffic -->
+    <base-config cleartextTrafficPermitted="false">
+        <trust-anchors>
+            <!-- Do not allow system and user certificates -->
+
+            <!-- Allow only Tchap intermediate certificate authority -->
+            <certificates src="@raw/certignaservicesrootca" />
+        </trust-anchors>
+    </base-config>
+</network-security-config>
diff --git a/vector/src/withpinning/res/xml/network_security_config.xml b/vector/src/gplay/withpinning/res/xml/network_security_config.xml
similarity index 90%
rename from vector/src/withpinning/res/xml/network_security_config.xml
rename to vector/src/gplay/withpinning/res/xml/network_security_config.xml
index 2a8ea127df..2aea413b18 100644
--- a/vector/src/withpinning/res/xml/network_security_config.xml
+++ b/vector/src/gplay/withpinning/res/xml/network_security_config.xml
@@ -3,7 +3,7 @@
     <!-- Do not allow clearText traffic -->
     <base-config cleartextTrafficPermitted="false">
         <trust-anchors>
-            <!-- Do not allow system and user certificates -->
+            <!-- Do not allow system and user certificates by default -->
 
             <!-- Allow only Tchap intermediate certificate authority -->
             <certificates src="@raw/certignaservicesrootca" />