From 7cb2138d13312c37347773602eb5856eea8b513b Mon Sep 17 00:00:00 2001
From: Branden Archer <b.m.archer4@gmail.com>
Date: Fri, 1 Jan 2016 02:29:02 -0500
Subject: [PATCH] Display IP Address and port of child device

Later, the parent will be able to use this information to pair
with the child device, as an alternative to using mDNS
---
 AndroidManifest.xml                          |  1 +
 res/layout/activity_monitor.xml              | 38 ++++++++++++++++++++
 res/values/strings.xml                       |  5 ++-
 src/protect/babymonitor/MonitorActivity.java | 29 +++++++++++++++
 4 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5fd218a..7fe6b8c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -9,6 +9,7 @@
         android:targetSdkVersion="17" />
     <uses-permission android:required="true" android:name="android.permission.INTERNET"/>
     <uses-permission android:required="true" android:name="android.permission.RECORD_AUDIO"/>
+    <uses-permission android:required="true" android:name="android.permission.ACCESS_WIFI_STATE"/>
 
     <application
         android:allowBackup="true"
diff --git a/res/layout/activity_monitor.xml b/res/layout/activity_monitor.xml
index 07625b9..59c50b4 100644
--- a/res/layout/activity_monitor.xml
+++ b/res/layout/activity_monitor.xml
@@ -47,6 +47,44 @@
        android:layout_width="match_parent"
        android:layout_height="15dip" />
 
+    <TextView
+        android:id="@+id/addressTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/addressTitle"
+        android:textSize="20sp" />
+
+    <TextView
+        android:id="@+id/address"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text=""
+        android:textSize="20sp"/>
+
+    <TextView
+        android:id="@+id/portTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/portTitle"
+        android:textSize="20sp" />
+
+    <TextView
+        android:id="@+id/port"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/loading"
+        android:textSize="20sp"/>
+
+    <TextView
+        android:id="@+id/addressDescription"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/addressDescription" />
+
+    <Space
+       android:layout_width="match_parent"
+       android:layout_height="15dip" />
+
     <TextView
         android:id="@+id/textStatus"
         android:layout_width="wrap_content"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1c690f9..ca583c4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -20,5 +20,8 @@
     <string name="connectedTo">Connected To:</string>
     <string name="disconnected">Disconnected</string>
     <string name="listening">Listening...</string>
-
+    <string name="addressTitle">Address:</string>
+    <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>
 </resources>
diff --git a/src/protect/babymonitor/MonitorActivity.java b/src/protect/babymonitor/MonitorActivity.java
index 82d854f..4d5a3ac 100644
--- a/src/protect/babymonitor/MonitorActivity.java
+++ b/src/protect/babymonitor/MonitorActivity.java
@@ -28,7 +28,10 @@ import android.media.AudioRecord;
 import android.media.MediaRecorder;
 import android.net.nsd.NsdManager;
 import android.net.nsd.NsdServiceInfo;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
 import android.os.Bundle;
+import android.text.format.Formatter;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -163,6 +166,29 @@ public class MonitorActivity extends Activity
             }
         });
         _serviceThread.start();
+
+        MonitorActivity.this.runOnUiThread(new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                final TextView addressText = (TextView) findViewById(R.id.address);
+
+                final WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
+                final WifiInfo info = wifiManager.getConnectionInfo();
+                final int address = info.getIpAddress();
+                if(address != 0)
+                {
+                    @SuppressWarnings("deprecation")
+                    final String ipAddress = Formatter.formatIpAddress(address);
+                    addressText.setText(ipAddress);
+                }
+                else
+                {
+                    addressText.setText(R.string.wifiNotConnected);
+                }
+            }
+        });
     }
 
     @Override
@@ -229,6 +255,9 @@ public class MonitorActivity extends Activity
 
                         final TextView serviceText = (TextView) findViewById(R.id.textService);
                         serviceText.setText(serviceName);
+
+                        final TextView portText = (TextView) findViewById(R.id.port);
+                        portText.setText(Integer.toString(port));
                     }
                 });
             }