Merge pull request #220 from hansemannn/TIMOB-25677

[TIMOB-25677] iOS: Fix cluster-annotations-crash and static analyser warnings
tidev · Jan 18, 2018 · cd471ab · cd471ab
2 parents 2737e81 + f3749ad
commit cd471ab
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 403 deletions.
diff --git a/ios/LICENSE → LICENSE b/ios/LICENSE → LICENSE
diff --git a/android/CHANGELOG.txt b/android/CHANGELOG.txt
diff --git a/android/LICENSE b/android/LICENSE
diff --git a/ios/Classes/TiMapView.m b/ios/Classes/TiMapView.m
@@ -1148,7 +1148,7 @@ - (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotationProxy:(TiMap
 
     if (!TiPreviewingDelegate) {
       NSLog(@"[ERROR] Unable to receive TiPreviewingDelegate class!");
-      return;
+      return nil;
     }
 
 #ifndef __clang_analyzer__

diff --git a/ios/Classes/TiMapViewProxy.m b/ios/Classes/TiMapViewProxy.m
@@ -278,8 +278,10 @@ - (void)setAnnotations:(id)arg
   // descriptors for them, we have to check and make sure there is
   // no overlap and remember/forget appropriately.
 
-  for (TiMapAnnotationProxy *annProxy in currentAnnotations) {
-    if (![newAnnotations containsObject:annProxy]) {
+  for (id annProxy in currentAnnotations) {
+    // Remove old proxy references that should not rendered anymore
+    // Also only forget proxies, not native annotations like cluster annotations
+    if ([annProxy isKindOfClass:[TiMapAnnotationProxy class]] && ![newAnnotations containsObject:annProxy]) {
       [self forgetProxy:annProxy];
     }
   }