From 8178ef2d830ecc9f5282c1194d4b4302cb9efe41 Mon Sep 17 00:00:00 2001
From: Tobias <git@tobiasmeier.dev>
Date: Mon, 29 Sep 2025 20:07:58 +0200
Subject: [PATCH] refactor: use shared func for header injection

---
 .../main/java/io/heckel/ntfy/msg/ApiService.kt    |  2 +-
 .../java/io/heckel/ntfy/service/WsConnection.kt   | 15 ++-------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/io/heckel/ntfy/msg/ApiService.kt b/app/src/main/java/io/heckel/ntfy/msg/ApiService.kt
index bbcabf80..6723e418 100644
--- a/app/src/main/java/io/heckel/ntfy/msg/ApiService.kt
+++ b/app/src/main/java/io/heckel/ntfy/msg/ApiService.kt
@@ -175,7 +175,7 @@ class ApiService(private val context: Context) {
     /**
      * Interceptor that adds custom headers to all HTTP requests
      */
-    private class CustomHeadersInterceptor(private val repository: Repository) : Interceptor {
+    class CustomHeadersInterceptor(private val repository: Repository) : Interceptor {
         override fun intercept(chain: Interceptor.Chain): Response {
             val originalRequest = chain.request()
             val customHeaders = repository.getCustomHeaders()
diff --git a/app/src/main/java/io/heckel/ntfy/service/WsConnection.kt b/app/src/main/java/io/heckel/ntfy/service/WsConnection.kt
index aea70e12..795de91a 100644
--- a/app/src/main/java/io/heckel/ntfy/service/WsConnection.kt
+++ b/app/src/main/java/io/heckel/ntfy/service/WsConnection.kt
@@ -5,6 +5,7 @@ import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import io.heckel.ntfy.db.*
+import io.heckel.ntfy.msg.ApiService
 import io.heckel.ntfy.msg.ApiService.Companion.requestBuilder
 import io.heckel.ntfy.msg.NotificationParser
 import io.heckel.ntfy.util.Log
@@ -44,19 +45,7 @@ class WsConnection(
         .readTimeout(0, TimeUnit.MILLISECONDS)
         .pingInterval(1, TimeUnit.MINUTES) // The server pings us too, so this doesn't matter much
         .connectTimeout(10, TimeUnit.SECONDS)
-        .addInterceptor { chain ->
-            val originalRequest = chain.request()
-            val customHeaders = repository.getCustomHeaders()
-            
-            val requestBuilder = originalRequest.newBuilder()
-            
-            // Add all custom headers to the request
-            customHeaders.forEach { (name, value) ->
-                requestBuilder.addHeader(name, value)
-            }
-            
-            chain.proceed(requestBuilder.build())
-        }
+        .addInterceptor(ApiService.CustomHeadersInterceptor(repository))
         .build()
     private var errorCount = 0
     private var webSocket: WebSocket? = null