Fix crash when receiving annotation interactions (#989) (#990)

Author: evil159

CHANGELOG.md

@@ -1,6 +1,7 @@
 ### 2.10.0-rc.1
 
 * Use Maps SDK Android dependency with NDK 27 support and [support for 16 KB page sizes](https://developer.android.com/guide/practices/page-sizes).
+* Fix crash when receiving annotation interactions.
 
 ### 2.10.0-beta.1
 

android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/GestureListeners.kt

@@ -217,70 +217,100 @@ private open class GestureListenersPigeonCodec : StandardMessageCodec() {
     return when (type) {
       129.toByte() -> {
         return (readValue(buffer) as Long?)?.let {
-          GestureState.ofRaw(it.toInt())
+          IconAnchor.ofRaw(it.toInt())
         }
       }
       130.toByte() -> {
+        return (readValue(buffer) as Long?)?.let {
+          IconTextFit.ofRaw(it.toInt())
+        }
+      }
+      131.toByte() -> {
+        return (readValue(buffer) as Long?)?.let {
+          TextAnchor.ofRaw(it.toInt())
+        }
+      }
+      132.toByte() -> {
+        return (readValue(buffer) as Long?)?.let {
+          TextJustify.ofRaw(it.toInt())
+        }
+      }
+      133.toByte() -> {
+        return (readValue(buffer) as Long?)?.let {
+          TextTransform.ofRaw(it.toInt())
+        }
+      }
+      134.toByte() -> {
+        return (readValue(buffer) as Long?)?.let {
+          LineJoin.ofRaw(it.toInt())
+        }
+      }
+      135.toByte() -> {
+        return (readValue(buffer) as Long?)?.let {
+          GestureState.ofRaw(it.toInt())
+        }
+      }
+      136.toByte() -> {
         return (readValue(buffer) as? List<Any?>)?.let {
           PointDecoder.fromList(it)
         }
       }
-      131.toByte() -> {
+      137.toByte() -> {
         return (readValue(buffer) as? List<Any?>)?.let {
           PolygonDecoder.fromList(it)
         }
       }
-      132.toByte() -> {
+      138.toByte() -> {
         return (readValue(buffer) as? List<Any?>)?.let {
           LineStringDecoder.fromList(it)
         }
       }
-      133.toByte() -> {
+      139.toByte() -> {
         return (readValue(buffer) as? List<Any?>)?.let {
           ScreenCoordinate.fromList(it)
         }
       }
-      134.toByte() -> {
+      140.toByte() -> {
         return (readValue(buffer) as? List<Any?>)?.let {
           MapContentGestureContext.fromList(it)
         }
       }
-      135.toByte() -> {
+      141.toByte() -> {
         return (readValue(buffer) as? List<Any?>)?.let {
           PointAnnotation.fromList(it)
         }
       }
-      136.toByte() -> {
+      142.toByte() -> {
         return (readValue(buffer) as? List<Any?>)?.let {
           CircleAnnotation.fromList(it)
         }
       }
-      137.toByte() -> {
+      143.toByte() -> {
         return (readValue(buffer) as? List<Any?>)?.let {
           PolygonAnnotation.fromList(it)
         }
       }
-      138.toByte() -> {
+      144.toByte() -> {
         return (readValue(buffer) as? List<Any?>)?.let {
           PolylineAnnotation.fromList(it)
         }
       }
-      139.toByte() -> {
+      145.toByte() -> {
         return (readValue(buffer) as? List<Any?>)?.let {
           PointAnnotationInteractionContext.fromList(it)
         }
       }
-      140.toByte() -> {
+      146.toByte() -> {
         return (readValue(buffer) as? List<Any?>)?.let {
           CircleAnnotationInteractionContext.fromList(it)
         }
       }
-      141.toByte() -> {
+      147.toByte() -> {
         return (readValue(buffer) as? List<Any?>)?.let {
           PolygonAnnotationInteractionContext.fromList(it)
         }
       }
-      142.toByte() -> {
+      148.toByte() -> {
         return (readValue(buffer) as? List<Any?>)?.let {
           PolylineAnnotationInteractionContext.fromList(it)
         }
@@ -290,60 +320,84 @@ private open class GestureListenersPigeonCodec : StandardMessageCodec() {
   }
   override fun writeValue(stream: ByteArrayOutputStream, value: Any?) {
     when (value) {
-      is GestureState -> {
+      is IconAnchor -> {
         stream.write(129)
         writeValue(stream, value.raw)
       }
-      is Point -> {
+      is IconTextFit -> {
         stream.write(130)
+        writeValue(stream, value.raw)
+      }
+      is TextAnchor -> {
+        stream.write(131)
+        writeValue(stream, value.raw)
+      }
+      is TextJustify -> {
+        stream.write(132)
+        writeValue(stream, value.raw)
+      }
+      is TextTransform -> {
+        stream.write(133)
+        writeValue(stream, value.raw)
+      }
+      is LineJoin -> {
+        stream.write(134)
+        writeValue(stream, value.raw)
+      }
+      is GestureState -> {
+        stream.write(135)
+        writeValue(stream, value.raw)
+      }
+      is Point -> {
+        stream.write(136)
         writeValue(stream, value.toList())
       }
       is Polygon -> {
-        stream.write(131)
+        stream.write(137)
         writeValue(stream, value.toList())
       }
       is LineString -> {
-        stream.write(132)
+        stream.write(138)
         writeValue(stream, value.toList())
       }
       is ScreenCoordinate -> {
-        stream.write(133)
+        stream.write(139)
         writeValue(stream, value.toList())
       }
       is MapContentGestureContext -> {
-        stream.write(134)
+        stream.write(140)
         writeValue(stream, value.toList())
       }
       is PointAnnotation -> {
-        stream.write(135)
+        stream.write(141)
         writeValue(stream, value.toList())
       }
       is CircleAnnotation -> {
-        stream.write(136)
+        stream.write(142)
         writeValue(stream, value.toList())
       }
       is PolygonAnnotation -> {
-        stream.write(137)
+        stream.write(143)
         writeValue(stream, value.toList())
       }
       is PolylineAnnotation -> {
-        stream.write(138)
+        stream.write(144)
         writeValue(stream, value.toList())
       }
       is PointAnnotationInteractionContext -> {
-        stream.write(139)
+        stream.write(145)
         writeValue(stream, value.toList())
       }
       is CircleAnnotationInteractionContext -> {
-        stream.write(140)
+        stream.write(146)
         writeValue(stream, value.toList())
       }
       is PolygonAnnotationInteractionContext -> {
-        stream.write(141)
+        stream.write(147)
         writeValue(stream, value.toList())
       }
       is PolylineAnnotationInteractionContext -> {
-        stream.write(142)
+        stream.write(148)
         writeValue(stream, value.toList())
       }
       else -> super.writeValue(stream, value)

android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PointAnnotationMessenger.kt

@@ -517,7 +517,7 @@ data class PointAnnotation(
    */
   val iconHaloWidth: Double? = null,
   /**
-   * Controls the transition progress between the image variants of icon-image. Zero means the first variant is used, one is the second, and in between they are blended together. Both images should be the same size and have the same type (either raster or vector).
+   * Controls the transition progress between the image variants of icon-image. Zero means the first variant is used, one is the second, and in between they are blended together. . Both images should be the same size and have the same type (either raster or vector).
    * Default value: 0. Value range: [0, 1]
    * Deprecated: Use `PointAnnotationManager.iconImageCrossFade` instead.
    */
@@ -838,7 +838,7 @@ data class PointAnnotationOptions(
    */
   val iconHaloWidth: Double? = null,
   /**
-   * Controls the transition progress between the image variants of icon-image. Zero means the first variant is used, one is the second, and in between they are blended together. Both images should be the same size and have the same type (either raster or vector).
+   * Controls the transition progress between the image variants of icon-image. Zero means the first variant is used, one is the second, and in between they are blended together. . Both images should be the same size and have the same type (either raster or vector).
    * Default value: 0. Value range: [0, 1]
    * Deprecated: Use `PointAnnotationManager.iconImageCrossFade` instead.
    */