mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-02-07 06:12:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

use upper case for base of URL in QR code to simplify the image

Browse Source
This commit is contained in:
Kevin Hester
2021-01-05 13:29:04 +08:00
parent 6c85a4f12b
commit 6fbe63c0b7
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/AndroidManifest.xml
View File

@@ -144,6 +144,10 @@
android:scheme="https"
android:host="www.meshtastic.org"
android:pathPrefix="/c/" />
<data
android:scheme="https"
android:host="www.meshtastic.org"
android:pathPrefix="/C/" />
</intent-filter>
<intent-filter>

16
app/src/main/java/com/geeksville/mesh/model/Channel.kt
View File

@@ -36,14 +36,14 @@ data class Channel(
const val prefix = "https://www.meshtastic.org/c/#"
private const val base64Flags = Base64.URL_SAFE + Base64.NO_WRAP
private const val base64Flags = Base64.URL_SAFE + Base64.NO_WRAP + Base64.NO_PADDING
private fun urlToSettings(url: Uri): MeshProtos.ChannelSettings {
val urlStr = url.toString()
// We no longer support the super old (about 0.8ish? verison of the URLs that don't use the # separator - I doubt
// anyone is still using that old format
val pathRegex = Regex("$prefix(.*)")
val pathRegex = Regex("$prefix(.*)", RegexOption.IGNORE_CASE)
val (base64) = pathRegex.find(urlStr)?.destructured
?: throw MalformedURLException("Not a meshtastic URL: ${urlStr.take(40)}")
val bytes = Base64.decode(base64, base64Flags)
@@ -111,20 +111,26 @@ data class Channel(
var editable = false
/// Return an URL that represents the current channel values
fun getChannelUrl(): Uri {
/// @param upperCasePrefix - portions of the URL can be upper case to make for more efficient QR codes
fun getChannelUrl(upperCasePrefix: Boolean = false): Uri {
// If we have a valid radio config use it, othterwise use whatever we have saved in the prefs
val channelBytes = settings.toByteArray() ?: ByteArray(0) // if unset just use empty
val enc = Base64.encodeToString(channelBytes, base64Flags)
return Uri.parse("$prefix$enc")
val p = if(upperCasePrefix)
prefix.toUpperCase()
else
prefix
return Uri.parse("$p$enc")
}
fun getChannelQR(): Bitmap {
val multiFormatWriter = MultiFormatWriter()
// 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().toString(), BarcodeFormat.QR_CODE, 192, 192);
multiFormatWriter.encode(getChannelUrl(true).toString(), BarcodeFormat.QR_CODE, 192, 192);
val barcodeEncoder = BarcodeEncoder()
return barcodeEncoder.createBitmap(bitMatrix)
}