Skip to content

Commit 6b27278

Browse files
authored
Fix Android interaction tool crash (project-chip#32197)
1 parent 165da46 commit 6b27278

File tree

1 file changed

+12
-3
lines changed
  • examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction

1 file changed

+12
-3
lines changed

examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt

+12-3
Original file line numberDiff line numberDiff line change
@@ -199,10 +199,19 @@ class ClusterDetailFragment : Fragment() {
199199

200200
private fun castStringToType(data: String, type: Class<*>, underlyingType: Class<*>): Any? {
201201
return when (type) {
202-
Int::class.java -> data.toInt()
203-
Boolean::class.java -> data.toBoolean()
202+
Int::class.java,
203+
java.lang.Integer::class.java -> data.toInt()
204+
Boolean::class.java,
205+
java.lang.Boolean::class.java -> data.toBoolean()
204206
ByteArray::class.java -> data.encodeToByteArray()
205-
Long::class.java -> data.toLong()
207+
Long::class.java,
208+
java.lang.Long::class.java -> data.toLong()
209+
Short::class.java,
210+
java.lang.Short::class.java -> data.toShort()
211+
Double::class.java,
212+
java.lang.Double::class.java -> data.toDouble()
213+
Float::class.java,
214+
java.lang.Float::class.java -> data.toFloat()
206215
Optional::class.java ->
207216
if (data.isEmpty()) Optional.empty()
208217
else Optional.of(castStringToType(data, underlyingType, underlyingType)!!)

0 commit comments

Comments
 (0)