--- a/localconnectivityservice/obexreceiveservices/opp/src/oppcontroller.cpp	Mon Jan 18 21:03:15 2010 +0200
+++ b/localconnectivityservice/obexreceiveservices/opp/src/oppcontroller.cpp	Fri Apr 23 23:16:31 2010 +0300
@@ -155,7 +155,6 @@
 
     iFile = RFile();
     iFullPathFilename.Zero();
-    iMsvIdArray.Reset();  
 	}
 
 // ---------------------------------------------------------
@@ -205,7 +204,11 @@
 void COPPController::TransportDownIndication()
     {
     TRACE_FUNC
-    TRAP_IGNORE(ShowFileReceivedQueryL());
+    // Remove receiving buffer and files used during file receiving.
+    //
+    delete iObexObject;
+    iObexObject = NULL;
+    TRAP_IGNORE(TObexUtilsMessageHandler::RemoveTemporaryRFileL (iFullPathFilename)); 
     iFs.Close();
     }
 
@@ -516,7 +519,7 @@
 	TRACE_ASSERT( iMediaType!=ESrcsMediaIrDA, KErrNotSupported);
 	if ( retVal == KErrNone)
 	    {
-	    TRAP (retVal, TObexUtilsMessageHandler::AddEntryToInboxL(iMsvIdParent, iFullPathFilename, &iMsvIdArray));		    
+	    TRAP (retVal, TObexUtilsMessageHandler::AddEntryToInboxL(iMsvIdParent, iFullPathFilename));		    
                 
     if( retVal != KErrNone )
         {
@@ -769,55 +772,6 @@
     }
 
  // ---------------------------------------------------------
- // ShowFileReceivedQuery()
- // ---------------------------------------------------------
- // 
- void COPPController::ShowFileReceivedQueryL()
-     {
-     // Remove receiving buffer and files used during file receiving.
-     //
-    delete iObexObject;
-    iObexObject = 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 first' and 3 = 'Largest first'
-        
-         if ( answer && fileCount == 1 )  // User accepts the query
-            {
-            TRAPD( error, TObexUtilsUiLayer::LaunchEditorApplicationL(iMsvIdArray[0]));
-            if ( error != KErrNone )  // File is not supported
-                {
-                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()
   // ---------------------------------------------------------
   //