From 7a47240e47255cbdf3d04bdf54e75446a92695a0 Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Sat, 18 Jul 2020 13:17:30 -0700
Subject: [PATCH] fix autobug: someone is testing crashing the app with invalid
 URLS ;-)

---
 .../java/com/geeksville/mesh/MainActivity.kt  | 51 +++++++++++--------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/MainActivity.kt b/app/src/main/java/com/geeksville/mesh/MainActivity.kt
index dbc81456b..d17f7ddb7 100644
--- a/app/src/main/java/com/geeksville/mesh/MainActivity.kt
+++ b/app/src/main/java/com/geeksville/mesh/MainActivity.kt
@@ -48,6 +48,7 @@ import com.google.android.gms.common.GoogleApiAvailability
 import com.google.android.gms.tasks.Task
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.tabs.TabLayoutMediator
+import com.google.protobuf.InvalidProtocolBufferException
 import com.vorlonsoft.android.rate.AppRate
 import com.vorlonsoft.android.rate.StoreType
 import kotlinx.android.synthetic.main.activity_main.*
@@ -629,29 +630,37 @@ class MainActivity : AppCompatActivity(), Logging,
     private fun perhapsChangeChannel() {
         // If the is opening a channel URL, handle it now
         requestedChannelUrl?.let { url ->
-            val channel = Channel(url)
-            requestedChannelUrl = null
+            try {
+                val channel = Channel(url)
+                requestedChannelUrl = null
 
-            MaterialAlertDialogBuilder(this)
-                .setTitle(R.string.new_channel_rcvd)
-                .setMessage(getString(R.string.do_you_want_switch).format(channel.name))
-                .setNeutralButton(R.string.cancel) { _, _ ->
-                    // Do nothing
-                }
-                .setPositiveButton(R.string.accept) { _, _ ->
-                    debug("Setting channel from URL")
-                    try {
-                        model.setChannel(channel.settings)
-                    } catch (ex: RemoteException) {
-                        errormsg("Couldn't change channel ${ex.message}")
-                        Toast.makeText(
-                            this,
-                            "Couldn't change channel, because radio is not yet connected. Please try again.",
-                            Toast.LENGTH_SHORT
-                        ).show()
+                MaterialAlertDialogBuilder(this)
+                    .setTitle(R.string.new_channel_rcvd)
+                    .setMessage(getString(R.string.do_you_want_switch).format(channel.name))
+                    .setNeutralButton(R.string.cancel) { _, _ ->
+                        // Do nothing
                     }
-                }
-                .show()
+                    .setPositiveButton(R.string.accept) { _, _ ->
+                        debug("Setting channel from URL")
+                        try {
+                            model.setChannel(channel.settings)
+                        } catch (ex: RemoteException) {
+                            errormsg("Couldn't change channel ${ex.message}")
+                            Toast.makeText(
+                                this,
+                                "Couldn't change channel, because radio is not yet connected. Please try again.",
+                                Toast.LENGTH_SHORT
+                            ).show()
+                        }
+                    }
+                    .show()
+            } catch (ex: InvalidProtocolBufferException) {
+                Toast.makeText(
+                    this,
+                    R.string.channel_invalid,
+                    Toast.LENGTH_LONG
+                ).show()
+            }
         }
     }