diff -r 3b7506f63335 -r f3d2589f22d6 mmappcomponents/collectionhelper/src/mpxdeletehelper.cpp --- a/mmappcomponents/collectionhelper/src/mpxdeletehelper.cpp Wed Jun 16 16:05:08 2010 +0100 +++ b/mmappcomponents/collectionhelper/src/mpxdeletehelper.cpp Thu Jul 22 16:38:21 2010 +0100 @@ -43,8 +43,7 @@ #include #endif //RD_MPX_TNM_INTEGRATION // cenrep key need to be checked whether USB cable is connected in MTP/Combined Mode -#include -#include +#include #include #include "mpxcollectionuihelperobserver.h" #include "mpxcollectionhelpercommon.h" @@ -310,32 +309,16 @@ { MPX_DEBUG3("CMPXDeleteHelper::RunL. [iMoreToDo %d] [iStatus %d]", iMoreToDo, iStatus.Int()); - // cenrep key need to be checked whether USB cable is connected in MTP/Combined Mode - TUsbDeviceState deviceState = EUsbDeviceStateConfigured; - if ( !iUsbManConnected ) - { - ConnectUsbMan(); - } - - if ( iUsbManConnected ) + TInt mtpStatus = EMtpPSStatusUninitialized; + RProperty::Get( KMtpPSUid, KMtpPSStatus, mtpStatus); + + MPX_DEBUG2("CMPXCollectionViewHgImp::ConstructL, mtpstatus = %d", mtpStatus); + + if (mtpStatus != EMtpPSStatusUninitialized) { - if ( iUsbMan.GetDeviceState( deviceState ) != KErrNone ) - { - deviceState = EUsbDeviceStateConfigured; - } - } - - if ( deviceState == EUsbDeviceStateAddress || - deviceState == EUsbDeviceStateConfigured ) - { - TInt usbStatus; - RProperty::Get(KPSUidUsbWatcher, KUsbWatcherSelectedPersonality, usbStatus); - if ((usbStatus == KUsbPersonalityIdMTP) || (usbStatus == KUsbPersonalityIdPCSuiteMTP)) - { - MPX_DEBUG1("USB is active, Stop Delete"); - CompleteDelete( KErrLocked ); - return; - } + MPX_DEBUG1("MTP is active, Stop Delete"); + CompleteDelete( KErrLocked ); + return; } if (iMoreToDo && iStatus.Int() == KErrNone)