Fix scanning for server

badaix · Jan 10, 2021 · 266e191 · 266e191
1 parent 2e4ea0b
commit 266e191
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/Snapcast/src/main/AndroidManifest.xml b/Snapcast/src/main/AndroidManifest.xml
@@ -6,6 +6,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
 
     <application
         android:allowBackup="true"

diff --git a/Snapcast/src/main/java/de/badaix/snapcast/utils/NsdHelper.java b/Snapcast/src/main/java/de/badaix/snapcast/utils/NsdHelper.java
@@ -26,6 +26,7 @@
 import android.content.Context;
 import android.net.nsd.NsdManager;
 import android.net.nsd.NsdServiceInfo;
+import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.util.Log;
 
@@ -46,6 +47,7 @@ public class NsdHelper {
     private android.net.nsd.NsdManager.ResolveListener mResolveListener = null;
     private Context mContext;
     private NsdHelperListener listener = null;
+    private WifiManager.MulticastLock multicastLock = null;
 
     private NsdHelper(Context context) {
         mContext = context;
@@ -65,6 +67,15 @@ public void startListening(String serviceType, String serviceName, NsdHelperList
         this.listener = listener;
         this.serviceName = serviceName;
         this.serviceType = serviceType;
+
+        // https://stackoverflow.com/questions/53615125/nsdmanager-discovery-does-not-work-on-android-9
+        WifiManager wifi = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
+        if (wifi != null) {
+            multicastLock = wifi.createMulticastLock("multicastLock");
+            multicastLock.setReferenceCounted(true);
+            multicastLock.acquire();
+        }
+
         initializeResolveListener();
         initializeDiscoveryListener();
         mNsdManager = (NsdManager) mContext.getSystemService(Context.NSD_SERVICE);
@@ -80,6 +91,10 @@ public void stopListening() {
             }
             mDiscoveryListener = null;
         }
+        if (multicastLock != null) {
+            multicastLock.release();
+            multicastLock = null;
+        }
     }
 
     private void initializeResolveListener() {