From c032e9f6422e60f9e47869b40b81abe4568fdb2e Mon Sep 17 00:00:00 2001
From: Branden Archer <b.m.archer4@gmail.com>
Date: Fri, 1 Jan 2016 16:58:53 -0500
Subject: [PATCH] Allow parent device to pair to child via IP Address and port

If mDNS fails to locate the child device, allow the parent device
to enter an IP address and port to connect.
---
 NEWS                                          |  3 +
 res/layout/activity_discover.xml              | 88 +++++--------------
 res/layout/activity_discover_address.xml      | 83 +++++++++++++++++
 res/layout/activity_discover_mdns.xml         | 41 +++++++++
 res/values/strings.xml                        |  7 +-
 src/protect/babymonitor/DiscoverActivity.java | 47 +++++++++-
 6 files changed, 200 insertions(+), 69 deletions(-)
 create mode 100644 res/layout/activity_discover_address.xml
 create mode 100644 res/layout/activity_discover_mdns.xml

diff --git a/NEWS b/NEWS
index 4b2064c..c4b0622 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,9 @@ In development:
   * Improve and simplify audio playback to reduce dropped
     audio samples
 
+  * A parent device may pair with a child device by entering
+    the child's IP address and port.
+
 
 Mon Dec 28, 2015: Release 0.1
 
diff --git a/res/layout/activity_discover.xml b/res/layout/activity_discover.xml
index 2a2806b..03fa076 100644
--- a/res/layout/activity_discover.xml
+++ b/res/layout/activity_discover.xml
@@ -22,78 +22,38 @@
         android:layout_width="match_parent"
         android:layout_height="15dip" />
 
-    <TextView
-        android:id="@+id/parentPairInstructions"
-        android:layout_width="wrap_content"
+    <Button
+        android:id="@+id/discoverChildButton"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/parentPairInstructions" />
+        android:text="@string/discoverChild"
+        android:textSize="17sp" />
+
+    <TextView
+        android:id="@+id/discoverChildDescription"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/discoverChildDescription"
+        android:textSize="14sp" />
 
     <Space
-        android:layout_width="match_parent"
-        android:layout_height="15dip" />
-
-    <TextView
-        android:id="@+id/ipAddressTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="20sp"
-        android:text="@string/addressTitle" />
-
-    <EditText
-        android:id="@+id/ipAddressField"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:ems="10"
-        android:hint="@string/exampleAddress"
-        android:inputType="textUri"
-        android:textSize="20sp"
-        android:nextFocusForward="@+id/portField" >
-
-    </EditText>
-
-    <TextView
-        android:id="@+id/portTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="20sp"
-        android:text="@string/portTitle" />
-
-    <EditText
-        android:id="@+id/portField"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="20sp"
-        android:ems="10"
-        android:inputType="number"
-        android:maxLength="5"
-        android:hint="@string/examplePort"
-        android:nextFocusForward="@+id/connectViaAddressButton"/>
+       android:layout_width="match_parent"
+       android:layout_height="15dip" />
 
     <Button
-        android:id="@+id/connectViaAddressButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/connect" />
-
-    <Space
+        android:id="@+id/enterChildAddressButton"
+        style="?android:attr/buttonStyleSmall"
         android:layout_width="match_parent"
-        android:layout_height="15dip" />
+        android:layout_height="wrap_content"
+        android:text="@string/enterChildAddress"
+        android:textSize="17sp" />
 
     <TextView
-        android:id="@+id/selectChildDeviceTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/selectChildDevice"
-        android:textSize="20sp" />
-
-    <ListView
-        android:id="@+id/ServiceTable"
-        android:scrollbars="vertical"
+        android:id="@+id/enterChildAddressDescription"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="0.32"
-        android:padding="10dp" >
-    </ListView>
+        android:layout_height="wrap_content"
+        android:text="@string/enterChildAddressDescription"
+        android:textSize="14sp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/activity_discover_address.xml b/res/layout/activity_discover_address.xml
new file mode 100644
index 0000000..b3945d2
--- /dev/null
+++ b/res/layout/activity_discover_address.xml
@@ -0,0 +1,83 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/LinearLayout1"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="protect.babymonitor.MonitorActivity" >
+
+    <TextView
+        android:id="@+id/parentDeviceTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/parentDevice"
+        android:textSize="25sp" />
+
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="15dip" />
+
+    <TextView
+        android:id="@+id/enterAddressInstructions"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/enterAddressInstructions" />
+
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="15dip" />
+
+    <TextView
+        android:id="@+id/ipAddressTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="20sp"
+        android:text="@string/addressTitle" />
+
+    <EditText
+        android:id="@+id/ipAddressField"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ems="10"
+        android:hint="@string/exampleAddress"
+        android:inputType="textUri"
+        android:textSize="20sp"
+        android:nextFocusForward="@+id/portField" >
+
+    </EditText>
+
+    <TextView
+        android:id="@+id/portTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="20sp"
+        android:text="@string/portTitle" />
+
+    <EditText
+        android:id="@+id/portField"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="20sp"
+        android:ems="10"
+        android:inputType="number"
+        android:maxLength="5"
+        android:hint="@string/examplePort"
+        android:nextFocusForward="@+id/connectViaAddressButton"/>
+
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="15dip" />
+
+    <Button
+        android:id="@+id/connectViaAddressButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="@string/connect" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/activity_discover_mdns.xml b/res/layout/activity_discover_mdns.xml
new file mode 100644
index 0000000..386bbcf
--- /dev/null
+++ b/res/layout/activity_discover_mdns.xml
@@ -0,0 +1,41 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/LinearLayout1"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="protect.babymonitor.MonitorActivity" >
+
+    <TextView
+        android:id="@+id/parentDeviceTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/parentDevice"
+        android:textSize="25sp" />
+
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="15dip" />
+
+    <TextView
+        android:id="@+id/selectChildDeviceTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/selectChildDevice"
+        android:textSize="20sp" />
+
+    <ListView
+        android:id="@+id/ServiceTable"
+        android:scrollbars="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="0.32"
+        android:padding="10dp" >
+    </ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fa6dfdb..36e036d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -24,9 +24,14 @@
     <string name="portTitle">Port:</string>
     <string name="addressDescription">Address and port that parent must pair to</string>
     <string name="wifiNotConnected">Not connected to a Wi-Fi network</string>
-    <string name="parentPairInstructions">Enter the IP Address and port of a child and click Connect, or choose a child from the list below</string>
+    <string name="enterAddressInstructions">Enter the IP Address and port of a child and click Connect</string>
     <string name="connect">Connect</string>
     <string name="exampleAddress">192.168.1.2</string>
     <string name="examplePort">10000</string>
     <string name="invalidPort">Either no port was entered or it is invalid</string>
+    <string name="invalidAddress">The address field needs to be filled out</string>
+    <string name="discoverChild">Discover Child on Network</string>
+    <string name="discoverChildDescription">Select child from a list of discovered children on the network</string>
+    <string name="enterChildAddress">Select Child by Address</string>
+    <string name="enterChildAddressDescription">Enter the address and port of the child</string>
 </resources>
diff --git a/src/protect/babymonitor/DiscoverActivity.java b/src/protect/babymonitor/DiscoverActivity.java
index e443823..69bc7be 100644
--- a/src/protect/babymonitor/DiscoverActivity.java
+++ b/src/protect/babymonitor/DiscoverActivity.java
@@ -50,6 +50,37 @@ public class DiscoverActivity extends Activity
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_discover);
 
+        final Button discoverChildButton = (Button) findViewById(R.id.discoverChildButton);
+        discoverChildButton.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                loadDiscoveryViaMdns();
+            }
+        });
+
+        final Button enterChildAddressButton = (Button) findViewById(R.id.enterChildAddressButton);
+        enterChildAddressButton.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                loadDiscoveryViaAddress();
+            }
+        });
+    }
+
+    private void loadDiscoveryViaMdns()
+    {
+        setContentView(R.layout.activity_discover_mdns);
+        startServiceDiscovery("_babymonitor._tcp.");
+    }
+
+    private void loadDiscoveryViaAddress()
+    {
+        setContentView(R.layout.activity_discover_address);
+
         final Button connectButton = (Button) findViewById(R.id.connectViaAddressButton);
         connectButton.setOnClickListener(new View.OnClickListener()
         {
@@ -64,19 +95,27 @@ public class DiscoverActivity extends Activity
                 final String addressString = addressField.getText().toString();
                 final String portString = portField.getText().toString();
 
+                if(addressString.length() == 0)
+                {
+                    Toast.makeText(DiscoverActivity.this, R.string.invalidAddress, Toast.LENGTH_LONG).show();
+                    return;
+                }
+
+                int port = 0;
+
                 try
                 {
-                    final int port = Integer.parseInt(portString);
-                    connectToChild(addressString, port, addressString);
+                    port = Integer.parseInt(portString);
                 }
                 catch(NumberFormatException e)
                 {
                     Toast.makeText(DiscoverActivity.this, R.string.invalidPort, Toast.LENGTH_LONG).show();
+                    return;
                 }
+
+                connectToChild(addressString, port, addressString);
             }
         });
-
-        startServiceDiscovery("_babymonitor._tcp.");
     }
 
     @Override