From 38e7e8a7832a7888c3e413329b255557e4cfe13e Mon Sep 17 00:00:00 2001 From: geeksville Date: Fri, 29 May 2020 14:16:16 -0700 Subject: [PATCH] oops - fix build - default channel name should never be localized --- app/src/main/java/com/geeksville/mesh/model/Channel.kt | 4 ++-- app/src/main/res/values/strings.xml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/model/Channel.kt b/app/src/main/java/com/geeksville/mesh/model/Channel.kt index 83b9eda57..a0323a8c9 100644 --- a/app/src/main/java/com/geeksville/mesh/model/Channel.kt +++ b/app/src/main/java/com/geeksville/mesh/model/Channel.kt @@ -4,7 +4,6 @@ import android.graphics.Bitmap import android.net.Uri import android.util.Base64 import com.geeksville.mesh.MeshProtos -import com.geeksville.mesh.R import com.google.zxing.BarcodeFormat import com.google.zxing.MultiFormatWriter import com.journeyapps.barcodescanner.BarcodeEncoder @@ -17,7 +16,8 @@ data class Channel( companion object { // Placeholder when emulating val emulated = Channel( - MeshProtos.ChannelSettings.newBuilder().setName(context.getString(R.string.default)) + // Note: this string _SHOULD NOT BE LOCALIZED_ because it directly hashes to values used on the device for the default channel name. + MeshProtos.ChannelSettings.newBuilder().setName("Default") .setModemConfig(MeshProtos.ChannelSettings.ModemConfig.Bw125Cr45Sf128).build() ) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f752ebb56..0976c025a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -59,5 +59,4 @@ Not connected, select radio below Connected to radio, but it is sleeping Update to %s - Default