Merge pull request #431 from tchapgouv/feature/fre/fix_fis_auth_error

Fix the FCM token error
tchapgouv · Feb 16, 2022 · a3cccaf · a3cccaf
2 parents 240ac15 + c120368
commit a3cccaf
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/changelog.d/402.bugfix b/changelog.d/402.bugfix
@@ -0,0 +1 @@
+Fix the FCM token error breaking the push notifications
diff --git a/...nning/res/xml/network_security_config.xml → ...nning/res/xml/network_security_config.xml b/...nning/res/xml/network_security_config.xml → ...nning/res/xml/network_security_config.xml
@@ -6,7 +6,7 @@
             <!-- 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>
 </network-security-config>
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
@@ -49,7 +49,8 @@ class NotificationTroubleshootTestManagerFactory @Inject constructor(
         mgr.addTest(testPlayServices)
         mgr.addTest(testFirebaseToken)
         mgr.addTest(testTokenRegistration)
-        mgr.addTest(testPushFromPushGateway)
+      // Tchap:  Hide this verification, we can't call tchap server.
+//        mgr.addTest(testPushFromPushGateway)
         mgr.addTest(testNotification)
         return mgr
     }

diff --git a/vector/src/gplay/withpinning/res/xml/network_security_config.xml b/vector/src/gplay/withpinning/res/xml/network_security_config.xml
@@ -0,0 +1,20 @@
+<?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 by default -->
+
+            <!-- Allow only Tchap intermediate certificate authority -->
+            <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>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix the FCM token error breaking the push notifications