[TIMOB-18500] Android: event.cancel not set properly for optionsDialog

[maggieaxway]

Update TiUIDialog.java

JIRA: https://jira.appcelerator.org/browse/TIMOB-18500

To test by clicking every option and button. Click outside dialog or back for cancel.

Test case:

var win = Ti.UI.createWindow({
    backgroundColor: 'white',
    exitOnClose: true,
});

var opts = {
    title: 'Delete File?'
};

var isAndroid = Ti.Platform.osname == 'android';

if(isAndroid){
    opts.options = ['Confirm', 'Cancel'];
    opts.buttonNames = ['Help'];
    //opts.Help = 0;
} else {
    opts.options = ['Confirm', 'Help', 'Cancel'];
}

var dialog;
win.addEventListener('click',function(){
    dialog = Ti.UI.createOptionDialog(opts);
    dialog.show();
    dialog.addEventListener('click', onSelectDialog);
    dialog.addEventListener('cancel', function(event){
        alert("Dialog canceled " + " event.cancel = " + event.cancel+ " event.index = " +event.index);
    })
});

function onSelectDialog(event){
    if(isAndroid){

        if(event.button === false && event.index === 0) {
            console.log(event.index + "fired");
            alert("Confirm option selected event.index= " + event.index);
        }

        if(event.button === false && event.index === 1) {
            console.log(event.index + "fired");
            alert("Cancel option selected event.index= " + event.index);
        }

        if(event.button === true && event.index === 0) {
            console.log(event.index + "fired event.index = " + event.index);
            alert("Help Button clicked event.index= " + event.index);

        }
    }

}

win.open();

[build]

	Fails
🚫	🔬 There are library changes, but no changes to the unit tests. That's OK as long as you're refactoring existing code, but will require an admin to merge this PR. Please see README.md#unit-tests for docs on unit testing.
🚫	Tests have failed, see below for more information.

Tests:

Classname	Name	Time	Error
android.Titanium.Network.HTTPClient	clearCookieUnaffectedCheck	60.061	Error: timeout of 60000ms exceeded

Generated by 🚫 dangerJS

[garymathews]

Could do this to prevent duplicate code:

boolean isCancel = id == cancelIndex;
...
data.put(TiC.PROPERTY_CANCEL, isCancel);
if (isCancel) {
    fireEvent(TiC.EVENT_CANCEL, data);
} else {
    fireEvent(TiC.EVENT_CLICK, data);
}

[garymathews]

Also, remember to put the ticket number in the title of the PR and the commit message. 👍

[hansemannn]

Changed fix-version from 6.3.0 to 7.0.0. Please do a backport to 6_3_X once this PR is approved and label that with 6.3.0, so we have all versions aligned. Thanks!

[lokeshchdhry]

FR Passed.

Right event.index is returned for every option.

Studio Ver: 4.10.0.201709271713
SDK Ver: 7.0.0 local build
OS Ver: 10.12.3
Xcode Ver: Xcode 8.3.3
Appc NPM: 4.2.10
Appc CLI: 6.3.0
Ti CLI Ver: 5.0.14
Alloy Ver: 1.10.7
Node Ver: 7.10.1
Java Ver: 1.8.0_101
Devices: ⇨ google Nexus 6P --- Android 8.0.0
⇨ google Nexus 5 --- Android 6.0.1

[lokeshchdhry]

@maggieaxway , can you please take a look at the unit test failures so that merge can be enabled.

[mukherjee2]

@lokeshchdhry @eric34 , I'm closing tickets, and noticed that there's no CR approval for this PR.

[mukherjee2]

@garymathews would you be able to do a CR?