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

Fix some warnings

Browse Source
This commit is contained in:
edr
2023-10-01 20:37:03 +02:00
parent db032437dd
commit 1625d50359
2 changed files with 35 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,9 +25,6 @@ import android.net.nsd.NsdServiceInfo;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
import android.view.View;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
@@ -40,23 +37,23 @@ public class DiscoverActivity extends Activity {
private static final String PREF_KEY_CHILD_DEVICE_PORT = "childDevicePort"; private static final String PREF_KEY_CHILD_DEVICE_PORT = "childDevicePort";
final String TAG = "ChildMonitor"; final String TAG = "ChildMonitor";
NsdManager _nsdManager; private NsdManager nsdManager;
NsdManager.DiscoveryListener _discoveryListener; private NsdManager.DiscoveryListener discoveryListener;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
Log.i(TAG, "ChildMonitor start"); Log.i(TAG, "ChildMonitor start");
_nsdManager = (NsdManager)this.getSystemService(Context.NSD_SERVICE); nsdManager = (NsdManager)this.getSystemService(Context.NSD_SERVICE);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_discover); setContentView(R.layout.activity_discover);
final Button discoverChildButton = (Button) findViewById(R.id.discoverChildButton); final Button discoverChildButton = findViewById(R.id.discoverChildButton);
discoverChildButton.setOnClickListener(v -> loadDiscoveryViaMdns()); discoverChildButton.setOnClickListener(v -> loadDiscoveryViaMdns());
final Button enterChildAddressButton = (Button) findViewById(R.id.enterChildAddressButton); final Button enterChildAddressButton = findViewById(R.id.enterChildAddressButton);
enterChildAddressButton.setOnClickListener(v -> loadDiscoveryViaAddress()); enterChildAddressButton.setOnClickListener(v -> loadDiscoveryViaAddress());
} }
@@ -68,9 +65,9 @@ public class DiscoverActivity extends Activity {
private void loadDiscoveryViaAddress() { private void loadDiscoveryViaAddress() {
setContentView(R.layout.activity_discover_address); setContentView(R.layout.activity_discover_address);
final Button connectButton = (Button) findViewById(R.id.connectViaAddressButton); final Button connectButton = findViewById(R.id.connectViaAddressButton);
final EditText addressField = (EditText) findViewById(R.id.ipAddressField); final EditText addressField = findViewById(R.id.ipAddressField);
final EditText portField = (EditText) findViewById(R.id.portField); final EditText portField = findViewById(R.id.portField);
String preferredAddress = getPreferences(MODE_PRIVATE).getString(PREF_KEY_CHILD_DEVICE_ADDRESS, null); String preferredAddress = getPreferences(MODE_PRIVATE).getString(PREF_KEY_CHILD_DEVICE_ADDRESS, null);
if (preferredAddress != null && !preferredAddress.isEmpty()) { if (preferredAddress != null && !preferredAddress.isEmpty()) {
addressField.setText(preferredAddress); addressField.setText(preferredAddress);
@@ -93,10 +90,9 @@ public class DiscoverActivity extends Activity {
return; return;
} }
int port = 0; int port;
try try {
{
port = Integer.parseInt(portString); port = Integer.parseInt(portString);
} }
catch(NumberFormatException e) catch(NumberFormatException e)
@@ -116,11 +112,11 @@ public class DiscoverActivity extends Activity {
protected void onDestroy() { protected void onDestroy() {
Log.i(TAG, "ChildMonitoring stop"); Log.i(TAG, "ChildMonitoring stop");
if(_discoveryListener != null) { if(discoveryListener != null) {
Log.i(TAG, "Unregistering monitoring service"); Log.i(TAG, "Unregistering monitoring service");
_nsdManager.stopServiceDiscovery(_discoveryListener); nsdManager.stopServiceDiscovery(discoveryListener);
_discoveryListener = null; discoveryListener = null;
} }
super.onDestroy(); super.onDestroy();
@@ -152,9 +148,9 @@ public class DiscoverActivity extends Activity {
} }
final ListView serviceTable = (ListView) findViewById(R.id.ServiceTable); final ListView serviceTable = findViewById(R.id.ServiceTable);
final ArrayAdapter<ServiceInfoWrapper> availableServicesAdapter = new ArrayAdapter<ServiceInfoWrapper>(this, final ArrayAdapter<ServiceInfoWrapper> availableServicesAdapter = new ArrayAdapter<>(this,
R.layout.available_children_list); R.layout.available_children_list);
serviceTable.setAdapter(availableServicesAdapter); serviceTable.setAdapter(availableServicesAdapter);
@@ -164,7 +160,7 @@ public class DiscoverActivity extends Activity {
}); });
// Instantiate a new DiscoveryListener // Instantiate a new DiscoveryListener
_discoveryListener = new NsdManager.DiscoveryListener() { discoveryListener = new NsdManager.DiscoveryListener() {
// Called as soon as service discovery begins. // Called as soon as service discovery begins.
@Override @Override
public void onDiscoveryStarted(String regType) public void onDiscoveryStarted(String regType)
@@ -197,7 +193,7 @@ public class DiscoverActivity extends Activity {
} }
}; };
_nsdManager.resolveService(service, resolver); DiscoverActivity.this.nsdManager.resolveService(service, resolver);
} else { } else {
Log.d(TAG, "Unknown Service name: " + service.getServiceName()); Log.d(TAG, "Unknown Service name: " + service.getServiceName());
} }
@@ -233,17 +229,10 @@ public class DiscoverActivity extends Activity {
}; };
nsdManager.discoverServices( nsdManager.discoverServices(
serviceType, NsdManager.PROTOCOL_DNS_SD, _discoveryListener serviceType, NsdManager.PROTOCOL_DNS_SD, discoveryListener
); );
} }
/**
* Launch the ListenActivity to connect to the given child device
*
* @param address
* @param port
* @param name
*/
private void connectToChild(final String address, final int port, final String name) { private void connectToChild(final String address, final int port, final String name) {
final Intent i = new Intent(getApplicationContext(), ListenActivity.class); final Intent i = new Intent(getApplicationContext(), ListenActivity.class);
final Bundle b = new Bundle(); final Bundle b = new Bundle();
@@ -256,30 +245,30 @@ public class DiscoverActivity extends Activity {
} }
class ServiceInfoWrapper { class ServiceInfoWrapper {
private NsdServiceInfo _info; private final NsdServiceInfo info;
public ServiceInfoWrapper(NsdServiceInfo info) public ServiceInfoWrapper(NsdServiceInfo info)
{ {
_info = info; this.info = info;
} }
public String getAddress() public String getAddress()
{ {
return _info.getHost().getHostAddress(); return info.getHost().getHostAddress();
} }
public int getPort() public int getPort()
{ {
return _info.getPort(); return info.getPort();
} }
public String getName() { public String getName() {
// If there is more than one service on the network, it will // If there is more than one service with the same name on the network, it will
// have a number at the end, but will appear as the following: // have a number at the end, but will appear as the following:
// "ChildMonitor\\032(number) // "ChildMonitor\\032(number)
// or // or
// "ChildMonitor\032(number) // "ChildMonitor\032(number)
// Replace \\032 and \032 with a " " // Replace \\032 and \032 with a " "
String serviceName = _info.getServiceName(); String serviceName = info.getServiceName();
serviceName = serviceName.replace("\\\\032", " "); serviceName = serviceName.replace("\\\\032", " ");
serviceName = serviceName.replace("\\032", " "); serviceName = serviceName.replace("\\032", " ");
return serviceName; return serviceName;

26
app/src/main/java/de/rochefort/childmonitor/MonitorActivity.java
View File

@@ -28,6 +28,7 @@ import android.net.Network;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.net.nsd.NsdManager; import android.net.nsd.NsdManager;
import android.net.nsd.NsdServiceInfo; import android.net.nsd.NsdServiceInfo;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
import android.widget.TextView; import android.widget.TextView;
@@ -56,7 +57,7 @@ public class MonitorActivity extends Activity {
private void serviceConnection(Socket socket) { private void serviceConnection(Socket socket) {
runOnUiThread(() -> { runOnUiThread(() -> {
final TextView statusText = (TextView) findViewById(R.id.textStatus); final TextView statusText = findViewById(R.id.textStatus);
statusText.setText(R.string.streaming); statusText.setText(R.string.streaming);
}); });
@@ -158,8 +159,7 @@ public class MonitorActivity extends Activity {
} }
private List<String> getListenAddresses() { private List<String> getListenAddresses() {
String service = Context.CONNECTIVITY_SERVICE; ConnectivityManager cm = (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
ConnectivityManager cm = (ConnectivityManager)getSystemService(service);
List<String> listenAddresses = new ArrayList<>(); List<String> listenAddresses = new ArrayList<>();
if (cm != null) { if (cm != null) {
for (Network network : cm.getAllNetworks()) { for (Network network : cm.getAllNetworks()) {
@@ -199,7 +199,7 @@ public class MonitorActivity extends Activity {
private void registerService(final int port) { private void registerService(final int port) {
final NsdServiceInfo serviceInfo = new NsdServiceInfo(); final NsdServiceInfo serviceInfo = new NsdServiceInfo();
serviceInfo.setServiceName("ChildMonitor"); serviceInfo.setServiceName("ChildMonitor on " + Build.MODEL);
serviceInfo.setServiceType("_childmonitor._tcp."); serviceInfo.setServiceType("_childmonitor._tcp.");
serviceInfo.setPort(port); serviceInfo.setPort(port);
@@ -213,19 +213,15 @@ public class MonitorActivity extends Activity {
Log.i(TAG, "Service name: " + serviceName); Log.i(TAG, "Service name: " + serviceName);
MonitorActivity.this.runOnUiThread(new Runnable() { MonitorActivity.this.runOnUiThread(() -> {
@Override final TextView statusText = findViewById(R.id.textStatus);
public void run() statusText.setText(R.string.waitingForParent);
{
final TextView statusText = (TextView) findViewById(R.id.textStatus);
statusText.setText(R.string.waitingForParent);
final TextView serviceText = (TextView) findViewById(R.id.textService); final TextView serviceText = findViewById(R.id.textService);
serviceText.setText(serviceName); serviceText.setText(serviceName);
final TextView portText = (TextView) findViewById(R.id.port); final TextView portText = findViewById(R.id.port);
portText.setText(Integer.toString(port)); portText.setText(Integer.toString(port));
}
}); });
} }