Merge pull request #9341 from garymathews/TIMOB-25186_6_2_X

[6_2_X][TIMOB-25186] Validate Ti.UI.Label onTouchEvent
tidev · Aug 23, 2017 · 499e1d7 · 499e1d7
2 parents 80f540f + f60fc70
commit 499e1d7
Showing 1 changed file with 19 additions and 17 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUILabel.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUILabel.java
@@ -186,24 +186,26 @@ public boolean onTouchEvent(MotionEvent event) {
 						y += textView.getScrollY();
 
 						Layout layout = textView.getLayout();
-						int line = layout.getLineForVertical(y);
-						int off = layout.getOffsetForHorizontal(line, x);
-
-						ClickableSpan[] link = buffer.getSpans(off, off, ClickableSpan.class);
-
-						if (link.length != 0) {
-							ClickableSpan cSpan = link[0]; 
-							if (action == MotionEvent.ACTION_UP) {
-								TiViewProxy proxy = getProxy();
-								if(proxy.hasListeners("link") && (cSpan instanceof URLSpan)) {
-									KrollDict evnt = new KrollDict();
-									evnt.put("url", ((URLSpan)cSpan).getURL());
-									proxy.fireEvent("link", evnt, false);
-								} else {
-									cSpan.onClick(textView);
+						if (layout != null) {
+							int line = layout.getLineForVertical(y);
+							int off = layout.getOffsetForHorizontal(line, x);
+
+							ClickableSpan[] link = buffer.getSpans(off, off, ClickableSpan.class);
+
+							if (link.length != 0) {
+								ClickableSpan cSpan = link[0]; 
+								if (action == MotionEvent.ACTION_UP) {
+									TiViewProxy proxy = getProxy();
+									if(proxy.hasListeners("link") && (cSpan instanceof URLSpan)) {
+										KrollDict evnt = new KrollDict();
+										evnt.put("url", ((URLSpan)cSpan).getURL());
+										proxy.fireEvent("link", evnt, false);
+									} else {
+										cSpan.onClick(textView);
+									}
+								} else if (action == MotionEvent.ACTION_DOWN) {
+									Selection.setSelection(buffer, buffer.getSpanStart(cSpan), buffer.getSpanEnd(cSpan));
 								}
-							} else if (action == MotionEvent.ACTION_DOWN) {
-								Selection.setSelection(buffer, buffer.getSpanStart(cSpan), buffer.getSpanEnd(cSpan));
 							}
 						}
 					}