Merge pull request #95 from NordicSemiconductor/bugfix/swipe-to-delete

Swipe to delete

Author: roshanrajaratnam

app/build.gradle.kts

@@ -54,7 +54,6 @@ dependencies {
     implementation(project(":feature:application-keys"))
     implementation(project(":feature:scenes"))
     implementation(project(":feature:provisioners"))
-    implementation(project(":feature:ranges"))
     implementation(project(":feature:export"))
     implementation(project(":mesh:core"))
     implementation(project(":mesh:provisioning"))

app/proguard-rules.pro

@@ -19,4 +19,6 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
--keep class no.nordicsemi.android.nrfmesh.core.navigation.ClickableSetting { *; }
+-keep class no.nordicsemi.android.nrfmesh.core.navigation.ClickableSetting { *; }
+-keep class no.nordicsemi.kotlin.mesh.** { *; }
+-dontwarn no.nordicsemi.kotlin.mesh.**

app/src/main/java/no/nordicsemi/android/nrfmesh/ui/network/NetworkRoute.kt

@@ -280,7 +280,7 @@ fun NetworkRoute(
                         keyboardOptions = KeyboardOptions(
                             capitalization = KeyboardCapitalization.Characters
                         ),
-                        regex = Regex("[0-9A-Fa-f]{0,4}"),
+                        regex = Regex("^[0-9A-Fa-f]{0,4}$"),
                         isError = isError,
                     )
                     Row(

core/common/src/main/java/no/nordicsemi/android/nrfmesh/core/common/Utils.kt

@@ -45,6 +45,9 @@ import no.nordicsemi.kotlin.mesh.core.exception.SceneInUse
 import no.nordicsemi.kotlin.mesh.core.exception.SecurityException
 import no.nordicsemi.kotlin.mesh.core.layers.access.AccessError
 import no.nordicsemi.kotlin.mesh.logger.LogLevel
+import kotlin.concurrent.atomics.AtomicLong
+import kotlin.concurrent.atomics.ExperimentalAtomicApi
+import kotlin.concurrent.atomics.incrementAndFetch
 
 /**
  * Helper object containing utility methods.
@@ -127,3 +130,15 @@ fun copyToClipboard(
         clipboard.setClipEntry(clipEntry = ClipEntry(clipData = clip))
     }
 }
+
+object KeyIdGenerator {
+    @OptIn(ExperimentalAtomicApi::class)
+    private val counter = AtomicLong(0)
+
+    /**
+     * Generates the next unique ID. This is a helper method used to generate unique IDs for keys in
+     * a LazyColumn
+     */
+    @OptIn(ExperimentalAtomicApi::class)
+    fun nextId() = counter.incrementAndFetch()
+}

core/data/src/main/java/no/nordicsemi/android/nrfmesh/core/data/CoreDataRepository.kt

@@ -229,7 +229,7 @@ class CoreDataRepository @Inject constructor(
      * @param boundNetworkKey Bound Network Key
      */
     fun addApplicationKey(
-        name: String = "Application Key ${meshNetwork.applicationKeys.size}",
+        name: String = "Application Key ${meshNetwork.applicationKeys.size + 1}",
         boundNetworkKey: NetworkKey,
     ): ApplicationKey = meshNetwork.add(
         name = name,

core/data/src/main/java/no/nordicsemi/android/nrfmesh/core/data/bearer/AndroidGattBearer.kt

@@ -22,8 +22,7 @@ class AndroidGattBearer(
     peripheral = peripheral
 ) {
     @OptIn(ExperimentalUuidApi::class)
-    override suspend fun open() {
-        super.open()
+    override suspend fun configurePeripheral(peripheral: Peripheral) {
         // Request highest connection parameters after connect in the super.open()
         peripheral.requestHighestValueLength()
     }

core/data/src/main/java/no/nordicsemi/android/nrfmesh/core/data/bearer/AndroidPbGattBearer.kt

@@ -22,9 +22,9 @@ class AndroidPbGattBearer(
     peripheral = peripheral
 ) {
     @OptIn(ExperimentalUuidApi::class)
-    override suspend fun open() {
-        super.open()
+    override suspend fun configurePeripheral(peripheral: Peripheral) {
         // Request highest connection parameters after connect in the super.open()
         peripheral.requestHighestValueLength()
+
     }
 }

core/data/src/main/java/no/nordicsemi/android/nrfmesh/core/data/models/ApplicationKeyData.kt

@@ -2,42 +2,44 @@
 
 package no.nordicsemi.android.nrfmesh.core.data.models
 
+import no.nordicsemi.android.nrfmesh.core.common.KeyIdGenerator
 import no.nordicsemi.kotlin.mesh.core.model.ApplicationKey
 import no.nordicsemi.kotlin.mesh.core.model.KeyIndex
-import no.nordicsemi.kotlin.mesh.core.model.NetworkKey
+import kotlin.uuid.ExperimentalUuidApi
 
 /**
  * Application Keys are used to secure communications at the upper transport layer.
  * The application key (AppKey) shall be generated using a random number generator
  * compatible with the requirements in Volume 2, Part H, Section 2 of the Core Specification [1].
  *
- * @property index              The index property contains an integer from 0 to 4095 that
- *                              represents the NetKey index for this network key.
  * @property name               Human-readable name for the application functionality associated
  *                              with this application key.
- * @property boundNetKeyIndex   The boundNetKey property contains a corresponding Network Key index
- *                              of the network key in the mesh network.
+ * @property index              The index property contains an integer from 0 to 4095 that
+ *                              represents the NetKey index for this network key.
  * @property key                128-bit application key.
  * @property oldKey             OldKey property contains the previous application key.
- * @property boundNetworkKey             Network key to which this application key is bound to.
- * @param    key               128-bit application key.
+ * @property boundNetKeyIndex   The boundNetKey property contains a corresponding Network Key index
+ *                              of the network key in the mesh network.
+ * @property isInUse            True if the application key is currently in use in the mesh network.
  */
+@OptIn(ExperimentalUuidApi::class)
 data class ApplicationKeyData(
     val name: String,
     val index: KeyIndex,
     val key: ByteArray,
     val oldKey: ByteArray? = null,
     val boundNetKeyIndex: KeyIndex,
-    val boundNetworkKey: NetworkKey?,
-    val isInUse: Boolean
+    val boundNetworkKeyName: String,
+    val isInUse: Boolean,
+    val id: Long = KeyIdGenerator.nextId()
 ) {
     constructor(key: ApplicationKey) : this(
         name = key.name,
         index = key.index,
         key = key.key,
         oldKey = key.oldKey,
-        boundNetKeyIndex = key.boundNetKeyIndex,
-        boundNetworkKey = key.boundNetworkKey,
+        boundNetKeyIndex = key.boundNetworkKey.index,
+        boundNetworkKeyName = key.boundNetworkKey.name,
         isInUse = key.isInUse
     )
 
@@ -55,7 +57,6 @@ data class ApplicationKeyData(
             if (!oldKey.contentEquals(other.oldKey)) return false
         } else if (other.oldKey != null) return false
         if (boundNetKeyIndex != other.boundNetKeyIndex) return false
-        if (boundNetworkKey != other.boundNetworkKey) return false
         if (isInUse != other.isInUse) return false
 
         return true
@@ -67,7 +68,6 @@ data class ApplicationKeyData(
         result = 31 * result + key.contentHashCode()
         result = 31 * result + (oldKey?.contentHashCode() ?: 0)
         result = 31 * result + boundNetKeyIndex.hashCode()
-        result = 31 * result + (boundNetworkKey?.hashCode() ?: 0)
         result = 31 * result + isInUse.hashCode()
         return result
     }

core/data/src/main/java/no/nordicsemi/android/nrfmesh/core/data/models/NetworkKeyData.kt

@@ -2,6 +2,7 @@
 
 package no.nordicsemi.android.nrfmesh.core.data.models
 
+import no.nordicsemi.android.nrfmesh.core.common.KeyIdGenerator
 import kotlin.time.Instant
 import no.nordicsemi.kotlin.mesh.core.model.KeyIndex
 import no.nordicsemi.kotlin.mesh.core.model.KeyRefreshPhase
@@ -56,7 +57,8 @@ data class NetworkKeyData internal constructor(
     val oldNetworkId: ByteArray?,
     val timestamp: Instant,
     val isPrimary: Boolean,
-    val isInUse: Boolean
+    val isInUse: Boolean,
+    val id: Long = KeyIdGenerator.nextId(),
 ) {
     /**
      * Convenience constructor for creating a new network key

core/data/src/main/java/no/nordicsemi/android/nrfmesh/core/data/models/NodeData.kt

@@ -140,7 +140,7 @@ data class NodeData internal constructor(
         excluded = node.excluded,
         heartbeatPublication = node.heartbeatPublication,
         heartbeatSubscription = node.heartbeatSubscription,
-        primaryElementData = node.primaryElement?.let { ElementData(it) },
+        primaryElementData = ElementData(node.primaryElement),
         elementsCount = node.elementsCount,
         addresses = node.addresses,
         unicastRange = node.unicastRange,