Fixed weird conditions for DNS responders.

neatorobito · Nov 1, 2015 · 3050a2d · 3050a2d
1 parent 4711d90
commit 3050a2d
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/src/main/java/com/peak/salut/Salut.java b/src/main/java/com/peak/salut/Salut.java
@@ -683,16 +683,19 @@ public void onDnsSdTxtRecordAvailable(String serviceFullDomainName, Map<String,
                 if(record.containsValue(thisDevice.serviceName))
                 {
                     SalutDevice foundDevice = new SalutDevice(device, record);
-
                     foundDevices.add(foundDevice);
-                    if(!firstDeviceAlreadyFound && !callContinously)
+
+                    if(callContinously)
                     {
                         onDeviceFound.call();
-                        firstDeviceAlreadyFound = true;
                     }
-                    else if(callContinously)
+                    else
                     {
-                        onDeviceFound.call();
+                        if(!firstDeviceAlreadyFound)
+                        {
+                            onDeviceFound.call();
+                            firstDeviceAlreadyFound = true;
+                        }
                     }
                 }
             }
@@ -741,14 +744,17 @@ public void onDnsSdTxtRecordAvailable(String serviceFullDomainName, Map<String,
                     SalutDevice foundDevice = new SalutDevice(device, record);
 
                     foundDevices.add(foundDevice);
-                    if(!firstDeviceAlreadyFound && !callContinously)
+                    if(callContinously)
                     {
                         onDeviceFound.call(foundDevice);
-                        firstDeviceAlreadyFound = true;
                     }
-                    else if(callContinously)
+                    else
                     {
-                        onDeviceFound.call(foundDevice);
+                        if(!firstDeviceAlreadyFound)
+                        {
+                            onDeviceFound.call(foundDevice);
+                            firstDeviceAlreadyFound = true;
+                        }
                     }
                 }
             }
@@ -900,6 +906,7 @@ public void onSuccess() {
     public void stopServiceDiscovery(boolean shouldUnregister)
     {
         isDiscovering = false;
+        firstDeviceAlreadyFound = false;
 
         if(isConnectedToAnotherDevice)
             disconnectFromDevice();