diff -r c3e98f10fcf4 -r 388a17646e40 localconnectivityservice/obexreceiveservices/bip/src/BIPController.cpp --- a/localconnectivityservice/obexreceiveservices/bip/src/BIPController.cpp Mon Jan 18 21:03:15 2010 +0200 +++ b/localconnectivityservice/obexreceiveservices/bip/src/BIPController.cpp Tue Feb 02 00:45:58 2010 +0200 @@ -191,7 +191,6 @@ iFile = RFile(); iFullPathFilename.Zero(); iCapabilityFileName.Zero(); - iMsvIdArray.Reset(); } // --------------------------------------------------------- @@ -236,7 +235,11 @@ void CBIPController::TransportDownIndication() { TRACE_FUNC - TRAP_IGNORE(ShowFileReceivedQueryL()); + // Remove receiving buffer and files used during file receiving. + // + delete iBTObject; + iBTObject = NULL; + TRAP_IGNORE(TObexUtilsMessageHandler::RemoveTemporaryRFileL (iFullPathFilename)); iFs.Close(); } @@ -566,7 +569,7 @@ iRemoteDeviceName)); if ( retVal == KErrNone) { - TRAP (retVal, TObexUtilsMessageHandler::AddEntryToInboxL(iMsvIdParent, iFullPathFilename, &iMsvIdArray)); + TRAP (retVal, TObexUtilsMessageHandler::AddEntryToInboxL(iMsvIdParent, iFullPathFilename)); } @@ -808,55 +811,6 @@ } // --------------------------------------------------------- - // ShowFileReceivedQuery() - // --------------------------------------------------------- - // - void CBIPController::ShowFileReceivedQueryL() - { - // Remove receiving buffer and files used during file receiving. - // - delete iBTObject; - iBTObject = NULL; - TObexUtilsMessageHandler::RemoveTemporaryRFileL (iFullPathFilename); - - TInt fileCount = iMsvIdArray.Count(); - if ( fileCount ) - { - TBool answer = EFalse; - TInt resourceID = R_BT_SAVED_SINGLE; - if( fileCount > 1) - { - resourceID = R_BT_SAVED_MULTIPLE; - } - answer = TObexUtilsUiLayer::ShowGlobalFileOpenConfirmationQueryL(resourceID, iDefaultFolder); - - TInt sortMethod = 2; // 0 = by name 1 = by type 2 = most recent file and 3 = largest file - - if ( answer && fileCount == 1 ) // User accepts the query - { - TRAPD( error, TObexUtilsUiLayer::LaunchEditorApplicationL(iMsvIdArray[0])); - if ( error != KErrNone ) // file is unsupported - { - TObexUtilsUiLayer::LaunchFileManagerL(iFullPathFilename, - sortMethod, - EFalse); // EFalse -> start file manager in standalone mode - } - } - - if ( answer && fileCount > 1 ) - { - // we open the file manager at default folder - // - TObexUtilsUiLayer::LaunchFileManagerL(iFullPathFilename, - sortMethod, - EFalse); // EFalse -> start file manager in standalone mode - } - iMsvIdArray.Reset(); - } - } - - - // --------------------------------------------------------- // GetDriveWithMaximumFreeSpace() // --------------------------------------------------------- //