Merge pull request #9290 from hansemannn/TIMOB-25046-6_2_X

[TIMOB-25046] (6_2_X) iOS: Fix peek-and-pop and other analyser warnings
tidev · Aug 15, 2017 · b3fcbfb · b3fcbfb
2 parents 71b415e + ce5477c
commit b3fcbfb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/iphone/Classes/TiMediaMusicPlayer.m b/iphone/Classes/TiMediaMusicPlayer.m
@@ -91,7 +91,7 @@ -(NSArray*)itemsFromArg:(id)args
 					   subreason:nil
 						location:CODELOCATION];
 
-			return;
+			return items;
 		}
 
 		[items addObject:[query.items firstObject]];

diff --git a/iphone/Classes/TiUIOptionDialogProxy.m b/iphone/Classes/TiUIOptionDialogProxy.m
@@ -150,12 +150,6 @@ -(void)hide:(id)args
 		return;
 	}
 
-	id options = nil;
-	if ([args count]>0) {
-		options = [args objectAtIndex:0];
-	}
-	BOOL animatedhide = [TiUtils boolValue:@"animated" properties:options def:YES];
-
     TiThreadPerformOnMainThread(^{
         if (alertController != nil) {
             [alertController dismissViewControllerAnimated:animated completion:^{

diff --git a/iphone/Classes/TiUIiOSPreviewActionProxy.m b/iphone/Classes/TiUIiOSPreviewActionProxy.m
@@ -35,11 +35,11 @@ -(NSString*)apiName
 -(UIPreviewAction*)action
 {
     if (action == nil) {
-        action = [UIPreviewAction actionWithTitle:_title style:_style handler:^void(UIPreviewAction *_action, UIViewController *_controller) {
+        action = [[UIPreviewAction actionWithTitle:_title style:_style handler:^void(UIPreviewAction *_action, UIViewController *_controller) {
             if ([self _hasListeners:@"click"]) {
                 [self fireEventWithAction:_action];
             }
-        }];
+        }] retain];
     }
 
     return action;

diff --git a/iphone/Classes/TiUIiOSPreviewContextProxy.m b/iphone/Classes/TiUIiOSPreviewContextProxy.m
@@ -59,6 +59,7 @@ -(void)dealloc
 
 -(void)connectToDelegate
 {
+#ifndef __clang_analyzer__
     UIView *nativeSourceView = nil;
 
 #ifdef USE_TI_UILISTVIEW
@@ -84,8 +85,9 @@ -(void)connectToDelegate
     }
 
     UIViewController *controller = [[[TiApp app] controller] topPresentedController];
-    [controller registerForPreviewingWithDelegate:[[[TiPreviewingDelegate alloc] initWithPreviewContext:self] autorelease]
+    [controller registerForPreviewingWithDelegate:[[TiPreviewingDelegate alloc] initWithPreviewContext:self]
                                        sourceView:nativeSourceView];
+#endif
 }
 
 @end