[TIMOB-9222][TIMOB-9223] Fix crashes on setData, hasData.

Fix hasText, hasData return values.
tidev · May 25, 2012 · 19f8add · 19f8add
1 parent 3e08ce1
commit 19f8add
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 6 deletions.
diff --git a/iphone/Classes/TiUIClipboardProxy.h b/iphone/Classes/TiUIClipboardProxy.h
@@ -18,8 +18,8 @@
 -(void)clearText:(id)args;
 -(id)getData:(id)args;
 -(NSString *)getText:(id)args;
--(BOOL)hasData:(id)args;
--(BOOL)hasText:(id)args;
+-(id)hasData:(id)args;
+-(id)hasText:(id)args;
 -(void)setData:(id)args;
 -(void)setText:(id)args;
 

diff --git a/iphone/Classes/TiUIClipboardProxy.m b/iphone/Classes/TiUIClipboardProxy.m
@@ -100,8 +100,20 @@ -(void)clearText:(id)args
 	board.strings = nil;
 }
 
--(id)getData:(id)arg
+-(id)getData:(id)args
 {
+    id arg = nil;
+    if ([args isKindOfClass:[NSArray class]])
+    {
+        if ([args count] > 0)
+        {
+            arg = [args objectAtIndex:0];
+        }
+    }
+    else 
+    {
+        arg = args;
+    }
 	ENSURE_STRING(arg);
 	NSString *mimeType = arg;
 	__block id result;
@@ -153,8 +165,20 @@ -(NSString *)getText:(id)args
 	return [self getData: @"text/plain"];
 }
 
--(BOOL)hasData:(id)arg
+-(id)hasData:(id)args
 {
+    id arg = nil;
+    if ([args isKindOfClass:[NSArray class]])
+    {
+        if ([args count] > 0)
+        {
+            arg = [args objectAtIndex:0];
+        }
+    }
+    else 
+    {
+        arg = args;
+    }
 	ENSURE_STRING_OR_NIL(arg);
 	NSString *mimeType = arg;
 	__block BOOL result=NO;
@@ -187,10 +211,10 @@ -(BOOL)hasData:(id)arg
 			}
 		}
 	}, YES);
-	return result;
+	return NUMBOOL(result);
 }
 
--(BOOL)hasText:(id)args
+-(id)hasText:(id)args
 {
 	return [self hasData: @"text/plain"];
 }
@@ -202,6 +226,10 @@ -(void)setData:(id)args
 
 	NSString *mimeType = [TiUtils stringValue: [args objectAtIndex: 0]];
 	id data = [args objectAtIndex: 1];
+    if (data == nil) {
+        DebugLog(@"[WARN] setData: data object was nil.");
+        return;
+    }
 	UIPasteboard *board = [UIPasteboard generalPasteboard];
 	ClipboardType dataType = mimeTypeToDataType(mimeType);