pi/babyphone
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'master' into feature/listen-service

Browse Source
This commit is contained in:
edr
2024-02-21 18:58:01 +01:00
parent 7473fffa8a f27e30f524
commit 1ac22e872b
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/de/rochefort/childmonitor/DiscoverActivity.java
View File

@@ -31,6 +31,8 @@ import android.widget.EditText;
import android.widget.ListView;
import android.widget.Toast;
import java.util.Objects;
public class DiscoverActivity extends Activity {
private static final String PREF_KEY_CHILD_DEVICE_ADDRESS = "childDeviceAddress";
@@ -189,7 +191,16 @@ public class DiscoverActivity extends Activity {
public void onServiceResolved(final NsdServiceInfo serviceInfo) {
Log.i(TAG, "Resolve Succeeded: " + serviceInfo);
DiscoverActivity.this.runOnUiThread(() -> availableServicesAdapter.add(new ServiceInfoWrapper(serviceInfo)));
DiscoverActivity.this.runOnUiThread(() -> {
for (int index=0; index < availableServicesAdapter.getCount(); index++) {
ServiceInfoWrapper item = availableServicesAdapter.getItem(index);
if (item != null && item.matches(serviceInfo)) {
// Prevent inserting duplicates
return;
}
}
availableServicesAdapter.add(new ServiceInfoWrapper(serviceInfo));
});
}
};
@@ -251,6 +262,10 @@ class ServiceInfoWrapper {
this.info = info;
}
public boolean matches(NsdServiceInfo other) {
return Objects.equals(this.info.getHost(), other.getHost()) && this.info.getPort() == other.getPort();
}
public String getAddress()
{
return info.getHost().getHostAddress();