fix(android): improve textColorStateList validation

tidev · Jun 8, 2020 · e9c58c3 · e9c58c3
1 parent ff57e3a
commit e9c58c3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUIAbstractTabGroup.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUIAbstractTabGroup.java
@@ -252,6 +252,10 @@ public void addTab(TabProxy tabProxy)
 	 */
 	protected ColorStateList textColorStateList(TiViewProxy tabProxy, int stateToUse)
 	{
+		if (getProxy() == null || tabProxy == null) {
+			return null;
+		}
+
 		int[][] textColorStates = new int[][] { new int[] { -stateToUse }, new int[] { stateToUse } };
 		int[] textColors = { this.textColorInt, this.textColorInt };
 

diff --git a/...oid/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUITabLayoutTabGroup.java b/...oid/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUITabLayoutTabGroup.java
@@ -6,6 +6,7 @@
  */
 package ti.modules.titanium.ui.widget.tabgroup;
 
+import android.content.res.ColorStateList;
 import android.content.res.Configuration;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
@@ -245,8 +246,10 @@ public void updateTabTitleColor(int index)
 					//TIMOB-27830: Update text color after layout for change to take effect.
 					tabLayout.addOnLayoutChangeListener(
 						(v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
-							if (tabProxy != null) {
-								textView.setTextColor(textColorStateList(tabProxy, android.R.attr.state_selected));
+							final ColorStateList colorStateList =
+								textColorStateList(tabProxy, android.R.attr.state_selected);
+							if (colorStateList != null) {
+								textView.setTextColor(colorStateList);
 							}
 						});
 				}