From 6dc26619b57e051be0b34cd2b8b5e57f437d75af Mon Sep 17 00:00:00 2001
From: Andre Kirchhoff <andrekir@pm.me>
Date: Wed, 17 Nov 2021 15:46:14 -0300
Subject: [PATCH 1/7] fix Mapbox lib attempt#1

---
 .github/workflows/android.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 6023a8552..f6654c50a 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -14,9 +14,6 @@ jobs:
         with:
           submodules: true
       - name: Loading secrets
-        env:
-          gservices: ${{ secrets.gservices }}
-          mapboxtoken: ${{ secrets.mapboxtoken }}
         run: |
           # not yet needed echo $gservices > ./app/google-services.json
           rm ./app/google-services.json          
@@ -25,10 +22,13 @@ jobs:
           rm ./app/src/main/res/values/mapbox-token.xml
           cp ./app/special/mapbox-token.xml ./app/src/main/res/values/
           # The following would not be valid XML, don't use yet
-          # echo $mapboxtoken > ./app/src/main/res/values/mapbox-token.xml
+          # echo $MAPBOXTOKEN > ./app/src/main/res/values/mapbox-token.xml
 
           mkdir -p ~/.gradle
-          echo "MAPBOX_DOWNLOADS_TOKEN=$mapboxtoken" >>~/.gradle/gradle.properties
+          echo "MAPBOX_DOWNLOADS_TOKEN=$MAPBOXTOKEN" >>~/.gradle/gradle.properties
+        env:
+          gservices: ${{ secrets.gservices }}
+          mapboxtoken: ${{ secrets.mapboxtoken }}
       - name: Mock curfirmware version for CI
         run: |
           rm ./app/src/main/res/values/curfirmwareversion.xml

From 65d11b6bb7183cd736ebf7ef798da39371985e32 Mon Sep 17 00:00:00 2001
From: Andre Kirchhoff <andrekir@pm.me>
Date: Wed, 17 Nov 2021 16:13:23 -0300
Subject: [PATCH 2/7] Mapbox fix attempt #2

---
 .github/workflows/android.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index f6654c50a..898a31ae7 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -28,7 +28,7 @@ jobs:
           echo "MAPBOX_DOWNLOADS_TOKEN=$MAPBOXTOKEN" >>~/.gradle/gradle.properties
         env:
           gservices: ${{ secrets.gservices }}
-          mapboxtoken: ${{ secrets.mapboxtoken }}
+          MAPBOXTOKEN: ${{ secrets.MAPBOXTOKEN }}
       - name: Mock curfirmware version for CI
         run: |
           rm ./app/src/main/res/values/curfirmwareversion.xml

From 3ecc247c76b601ad910353bbe9fa3e754adccde3 Mon Sep 17 00:00:00 2001
From: andrekir <andrekir@pm.me>
Date: Mon, 15 Nov 2021 10:54:10 -0300
Subject: [PATCH 3/7] QR Code scanning with camera

---
 app/src/main/AndroidManifest.xml              | 13 ++++---
 .../com/geeksville/mesh/ui/ChannelFragment.kt | 36 ++++++++++++++++++-
 app/src/main/res/layout/channel_fragment.xml  | 22 ++++++++----
 3 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4f56cb1ec..016006d7b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -50,11 +50,8 @@
 
     <!-- Uart access -->
 
-
-    <!-- the xing library will try to bring this permission in but we don't want it -->
-    <uses-permission
-        android:name="android.permission.CAMERA"
-        tools:node="remove" />
+    <!-- zxing library for QR Code scanning using camera -->
+    <uses-permission android:name="android.permission.CAMERA" />
 
     <uses-feature
         android:name="android.hardware.bluetooth_le"
@@ -117,6 +114,12 @@
             android:enabled="true"
             android:exported="false" />
 
+        <!-- zxing for QR Code scanning: lock portrait orientation -->
+        <activity
+            android:name="com.journeyapps.barcodescanner.CaptureActivity"
+            android:screenOrientation="portrait"
+            tools:replace="screenOrientation" />
+
         <activity
             android:name="com.geeksville.mesh.MainActivity"
             android:label="@string/app_name"
diff --git a/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
index c3a745316..2ccefdcca 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
@@ -4,6 +4,7 @@ import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.graphics.ColorMatrix
 import android.graphics.ColorMatrixColorFilter
+import android.net.Uri
 import android.os.Bundle
 import android.os.RemoteException
 import android.view.LayoutInflater
@@ -29,6 +30,8 @@ import com.geeksville.mesh.service.MeshService
 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
 
 
@@ -70,6 +73,7 @@ class ChannelFragment : ScreenFragment("Channel"), Logging {
 
         binding.channelOptions.isEnabled = isEditing
         binding.shareButton.isEnabled = !isEditing
+        binding.scanButton.isEnabled = isEditing
         binding.channelNameView.isEnabled = isEditing
         if (isEditing) // Dim the (stale) QR code while editing...
             binding.qrView.setDim()
@@ -203,6 +207,15 @@ class ChannelFragment : ScreenFragment("Channel"), Logging {
                 .show()
         }
 
+        binding.scanButton.setOnClickListener {
+            val zxingScan = IntentIntegrator.forSupportFragment(this)
+            zxingScan.setCameraId(0)
+            zxingScan.setPrompt("")
+            zxingScan.setBeepEnabled(false)
+            zxingScan.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE)
+            zxingScan.initiateScan()
+        }
+
         // Note: Do not use setOnCheckedChanged here because we don't want to be called when we programmatically disable editing
         binding.editableCheckbox.setOnClickListener { _ ->
 
@@ -287,4 +300,25 @@ class ChannelFragment : ScreenFragment("Channel"), Logging {
 
         return ChannelProtos.ChannelSettings.ModemConfig.UNRECOGNIZED
     }
-}
+
+    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()
+                }
+            }
+        } else {
+            super.onActivityResult(requestCode, resultCode, data)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/channel_fragment.xml b/app/src/main/res/layout/channel_fragment.xml
index af5ea0dbb..d916757ca 100644
--- a/app/src/main/res/layout/channel_fragment.xml
+++ b/app/src/main/res/layout/channel_fragment.xml
@@ -98,30 +98,40 @@
         android:id="@+id/resetButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
+        android:layout_marginEnd="10dp"
         android:text="@string/reset"
         app:icon="@drawable/ic_twotone_public_24"
         app:layout_constraintBottom_toBottomOf="@id/bottomButtonsGuideline"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintEnd_toStartOf="@id/editableCheckbox" />
+
+    <Button
+        android:id="@+id/scanButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:text="Scan"
+        app:layout_constraintBottom_toBottomOf="@id/bottomButtonsGuideline"
+        app:layout_constraintStart_toEndOf="@id/editableCheckbox" />
 
     <CheckBox
         android:id="@+id/editableCheckbox"
+        android:minWidth="0dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
         android:button="@drawable/sl_lock_24dp"
         app:layout_constraintBottom_toBottomOf="@id/bottomButtonsGuideline"
-        app:layout_constraintStart_toEndOf="@+id/resetButton"></CheckBox>
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
 
     <ImageButton
         android:id="@+id/shareButton"
         style="@android:style/Widget.Material.ImageButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="32dp"
+        android:layout_marginEnd="16dp"
         android:contentDescription="@string/share"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/editableCheckbox"
+        app:layout_constraintBottom_toBottomOf="@id/bottomButtonsGuideline"
         app:srcCompat="@drawable/ic_twotone_share_24" />
 
     <androidx.constraintlayout.widget.Guideline

From 14af474b716ca413768042e7fcaa8b9febe34af9 Mon Sep 17 00:00:00 2001
From: andrekir <andrekir@pm.me>
Date: Wed, 17 Nov 2021 16:26:12 -0300
Subject: [PATCH 4/7] minor details all changes (edit, reset, scan) require
 unlock

---
 app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
index 2ccefdcca..bc41b5859 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
@@ -73,6 +73,7 @@ class ChannelFragment : ScreenFragment("Channel"), Logging {
 
         binding.channelOptions.isEnabled = isEditing
         binding.shareButton.isEnabled = !isEditing
+        binding.resetButton.isEnabled = isEditing
         binding.scanButton.isEnabled = isEditing
         binding.channelNameView.isEnabled = isEditing
         if (isEditing) // Dim the (stale) QR code while editing...
@@ -90,7 +91,6 @@ class ChannelFragment : ScreenFragment("Channel"), Logging {
 
         // Only let buttons work if we are connected to the radio
         binding.shareButton.isEnabled = connected
-        binding.resetButton.isEnabled = connected && Channel.default != channel
 
         binding.editableCheckbox.isChecked = false // start locked
         if (channel != null) {
@@ -321,4 +321,4 @@ class ChannelFragment : ScreenFragment("Channel"), Logging {
             super.onActivityResult(requestCode, resultCode, data)
         }
     }
-}
\ No newline at end of file
+}

From 062dbbc47d4b375ff9e9bb4cd969014e94e94944 Mon Sep 17 00:00:00 2001
From: andrekir <andrekir@pm.me>
Date: Fri, 19 Nov 2021 01:20:54 -0300
Subject: [PATCH 5/7] camera permissions routine

---
 .../java/com/geeksville/mesh/MainActivity.kt   |  3 +++
 .../geeksville/mesh/android/ContextServices.kt | 14 +++++++++++++-
 .../com/geeksville/mesh/ui/ChannelFragment.kt  | 18 ++++++++++++------
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/MainActivity.kt b/app/src/main/java/com/geeksville/mesh/MainActivity.kt
index 64e73ad06..d2b85057a 100644
--- a/app/src/main/java/com/geeksville/mesh/MainActivity.kt
+++ b/app/src/main/java/com/geeksville/mesh/MainActivity.kt
@@ -42,6 +42,7 @@ import com.geeksville.android.Logging
 import com.geeksville.android.ServiceClient
 import com.geeksville.concurrent.handledLaunch
 import com.geeksville.mesh.android.getBackgroundPermissions
+import com.geeksville.mesh.android.getCameraPermissions
 import com.geeksville.mesh.android.getMissingPermissions
 import com.geeksville.mesh.database.entity.Packet
 import com.geeksville.mesh.databinding.ActivityMainBinding
@@ -247,6 +248,8 @@ class MainActivity : AppCompatActivity(), Logging,
         return getMissingPermissions(perms)
     }
 
+    /** Ask the user to grant camera permission */
+    fun requestCameraPermission() = requestPermission(getCameraPermissions(), false)
 
     /** Ask the user to grant background location permission */
     fun requestBackgroundPermission() = requestPermission(getBackgroundPermissions(), false)
diff --git a/app/src/main/java/com/geeksville/mesh/android/ContextServices.kt b/app/src/main/java/com/geeksville/mesh/android/ContextServices.kt
index 656ed7459..77fad486b 100644
--- a/app/src/main/java/com/geeksville/mesh/android/ContextServices.kt
+++ b/app/src/main/java/com/geeksville/mesh/android/ContextServices.kt
@@ -28,6 +28,18 @@ fun Context.getMissingPermissions(perms: List<String>) = perms.filter {
     ) != PackageManager.PERMISSION_GRANTED
 }
 
+/**
+ * Camera permission (or empty if we already have what we need)
+ */
+fun Context.getCameraPermissions(): List<String> {
+    val perms = mutableListOf(Manifest.permission.CAMERA)
+
+    return getMissingPermissions(perms)
+}
+
+/** @return true if the user already has camera permission */
+fun Context.hasCameraPermission() = getCameraPermissions().isEmpty()
+
 /**
  * A list of missing background location permissions (or empty if we already have what we need)
  */
@@ -41,4 +53,4 @@ fun Context.getBackgroundPermissions(): List<String> {
 }
 
 /** @return true if the user already has background location permission */
-fun Context.hasBackgroundPermission() = getBackgroundPermissions().isEmpty()
\ No newline at end of file
+fun Context.hasBackgroundPermission() = getBackgroundPermissions().isEmpty()
diff --git a/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
index bc41b5859..c6cfbcd3e 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
@@ -20,7 +20,9 @@ import com.geeksville.android.Logging
 import com.geeksville.android.hideKeyboard
 import com.geeksville.mesh.AppOnlyProtos
 import com.geeksville.mesh.ChannelProtos
+import com.geeksville.mesh.MainActivity
 import com.geeksville.mesh.R
+import com.geeksville.mesh.android.hasCameraPermission
 import com.geeksville.mesh.databinding.ChannelFragmentBinding
 import com.geeksville.mesh.model.Channel
 import com.geeksville.mesh.model.ChannelOption
@@ -208,12 +210,16 @@ class ChannelFragment : ScreenFragment("Channel"), Logging {
         }
 
         binding.scanButton.setOnClickListener {
-            val zxingScan = IntentIntegrator.forSupportFragment(this)
-            zxingScan.setCameraId(0)
-            zxingScan.setPrompt("")
-            zxingScan.setBeepEnabled(false)
-            zxingScan.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE)
-            zxingScan.initiateScan()
+            if ((requireActivity() as MainActivity).hasCameraPermission()) {
+                val zxingScan = IntentIntegrator.forSupportFragment(this)
+                zxingScan.setCameraId(0)
+                zxingScan.setPrompt("")
+                zxingScan.setBeepEnabled(false)
+                zxingScan.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE)
+                zxingScan.initiateScan()
+            } else {
+                (requireActivity() as MainActivity).requestCameraPermission()
+            }
         }
 
         // Note: Do not use setOnCheckedChanged here because we don't want to be called when we programmatically disable editing

From bd423972373c676350fe9cde474de2813278b814 Mon Sep 17 00:00:00 2001
From: andrekir <andrekir@pm.me>
Date: Fri, 19 Nov 2021 23:35:10 -0300
Subject: [PATCH 6/7] add dialog / strings (camera_required &
 why_camera_required)

---
 .../java/com/geeksville/mesh/ui/ChannelFragment.kt    | 11 ++++++++++-
 app/src/main/res/values-pt-rBR/strings.xml            |  2 ++
 app/src/main/res/values-pt/strings.xml                |  2 ++
 app/src/main/res/values/strings.xml                   |  2 ++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
index c6cfbcd3e..b2ca3fb80 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
@@ -218,7 +218,16 @@ class ChannelFragment : ScreenFragment("Channel"), Logging {
                 zxingScan.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE)
                 zxingScan.initiateScan()
             } else {
-                (requireActivity() as MainActivity).requestCameraPermission()
+                MaterialAlertDialogBuilder(requireContext())
+                    .setTitle(R.string.camera_required)
+                    .setMessage(R.string.why_camera_required)
+                    .setNeutralButton(R.string.cancel) { _, _ ->
+                        debug("Camera permission denied")
+                    }
+                    .setPositiveButton(getString(R.string.accept)) { _, _ ->
+                        (requireActivity() as MainActivity).requestCameraPermission()
+                    }
+                    .show()
             }
         }
 
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index f2df3816e..149e16e27 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -112,4 +112,6 @@
     <string name="cancel_no_radio">Cancelar (sem acesso ao rádio)</string>
     <string name="allow_will_show">Permitir (exibe diálogo)</string>
     <string name="provide_location_to_mesh">Fornecer localização para mesh</string>
+    <string name="camera_required">Permissão da câmera</string>
+    <string name="why_camera_required">Precisamos acessar a câmera para escanear códigos QR. Nenhuma foto ou video são armazenados.</string>
 </resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index d6b331a91..61a6895a8 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -112,4 +112,6 @@
     <string name="cancel_no_radio">Cancelar (sem acesso ao rádio)</string>
     <string name="allow_will_show">Permitir (exibe diálogo)</string>
     <string name="provide_location_to_mesh">Fornecer localização para mesh</string>
+    <string name="why_camera_required">Precisamos acessar a câmera para escanear códigos QR. Nenhuma foto ou video são armazenados.</string>
+    <string name="camera_required">Permissão da câmera</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 206bc2adf..a40f0de64 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -116,4 +116,6 @@
     <string name="cancel_no_radio">Cancel (no radio access)</string>
     <string name="allow_will_show">Allow (will show dialog)</string>
     <string name="provide_location_to_mesh">Provide location to mesh</string>
+    <string name="camera_required">Camera permission</string>
+    <string name="why_camera_required">We must be granted access to the camera to read QR codes. No pictures or videos will be saved.</string>
 </resources>
\ No newline at end of file

From 011ef14f3f160c98226e75fbe6d296ad8d182f88 Mon Sep 17 00:00:00 2001
From: Andre Kirchhoff <andrekir@pm.me>
Date: Sat, 20 Nov 2021 00:02:34 -0300
Subject: [PATCH 7/7] cleanup#2

---
 .github/workflows/android.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 898a31ae7..6023a8552 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -14,6 +14,9 @@ jobs:
         with:
           submodules: true
       - name: Loading secrets
+        env:
+          gservices: ${{ secrets.gservices }}
+          mapboxtoken: ${{ secrets.mapboxtoken }}
         run: |
           # not yet needed echo $gservices > ./app/google-services.json
           rm ./app/google-services.json          
@@ -22,13 +25,10 @@ jobs:
           rm ./app/src/main/res/values/mapbox-token.xml
           cp ./app/special/mapbox-token.xml ./app/src/main/res/values/
           # The following would not be valid XML, don't use yet
-          # echo $MAPBOXTOKEN > ./app/src/main/res/values/mapbox-token.xml
+          # echo $mapboxtoken > ./app/src/main/res/values/mapbox-token.xml
 
           mkdir -p ~/.gradle
-          echo "MAPBOX_DOWNLOADS_TOKEN=$MAPBOXTOKEN" >>~/.gradle/gradle.properties
-        env:
-          gservices: ${{ secrets.gservices }}
-          MAPBOXTOKEN: ${{ secrets.MAPBOXTOKEN }}
+          echo "MAPBOX_DOWNLOADS_TOKEN=$mapboxtoken" >>~/.gradle/gradle.properties
       - name: Mock curfirmware version for CI
         run: |
           rm ./app/src/main/res/values/curfirmwareversion.xml