Relocate proto utils (#3621)

core/proto/build.gradle.kts

@@ -14,24 +14,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-
-/*
- * Copyright (c) 2025 Meshtastic LLC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 plugins {
     alias(libs.plugins.meshtastic.android.library)
     alias(libs.plugins.meshtastic.android.library.compose)
@@ -54,9 +36,6 @@ protobuf {
 }
 
 dependencies {
-    implementation(projects.core.strings)
-
-    implementation(libs.timber)
     // This needs to be API for consuming modules
     api(libs.protobuf.kotlin)
 }

core/proto/src/main/kotlin/org/meshtastic/core/proto/HardwareModelExtensions.kt

@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2025 Meshtastic LLC
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package org.meshtastic.core.proto
-
-import org.meshtastic.proto.MeshProtos
-import timber.log.Timber
-
-/**
- * Safely extracts the hardware model number from a HardwareModel enum.
- *
- * This function handles unknown enum values gracefully by catching IllegalArgumentException and returning a fallback
- * value. This prevents crashes when the app receives data from devices with hardware models not yet defined in the
- * current protobuf version.
- *
- * @param fallbackValue The value to return if the enum is unknown (defaults to 0 for UNSET)
- * @return The hardware model number, or the fallback value if the enum is unknown
- */
-@Suppress("detekt:SwallowedException")
-fun MeshProtos.HardwareModel.safeNumber(fallbackValue: Int = -1): Int = try {
-    this.number
-} catch (e: IllegalArgumentException) {
-    Timber.w("Unknown hardware model enum value: $this, using fallback value: $fallbackValue")
-    fallbackValue
-}
-
-/**
- * Checks if the hardware model is a known/supported value.
- *
- * @return true if the hardware model is known and supported, false otherwise
- */
-@Suppress("detekt:SwallowedException")
-fun MeshProtos.HardwareModel.isKnown(): Boolean = try {
-    this.number
-    true
-} catch (e: IllegalArgumentException) {
-    false
-}

core/ui/src/main/kotlin/org/meshtastic/core/ui/qr/ScannedQrCodeViewModel.kt

@@ -23,8 +23,8 @@ import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import org.meshtastic.core.data.repository.RadioConfigRepository
-import org.meshtastic.core.proto.getChannelList
 import org.meshtastic.core.service.ServiceRepository
+import org.meshtastic.core.ui.util.getChannelList
 import org.meshtastic.core.ui.viewmodel.stateInWhileSubscribed
 import org.meshtastic.proto.AppOnlyProtos
 import org.meshtastic.proto.ChannelProtos

core/ui/src/main/kotlin/org/meshtastic/core/ui/util/ProtoExtensions.kt

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.meshtastic.core.proto
+package org.meshtastic.core.ui.util
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource