Merge pull request #362 from meshtastic/change-channel

update channel directly from QR code scan result

app/src/main/java/com/geeksville/mesh/MainActivity.kt

@@ -60,7 +60,6 @@ import com.google.android.gms.tasks.Task
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 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.coroutines.*
@@ -388,12 +387,7 @@ class MainActivity : AppCompatActivity(), Logging,
 
         return if (message != null) {
             errormsg("Denied permissions: $message")
-            Snackbar.make(findViewById(android.R.id.content), message, Snackbar.LENGTH_INDEFINITE)
-                .apply { view.findViewById<TextView>(R.id.snackbar_text).isSingleLine = false }
-                .setAction(R.string.okay) {
-                    // dismiss
-                }
-                .show()
+            showSnackbar(message)
             true
         } else
             false
@@ -814,30 +808,35 @@ class MainActivity : AppCompatActivity(), Logging,
         }
     }
 
-    private fun showToast(msgId: Int) {
-        Toast.makeText(
-            this,
+    private fun showSnackbar(msgId: Int) {
+        Snackbar.make(
+            findViewById(android.R.id.content),
             msgId,
-            Toast.LENGTH_LONG
+            Snackbar.LENGTH_LONG
         ).show()
     }
 
-    private fun showToast(msg: String) {
-        Toast.makeText(
-            this,
+    private fun showSnackbar(msg: String) {
+        Snackbar.make(
+            findViewById(android.R.id.content),
             msg,
-            Toast.LENGTH_LONG
-        ).show()
+            Snackbar.LENGTH_INDEFINITE
+        )
+            .apply { view.findViewById<TextView>(R.id.snackbar_text).isSingleLine = false }
+            .setAction(R.string.okay) {
+                // dismiss
+            }
+            .show()
     }
 
-    private fun perhapsChangeChannel() {
+    fun perhapsChangeChannel(url: Uri? = requestedChannelUrl) {
         // If the is opening a channel URL, handle it now
-        requestedChannelUrl?.let { url ->
+        if (url != null) {
             try {
                 val channels = ChannelSet(url)
                 val primary = channels.primaryChannel
                 if (primary == null)
-                    showToast(R.string.channel_invalid)
+                    showSnackbar(R.string.channel_invalid)
                 else {
                     requestedChannelUrl = null
 
@@ -853,13 +852,14 @@ class MainActivity : AppCompatActivity(), Logging,
                                 model.setChannels(channels)
                             } catch (ex: RemoteException) {
                                 errormsg("Couldn't change channel ${ex.message}")
-                                showToast(R.string.cant_change_no_radio)
+                                showSnackbar(R.string.cant_change_no_radio)
                             }
                         }
                         .show()
                 }
-            } catch (ex: InvalidProtocolBufferException) {
-                showToast(R.string.channel_invalid)
+            } catch (ex: Throwable) {
+                errormsg("Channel url error: ${ex.message}")
+                showSnackbar("${getString(R.string.channel_invalid)}: ${ex.message}")
             }
         }
     }
@@ -1184,7 +1184,7 @@ class MainActivity : AppCompatActivity(), Logging,
         try {
             val packageInfo: PackageInfo = packageManager.getPackageInfo(packageName, 0)
             val versionName = packageInfo.versionName
-            showToast(versionName)
+            Toast.makeText(this, versionName, Toast.LENGTH_LONG).show()
         } catch (e: PackageManager.NameNotFoundException) {
             errormsg("Can not find the version: ${e.message}")
         }

app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt

@@ -33,7 +33,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import com.google.protobuf.ByteString
 import com.google.zxing.integration.android.IntentIntegrator
-import java.net.MalformedURLException
 import java.security.SecureRandom
 
 
@@ -320,18 +319,8 @@ class ChannelFragment : ScreenFragment("Channel"), Logging {
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         val result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data)
         if (result != null) {
-            if (result.contents == null) {
-                Snackbar.make(binding.scanButton, R.string.channel_invalid, Snackbar.LENGTH_LONG).show()
-            } else {
-                try {
-                    val intent = Intent(Intent.ACTION_VIEW)
-                    intent.data = ChannelSet(Uri.parse(result.contents)).getChannelUrl(false)
-                    startActivity(intent)
-                } catch (ex: ActivityNotFoundException) {
-                    Snackbar.make(binding.scanButton, R.string.channel_invalid, Snackbar.LENGTH_LONG).show()
-                } catch (ex: MalformedURLException) {
-                    Snackbar.make(binding.scanButton, R.string.channel_invalid, Snackbar.LENGTH_LONG).show()
-                }
+            if (result.contents != null) {
+                ((requireActivity() as MainActivity).perhapsChangeChannel(Uri.parse(result.contents)))
             }
         } else {
             super.onActivityResult(requestCode, resultCode, data)

app/src/main/res/drawable/ic_twotone_public_24.xml

@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M14.99,4.59V5c0,1.1 -0.9,2 -2,2h-2v2c0,0.55 -0.45,1 -1,1h-2v2h6c0.55,0 1,0.45 1,1v3h1c0.89,0 1.64,0.59 1.9,1.4C19.19,15.98 20,14.08 20,12c0,-3.35 -2.08,-6.23 -5.01,-7.41zM8.99,16v-1l-4.78,-4.78C4.08,10.79 4,11.39 4,12c0,4.07 3.06,7.43 6.99,7.93V18c-1.1,0 -2,-0.9 -2,-2z"
-      android:strokeAlpha="0.3"
-      android:fillAlpha="0.3"/>
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10.99,19.93C7.06,19.43 4,16.07 4,12c0,-0.61 0.08,-1.21 0.21,-1.78L8.99,15v1c0,1.1 0.9,2 2,2v1.93zM17.89,17.4c-0.26,-0.81 -1,-1.4 -1.9,-1.4h-1v-3c0,-0.55 -0.45,-1 -1,-1h-6v-2h2c0.55,0 1,-0.45 1,-1L10.99,7h2c1.1,0 2,-0.9 2,-2v-0.41C17.92,5.77 20,8.65 20,12c0,2.08 -0.81,3.98 -2.11,5.4z"/>
-</vector>

app/src/main/res/layout/channel_fragment.xml

@@ -100,7 +100,6 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="10dp"
         android:text="@string/reset"
-        app:icon="@drawable/ic_twotone_public_24"
         app:layout_constraintBottom_toBottomOf="@id/bottomButtonsGuideline"
         app:layout_constraintEnd_toStartOf="@id/editableCheckbox" />