FCL/sf/mw/btservices: comparison bluetoothengine/btnotif/btdevicedialogplugin/src/btdevicedialogquerywidget.cpp

equal deleted inserted replaced

-:4545c04e61e1
+:bcf742120177
 #include <bluetoothdevicedialogs.h>
 #include <hbaction.h>
 #include <hbdialog.h>
 #include <hblabel.h>
 #include "btdevicedialogpluginerrors.h"
+#include <Bluetooth\hci\hcitypes.h>
+const int MaxPasskeyLength = 6;
 /*!
 class Constructor
 */
 BtDeviceDialogQueryWidget::BtDeviceDialogQueryWidget(
 connect(mMessageBox, SIGNAL(finished(HbAction*)), this, SLOT(messageBoxClosed(HbAction*)));
 TRACE_EXIT
 return true;
 }
+/*!
+Take parameter values and generate the input status string
+*/
+QString& BtDeviceDialogQueryWidget::GetPasskeyEntryStatusString(int aStatus)
+{
+switch(aStatus)
+{
+case EPasskeyDigitEntered :
+mDispPassKeyNumDigit ++; // keep count of remote entry
+if(mDisplayPasskeyStatus.length()< MaxPasskeyLength + 1) // + 1 space
+{
+if(mDisplayPasskeyStatus.length()== 3)
+{
+mDisplayPasskeyStatus.append(tr(" ")); // cosmetic
+}
+mDisplayPasskeyStatus.append(tr("*"));
+}
+break;
+case EPasskeyDigitDeleted :
+// passkey entry is limited to 6 digits
+if((mDisplayPasskeyStatus.length()> 0 )&& (mDispPassKeyNumDigit < MaxPasskeyLength + 1))
+{
+if(mDisplayPasskeyStatus.length() == 5) // cosmetic
+{
+mDisplayPasskeyStatus = mDisplayPasskeyStatus.left(mDisplayPasskeyStatus.length()-1);
+}
+mDisplayPasskeyStatus = mDisplayPasskeyStatus.left(mDisplayPasskeyStatus.length()-1);
+// we only decrement if the string is not zero
+mDispPassKeyNumDigit --;
+}
+break;
+case EPasskeyCleared :
+case EPasskeyEntryStarted :
+case EPasskeyEntryCompleted :
+default:
+mDispPassKeyNumDigit = 0;
+mDisplayPasskeyStatus.clear();
+mDisplayPasskeyStatus.append(tr(""));
+break;
+}
+return mDisplayPasskeyStatus;
+}
 /*!
 Take parameter values and generate relevant property of this widget
 */
 void BtDeviceDialogQueryWidget::processParam(const QVariantMap &parameters)
 {
 TRACE_ENTRY
 QString keyStr, prompt,title;
-QVariant name,param,addval;
+int status = -1;
+QVariant name,param,addval,passkeyinputstatus;
 keyStr.setNum( TBluetoothDialogParams::EResource );
 // Validate if the resource item exists.
 QVariantMap::const_iterator i = parameters.constFind( keyStr );
 // item of ResourceId is not found, can't continue.
 if ( i == parameters.constEnd() ) {
 mLastError = UnknownDeviceDialogError;
 return;
 }
+// For passkey display the dialog may be terminated by
+// a passkey entry completed event from the remote side
+mSendPasskeyEntryCompletedAction = false;
 param = parameters.value( keyStr );
 int key = param.toInt();
 switch ( key ) {
 case ENumericComparison:
 prompt = QString( hbTrId( "txt_bt_info_does_this_code_match_the_code_on_1" ) );
 {
 addval = parameters.value( QString::number( TBluetoothDeviceDialog::EAdditionalDesc ) );
 // todo: Formating the prompt need to be discussed with UI designer
 // The passcode could be displayed on a separate row if it the label did support
 // the use of newline escape character.
-prompt.append(tr("\n\n")); // insert 2 newlines for clarity
+prompt.append(tr("\n")); // insert 1 newlines for clarity
 prompt.append(addval.toString());
 if(key == EPasskeyDisplay)
 {
 prompt.append("\n");
+bool ret = false;
+passkeyinputstatus = parameters.value( QString::number( TBluetoothDeviceDialog::EAdditionalInt ));
+status = passkeyinputstatus.toInt(&ret);
+if(ret)
+{
+prompt.append(GetPasskeyEntryStatusString(status));
+}
 }
 }
 }
 // set property value to this dialog widget
 if(key != EPairingFailureRetry && key != EPairingFailureOk)
 {
 title = QString(hbTrId("txt_bt_title_pairing_with_1"));
 title = title.arg(name.toString());
 mMessageBox->setHeadingWidget(new HbLabel(title));
 mMessageBox->setIconVisible(false);
-mMessageBox->setStandardButtons( HbMessageBox::Yes | HbMessageBox::No);
+if(key == EPasskeyDisplay)
+{
+mMessageBox->setStandardButtons(HbMessageBox::Cancel);
+}
+else
+{
+mMessageBox->setStandardButtons( HbMessageBox::Yes | HbMessageBox::No);
+}
 }
 else
 {
 if(key == EPairingFailureRetry)
 {
 {
 mMessageBox->setStandardButtons( HbMessageBox::Ok);
 }
 }
 mMessageBox->setText( prompt );
+if(status == EPasskeyEntryCompleted && key == EPasskeyDisplay)
+{
+mSendPasskeyEntryCompletedAction = true;
+mMessageBox->close();
+}
 TRACE_EXIT
 }
 /*!
 Reset properties to default values
 // set to default values
 mMessageBox->setModal(true);
 mMessageBox->setTimeout(HbDialog::NoTimeout);
 mMessageBox->setDismissPolicy(HbDialog::NoDismiss);
 mSendAction = true;
+mDispPassKeyNumDigit = 0;
 TRACE_EXIT
 return;
 }
 void BtDeviceDialogQueryWidget::messageBoxClosed(HbAction* action)
 {
+TRACE_ENTRY
 QVariantMap data;
 HbMessageBox *dlg=static_cast<HbMessageBox*>(sender());
-if(dlg->actions().first() == action) {
+if(dlg->actions().first() == action)
-//Yes
+{
-data.insert( QString( "result" ), QVariant(true));
+if(dlg->actions().count() > 1)
-}
+{
-else if(dlg->actions().at(1) == action) {
+data.insert( QString( "result" ), QVariant(true));
+}
+else
+{
+// this is a passkey display dialog with a cancel button
+data.insert( QString( "result" ), QVariant(false));
+}
+}
+else if(dlg->actions().count() > 1)
+{
+if(dlg->actions().at(1) == action) {
 //No
 data.insert( QString( "result" ), QVariant(false));
 }
+}
+if(mSendPasskeyEntryCompletedAction)
+{
+// complete successfully the dialog
+// The BT stack will determine if pairing was ok
+data.insert( QString( "result" ), QVariant(true));
+mSendPasskeyEntryCompletedAction = false;
+}
 emit deviceDialogData(data);
 emit deviceDialogClosed();
 mSendAction = false;
-}
+TRACE_EXIT
+}

changeset 63	bcf742120177
parent 52	4545c04e61e1
child 70	f5508c13dfe0