From 629bf5766d74afd2aa4fbd61f711ff2d6e14cbef Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Tue, 5 Feb 2019 22:51:48 -0800
Subject: [PATCH] Fix a couple crash reports

---
 .../main/java/com/limelight/ShortcutTrampoline.java    |  8 ++++++++
 .../com/limelight/preferences/AddComputerManually.java | 10 ++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/limelight/ShortcutTrampoline.java b/app/src/main/java/com/limelight/ShortcutTrampoline.java
index e8e849b0..6287403d 100644
--- a/app/src/main/java/com/limelight/ShortcutTrampoline.java
+++ b/app/src/main/java/com/limelight/ShortcutTrampoline.java
@@ -200,6 +200,14 @@ public class ShortcutTrampoline extends Activity {
 
     protected boolean validateInput() {
         // Validate UUID
+        if (uuidString == null) {
+            Dialog.displayDialog(ShortcutTrampoline.this,
+                    getResources().getString(R.string.conn_error_title),
+                    getResources().getString(R.string.scut_invalid_uuid),
+                    true);
+            return false;
+        }
+
         try {
             UUID.fromString(uuidString);
         } catch (IllegalArgumentException ex) {
diff --git a/app/src/main/java/com/limelight/preferences/AddComputerManually.java b/app/src/main/java/com/limelight/preferences/AddComputerManually.java
index ffa717db..5a0e4d51 100644
--- a/app/src/main/java/com/limelight/preferences/AddComputerManually.java
+++ b/app/src/main/java/com/limelight/preferences/AddComputerManually.java
@@ -91,14 +91,20 @@ public class AddComputerManually extends Activity {
     }
 
     private void doAddPc(String host) {
-        String msg;
         boolean wrongSiteLocal = false;
         boolean success;
 
         SpinnerDialog dialog = SpinnerDialog.displayDialog(this, getResources().getString(R.string.title_add_pc),
             getResources().getString(R.string.msg_add_pc), false);
 
-        success = managerBinder.addComputerBlocking(host, true);
+        try {
+            success = managerBinder.addComputerBlocking(host, true);
+        } catch (IllegalArgumentException e) {
+            // This can be thrown from OkHttp if the host fails to canonicalize to a valid name.
+            // https://github.com/square/okhttp/blob/okhttp_27/okhttp/src/main/java/com/squareup/okhttp/HttpUrl.java#L705
+            e.printStackTrace();
+            success = false;
+        }
         if (!success){
             wrongSiteLocal = isWrongSubnetSiteLocalAddress(host);
         }