Android: Fix crash when using NetworkServiceDiscovery

juce-framework · Dec 18, 2023 · 6219eb9 · 6219eb9
1 parent 90c15c4
commit 6219eb9
Showing 1 changed file with 12 additions and 17 deletions.
diff --git a/modules/juce_core/native/juce_Network_android.cpp b/modules/juce_core/native/juce_Network_android.cpp
@@ -212,30 +212,25 @@ DECLARE_JNI_CLASS (AndroidMulticastLock, "android/net/wifi/WifiManager$Multicast
 DECLARE_JNI_CLASS (AndroidWifiManager, "android/net/wifi/WifiManager")
 #undef JNI_CLASS_MEMBERS
 
-static LocalRef<jobject> getMulticastLock()
+static jobject getMulticastLock()
 {
-    static LocalRef<jobject> multicastLock;
-    static bool hasChecked = false;
-
-    if (! hasChecked)
+    static GlobalRef multicastLock = [&]
     {
-        hasChecked = true;
-
         auto* env = getEnv();
 
         LocalRef<jobject> wifiManager (env->CallObjectMethod (getAppContext().get(),
                                                               AndroidContext.getSystemService,
                                                               javaString ("wifi").get()));
 
-        if (wifiManager != nullptr)
-        {
-            multicastLock = LocalRef<jobject> (env->CallObjectMethod (wifiManager.get(),
-                                                                      AndroidWifiManager.createMulticastLock,
-                                                                      javaString ("JUCE_MulticastLock").get()));
-        }
-    }
+        if (wifiManager == nullptr)
+            return GlobalRef{};
+
+        return GlobalRef (LocalRef<jobject> (env->CallObjectMethod (wifiManager.get(),
+                                                                    AndroidWifiManager.createMulticastLock,
+                                                                    javaString ("JUCE_MulticastLock").get())));
+    }();
 
-    return multicastLock;
+    return multicastLock.get();
 }
 
 JUCE_API void JUCE_CALLTYPE acquireMulticastLock();
@@ -244,7 +239,7 @@ JUCE_API void JUCE_CALLTYPE acquireMulticastLock()
     auto multicastLock = getMulticastLock();
 
     if (multicastLock != nullptr)
-        getEnv()->CallVoidMethod (multicastLock.get(), AndroidMulticastLock.acquire);
+        getEnv()->CallVoidMethod (multicastLock, AndroidMulticastLock.acquire);
 }
 
 JUCE_API void JUCE_CALLTYPE releaseMulticastLock();
@@ -253,7 +248,7 @@ JUCE_API void JUCE_CALLTYPE releaseMulticastLock()
     auto multicastLock = getMulticastLock();
 
     if (multicastLock != nullptr)
-        getEnv()->CallVoidMethod (multicastLock.get(), AndroidMulticastLock.release);
+        getEnv()->CallVoidMethod (multicastLock, AndroidMulticastLock.release);
 }
 
 //==============================================================================