Prevent app crash in #1

bilde2910 · Aug 30, 2019 · 1549838 · 1549838
1 parent 17a81a7
commit 1549838
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/android/app/src/main/java/info/varden/hauk/MainActivity.java b/android/app/src/main/java/info/varden/hauk/MainActivity.java
@@ -187,6 +187,13 @@ public void run(HTTPThread.Response resp) {
                     // A successful session initiation contains "OK" on line 1, the session ID on
                     // line 2, and a publicly sharable tracking link on line 3.
                     String[] data = resp.getData();
+
+                    // Somehow the data array is empty.
+                    if (data.length < 1) {
+                        diagSvc.showDialog(R.string.err_server, R.string.err_empty, resetTask);
+                        return;
+                    }
+
                     if (data[0].equals("OK")) {
                         String session = data[1];
                         viewLink = data[2];

diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
@@ -38,6 +38,7 @@
     <string name="err_malformed_url">The server URL you entered is invalid.</string>
     <string name="err_missing_perms">Location permission is required to use this app.</string>
     <string name="err_location_disabled">Location services are disabled. Please enable high-accuracy location services to share your location.</string>
+    <string name="err_empty">The server returned an empty response.</string>
 
     <string name="ok_title">Connection established</string>
     <string name="ok_message">Location sharing is active! Click the share button to copy the publicly viewable URL for your share.</string>