From 51d92265f4163967c0045f67495954515da15c62 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Fri, 25 Oct 2024 16:05:09 +1100
Subject: [PATCH] fix(android): never route notifications through the tunnel
 (#7160)

Resolves: #5637.
---
 .../main/java/dev/firezone/android/tunnel/TunnelService.kt   | 5 +++++
 website/src/components/Changelog/Android.tsx                 | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/kotlin/android/app/src/main/java/dev/firezone/android/tunnel/TunnelService.kt b/kotlin/android/app/src/main/java/dev/firezone/android/tunnel/TunnelService.kt
index a0283a807..b463b73be 100644
--- a/kotlin/android/app/src/main/java/dev/firezone/android/tunnel/TunnelService.kt
+++ b/kotlin/android/app/src/main/java/dev/firezone/android/tunnel/TunnelService.kt
@@ -196,6 +196,11 @@ class TunnelService : VpnService() {
                 "disallowedApplications",
             ) { addDisallowedApplication(it) }
 
+            // Never route GCM notifications through the tunnel.
+            addDisallowedApplication("com.google.android.gms") // Google Mobile Services
+            addDisallowedApplication("com.google.firebase.messaging") // Firebase Cloud Messaging
+            addDisallowedApplication("com.google.android.gsf") // Google Services Framework
+
             tunnelRoutes.forEach {
                 addRoute(it.address, it.prefix)
             }
diff --git a/website/src/components/Changelog/Android.tsx b/website/src/components/Changelog/Android.tsx
index feecac32c..a6a9e49f9 100644
--- a/website/src/components/Changelog/Android.tsx
+++ b/website/src/components/Changelog/Android.tsx
@@ -16,6 +16,10 @@ export default function Android() {
         <ChangeItem pull="7151">
           Adds always-on error reporting using sentry.io.
         </ChangeItem>
+        <ChangeItem pull="7160">
+          Fixes an issue where notifications would sometimes not get delivered
+          when Firezone was active.
+        </ChangeItem>
       </Unreleased>
       <Entry version="1.3.5" date={new Date("2024-10-03")}>
         <ChangeItem pull="6831">