From bc781720b5c938084278215d57ff5e92f8ef098b Mon Sep 17 00:00:00 2001
From: Oscar Mira <valldrac@molly.im>
Date: Tue, 6 Aug 2024 07:19:04 +0200
Subject: [PATCH] Fix NetworkManager initialization to use lazy delegate

---
 .../thoughtcrime/securesms/dependencies/AppDependencies.kt   | 5 +++--
 .../java/org/thoughtcrime/securesms/net/NetworkManager.java  | 4 ----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/dependencies/AppDependencies.kt b/app/src/main/java/org/thoughtcrime/securesms/dependencies/AppDependencies.kt
index 16eac6b252..b51269e47b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/dependencies/AppDependencies.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/dependencies/AppDependencies.kt
@@ -217,8 +217,9 @@ object AppDependencies {
   val webSocketObserver: Observable<WebSocketConnectionState> = _webSocketObserver
 
   @JvmStatic
-  val networkManager: NetworkManager
-    get() = provider.provideNetworkManager()
+  val networkManager: NetworkManager by lazy {
+    provider.provideNetworkManager()
+  }
 
   private val _networkModule = resettableLazy {
     NetworkDependenciesModule(application, provider, _webSocketObserver)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/net/NetworkManager.java b/app/src/main/java/org/thoughtcrime/securesms/net/NetworkManager.java
index 7ec81748cf..e6c1a90226 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/net/NetworkManager.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/net/NetworkManager.java
@@ -53,10 +53,6 @@ public static NetworkManager create(@NonNull Context context) {
     return new NetworkManager(ApplicationContext.getInstance(), OrbotHelper.get(context));
   }
 
-  public boolean isNetworkEnabled() {
-    return Networking.isEnabled();
-  }
-
   public void setNetworkEnabled(boolean enabled) {
     Networking.setEnabled(enabled);
     if (enabled) {