Merge branch 'meshtastic:master' into osmdroid-phase3

This commit is contained in:
PWRxPSYCHO 2022-10-14 09:53:41 -04:00 committed by GitHub
commit 4acbd05472
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 34 additions and 13 deletions

View file

@ -15,7 +15,7 @@ data class ChannelSet(
) : Logging {
companion object {
const val prefix = "https://www.meshtastic.org/e/#"
const val prefix = "https://meshtastic.org/e/#"
private const val base64Flags = Base64.URL_SAFE + Base64.NO_WRAP + Base64.NO_PADDING
@ -65,7 +65,7 @@ data class ChannelSet(
// We encode as UPPER case for the QR code URL because QR codes are more efficient for that special case
val bitMatrix =
multiFormatWriter.encode(
getChannelUrl(true).toString(),
getChannelUrl(false).toString(),
BarcodeFormat.QR_CODE,
960,
960