From 90c831538a3103e417f6d82312818ff55b6aefab Mon Sep 17 00:00:00 2001
From: Jamil <jamilbk@users.noreply.github.com>
Date: Thu, 7 Mar 2024 12:11:07 -0800
Subject: [PATCH] refactor(android): Log allowed/disallowed applications
 (#4038)

Also DRY up the call a little bit.
---
 .../firezone/android/tunnel/TunnelService.kt  | 41 +++++++++----------
 1 file changed, 20 insertions(+), 21 deletions(-)

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 40e2696d9..097954a7f 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
@@ -329,27 +329,8 @@ class TunnelService : VpnService() {
             Firebase.crashlytics.log("IPv6 Address: $tunnelIpv6Address")
             addAddress(tunnelIpv6Address!!, 128)
 
-            appRestrictions.getString("allowedApplications")?.let {
-                if (it.isNotBlank()) {
-                    Firebase.crashlytics.log("Allowed applications: $it")
-                    it.split(",").forEach { p ->
-                        if (p.isNotBlank()) {
-                            addAllowedApplication(p.trim())
-                        }
-                    }
-                }
-            }
-
-            appRestrictions.getString("disallowedApplications")?.let {
-                if (it.isNotBlank()) {
-                    Firebase.crashlytics.log("Disallowed applications: $it")
-                    it.split(",").forEach { p ->
-                        if (p.isNotBlank()) {
-                            addDisallowedApplication(p.trim())
-                        }
-                    }
-                }
-            }
+            updateAllowedDisallowedApplications("allowedApplications", ::addAllowedApplication)
+            updateAllowedDisallowedApplications("disallowedApplications", ::addDisallowedApplication)
 
             setSession(SESSION_NAME)
             setMtu(MTU)
@@ -358,6 +339,24 @@ class TunnelService : VpnService() {
         }
     }
 
+    private fun updateAllowedDisallowedApplications(
+        key: String,
+        allowOrDisallow: (String) -> Unit,
+    ) {
+        val applications = appRestrictions.getString(key)
+        Log.d(TAG, "$key: $applications")
+        Firebase.crashlytics.log("$key: $applications")
+        applications?.let {
+            if (it.isNotBlank()) {
+                it.split(",").forEach { p ->
+                    if (p.isNotBlank()) {
+                        allowOrDisallow(p.trim())
+                    }
+                }
+            }
+        }
+    }
+
     private fun updateStatusNotification(message: String?) {
         val manager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager