Merge branch 'master' into blob-uint8array

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

@@ -41,6 +41,9 @@ public String getColor()
 	public void setColor(String color)
 	{
 		setPropertyAndFire(TiC.PROPERTY_COLOR, color);
+		if (rowListener != null) {
+			rowListener.rowChanged(this);
+		}
 	}
 
 	@Kroll.method

apidoc/Titanium/UI/Android/ProgressIndicator.yml

@@ -10,18 +10,17 @@ description:  |
     Use the <Titanium.UI.Android.createProgressIndicator> method or **`<ProgressIndicator>`** Alloy
     element to create a progress indicator.
 
-    A progress indicator can be either a progress dialog or a horizontal progress bar in the title 
-    of the window. The progress dialog is a modal dialog that blocks the UI. See also: 
+    A progress indicator can be either a progress dialog or a horizontal progress bar in the title
+    of the window. The progress dialog is a modal dialog that blocks the UI. See also:
     <Titanium.UI.Android.PROGRESS_INDICATOR_DIALOG>,
     <Titanium.UI.Android.PROGRESS_INDICATOR_STATUS_BAR>.
 
-    Calling <Titanium.UI.Android.ProgressIndicator.show> displays the indicator, 
-    and calling <Titanium.UI.Android.ProgressIndicator.hide> removes it.
+    **NOTE:** <Titanium.UI.Android.PROGRESS_INDICATOR_STATUS_BAR> does not work anymore on devices
+    running Android 4.4+ since the underlying API was deprecated and removed by Google. See
+    [TIMOB-27312](https://jira.appcelerator.org/browse/TIMOB-27312) for more details.
 
-    To display a horizontal progress bar in the title of a heavyweight window,
-    wait for the window to open before creating the progress bar.
-    For example, in the sample code below, for it to work in the status bar,
-    create the progress bar inside the event listener, which waits for the open event.
+    Calling <Titanium.UI.Android.ProgressIndicator.show> displays the indicator,
+    and calling <Titanium.UI.Android.ProgressIndicator.hide> removes it.
 extends: Titanium.UI.View
 since: "3.0.0"
 platforms: [android]

cli/commands/build.js

@@ -15,7 +15,6 @@ const appc = require('node-appc'),
 	sprintf = require('sprintf'),
 	ti = require('node-titanium-sdk'),
 	tiappxml = require('node-titanium-sdk/lib/tiappxml'),
-	semver = require('semver'),
 	__ = appc.i18n(__dirname).__;
 
 fields.setup({

common/Resources/ti.internal/extensions/node/internal/util/inspect.js

@@ -231,7 +231,7 @@ Object.defineProperty(inspect, 'defaultOptions', {
 		if (options === null || typeof options !== 'object') {
 			throw new ERR_INVALID_ARG_TYPE('options', 'Object', options);
 		}
-		return Object.assign(inspectDefaultOptions, options);
+		Object.assign(inspectDefaultOptions, options);
 	}
 });
 

iphone/Classes/TiUIListView.m

@@ -1875,7 +1875,12 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
 
 - (void)tableView:(UITableView *)tableView accessoryButtonTappedForRowWithIndexPath:(NSIndexPath *)indexPath
 {
-  [self fireClickForItemAtIndexPath:[self pathForSearchPath:indexPath] tableView:tableView accessoryButtonTapped:YES];
+  // TIMOB-27994: This delegate should called only when accessory detail button is clicked.
+  // If tableView is in edit mode, accessory buttons (detail button) does not appear.
+  // But in iOS 13+, On click of 'reorder control' this delegate is called (probably a bug). So following condition applied.
+  if (!tableView.isEditing) {
+    [self fireClickForItemAtIndexPath:[self pathForSearchPath:indexPath] tableView:tableView accessoryButtonTapped:YES];
+  }
 }
 
 #pragma mark - ScrollView Delegate

iphone/TitaniumKit/TitaniumKit/Sources/API/TiBlob.m

@@ -68,7 +68,7 @@ - (NSUInteger)width
 {
   [self ensureImageLoaded];
   if (image != nil) {
-    return image.size.width;
+    return image.size.width * image.scale;
   }
   return 0;
 }
@@ -78,7 +78,7 @@ - (NSUInteger)height
 {
   [self ensureImageLoaded];
   if (image != nil) {
-    return image.size.height;
+    return image.size.height * image.scale;
   }
   return 0;
 }
@@ -88,7 +88,7 @@ - (NSUInteger)size
 {
   [self ensureImageLoaded];
   if (image != nil) {
-    return image.size.width * image.size.height;
+    return image.size.width * image.size.height * image.scale * image.scale;
   }
   switch (type) {
   case TiBlobTypeData: {

iphone/cli/hooks/frameworks.js

@@ -260,6 +260,10 @@ class InspectFrameworksTask extends IncrementalFileTask {
 		return [ this._outputDirectory ];
 	}
 
+	get outputDirectory() {
+		return this._outputDirectory;
+	}
+
 	/**
 	 * Sets the output directory where this task will write the framework metadata
 	 *

iphone/cli/hooks/install.js

@@ -200,9 +200,7 @@ exports.init = function (logger, config, cli) {
 							} else if (err.indexOf('0xe800007f') !== -1) {
 								details = __('Try reconnecting your device and try again.');
 							} else if (err.indexOf('0xe8008016') !== -1) {
-								details = __('Chances are there is an issue with your entitlements. Verify the bundle IDs in the generated Info.plist file.');
-							} else if (err.indexOf('0xe8008016') !== -1) {
-								details = __('Your provisioning profile probably has some entitlements that are not enabled in the Entitlements.plist file.');
+								details = __('Chances are there is an issue with your entitlements. Verify the bundle IDs in the generated Info.plist file.; or your provisioning profile probably has some entitlements that are not enabled in the Entitlements.plist file.');
 							} else {
 								details = __('For some reason the app failed to install on the device. Try reconnecting your device and check your provisioning profile and entitlements.');
 							}