FCL/sf/mw/btservices: comparison bluetoothengine/btnotif/btnotifsrv/src/btnotifdeviceselector.cpp

equal deleted inserted replaced

-:4545c04e61e1
+:bcf742120177
 #include "btnotifdeviceselector.h"
 #include "btnotifserver.h"
 #include "btnotificationmanager.h"
 #include "btnotifclientserver.h"
 // Key description length
 const TInt KMaxKeyDesCLength  = 20;
+const TInt KLastUsedDevices = 5;
 // ======== MEMBER FUNCTIONS ========
 // ---------------------------------------------------------------------------
 // C++ default constructor
 iNotification = NULL;
 }
 iDevices.ResetAndDestroy();
 iDevices.Close();
 delete iDiscoverer;
 }
 // ---------------------------------------------------------------------------
 // Process a client message related to notifiers.
 // ---------------------------------------------------------------------------
 iLoadDevices = EFalse;
 if(iServer.DevRepository().IsInitialized())
 {
 iLoadDevices = ETrue;
+iDevices.ResetAndDestroy();
 if(iServer.DevRepository().AllDevices().Count()==0)
 {
 PrepareNotificationL(TBluetoothDialogParams::EDeviceSearch, ENoResource);
-iDevices.ResetAndDestroy();
 iDiscoverer->DiscoverDeviceL();
 }
 else
 {
-iDevices.ResetAndDestroy();
 PrepareNotificationL(TBluetoothDialogParams::EMoreDevice, ENoResource);
 LoadUsedDevicesL();
 }
 }
 iMessage = aMessage;
 TInt val = *(static_cast<TInt*>(aData.Get(_L("selectedindex"))->Data()));
 BOstrace1( TRACE_DEBUG, TNAME_DEVLIST_2, "MBRDataReceived, val %d", val );
 if ( !iMessage.IsNull() )
 {
-// TInt sel = val;// - TBluetoothDialogParams::EDialogExt;
 TBTDeviceResponseParamsPckg devParams;
 if (  val > -1 && val < iDevices.Count() )
 {
 TRAP(err,SendSelectedDeviceL(aData));
-/*   devParams().SetDeviceAddress( iDevices[val]->Addr() );
-devParams().SetDeviceClass(iDevices[val]->Device().DeviceClass());
-devParams().SetDeviceName(iDevices[val]->Alias());
-err = iMessage.Write( EBTNotifSrvReplySlot, devParams );*/
 iNotification->RemoveObserver();
 iNotification->Close(); // Also dequeues the notification from the queue.
 iNotification = NULL;
 }
 iMessage.Complete( err );
 // ---------------------------------------------------------------------------
 //
 void CBTNotifDeviceSelector::HandleNextDiscoveryResultL(
 const TInquirySockAddr& aAddr, const TDesC& aName )
 {
-// Todo: look for this device in repository before creating it.
-TBuf<KBTDevAddrSize * 2> addr;
 CBtDevExtension* devext = GetDeviceFromRepositoryL(aAddr.BTAddr());
 if(!devext)
 {
 devext = CBtDevExtension::NewLC( aAddr, aName );
 if(iNotification)
 {// conditional check required as CAdvanceDevDiscoverer sends discovered devices at times
 // even after canceldiscovery is issued and notification is set to NULL
 // this causes EExcDataAbort
-CHbSymbianVariantMap* map = iNotification->Data();
+LoadDeviceDetailsL(*devext);
-/*    TBuf<KMaxKeyDesCLength> keyStr;
-CHbSymbianVariant* devEntry;
-keyStr.Num( TBluetoothDialogParams::EDialogExt + iDevices.Count() - 1 );
-devEntry = CHbSymbianVariant::NewL( (TAny*) &(devext->Alias()),
-CHbSymbianVariant::EDes );
-map->Add( keyStr, devEntry );*/
-User::LeaveIfError(iNotification->SetData(TBluetoothDeviceDialog::EDeviceName,
-devext->Alias()));
-devext->Addr().GetReadable(addr);
-User::LeaveIfError(iNotification->SetData(TBluetoothDialogParams::EAddress,addr));
-TInt classOfDevice;
-classOfDevice =  devext->Device().DeviceClass().DeviceClass();
-User::LeaveIfError(iNotification->SetData(TBluetoothDeviceDialog::EDeviceClass,classOfDevice));
-TBool status;
-status = isBonded( devext->Device());
-//   setMajorProperty(majorProperty, _L("Bonded"), isBonded( devArray[i]->Device() ));
-AddDataL(map,_L("Bonded"),&status,CHbSymbianVariant::EBool);
-status = devext->Device().GlobalSecurity().Banned();
-AddDataL(map,_L("Blocked"),&status,
-CHbSymbianVariant::EBool);
-status = devext->Device().GlobalSecurity().NoAuthorise();
-AddDataL(map,_L("Trusted"),&status,
-CHbSymbianVariant::EBool);
-status = devext->ServiceConnectionStatus() == EBTEngConnected;
-AddDataL(map,_L("Connected"),&status,
-CHbSymbianVariant::EBool);
-iNotification->Update();
 }
 }
 // ---------------------------------------------------------------------------
 // HandleDiscoveryCompleted
 iRepositoryInitialized = ETrue;
 TInt err(KErrNone);
 if(!iLoadDevices)
 {
 iLoadDevices = ETrue;
+iDevices.ResetAndDestroy();
 if(iServer.DevRepository().AllDevices().Count()==0)
 {
-iDevices.ResetAndDestroy();
 TRAP(err, {
 PrepareNotificationL(TBluetoothDialogParams::EDeviceSearch, ENoResource);
 iDiscoverer->DiscoverDeviceL(); } );
 }
 else
 {
-iDevices.ResetAndDestroy();
 TRAP( err,
 {PrepareNotificationL(
 TBluetoothDialogParams::EMoreDevice, ENoResource);
 LoadUsedDevicesL();
 } );
 }
 void CBTNotifDeviceSelector::LoadUsedDevicesL()
 {
 const RDevExtensionArray& devArray= iServer.DevRepository().AllDevices();
-TBuf<KBTDevAddrSize * 2> addr;
 for(TInt i=0; i< devArray.Count(); i++ )
 {
-const TTime& usedTime = devArray[i]->Device().Used();
+iDevices.AppendL( devArray[i]->CopyL() );
-TTime monthBack;
+}
-monthBack.HomeTime();
+SortUsedDevicesL();
-monthBack -= TTimeIntervalDays(30);
+RemoveUnWantedDevices();
-if(usedTime >= monthBack)
+SendLastUsedDevicesL();
-{
+SendPairedDevicesL();
-iDevices.AppendL( devArray[i]->CopyL() );
-CHbSymbianVariantMap* map = iNotification->Data();
+}
-//           TBuf<KMaxKeyDesCLength> keyStr;
-//           CHbSymbianVariant* devEntry;
+void CBTNotifDeviceSelector::SortUsedDevicesL()
-//          keyStr.Num( TBluetoothDialogParams::EDialogExt + iDevices.Count() - 1 );
+{
-//            devEntry = CHbSymbianVariant::NewL( (TAny*) &(devArray[i]->Alias()),
+TInt count  = iDevices.Count();
-//                  CHbSymbianVariant::EDes );
+for(TInt i=0;i<(count-1);i++)
-//          map->Add( keyStr, devEntry, );
+{
-User::LeaveIfError(iNotification->SetData(TBluetoothDeviceDialog::EDeviceName,
+for(TInt j=0;j<(count-(i+1));j++)
-devArray[i]->Alias()));
+{
-//            AddDataL(map,keyStr,&(devArray[i]->Alias()),CHbSymbianVariant::EDes);
+if(iDevices[j]->Device().Used().Int64() < iDevices[j+1]->Device().Used().Int64())
-devArray[i]->Addr().GetReadable(addr);
+{
-User::LeaveIfError(iNotification->SetData(TBluetoothDialogParams::EAddress,addr));
+CBtDevExtension* devextension = iDevices[j+1];
-addr.Zero();
+iDevices.Remove(j+1);
-TInt classOfDevice;
+iDevices.InsertL(devextension,j);
-classOfDevice =  devArray[i]->Device().DeviceClass().DeviceClass();
+}
-User::LeaveIfError(iNotification->SetData(TBluetoothDeviceDialog::EDeviceClass,classOfDevice));
+}
+}
-TBool status;
+}
-status = isBonded( devArray[i]->Device());
-//   setMajorProperty(majorProperty, _L("Bonded"), isBonded( devArray[i]->Device() ));
+void CBTNotifDeviceSelector::RemoveUnWantedDevices()
-AddDataL(map,_L("Bonded"),&status,CHbSymbianVariant::EBool);
+{
-status = devArray[i]->Device().GlobalSecurity().Banned();
+for(TInt i=(iDevices.Count()-1);i>-1;i--)
-AddDataL(map,_L("Blocked"),&status,
+{
-CHbSymbianVariant::EBool);
+TInt classOfDevice = iDevices[i]->Device().DeviceClass().DeviceClass();
-status = devArray[i]->Device().GlobalSecurity().NoAuthorise();
+TBTDeviceClass codClass = TBTDeviceClass( classOfDevice );
-AddDataL(map,_L("Trusted"),&status,
+TUint8 majorDevCls = codClass.MajorDeviceClass();
-CHbSymbianVariant::EBool);
+if((majorDevCls ==EMajorDeviceComputer)|| (majorDevCls ==EMajorDevicePhone))
-status = devArray[i]->ServiceConnectionStatus() == EBTEngConnected;
+{
-AddDataL(map,_L("Connected"),&status,
+}
-CHbSymbianVariant::EBool);
+else
-// set blocked status:
+{
-/*             setMajorProperty(majorProperty, BtuiDevProperty::Blocked,
+CBtDevExtension* devextension = iDevices[i];
-devArray[i]->Device().GlobalSecurity().Banned() );
+iDevices.Remove(i);
-// set trusted status:
+delete devextension;
-setMajorProperty(majorProperty, BtuiDevProperty::Trusted,
+devextension = NULL;
-devArray[i]->Device().GlobalSecurity().NoAuthorise() );
+iDevices.Compress();
-// set connected status:
+}
-// EBTEngConnecting is an intermediate state between connected and not-connected,
+}
-// we do not treat it as connected:
+}
-setMajorProperty(majorProperty, BtuiDevProperty::Connected, devArray[i]->ServiceConnectionStatus() == EBTEngConnected);
+void CBTNotifDeviceSelector::SendLastUsedDevicesL()
-*/
+{
+TInt Count = iDevices.Count();
-//           AddDataL(map,keyStr,&(devArray[i]->Alias()),CHbSymbianVariant::EDes);
+if(Count > KLastUsedDevices)
-iNotification->Update();
+Count = KLastUsedDevices;
-}
+for(TInt i=0;i < Count;i++)
-}
+{
-}
+LoadDeviceDetailsL(*(iDevices[i]));
+}
+}
+void CBTNotifDeviceSelector::SendPairedDevicesL()
+{
+TInt count = iDevices.Count();
+if(count > KLastUsedDevices)
+{
+for(TInt i = KLastUsedDevices; i< count; i++)
+{
+if(isBonded( iDevices[i]->Device()))
+{
+LoadDeviceDetailsL(*(iDevices[i]));
+}
+}
+}
+}
+void CBTNotifDeviceSelector::LoadDeviceDetailsL(const CBtDevExtension& aDevice)
+{
+TBuf<KBTDevAddrSize * 2> addr;
+TUint32 classOfDevice;
+TBool status;
+//TODO Need to create string constants Also try Enum value for device name rather
+//than hadrdcoded string for key. It was not working previously
+CHbSymbianVariantMap* map = iNotification->CreateNotificationDataL();
+AddDataL(map,_L("Name"),(TAny*) &(aDevice.Alias()),CHbSymbianVariant::EDes);
+aDevice.Addr().GetReadable(addr);
+User::LeaveIfError(iNotification->SetData(TBluetoothDeviceDialog::EAddress,addr));
+classOfDevice =  aDevice.Device().DeviceClass().DeviceClass();
+User::LeaveIfError(iNotification->SetData(TBluetoothDeviceDialog::EDeviceClass,classOfDevice));
+status = isBonded( aDevice.Device());
+AddDataL(map,_L("Bonded"),&status,CHbSymbianVariant::EBool);
+status = aDevice.Device().GlobalSecurity().Banned();
+AddDataL(map,_L("Blocked"),&status,CHbSymbianVariant::EBool);
+status = aDevice.Device().GlobalSecurity().NoAuthorise();
+AddDataL(map,_L("Trusted"),&status,CHbSymbianVariant::EBool);
+status = aDevice.ServiceConnectionStatus() == EBTEngConnected;
+AddDataL(map,_L("Connected"),&status,CHbSymbianVariant::EBool);
+iNotification->Update();
+}
 /*!
 Tells if the given device is bonded.
 */
-TBool CBTNotifDeviceSelector::isBonded( const CBTDevice &dev )
+TBool CBTNotifDeviceSelector::isBonded( const CBTDevice &dev ) const
 {
 // todo: this has not addresses Just Works pairing mode yet.
 return dev.IsValidPaired() && dev.IsPaired() &&
 dev.LinkKeyType() != ELinkKeyUnauthenticatedUpgradable;
 }
 if(pos > -1)
 {
 return devArray[pos]->CopyL();
 }
 return NULL;
-/*    addrSymbianToReadbleString( addrStr, addr );
-for (int i = 0; i < mData.count(); ++i ) {
-if ( mData.at( i ).value( BtDeviceModel::ReadableBdaddrRole )
-== addrStr ) {
-return i;
-}
-}
-return -1;*/
 }
 void CBTNotifDeviceSelector::SendSelectedDeviceL( CHbSymbianVariantMap& aData )
 {
-TInt err;
 TBTDeviceResponseParamsPckg devParams;
 TBTDevAddr address;
 User::LeaveIfError(address.SetReadable(
 *(static_cast<TDesC*>(aData.Get(_L("deviceaddress"))->Data()))));
 devParams().SetDeviceAddress( address );

changeset 63	bcf742120177
parent 52	4545c04e61e1