Merge pull request #12 in THFM/fm.touhou.touhoufm from...

Merge pull request #12 in THFM/fm.touhou.touhoufm from bugfix/THFMA-6-nullpointer-exception-at-rtpreceiver.sendhello to development

* commit '1b604028':
  Fixed Nullpointer Exception in RtpReceiver

app/src/main/java/fm/touhou/touhoufm/radio/RtpReceiver.java

@@ -9,6 +9,7 @@ import java.net.DatagramSocket;
 import java.net.InetAddress;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
+import java.net.UnknownHostException;
 
 import fm.touhou.touhoufm.service.RadioService;
 import fm.touhou.touhoufm.utils.OpusDecoder;
@@ -60,32 +61,47 @@ public class RtpReceiver extends Thread {
 
     }
 
-    private void initUdpConn() {
-        try {
+    private void initUdpConn() throws UnknownHostException {
         // connect
-            if (address == null) {
-                address = InetAddress.getByName(RadioService.STREAM_HOST);
-            }
+        resolveHost();
 
         String msg = "Hello";
 
         DatagramPacket sendPacket = new DatagramPacket(msg.getBytes(), msg.length(), address, RadioService.STREAM_PORT);
+        try {
             mRecvSocket.send(sendPacket);
         } catch (IOException e) {
-            Log.e(TAG, "Failed to init udp conn", e);
+            Log.e(TAG, "Failed to send hello", e);
         }
     }
 
-    private void initUdpSock() {
+    private void resolveHost() throws UnknownHostException {
+        int count = 8;
+        while (address == null) {
+            try {
+                address = InetAddress.getByName(RadioService.STREAM_HOST);
+            } catch (UnknownHostException e) {
+                if (count < 0) {
+                    address = null;
+                    throw e;
+                } else {
                     try {
+                        Thread.sleep(10000);
+                    } catch (InterruptedException e1) {
+                        interrupt();
+                    }
+                }
+            }
+            count--;
+        }
+    }
+
+    private void initUdpSock() throws SocketException {
         if (mRecvSocket == null) {
             mRecvSocket = new DatagramSocket();
         } else {
             Log.e(TAG, "Recv socket already initialized");
         }
-        } catch (SocketException e) {
-            Log.e(TAG, "Failed to init sock", e);
-        }
     }
 
     private void clrUdpConn() {
@@ -103,11 +119,19 @@ public class RtpReceiver extends Thread {
 
     @Override
     public void run() {
+        try {
             initUdpSock();
             initUdpConn();
             play();
-        shutDown();
             clrUdpConn();
+        } catch (SocketException e) {
+            Log.e(TAG, "UdpSocket error", e);
+        } catch (UnknownHostException e) {
+            Log.e(TAG, "Cannot resolve host", e);
+        } finally {
+            shutDown();
+
+        }
     }
 
     private void play() {