Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the FCM token error #431

Merged
merged 5 commits into from
Feb 16, 2022
Merged

Fix the FCM token error #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f24f55f
[FCM] Allow system certificates for firebase domain
Feb 15, 2022
5e1d317
Hide "Test Push" step from the troubleshoot notifications screen
Feb 15, 2022
6f3ce56
add changelog
Feb 15, 2022
258deba
Add tchap comment about code change
Florian14 Feb 15, 2022
c120368
Pinning: Split network security config for gplay and fdroid
Feb 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/402.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix the FCM token error breaking the push notifications
2 changes: 1 addition & 1 deletion ...nning/res/xml/network_security_config.xml → ...nning/res/xml/network_security_config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
3 changes: 2 additions & 1 deletion vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Florian14 marked this conversation as resolved.
Show resolved Hide resolved
mgr.addTest(testNotification)
return mgr
}
Expand Down
20 changes: 20 additions & 0 deletions vector/src/gplay/withpinning/res/xml/network_security_config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>