fix(android): TabbedBar crash caused by setting properties before window opened

android/modules/ui/src/java/ti/modules/titanium/ui/TabbedBarProxy.java

@@ -7,120 +7,40 @@
 package ti.modules.titanium.ui;
 
 import android.app.Activity;
-import android.os.Message;
 
-import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.annotations.Kroll;
-import org.appcelerator.kroll.common.AsyncResult;
-import org.appcelerator.kroll.common.TiMessenger;
-import org.appcelerator.titanium.TiApplication;
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.proxy.TiViewProxy;
 import org.appcelerator.titanium.view.TiUIView;
 
 import ti.modules.titanium.ui.android.AndroidModule;
 import ti.modules.titanium.ui.widget.TiUITabbedBar;
 
-@Kroll.proxy(creatableInModule = UIModule.class, propertyAccessors =
-													 {
-														 TiC.PROPERTY_INDEX,
-														 TiC.PROPERTY_LABELS,
-														 TiC.PROPERTY_STYLE,
-													 })
+// clang-format off
+@Kroll.proxy(creatableInModule = UIModule.class, propertyAccessors = {
+	TiC.PROPERTY_INDEX,
+	TiC.PROPERTY_LABELS,
+	TiC.PROPERTY_STYLE,
+})
+// clang-format on
 public class TabbedBarProxy extends TiViewProxy
 {
-
-	private static final int MSG_CHANGE_INDEX = 3001;
-	private static final int MSG_CHANGE_LABELS = 3002;
-	private static final int MSG_CHANGE_STYLE = 3003;
-
 	private static final String TAG = "TabbedBarProxy";
 
-	private TiUITabbedBar tabbedBar;
-
-	@Override
-	public String getApiName()
-	{
-		return "Ti.UI.TabbedBar";
-	}
-
-	@Override
-	public void handleCreationDict(KrollDict options)
+	public TabbedBarProxy()
 	{
-		super.handleCreationDict(options);
-		// If a style is not set in the creation dictionary use the default one
-		if (!options.containsKeyAndNotNull(TiC.PROPERTY_STYLE)) {
-			this.setProperty(TiC.PROPERTY_STYLE, AndroidModule.TABS_STYLE_DEFAULT);
-		}
+		defaultValues.put(TiC.PROPERTY_STYLE, AndroidModule.TABS_STYLE_DEFAULT);
 	}
 
 	@Override
 	public TiUIView createView(Activity activity)
 	{
-		tabbedBar = new TiUITabbedBar(this);
-		if (hasPropertyAndNotNull(TiC.PROPERTY_INDEX)) {
-			tabbedBar.setSelectedIndex(((int) getProperty(TiC.PROPERTY_INDEX)));
-		}
-		return tabbedBar;
-	}
-
-	// clang-format off
-	@Kroll.getProperty
-	@Kroll.method
-	public int getIndex()
-	// clang-format on
-	{
-		return tabbedBar.getSelectedIndex();
+		return new TiUITabbedBar(this);
 	}
 
 	@Override
-	public void onPropertyChanged(String name, Object value)
-	{
-		super.onPropertyChanged(name, value);
-		if (name.equals(TiC.PROPERTY_INDEX)) {
-			if (TiApplication.isUIThread()) {
-				tabbedBar.setSelectedIndex(((int) value));
-			} else {
-				TiMessenger.sendBlockingMainMessage(getMainHandler().obtainMessage(MSG_CHANGE_INDEX), value);
-			}
-		}
-		if (name.equals(TiC.PROPERTY_LABELS)) {
-			if (TiApplication.isUIThread()) {
-				tabbedBar.setNewLabels();
-			} else {
-				TiMessenger.sendBlockingMainMessage(getMainHandler().obtainMessage(MSG_CHANGE_LABELS));
-			}
-		}
-		/*if (name.equals(TiC.PROPERTY_STYLE)) {
-			if (TiApplication.isUIThread()) {
-				tabbedBar.setNewStyle(((int) value));
-			} else {
-				TiMessenger.sendBlockingMainMessage(getMainHandler().obtainMessage(MSG_CHANGE_STYLE), value);
-			}
-		}*/
-	}
-
-	@Override
-	public boolean handleMessage(Message msg)
+	public String getApiName()
 	{
-		if (msg.what == MSG_CHANGE_INDEX) {
-			AsyncResult result = (AsyncResult) msg.obj;
-			tabbedBar.setSelectedIndex(((int) result.getArg()));
-			result.setResult(null);
-			return true;
-		} else if (msg.what == MSG_CHANGE_LABELS) {
-			AsyncResult result = (AsyncResult) msg.obj;
-			tabbedBar.setNewLabels();
-			result.setResult(null);
-			return true;
-			//TODO: See if iOS supports change of styles after creation
-			/*} else if (msg.what == MSG_CHANGE_STYLE) {
-			AsyncResult result = (AsyncResult) msg.obj;
-			tabbedBar.setNewStyle(((int) result.getArg()));
-			result.setResult(null);
-			return true;*/
-		} else {
-			return super.handleMessage(msg);
-		}
+		return "Ti.UI.TabbedBar";
 	}
 }

android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUITabbedBar.java

@@ -12,10 +12,12 @@
 import android.view.MenuItem;
 
 import org.appcelerator.kroll.KrollDict;
+import org.appcelerator.kroll.KrollProxy;
 import org.appcelerator.kroll.common.Log;
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.proxy.TiViewProxy;
 import org.appcelerator.titanium.util.TiColorHelper;
+import org.appcelerator.titanium.util.TiConvert;
 import org.appcelerator.titanium.util.TiUIHelper;
 import org.appcelerator.titanium.view.TiDrawableReference;
 import org.appcelerator.titanium.view.TiUIView;
@@ -27,12 +29,11 @@
 
 public class TiUITabbedBar extends TiUIView implements MenuItem.OnMenuItemClickListener, TabLayout.OnTabSelectedListener
 {
-
 	private static final String TAG = "TiUITabbedBar";
 
 	private TabLayout tabLayout;
 	private BottomNavigationView bottomNavigationView;
-	private int style;
+	private int style = AndroidModule.TABS_STYLE_DEFAULT;
 	private ArrayList<MenuItem> bottomNavigationMenuItems = new ArrayList<>();
 	private int bottomNavigationIndex = -1;
 
@@ -45,15 +46,30 @@ public class TiUITabbedBar extends TiUIView implements MenuItem.OnMenuItemClickL
 	public TiUITabbedBar(TiViewProxy proxy)
 	{
 		super(proxy);
-		this.style = ((Integer) getProxy().getProperty(TiC.PROPERTY_STYLE));
+
+		Object styleObject = proxy.getProperty(TiC.PROPERTY_STYLE);
+		if (styleObject instanceof Number) {
+			this.style = TiConvert.toInt(styleObject, this.style);
+		} else if (styleObject != null) {
+			Log.w(TAG, "TabbedBar '" + TiC.PROPERTY_STYLE
+						   + "' property must be set to a 'Ti.UI.Module' TABS_STYLE constant.");
+		} else {
+			proxy.setProperty(TiC.PROPERTY_STYLE, this.style);
+		}
+
 		switch (this.style) {
 			case AndroidModule.TABS_STYLE_DEFAULT:
 				createTabLayout();
 				break;
 			case AndroidModule.TABS_STYLE_BOTTOM_NAVIGATION:
 				createBottomNavigationView();
 				break;
-				// end of switch
+			default:
+				Log.w(TAG, "TabbedBar '" + TiC.PROPERTY_STYLE
+							   + "' property was assigned to an unknow value. Using default style instead.");
+				this.style = AndroidModule.TABS_STYLE_DEFAULT;
+				createTabLayout();
+				break;
 		}
 	}
 
@@ -96,6 +112,41 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
 		setNativeView(this.bottomNavigationView);
 	}
 
+	@Override
+	public void processProperties(KrollDict properties)
+	{
+		// Validate.
+		if (properties == null) {
+			return;
+		}
+
+		// Apply given properties to view.
+		if (properties.containsKey(TiC.PROPERTY_INDEX)) {
+			setSelectedIndex(properties.get(TiC.PROPERTY_INDEX));
+		}
+
+		// Let base class handle all other view property settings.
+		super.processProperties(properties);
+	}
+
+	@Override
+	public void propertyChanged(String key, Object oldValue, Object newValue, KrollProxy proxy)
+	{
+		// Validate.
+		if (key == null) {
+			return;
+		}
+
+		// Handle property change.
+		if (key.equals(TiC.PROPERTY_INDEX)) {
+			setSelectedIndex(newValue);
+		} else if (key.equals(TiC.PROPERTY_LABELS)) {
+			setNewLabels();
+		} else {
+			super.propertyChanged(key, oldValue, newValue, proxy);
+		}
+	}
+
 	private void parseDataSet()
 	{
 		Object[] labels = ((Object[]) getProxy().getProperty(TiC.PROPERTY_LABELS));
@@ -219,8 +270,27 @@ public void setNewLabels()
 		parseDataSet();
 	}
 
+	private void setSelectedIndex(Object value)
+	{
+		if (value instanceof Number) {
+			setSelectedIndex(TiConvert.toInt(value, -1));
+		} else if (value != null) {
+			Log.w(TAG, "TabbedBar '" + TiC.PROPERTY_INDEX + "' property must be set to a number.");
+		} else {
+			Log.w(TAG, "TabbedBar '" + TiC.PROPERTY_INDEX
+						   + "' property does not support null assignments to clear the selection on Android.");
+		}
+	}
+
 	public void setSelectedIndex(int i)
 	{
+		// Validate argument.
+		if ((i < 0) || (i >= getTabCount())) {
+			Log.e(TAG, "Given TabbedBar index '" + i + "' is out of range.");
+			return;
+		}
+
+		// Select the indexed tab.
 		switch (this.style) {
 			case AndroidModule.TABS_STYLE_DEFAULT:
 				this.tabLayout.getTabAt(i).select();
@@ -248,20 +318,30 @@ public int getSelectedIndex()
 	public boolean onMenuItemClick(MenuItem item)
 	{
 		this.bottomNavigationIndex = this.bottomNavigationMenuItems.indexOf(item);
-		KrollDict data = new KrollDict();
-		data.put(TiC.PROPERTY_INDEX, this.bottomNavigationIndex);
-		proxy.fireEvent(TiC.EVENT_CLICK, data);
-		getProxy().setProperty(TiC.PROPERTY_INDEX, this.bottomNavigationIndex);
+		onTabIndexChangedTo(this.bottomNavigationIndex);
 		return false;
 	}
 
 	@Override
 	public void onTabSelected(TabLayout.Tab tab)
 	{
-		KrollDict data = new KrollDict();
-		data.put(TiC.PROPERTY_INDEX, tab.getPosition());
-		getProxy().setProperty(TiC.PROPERTY_INDEX, tab.getPosition());
-		proxy.fireEvent(TiC.EVENT_CLICK, data);
+		if (tab != null) {
+			onTabIndexChangedTo(tab.getPosition());
+		}
+	}
+
+	private void onTabIndexChangedTo(int index)
+	{
+		KrollProxy proxy = getProxy();
+		if (proxy != null) {
+			// First, update the proxy's "index" property.
+			proxy.setProperty(TiC.PROPERTY_INDEX, index);
+
+			// Last, fire a "click" event.
+			KrollDict data = new KrollDict();
+			data.put(TiC.PROPERTY_INDEX, index);
+			proxy.fireEvent(TiC.EVENT_CLICK, data);
+		}
 	}
 
 	@Override
@@ -275,4 +355,15 @@ public void onTabReselected(TabLayout.Tab tab)
 	{
 		// No override
 	}
+
+	private int getTabCount()
+	{
+		switch (this.style) {
+			case AndroidModule.TABS_STYLE_DEFAULT:
+				return this.tabLayout.getTabCount();
+			case AndroidModule.TABS_STYLE_BOTTOM_NAVIGATION:
+				return this.bottomNavigationView.getMenu().size();
+		}
+		return 0;
+	}
 }

tests/Resources/ti.ui.tabbedbar.addontest.js

@@ -0,0 +1,59 @@
+/*
+ * Appcelerator Titanium Mobile
+ * Copyright (c) 2015-Present by Axway, Inc. All Rights Reserved.
+ * Licensed under the terms of the Apache Public License
+ * Please see the LICENSE included with this distribution for details.
+ */
+/* eslint-env mocha */
+/* global Ti */
+/* eslint no-unused-expressions: "off" */
+'use strict';
+var should = require('./utilities/assertions');
+
+describe.windowsMissing('Titanium.UI.TabbedBar', function () {
+	let win;
+	this.timeout(5000);
+
+	beforeEach(() => {
+		win = Ti.UI.createWindow();
+	});
+
+	afterEach(() => {
+		if (win) {
+			win.close();
+		}
+		win = null;
+	});
+
+	it('Labels update - before window.open()', finish => {
+		const tabbedBar = Ti.UI.createTabbedBar();
+		tabbedBar.labels = [ 'A', 'B', 'C' ];
+		win.add(tabbedBar);
+		win.addEventListener('open', () => {
+			try {
+				should(tabbedBar.labels[1]).be.eql('B');
+				finish();
+			} catch (err) {
+				finish(err);
+			}
+		});
+		win.open();
+	});
+
+	it('Index update - before window.open()', finish => {
+		var tabbedBar = Ti.UI.createTabbedBar({
+			labels: [ 'A', 'B', 'C' ]
+		});
+		tabbedBar.index = 2;
+		win.add(tabbedBar);
+		win.addEventListener('open', () => {
+			try {
+				should(tabbedBar.index).be.eql(2);
+				finish();
+			} catch (err) {
+				finish(err);
+			}
+		});
+		win.open();
+	});
+});