From e0aae7d0e86eb43f2dc5819a5abba9c1ea8edf28 Mon Sep 17 00:00:00 2001
From: alperozturk96 <alper_ozturk@proton.me>
Date: Wed, 24 Jun 2026 16:11:26 +0300
Subject: [PATCH 1/2] fix(connectivity-service): too many attempt

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
---
 .../client/network/ConnectivityServiceImpl.kt |  8 +++++++-
 .../client/network/NetworkModule.java         | 19 ++++++++++++++-----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/client/network/ConnectivityServiceImpl.kt b/app/src/main/java/com/nextcloud/client/network/ConnectivityServiceImpl.kt
index 8dd24f24d145..30d5717e0da6 100644
--- a/app/src/main/java/com/nextcloud/client/network/ConnectivityServiceImpl.kt
+++ b/app/src/main/java/com/nextcloud/client/network/ConnectivityServiceImpl.kt
@@ -36,6 +36,9 @@ class ConnectivityServiceImpl(
 ) : ConnectivityService {
 
     companion object {
+        var instance: ConnectivityServiceImpl? = null
+
+        private var initCount = 0
         private const val TAG = "ConnectivityServiceImpl"
         private const val CONNECTIVITY_CHECK_ROUTE = "/index.php/204"
     }
@@ -66,10 +69,13 @@ class ConnectivityServiceImpl(
     }
     // endregion
 
+
+
     init {
+        initCount += 1
         connectivityManager.registerDefaultNetworkCallback(networkCallback)
         updateConnectivity()
-        Log_OC.d(TAG, "connectivity service constructed")
+        Log_OC.d(TAG, "connectivity service constructed: " + initCount)
     }
 
     // region overridden methods
diff --git a/app/src/main/java/com/nextcloud/client/network/NetworkModule.java b/app/src/main/java/com/nextcloud/client/network/NetworkModule.java
index 73edbf57706a..7dd0bc22ff1f 100644
--- a/app/src/main/java/com/nextcloud/client/network/NetworkModule.java
+++ b/app/src/main/java/com/nextcloud/client/network/NetworkModule.java
@@ -19,17 +19,26 @@
 @Module
 public class NetworkModule {
 
+    // todo: check 429, remove manual instance...
     @Provides
+    @Singleton
     ConnectivityService connectivityService(Context context,
                                             UserAccountManager accountManager,
                                             ClientFactory clientFactory,
                                             WalledCheckCache walledCheckCache) {
-        return new ConnectivityServiceImpl(context,
-                                           accountManager,
-                                           clientFactory,
-                                           url -> new GetMethod(url, false),
-                                           walledCheckCache
+        var instance = ConnectivityServiceImpl.Companion.getInstance();
+        if (instance != null) {
+            return instance;
+        }
+
+        instance = new ConnectivityServiceImpl(context,
+                                               accountManager,
+                                               clientFactory,
+                                               url -> new GetMethod(url, false),
+                                               walledCheckCache
         );
+        ConnectivityServiceImpl.Companion.setInstance(instance);
+        return instance;
     }
 
     @Provides

From 712e70a34da819ba094a7e00b1a732c7c42ee9fd Mon Sep 17 00:00:00 2001
From: alperozturk96 <alper_ozturk@proton.me>
Date: Wed, 24 Jun 2026 16:11:39 +0300
Subject: [PATCH 2/2] fix(connectivity-service): too many attempt

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
---
 .../java/com/nextcloud/client/network/ConnectivityServiceImpl.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/nextcloud/client/network/ConnectivityServiceImpl.kt b/app/src/main/java/com/nextcloud/client/network/ConnectivityServiceImpl.kt
index 30d5717e0da6..0d6b4e978fef 100644
--- a/app/src/main/java/com/nextcloud/client/network/ConnectivityServiceImpl.kt
+++ b/app/src/main/java/com/nextcloud/client/network/ConnectivityServiceImpl.kt
@@ -38,6 +38,7 @@ class ConnectivityServiceImpl(
     companion object {
         var instance: ConnectivityServiceImpl? = null
 
+        // todo: remove
         private var initCount = 0
         private const val TAG = "ConnectivityServiceImpl"
         private const val CONNECTIVITY_CHECK_ROUTE = "/index.php/204"