# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1268984558 -7200 # Node ID 0feebc79960666c504d2da84818c77f52bd2a667 # Parent 388a17646e40b0250988ad0b90e4f6dd018aa869 Revision: 201007 Kit: 201011 diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/dun/atext/src/DunAtCmdHandler.cpp --- a/localconnectivityservice/dun/atext/src/DunAtCmdHandler.cpp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/dun/atext/src/DunAtCmdHandler.cpp Fri Mar 19 09:42:38 2010 +0200 @@ -488,17 +488,17 @@ } if ( iVerboseOn ) { - _LIT8( KVerboseError, "OK" ); + _LIT8( KVerboseOk, "OK" ); iOkBuffer.Append( iCarriageReturn ); iOkBuffer.Append( iLineFeed ); - iOkBuffer.Append( KVerboseError ); + iOkBuffer.Append( KVerboseOk ); iOkBuffer.Append( iCarriageReturn ); iOkBuffer.Append( iLineFeed ); } else { - _LIT8( KNumericError, "4" ); - iOkBuffer.Append( KNumericError ); + _LIT8( KNumericOk, "0" ); + iOkBuffer.Append( KNumericOk ); iOkBuffer.Append( iCarriageReturn ); } FTRACE(FPrint( _L("CDunAtCmdHandler::RegenerateOkReply() complete") )); @@ -1467,11 +1467,13 @@ if ( aMode & KModeVerbose ) // verbose mode ON { iAtCmdExt.ReportVerboseModeChange( ETrue ); + iVerboseOn = ETrue; FTRACE(FPrint( _L("CDunAtCmdHandler::NotifyVerboseStatusChange() verbose mode changed ON" ) )); } else // verbose mode OFF { iAtCmdExt.ReportVerboseModeChange( EFalse ); + iVerboseOn = EFalse; FTRACE(FPrint( _L("CDunAtCmdHandler::NotifyVerboseStatusChange() verbose mode changed OFF" ) )); } FTRACE(FPrint( _L("CDunAtCmdHandler::ManageVerboseModeChange() (change) complete" ) )); diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/dun/atext/src/DunAtCmdPusher.cpp --- a/localconnectivityservice/dun/atext/src/DunAtCmdPusher.cpp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/dun/atext/src/DunAtCmdPusher.cpp Fri Mar 19 09:42:38 2010 +0200 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -286,10 +286,15 @@ void CDunAtCmdPusher::SendReplyData( TBool aRecvBuffer ) { FTRACE(FPrint( _L("CDunAtCmdPusher::SendReplyData()") )); - TDesC8* sendBuffer = &iRecvBuffer; - if ( !aRecvBuffer ) + TDesC8* sendBuffer = iOkBuffer; + if ( aRecvBuffer ) { - sendBuffer = iOkBuffer; + sendBuffer = &iRecvBuffer; + // Check if last block of long push and remove "OK" if exists + if ( iReplyType==EReplyTypeOther && iReplyBytesLeft==0 ) + { + CheckAndRemoveOkString(); + } } FTRACE(FPrint( _L("CDunAtCmdPusher::SendReplyData() send reply:") )); FTRACE(FPrintRaw(*sendBuffer) ); @@ -310,7 +315,6 @@ { FTRACE(FPrint( _L("CDunAtCmdPusher::ManageReplyTypeChange() EReplyTypeOther") )); iNoErrorReceived = ETrue; - CheckAndRemoveOkString(); SendReplyData(); } break; diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/generichid/tsrc/GenericHidTest/conf/GenericHidTest.cfg --- a/localconnectivityservice/generichid/tsrc/GenericHidTest/conf/GenericHidTest.cfg Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/generichid/tsrc/GenericHidTest/conf/GenericHidTest.cfg Fri Mar 19 09:42:38 2010 +0200 @@ -150,7 +150,7 @@ tester ExecuteBranchTestBlock DataIn BRANCH c:\data\others\play.hid tester ExecuteBranchTestBlock Wait BRANCH 20 tester ExecuteBranchTestBlock AddAlarm BRANCH 1000 -tester ExecuteBranchTestBlock Wait BRANCH 80 +tester ExecuteBranchTestBlock Wait BRANCH 70 tester ExecuteBranchTestBlock DataIn BRANCH c:\data\others\hook.hid tester ExecuteBranchTestBlock Wait BRANCH 20 tester ExecuteBranchTestBlock DataIn BRANCH c:\data\others\stop.hid diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/headset/group/hidheadset.mmp --- a/localconnectivityservice/headset/group/hidheadset.mmp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/headset/group/hidheadset.mmp Fri Mar 19 09:42:38 2010 +0200 @@ -38,7 +38,11 @@ USERINCLUDE ../inc ../hidremconbearer/inc +#ifdef NO101APPDEPFIXES APP_LAYER_SYSTEMINCLUDE +#else //NO101APPDEPFIXES +MW_LAYER_SYSTEMINCLUDE +#endif //NO101APPDEPFIXES SYSTEMINCLUDE ../../../inc LIBRARY euser.lib diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/headset/inc/headset.h --- a/localconnectivityservice/headset/inc/headset.h Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/headset/inc/headset.h Fri Mar 19 09:42:38 2010 +0200 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -317,7 +317,7 @@ * Handle doubleclick timer expiration * */ - void ExpiredDubleClickTimer(); + void ExpiredDoubleClickTimer(); /** * Handle long press timer expiration @@ -450,6 +450,11 @@ RASCliSession iAlarmServerSession; /** + * Incoming call status + */ + TBool iIncomingCallStatus; + + /** * Alarm statusd */ TBool iAlarmStatus; diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/headset/src/headset.cpp --- a/localconnectivityservice/headset/src/headset.cpp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/headset/src/headset.cpp Fri Mar 19 09:42:38 2010 +0200 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -24,7 +24,23 @@ #include #include #include +#ifdef NO101APPDEPFIXES #include +#else //NO101APPDEPFIXES +const TUid KPSUidAlarmExtCntl = { 0x102072D4 }; // reusing an AlarmUI dll UID +const TUint32 KAlarmStopKey = 0x00000001; +enum TAlarmUIStopAlarm + { + EAlarmUIStopAlarmUninitialized = 0, + EAlarmUIStopAlarm + }; +const TUint32 KAlarmSnoozeKey = 0x00000002; +enum TAlarmUISnoozeAlarm + { + EAlarmUISnoozeAlarmUninitialized = 0, + EAlarmUISnoozeAlarm + }; +#endif //NO101APPDEPFIXES #include #include @@ -40,6 +56,7 @@ const TInt KHidUndefinedKeyCode = 0; const TInt KHidNotSetKeyValue = 0; const TInt KDoubleClickTimeout = 900000; // 0,9 seconds +const TInt KDoubleClickTimeoutRing = 500000; // 0,5 seconds const TInt KScanClickTimeout = 500000; // 0,5 seconds const TInt KLongClickTimeout = 3000000; // 3 seconds @@ -734,15 +751,47 @@ switch ( hookStatus ) { case EOnHook: - TRACE_INFO(_L("[HID]\tCHidHeadsetDriver Hook On Pressed")); - iOnHookPressed = ETrue; - break; + if ( !iIncomingCallStatus ) + { + // For the first click, trigger the timer + // single click is handled in ExpiredDoubleClickTimer + if ( iDoubleClicktimer ) + { + delete iDoubleClicktimer; + iDoubleClicktimer = NULL; + } + TRAP_IGNORE( iDoubleClicktimer = CKeyPressTimer::NewL( this, + TTimeIntervalMicroSeconds32( KDoubleClickTimeoutRing ), + EDoubleClickTimer ) ); + if ( iDoubleClicktimer ) + { + iIncomingCallStatus = ETrue; + } + else // If fail to create timer, handle as single click, + // for double click case, the next click will hang off + { + iIncomingCallStatus = EFalse; + iOnHookPressed = ETrue; + } + break; // switch + } + else + { + iIncomingCallStatus = EFalse; + if ( iDoubleClicktimer ) + { + delete iDoubleClicktimer; + iDoubleClicktimer = NULL; + } + // This is the double click case, handle as EOffHook + } + // No break here case EOffHook: TRACE_INFO(_L("[HID]\tCHidHeadsetDriver Hook Off Pressed")); iOffHookPressed = ETrue; break; case ENoHook: - TRACE_INFO(_L("[HID]\tCHidHeadsetDriver Hook None Pressed")); + TRACE_INFO(_L("[HID]\tCHidHeadsetDriver Hook None Pressed")); TRAP_IGNORE( HandleNoneHookPressL() ); break; default: @@ -1030,7 +1079,7 @@ switch ( aTimerType ) { case EDoubleClickTimer: - ExpiredDubleClickTimer(); + ExpiredDoubleClickTimer(); break; case ELongPressTimer: ExpiredLongClickTimer(); @@ -1053,16 +1102,23 @@ } // --------------------------------------------------------------------------- -// ExpiredDubleClickTimer() +// ExpiredDoubleClickTimer() // --------------------------------------------------------------------------- // -void CHidHeadsetDriver::ExpiredDubleClickTimer() +void CHidHeadsetDriver::ExpiredDoubleClickTimer() { TRACE_FUNC_ENTRY if ( iDoubleClicktimer ) { delete iDoubleClicktimer; iDoubleClicktimer = NULL; + + if ( iIncomingCallStatus ) + { + iIncomingCallStatus = EFalse; + iOnHookPressed = ETrue; + ReleaseHookKey(); + } if ( iAlarmStatus ) { RProperty::Set( KPSUidAlarmExtCntl, KAlarmStopKey, diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/lccustomplugin/inc/lccustomplugin.h --- a/localconnectivityservice/lccustomplugin/inc/lccustomplugin.h Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/lccustomplugin/inc/lccustomplugin.h Fri Mar 19 09:42:38 2010 +0200 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -15,7 +15,6 @@ * */ - #ifndef C_LCCUSTOMPLUGIN_H #define C_LCCUSTOMPLUGIN_H @@ -23,6 +22,7 @@ class CLcCustomPlugin; +/** Character types: carriage return, line feed or backspace */ enum TCharacterTypes { ECharTypeCR, // Carriage return @@ -30,12 +30,30 @@ ECharTypeBS // Backspace }; +/** Type of modes (quiet, verbose) */ enum TModeTypes { EModeTypeQuiet, // Quiet mode EModeTypeVerbose // Verbose mode }; +/** Handler types for the four types */ +enum TCmdHandlerType + { + ECmdHandlerTypeUndefined = KErrNotFound, + ECmdHandlerTypeBase = 0x01, // For command "AT+COMMAND" + ECmdHandlerTypeSet = 0x02, // For command "AT+COMMAND=" + ECmdHandlerTypeRead = 0x04, // For command "AT+COMMAND?" + ECmdHandlerTypeTest = 0x08, // For command "AT+COMMAND=?" + }; + +/** Detected commands */ +enum TDetectedCmd + { + EDetectedCmdUndefined, + EDetectedCmdCLAC // For command "AT+CLAC" + }; + /** * Class for common AT command handler interface * @@ -116,8 +134,6 @@ * * @since S60 5.0 * @param aReplyType Type of reply - * @param aDstBuffer Destination buffer; used for the API requiring the - * AT command reply * @param aSrcBuffer Source buffer; used only if aReplyType is EReplyTypeOther * @param aError Completion code. If not KErrNone then other arguments are * ignored and the request is completed to ATEXT with @@ -125,7 +141,6 @@ * @return None */ virtual TInt CreateReplyAndComplete( TATExtensionReplyType aReplyType, - RBuf8& aDstBuffer, const TDesC8& aSrcBuffer=KNullDesC8, TInt aError=KErrNone ) = 0; @@ -142,6 +157,17 @@ TBool aOkReply ) = 0; /** + * Checks if the command is a base, set, read or test type of command + * + * @since TB9.2 + * @param aCmdBase Base part of the command to check + * @param aCmdFull Full command to check + * @return Type of command + */ + virtual TCmdHandlerType CheckCommandType( const TDesC8& aCmdBase, + const TDesC8& aCmdFull ) = 0; + + /** * Returns the array of supported commands * * @since S60 5.0 @@ -347,8 +373,6 @@ * * @since S60 5.0 * @param aReplyType Type of reply - * @param aDstBuffer Destination buffer; used for the API requiring the - * AT command reply * @param aSrcBuffer Source buffer; used only if aReplyType is EReplyTypeOther * @param aError Completion code. If not KErrNone then other arguments are * ignored and the request is completed to ATEXT with @@ -356,7 +380,6 @@ * @return None */ TInt CreateReplyAndComplete( TATExtensionReplyType aReplyType, - RBuf8& aDstBuffer, const TDesC8& aSrcBuffer=KNullDesC8, TInt aError=KErrNone ); @@ -375,6 +398,18 @@ /** * From MLcCustomPlugin. + * Checks if the command is a base, set, read or test type of command + * + * @since S60 5.0 + * @param aCmdBase Base part of the command to check + * @param aCmdFull Full command to check + * @return Type of command + */ + TCmdHandlerType CheckCommandType( const TDesC8& aCmdBase, + const TDesC8& aCmdFull ); + + /** + * From MLcCustomPlugin. * Returns the array of supported commands * * @since S60 5.0 @@ -420,6 +455,18 @@ CLcCustomPluginBase* iHandler; /** + * Buffer for handle command's command + * Not own. + */ + const TDesC8* iHcCmd; + + /** + * Buffer for handle command reply + * Not own. + */ + RBuf8* iHcReply; + + /** * Global reply buffer for the AT command replies */ RBuf8 iReplyBuffer; diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/lccustomplugin/inc/lclistallcmd.h --- a/localconnectivityservice/lccustomplugin/inc/lclistallcmd.h Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/lccustomplugin/inc/lclistallcmd.h Fri Mar 19 09:42:38 2010 +0200 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -11,24 +11,15 @@ * * Contributors: * -* Description: Handles the commands "AT+CLAC?" and "AT+CLAC" +* Description: Handles the commands "AT+CLAC=?" and "AT+CLAC" * */ - #ifndef C_LCLISTALLCMD_H #define C_LCLISTALLCMD_H #include "lccustomplugin.h" -/** Handler types for the two AT commands */ -enum TCmdHandlerType - { - ECmdHandlerTypeUndefined, - ECmdHandlerTypeQuery, // For command "AT+CLAC=?" - ECmdHandlerTypeList // For command "AT+CLAC" - }; - /** * Class for handling commands "AT+CLAC=?" and "AT+CLAC" * @@ -58,6 +49,25 @@ void ConstructL(); /** + * Checks command types + * + * @since TB9.2 + * @param aCmd Command to check + * @return ETrue if command understood, EFalse otherwise + */ + TBool CheckCommand( const TDesC8& aCmd ); + + /** + * Main command handler (leaving version) + * + * @since TB9.2 + * @return ETrue if command understood, EFalse otherwise + */ + TBool HandleCommandL(); + +// from base class MLcCustomPluginBase + + /** * Reports the support status of an AT command. This is a synchronous API. * * @param aCmd The AT command. Its format may vary depending on the @@ -126,6 +136,11 @@ */ TCmdHandlerType iCmdHandlerType; + /** + * Detected command + */ + TDetectedCmd iDetectedCmd; + }; #endif // C_LCLISTALLCMD_H diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/lccustomplugin/src/20021360.rss --- a/localconnectivityservice/lccustomplugin/src/20021360.rss Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/lccustomplugin/src/20021360.rss Fri Mar 19 09:42:38 2010 +0200 @@ -16,6 +16,7 @@ */ +#include #include // Declares info for two implementations @@ -29,7 +30,7 @@ INTERFACE_INFO { // UID of interface that is implemented - interface_uid = 0x2001CBEE; // ATEXT_INTERFACE_DUN_UID + interface_uid = ATEXT_INTERFACE_DUN_UID; implementations = { // Info for BTSAC @@ -38,7 +39,7 @@ implementation_uid = 0x20021375; version_no = 1; display_name = "LC Custom Plugin DUN"; - default_data= "PAT+CLAC"; + default_data= "MAT+CLAC"; opaque_data = ""; } }; @@ -46,7 +47,7 @@ INTERFACE_INFO { // UID of interface that is implemented - interface_uid = 0x2001CBEF; // ATEXT_INTERFACE_HFP_UID + interface_uid = ATEXT_INTERFACE_HFP_UID; implementations = { // Info for BTSAC @@ -55,7 +56,7 @@ implementation_uid = 0x20021376; version_no = 1; display_name = "LC Custom Plugin HFP"; - default_data= "PAT+CLAC"; + default_data= "MAT+CLAC"; opaque_data = ""; } }; diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/lccustomplugin/src/lccustomplugin.cpp --- a/localconnectivityservice/lccustomplugin/src/lccustomplugin.cpp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/lccustomplugin/src/lccustomplugin.cpp Fri Mar 19 09:42:38 2010 +0200 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -15,7 +15,6 @@ * */ - #include "lccustomplugin.h" #include "lclistallcmd.h" #include "debug.h" @@ -53,6 +52,8 @@ CLcCustomPlugin::CLcCustomPlugin() : CATExtPluginBase() { iHandler = NULL; + iHcCmd = NULL; + iHcReply = NULL; } // --------------------------------------------------------------------------- @@ -83,6 +84,8 @@ TBool CLcCustomPlugin::IsCommandSupported( const TDesC8& aCmd ) { TRACE_FUNC_ENTRY + iHcCmd = NULL; + iHcReply = NULL; TInt i; TInt count = iHandlers.Count(); for ( i=0; iHandleCommand( aCmd, aReply, aReplyNeeded ); } TRACE_FUNC_EXIT @@ -201,13 +206,13 @@ // Reports about external handle command error condition. // This is for cases when for example DUN decided the reply contained an // error condition but the plugin is still handling the command internally. -// Example: in command line "AT+TEST;ATDT1234" was given. "AT+TEST" returns -// "OK" and "ATDT" returns "CONNECT". Because "OK" and "CONNECT" are -// different reply types the condition is "ERROR" and DUN ends processing. -// This solution keeps the pointer to the last AT command handling plugin -// inside ATEXT and calls this function there to report the error. -// It is to be noted that HandleCommandCancel() is not sufficient to stop -// the processing as the command handling has already finished. +// Example: "AT+TEST;+TEST2" was given in command line; "AT+TEST" returns +// non-EReplyTypeError condition and "AT+TEST2" returns EReplyTypeError. +// As the plugin(s) returning the non-EReplyTypeError may still have some +// ongoing operation then these plugins are notified about the external +// EReplyTypeError in command line processing. It is to be noted that +// HandleCommandCancel() is not sufficient to stop the processing as the +// command handling has already finished. // --------------------------------------------------------------------------- // void CLcCustomPlugin::ReportExternalHandleCommandError() @@ -252,23 +257,28 @@ // --------------------------------------------------------------------------- // TInt CLcCustomPlugin::CreateReplyAndComplete( TATExtensionReplyType aReplyType, - RBuf8& aDstBuffer, const TDesC8& aSrcBuffer, - TInt aError ) + TInt aError ) { TRACE_FUNC_ENTRY iReplyBuffer.Close(); if ( aError != KErrNone ) { HandleCommandCompleted( aError, EReplyTypeUndefined ); + iHcCmd = NULL; + iHcReply = NULL; TRACE_FUNC_EXIT return KErrNone; } - TInt retVal = KErrNone; + if ( !iHcReply ) + { + TRACE_FUNC_EXIT + return KErrGeneral; + } switch ( aReplyType ) { case EReplyTypeOther: - if ( iQuietMode || !iVerboseMode ) + if ( iQuietMode ) { iReplyBuffer.Create( KNullDesC8 ); } @@ -276,25 +286,23 @@ { iReplyBuffer.Create( aSrcBuffer ); } - CreatePartOfReply( aDstBuffer ); - HandleCommandCompleted( KErrNone, aReplyType ); break; case EReplyTypeOk: CreateOkOrErrorReply( iReplyBuffer, ETrue ); - CreatePartOfReply( aDstBuffer ); - HandleCommandCompleted( KErrNone, aReplyType ); break; case EReplyTypeError: CreateOkOrErrorReply( iReplyBuffer, EFalse ); - CreatePartOfReply( aDstBuffer ); - HandleCommandCompleted( KErrNone, aReplyType ); break; default: - retVal = KErrGeneral; - break; + TRACE_FUNC_EXIT + return KErrGeneral; } + CreatePartOfReply( *iHcReply ); + HandleCommandCompleted( KErrNone, aReplyType ); + iHcCmd = NULL; + iHcReply = NULL; TRACE_FUNC_EXIT - return retVal; + return KErrNone; } // --------------------------------------------------------------------------- @@ -349,6 +357,58 @@ // --------------------------------------------------------------------------- // From MLcCustomPlugin. +// Checks if the command is a base, set, read or test type of command +// --------------------------------------------------------------------------- +// +TCmdHandlerType CLcCustomPlugin::CheckCommandType( + const TDesC8& aCmdBase, + const TDesC8& aCmdFull ) + { + TRACE_FUNC_ENTRY + TInt retTemp = KErrNone; + TBuf8 atCmdBuffer; + atCmdBuffer.Copy( aCmdBase ); + // Check "base" command ("AT+COMMAND") + retTemp = aCmdFull.Compare( atCmdBuffer ); + if ( retTemp == 0 ) + { + TRACE_FUNC_EXIT + return ECmdHandlerTypeBase; + } + // Check "read" command ("AT+COMMAND?") + // Add last question mark + atCmdBuffer.Append( '?' ); + retTemp = aCmdFull.Compare( atCmdBuffer ); + if ( retTemp == 0 ) + { + TRACE_FUNC_EXIT + return ECmdHandlerTypeRead; + } + // Check "test" command ("AT+COMMAND=?") + // Add "=" before the question mark + _LIT8( KAssignmentMark, "=" ); + atCmdBuffer.Insert( atCmdBuffer.Length()-1, KAssignmentMark ); + retTemp = aCmdFull.Compare( atCmdBuffer ); + if ( retTemp == 0 ) + { + TRACE_FUNC_EXIT + return ECmdHandlerTypeTest; + } + // Check "set" command ("AT+COMMAND=") + // Remove last question mark + atCmdBuffer.SetLength( atCmdBuffer.Length() - 1 ); + retTemp = aCmdFull.Compare( atCmdBuffer ); + if ( retTemp == 0 ) + { + TRACE_FUNC_EXIT + return ECmdHandlerTypeSet; + } + TRACE_FUNC_EXIT + return ECmdHandlerTypeUndefined; + } + +// --------------------------------------------------------------------------- +// From MLcCustomPlugin. // Returns the array of supported commands // --------------------------------------------------------------------------- // diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/lccustomplugin/src/lclistallcmd.cpp --- a/localconnectivityservice/lccustomplugin/src/lclistallcmd.cpp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/lccustomplugin/src/lclistallcmd.cpp Fri Mar 19 09:42:38 2010 +0200 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -15,16 +15,14 @@ * */ - #include "lclistallcmd.h" #include "debug.h" -_LIT8( KListAllQueryCmd, "AT+CLAC=?" ); -_LIT8( KListAllCmd, "AT+CLAC" ); - const TInt KCrLfLength = 2; // CR+LF const TInt KOkReplyLength = 6; // CR+LF+"OK"+CR+LF +_LIT8( KClacCmd, "AT+CLAC" ); + // --------------------------------------------------------------------------- // Two-phased constructor. // --------------------------------------------------------------------------- @@ -69,28 +67,42 @@ } // --------------------------------------------------------------------------- +// Checks command types +// --------------------------------------------------------------------------- +// +TBool CLcListAllCmd::CheckCommand( const TDesC8& aCmd ) + { + TRACE_FUNC_ENTRY + // The AT+CLAC command supports two types: base and test + iCmdHandlerType = iCallback->CheckCommandType( KClacCmd, aCmd ); + if ( iCmdHandlerType==ECmdHandlerTypeBase || + iCmdHandlerType==ECmdHandlerTypeTest ) + { + iDetectedCmd = EDetectedCmdCLAC; + TRACE_FUNC_EXIT + return ETrue; + } + TRACE_FUNC_EXIT + return EFalse; + } + +// --------------------------------------------------------------------------- // Reports the support status of an AT command. This is a synchronous API. // --------------------------------------------------------------------------- // TBool CLcListAllCmd::IsCommandSupported( const TDesC8& aCmd ) { TRACE_FUNC_ENTRY - TInt retTemp = KErrNone; - retTemp = aCmd.Compare( KListAllQueryCmd ); - if ( retTemp == 0 ) + // Set all to undefined if either the command or its type is unknown + // HandleCommand() should be round only when both are set + TBool cmdUnderstood = CheckCommand( aCmd ); + if ( cmdUnderstood ) { - iCmdHandlerType = ECmdHandlerTypeQuery; - TRACE_FUNC_EXIT - return ETrue; - } - retTemp = aCmd.Compare( KListAllCmd ); - if ( retTemp == 0 ) - { - iCmdHandlerType = ECmdHandlerTypeList; TRACE_FUNC_EXIT return ETrue; } iCmdHandlerType = ECmdHandlerTypeUndefined; + iDetectedCmd = EDetectedCmdUndefined; TRACE_FUNC_EXIT return EFalse; } @@ -102,7 +114,7 @@ // --------------------------------------------------------------------------- // void CLcListAllCmd::HandleCommand( const TDesC8& /*aCmd*/, - RBuf8& aReply, + RBuf8& /*aReply*/, TBool aReplyNeeded ) { TRACE_FUNC_ENTRY @@ -111,52 +123,45 @@ TRACE_FUNC_EXIT return; } - if ( iCmdHandlerType == ECmdHandlerTypeQuery ) + if ( iCmdHandlerType == ECmdHandlerTypeTest ) { - iCallback->CreateReplyAndComplete( EReplyTypeOk, - aReply ); + iCallback->CreateReplyAndComplete( EReplyTypeOk ); TRACE_FUNC_EXIT return; } - // Else here means ECmdHandlerTypeList + // Else here means ECmdHandlerTypeBase // First check the quiet mode and verbose mode. // These are handled in CreateReplyAndComplete() TInt retTemp; TBool quietMode = EFalse; - TBool verboseMode = EFalse; retTemp = iCallback->GetModeValue( EModeTypeQuiet, quietMode ); - retTemp |= iCallback->GetModeValue( EModeTypeVerbose, verboseMode ); if ( retTemp != KErrNone ) { - iCallback->CreateReplyAndComplete( EReplyTypeError, - aReply ); - TRACE_FUNC_EXIT - return; - } - if ( quietMode || !verboseMode ) - { - iCallback->CreateReplyAndComplete( EReplyTypeOther, - aReply ); + iCallback->CreateReplyAndComplete( EReplyTypeError ); TRACE_FUNC_EXIT return; } RBuf8 reply; + if ( quietMode ) + { + iCallback->CreateReplyAndComplete( EReplyTypeOther, reply ); + reply.Close(); + TRACE_FUNC_EXIT + return; + } TBool error = CreateSupportedList( reply ); if ( error ) { - iCallback->CreateReplyAndComplete( EReplyTypeError, - aReply ); + iCallback->CreateReplyAndComplete( EReplyTypeError ); reply.Close(); TRACE_FUNC_EXIT return; } RBuf8 okReply; iCallback->CreateOkOrErrorReply( okReply, ETrue ); - reply.Append( okReply); + reply.Append( okReply ); okReply.Close(); - iCallback->CreateReplyAndComplete( EReplyTypeOther, - aReply, - reply ); + iCallback->CreateReplyAndComplete( EReplyTypeOther, reply ); reply.Close(); TRACE_FUNC_EXIT } @@ -199,6 +204,7 @@ linearSize += KCrLfLength; } } + linearSize += KCrLfLength; // Now we have the length of the linear region, // use that to create the reply TChar carriageReturn; @@ -223,6 +229,8 @@ aReply.Append( lineFeed ); } } + aReply.Append( carriageReturn ); + aReply.Append( lineFeed ); // Delete the array as it is no longer needed commands.ResetAndDestroy(); commands.Close(); diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/lcstylustap/data/lcstylustaprsc.rss --- a/localconnectivityservice/lcstylustap/data/lcstylustaprsc.rss Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/lcstylustap/data/lcstylustaprsc.rss Fri Mar 19 09:42:38 2010 +0200 @@ -33,6 +33,6 @@ { } RESOURCE TBUF r_lcstylustap_bt_name { buf = qtn_bt_title_bluetooth; } -RESOURCE TBUF r_lcstylustap_usb_name { buf = qtn_usb_title; } +RESOURCE TBUF r_lcstylustap_usb_name { buf = qtn_usb_stylus_tap; } RESOURCE TBUF r_lcstylustap_usb_mem_eject { buf = qtn_usb_mem_eject; } diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/lcstylustap/group/lcstylustap.mmp --- a/localconnectivityservice/lcstylustap/group/lcstylustap.mmp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/lcstylustap/group/lcstylustap.mmp Fri Mar 19 09:42:38 2010 +0200 @@ -67,7 +67,6 @@ LIBRARY cone.lib LIBRARY commonengine.lib LIBRARY efsrv.lib -LIBRARY platformenv.lib LIBRARY flogger.lib diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/lcstylustap/src/lcstylustapdismount.cpp --- a/localconnectivityservice/lcstylustap/src/lcstylustapdismount.cpp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/lcstylustap/src/lcstylustapdismount.cpp Fri Mar 19 09:42:38 2010 +0200 @@ -17,7 +17,6 @@ #include "debug.h" #include "lcstylustapdismount.h" -#include "driveinfo.h" // --------------------------------------------------------------------------- // Destructor. @@ -126,15 +125,17 @@ // void CLcStylusTapDismount::DoDismount() { - TRACE_FUNC - TUint driveStatus( 0 ); - + TRACE_FUNC + TDriveInfo info; + TInt err = KErrNone; for ( ; iDriveIndex < KMaxDrives; iDriveIndex++ ) { if ( iDriveList[iDriveIndex] ) { - DriveInfo::GetDriveStatus( iRFs, iDriveIndex, driveStatus ); - if ( driveStatus & DriveInfo::EDriveUsbMemory ) + err = iRFs.Drive( info , iDriveIndex ); + if ( info.iConnectionBusType == EConnectionBusUsb && + info.iDriveAtt & KDriveAttExternal && + err == KErrNone ) { TRACE_INFO(_L("CLcStylusTapDismount::DoDismount Dismount notify request ")); iRFs.NotifyDismount( iDriveIndex, iStatus, EFsDismountNotifyClients ); diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/lcstylustap/tsrc/LcStylusTapTest/conf/ui_LcStylusTapTest.cfg --- a/localconnectivityservice/lcstylustap/tsrc/LcStylusTapTest/conf/ui_LcStylusTapTest.cfg Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/lcstylustap/tsrc/LcStylusTapTest/conf/ui_LcStylusTapTest.cfg Fri Mar 19 09:42:38 2010 +0200 @@ -2,7 +2,7 @@ * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available -* under the terms of the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/legacymodemplugin/src/proxy.cpp --- a/localconnectivityservice/legacymodemplugin/src/proxy.cpp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/legacymodemplugin/src/proxy.cpp Fri Mar 19 09:42:38 2010 +0200 @@ -16,7 +16,7 @@ */ #include -#include +#include #include "legacymodemplugin.h" // --------------------------------------------------------------------------- diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/modematplugin/inc/atcopscmd.h --- a/localconnectivityservice/modematplugin/inc/atcopscmd.h Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/modematplugin/inc/atcopscmd.h Fri Mar 19 09:42:38 2010 +0200 @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/modematplugin/src/atcopscmd.cpp --- a/localconnectivityservice/modematplugin/src/atcopscmd.cpp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/modematplugin/src/atcopscmd.cpp Fri Mar 19 09:42:38 2010 +0200 @@ -16,7 +16,7 @@ */ -#include +#include #include "atcopscmd.h" #include "cmdpluginobserver.h" #include "debug.h" diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/modematplugin/src/proxy.cpp --- a/localconnectivityservice/modematplugin/src/proxy.cpp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/modematplugin/src/proxy.cpp Fri Mar 19 09:42:38 2010 +0200 @@ -20,7 +20,7 @@ #define REFERENCE_ATEXT_H #include -#include +#include #include "modematplugin.h" // --------------------------------------------------------------------------- diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexreceiveservices/bip/src/BIPController.cpp --- a/localconnectivityservice/obexreceiveservices/bip/src/BIPController.cpp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexreceiveservices/bip/src/BIPController.cpp Fri Mar 19 09:42:38 2010 +0200 @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include // provides interface for quering system paths @@ -45,7 +45,7 @@ _LIT8(KBipCapabilityType, "x-bt/img-capabilities\0"); -const TInt KBufferSize = 0x4000; // 16kB +const TInt KBufferSize = 0x10000; // 64 kB // ================= MEMBER FUNCTIONS ======================= @@ -252,6 +252,17 @@ TRACE_FUNC_ENTRY iLengthHeaderReceived = EFalse; // New put request so clear header based state iBTTransferState = ETransferPut; + + // Checking if backup is running now - if backup process is active, then we + // need to cancel transfer - otherwise phone will freeze during receiving + // data + if ( TObexUtilsUiLayer::IsBackupRunning() ) + { + TRACE_INFO ( _L ("Backup in progress! Canceling incoming transfer.")); + iBTTransferState = ETransferPutInitError; + return NULL; + } + TRAPD(err, HandlePutImageRequestL()); if (err == KErrNone) { diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexreceiveservices/mtmuibluetooth/group/btmtmui.mmp --- a/localconnectivityservice/obexreceiveservices/mtmuibluetooth/group/btmtmui.mmp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexreceiveservices/mtmuibluetooth/group/btmtmui.mmp Fri Mar 19 09:42:38 2010 +0200 @@ -38,7 +38,11 @@ SOURCEPATH ../src USERINCLUDE ../inc SYSTEMINCLUDE ../../../inc ../../../../inc +#ifdef NO101APPDEPFIXES APP_LAYER_SYSTEMINCLUDE +#else //NO101APPDEPFIXES +MW_LAYER_SYSTEMINCLUDE +#endif //NO101APPDEPFIXES SOURCE btmtmuidll.cpp SOURCE btmtmuidata.cpp @@ -48,7 +52,9 @@ LIBRARY euser.lib LIBRARY msgs.lib LIBRARY mtur.lib +#ifdef NO101APPDEPFIXES LIBRARY muiu.lib +#endif //NO101APPDEPFIXES LIBRARY bluetooth.lib LIBRARY btdevice.lib LIBRARY btengdiscovery.lib diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexreceiveservices/mtmuibluetooth/src/btmtmui.cpp --- a/localconnectivityservice/obexreceiveservices/mtmuibluetooth/src/btmtmui.cpp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexreceiveservices/mtmuibluetooth/src/btmtmui.cpp Fri Mar 19 09:42:38 2010 +0200 @@ -22,23 +22,31 @@ #include "btmtmuidebug.h" //#include +#ifdef NO101APPDEPFIXES #include -#include +#endif //NO101APPDEPFIXES + +#ifdef NO101APPDEPFIXES_NEW +#include +#endif //NO101APPDEPFIXES_NEW + #include #include #include -#include +#include #include #include #include // CONSTANTS +#ifdef NO101APPDEPFIXES const TInt KBtMtmUiToFromFieldBuffer = 80; const TInt KBtMtmUiConnectionTimeout = 20000000; const TInt KBtMtmUiConnectionPutTimeout = 0; const TInt KBtMtmUiObexPort = 1; const TInt KBtMtmUiAddressMaxLength = 3; +#endif //NO101APPDEPFIXES // ENUMS enum TBtMtmAsyncCmds @@ -223,8 +231,6 @@ CMsvOperation* CBtMtmUi::EditL( TRequestStatus& aStatus ) { FLOG( _L( "[BtMtmUi] CBtMtmUi: EditL 2 \t" ) ); - TInt resourceId; - TInt retVal=0; switch( iBaseMtm.Entry().Entry().iType.iUid ) { case KUidMsvMessageEntryValue: @@ -235,8 +241,10 @@ // Edit/"use" entries in the Inbox return LaunchEditorApplicationL( aStatus, iBaseMtm.Entry().Session() ); } +#ifdef NO101APPDEPFIXES else { + TInt resourceId; HBufC* password = HBufC::NewL(1); CleanupStack::PushL( password ); // 1st push BaseMtm().LoadMessageL(); @@ -254,7 +262,8 @@ if ( iDiscovery->SearchRemoteDevice( iDevice ) == KErrNone ) - { + { + TInt retVal=0; iWaiter.Start(); if ( iState ==KErrNone) @@ -363,6 +372,7 @@ CleanupStack::PopAndDestroy(3); // waiter, sel, password return reporter; } +#endif //NO101APPDEPFIXES } case KUidMsvServiceEntryValue: case KUidMsvAttachmentEntryValue: @@ -484,8 +494,13 @@ // --------------------------------------------------------- // TInt CBtMtmUi::DisplayProgressSummaryL( const TDesC8& aProgress ) const - { - FLOG( _L( "[CBtMtmUi] CBtMtmUi:DisplayProgressSummaryL\t" ) ); + { + #ifndef NO101APPDEPFIXES_NEW + (void) aProgress; + #endif //NO101APPDEPFIXES_NEW + + #ifdef NO101APPDEPFIXES_NEW + FLOG( _L( "[CBtMtmUi] CBtMtmUi:DisplayProgressSummaryL\t" ) ); TInt resourceId; if( ( !aProgress.Length() ) || ( aProgress.Size() == sizeof( TMsvLocalOperationProgress ) ) ) { @@ -555,6 +570,7 @@ return KErrCancel; } } + #endif //NO101APPDEPFIXES_NEW return KErrNone; } @@ -571,8 +587,19 @@ TInt& aCurrentEntrySize, TInt& aCurrentBytesTrans ) const { - TInt resourceId; - FLOG( _L( "[CBtMtmUi] CBtMtmUi: GetProgress\t" ) ); + #ifndef NO101APPDEPFIXES_NEW + (void) aProgress; + (void) aReturnString; + (void) aTotalEntryCount; + (void) aEntriesDone; + (void) aCurrentEntrySize; + (void) aCurrentBytesTrans; + #endif //NO101APPDEPFIXES_NEW + + #ifdef NO101APPDEPFIXES_NEW + TInt resourceId; + + FLOG( _L( "[CBtMtmUi] CBtMtmUi: GetProgress\t" ) ); TPckgBuf paramPack; paramPack.Copy( aProgress ); TObexMtmProgress& progress = paramPack(); @@ -625,6 +652,7 @@ } } FLOG( _L( "[CBtMtmUi] CBtMtmUi: GetProgress Done\t" ) ); + #endif //NO101APPDEPFIXES_NEW return KErrNone; } diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexreceiveservices/mtmuibluetooth/src/btmtmuidata.cpp --- a/localconnectivityservice/obexreceiveservices/mtmuibluetooth/src/btmtmuidata.cpp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexreceiveservices/mtmuibluetooth/src/btmtmuidata.cpp Fri Mar 19 09:42:38 2010 +0200 @@ -27,7 +27,7 @@ #include //kuidmtmquerymaxbodysizevalue etc #endif #include -#include +#include #include diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexreceiveservices/mtmuiinfrared/data/irmtmui.rss --- a/localconnectivityservice/obexreceiveservices/mtmuiinfrared/data/irmtmui.rss Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexreceiveservices/mtmuiinfrared/data/irmtmui.rss Fri Mar 19 09:42:38 2010 +0200 @@ -70,7 +70,8 @@ RESOURCE MTM_CAPABILITIES { - send_capability = 1; +// send_capability = 1; + send_capability = 0; body_capability = 1; } diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexreceiveservices/mtmuiinfrared/group/irmtmui.mmp --- a/localconnectivityservice/obexreceiveservices/mtmuiinfrared/group/irmtmui.mmp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexreceiveservices/mtmuiinfrared/group/irmtmui.mmp Fri Mar 19 09:42:38 2010 +0200 @@ -38,7 +38,7 @@ SOURCEPATH ../src USERINCLUDE ../inc SYSTEMINCLUDE ../../../inc ../../../../inc -APP_LAYER_SYSTEMINCLUDE +MW_LAYER_SYSTEMINCLUDE SOURCE irmtmui.cpp SOURCE irmtmuidata.cpp @@ -48,7 +48,7 @@ LIBRARY euser.lib LIBRARY msgs.lib LIBRARY mtur.lib -LIBRARY muiu.lib +// LIBRARY muiu.lib // Used for forwarding messages over Infrared LIBRARY featmgr.lib DEBUGLIBRARY flogger.lib diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexreceiveservices/mtmuiinfrared/src/irmtmui.cpp --- a/localconnectivityservice/obexreceiveservices/mtmuiinfrared/src/irmtmui.cpp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexreceiveservices/mtmuiinfrared/src/irmtmui.cpp Fri Mar 19 09:42:38 2010 +0200 @@ -22,12 +22,14 @@ #include "irmtmui.h" #include "debug.h" -#include -#include +#ifdef NO101APPDEPFIXES_NEW +#include +#endif //NO101APPDEPFIXES_NEW + #include #include #include -#include +#include #include #include #include @@ -36,9 +38,6 @@ #include #include -const TInt KIrMtmUiConnectionTimeout = 20000000; -const TInt KIrMtmUiReceiveTimeout = 0; - // ================= MEMBER FUNCTIONS ======================= // C++ default constructor can NOT contain any code, that @@ -216,6 +215,14 @@ { case KUidMsvMessageEntryValue: { + return LaunchEditorApplicationL( aStatus, iBaseMtm.Entry().Session() ); + /* Infrared is not supported anymore. Implementation for sending over Infrared is left for reference: + ( add #include to the included files ) + ( add constants: + const TInt KIrMtmUiConnectionTimeout = 20000000; + const TInt KIrMtmUiReceiveTimeout = 0; ) + code starts here: + if( iBaseMtm.Entry().Entry().Parent() != KMsvDraftEntryId && iBaseMtm.Entry().Entry().Parent() != KMsvGlobalOutBoxIndexEntryId ) { @@ -304,6 +311,9 @@ // ownership of reporter transfered to caller return reporter; } + + End of reference implementation for sending over Infrared: + */ } case KUidMsvServiceEntryValue: case KUidMsvAttachmentEntryValue: @@ -436,6 +446,11 @@ // TInt CIrMtmUi::DisplayProgressSummaryL( const TDesC8& aProgress ) const { + #ifndef NO101APPDEPFIXES_NEW + (void) aProgress; + #endif //NO101APPDEPFIXES_NEW + + #ifdef NO101APPDEPFIXES_NEW FLOG( _L( "[IRU] CIrMtmUi: DisplayProgressSummaryL\t" ) ); TInt resourceId; if( ( !aProgress.Length() ) || @@ -504,6 +519,7 @@ } } FLOG( _L( "[IRU] CIrMtmUi: DisplayProgressSummaryL Done\t" ) ); + #endif //NO101APPDEPFIXES_NEW return KErrNone; } @@ -519,6 +535,16 @@ TInt& aCurrentEntrySize, TInt& aCurrentBytesTrans ) const { + #ifndef NO101APPDEPFIXES_NEW + (void) aProgress; + (void) aReturnString; + (void) aTotalEntryCount; + (void) aEntriesDone; + (void) aCurrentEntrySize; + (void) aCurrentBytesTrans; + #endif //NO101APPDEPFIXES_NEW + + #ifdef NO101APPDEPFIXES_NEW FLOG( _L( "[CIrMtmUi] CIrMtmUi: GetProgress\t" ) ); TPckgBuf paramPack; paramPack.Copy( aProgress ); @@ -565,6 +591,7 @@ } } FLOG( _L( "[CBtMtmUi] CBtMtmUi: GetProgress Done\t" ) ); + #endif //NO101APPDEPFIXES_NEW return KErrNone; } diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexreceiveservices/mtmuiinfrared/src/irmtmuidata.cpp --- a/localconnectivityservice/obexreceiveservices/mtmuiinfrared/src/irmtmuidata.cpp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexreceiveservices/mtmuiinfrared/src/irmtmuidata.cpp Fri Mar 19 09:42:38 2010 +0200 @@ -20,7 +20,7 @@ // INCLUDE FILES #include "irmtmuidata.h" #include "irmtmui.h" -#include +#include #include #include #ifndef SYMBIAN_ENABLE_SPLIT_HEADERS @@ -29,8 +29,7 @@ #include //kuidmtmquerymaxbodysizevalue etc #include //kuidmtmquerymaxbodysizevalue etc #endif -#include -#include +#include #include #include "debug.h" @@ -116,11 +115,18 @@ aResponse = KIrMtmUiDataMsgEditorAppValue; break; } + /* Infrared is not supported anymore. Implementation for sending over Infrared is left for reference: + ( add #include to the included files ) + code starts here: + case KUidMsvMtmQuerySupportLinks: { aResponse = ETrue; break; } + + End of reference implementation for sending over Infrared: + */ case KUidMtmQuerySupportAttachmentsValue: case KUidMtmQueryCanSendMsgValue: { diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexreceiveservices/opp/src/oppcontroller.cpp --- a/localconnectivityservice/obexreceiveservices/opp/src/oppcontroller.cpp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexreceiveservices/opp/src/oppcontroller.cpp Fri Mar 19 09:42:38 2010 +0200 @@ -22,7 +22,7 @@ #include "btengdevman.h" #include #include "debug.h" -#include +#include #include #include #include @@ -37,7 +37,7 @@ // CONSTANTS -const TInt KBufferSize = 0x4000; // 16kB +const TInt KBufferSize = 0x10000; // 64 kB // ================= MEMBER FUNCTIONS ======================= @@ -221,6 +221,17 @@ TRACE_FUNC iLengthHeaderReceived = EFalse; // New put request so clear header based state iObexTransferState = ETransferPut; + + // Checking if backup is running now - if backup process is active, then we + // need to cancel transfer - otherwise phone will freeze during receiving + // data + if ( TObexUtilsUiLayer::IsBackupRunning() ) + { + TRACE_INFO ( _L ("Backup in progress! Canceling incoming transfer.")); + iObexTransferState = ETransferPutInitError; + return NULL; + } + TRAPD(err, HandlePutRequestL()); if(err == KErrNone) { diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexreceiveservices/rom/mtmuiinfrared.iby --- a/localconnectivityservice/obexreceiveservices/rom/mtmuiinfrared.iby Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexreceiveservices/rom/mtmuiinfrared.iby Fri Mar 19 09:42:38 2010 +0200 @@ -18,8 +18,6 @@ #ifndef __MTMUIINFRARED_IBY__ #define __MTMUIINFRARED_IBY__ -#ifdef __IRDA file=ABI_DIR\BUILD_DIR\irmtmui.dll SHARED_LIB_DIR\irmtmui.dll -#endif #endif diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexreceiveservices/rom/mtmuiinfraredResources.iby --- a/localconnectivityservice/obexreceiveservices/rom/mtmuiinfraredResources.iby Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexreceiveservices/rom/mtmuiinfraredResources.iby Fri Mar 19 09:42:38 2010 +0200 @@ -18,10 +18,6 @@ #ifndef __MTMUIINFRAREDRESOURCES_IBY__ #define __MTMUIINFRAREDRESOURCES_IBY__ -#ifdef __IRDA - data=DATAZ_\resource\messaging\mtm\irmtmui.rsc resource\messaging\mtm\irmtmui.rsc #endif - -#endif diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexsendservices/group/bld.inf --- a/localconnectivityservice/obexsendservices/group/bld.inf Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexsendservices/group/bld.inf Fri Mar 19 09:42:38 2010 +0200 @@ -24,7 +24,7 @@ PRJ_EXPORTS ../obexservicesendutils/inc/BTServiceAPI.h |../../inc/btserviceapi.h -../obexservicesendutils/inc/BTServiceParameterList.h |../../inc/btserviceparameterlist.h +../obexservicesendutils/inc/BTServiceParameterList.h |../../inc/BTServiceParameterList.h ../rom/obexservicebtsend.iby CORE_MW_LAYER_IBY_EXPORT_PATH(obexservicebtsend.iby) ../rom/obexserviceirsend.iby CORE_MW_LAYER_IBY_EXPORT_PATH(obexserviceirsend.iby) ../rom/obexservicesendutils.iby CORE_MW_LAYER_IBY_EXPORT_PATH(obexservicesendutils.iby) diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexsendservices/obexserviceirsend/src/IRClient.cpp --- a/localconnectivityservice/obexsendservices/obexserviceirsend/src/IRClient.cpp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexsendservices/obexserviceirsend/src/IRClient.cpp Fri Mar 19 09:42:38 2010 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES #include -#include +#include #include #include "IRClient.h" diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexsendservices/obexserviceirsend/src/IRSSProvider.cpp --- a/localconnectivityservice/obexsendservices/obexserviceirsend/src/IRSSProvider.cpp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexsendservices/obexserviceirsend/src/IRSSProvider.cpp Fri Mar 19 09:42:38 2010 +0200 @@ -21,7 +21,7 @@ #include #include -#include +#include #include // Notifier UID's #include //For notifier #include diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexsendservices/obexservicesendutils/src/BTSBIPController.cpp --- a/localconnectivityservice/obexsendservices/obexservicesendutils/src/BTSBIPController.cpp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexsendservices/obexservicesendutils/src/BTSBIPController.cpp Fri Mar 19 09:42:38 2010 +0200 @@ -22,7 +22,7 @@ #include "BTSUDebug.h" #include "BTSUImageConverter.h" #include "BTSUXmlParser.h" -#include +#include diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexsendservices/obexservicesendutils/src/BTSBPPController.cpp --- a/localconnectivityservice/obexsendservices/obexservicesendutils/src/BTSBPPController.cpp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexsendservices/obexservicesendutils/src/BTSBPPController.cpp Fri Mar 19 09:42:38 2010 +0200 @@ -23,7 +23,7 @@ #include "BTSUDebug.h" #include -#include +#include #include // CONSTANTS diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexsendservices/obexservicesendutils/src/BTServiceStarter.cpp --- a/localconnectivityservice/obexsendservices/obexservicesendutils/src/BTServiceStarter.cpp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexsendservices/obexservicesendutils/src/BTServiceStarter.cpp Fri Mar 19 09:42:38 2010 +0200 @@ -24,7 +24,7 @@ #include "BTSBIPController.h" #include "BTSBPPController.h" -#include +#include #include #include #include diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexserviceman/utils/bwins/OBEXUTILSU.DEF --- a/localconnectivityservice/obexserviceman/utils/bwins/OBEXUTILSU.DEF Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexserviceman/utils/bwins/OBEXUTILSU.DEF Fri Mar 19 09:42:38 2010 +0200 @@ -1,61 +1,62 @@ EXPORTS - ??0CObexUtilsOpaqueData@@QAE@ABVTDesC8@@@Z @ 1 NONAME ; CObexUtilsOpaqueData::CObexUtilsOpaqueData(class TDesC8 const &) - ?CancelProgressDialogL@CObexUtilsDialog@@QAEXXZ @ 2 NONAME ; void CObexUtilsDialog::CancelProgressDialogL(void) - ?CancelWaitDialogL@CObexUtilsDialog@@QAEXXZ @ 3 NONAME ; void CObexUtilsDialog::CancelWaitDialogL(void) - ?ContextIcon@TObexUtilsUiLayer@@SAHABVTMsvEntry@@W4TContextMedia@@@Z @ 4 NONAME ; int TObexUtilsUiLayer::ContextIcon(class TMsvEntry const &, enum TContextMedia) - ?CreateDefaultMtmServiceL@TObexUtilsMessageHandler@@SAXVTUid@@@Z @ 5 NONAME ; void TObexUtilsMessageHandler::CreateDefaultMtmServiceL(class TUid) - ?CreateIconsL@TObexUtilsUiLayer@@SAXVTUid@@PAV?$CArrayPtr@V?$CArrayPtr@VCFbsBitmap@@@@@@@Z @ 6 NONAME ; void TObexUtilsUiLayer::CreateIconsL(class TUid, class CArrayPtr > *) - ?CreateInboxAttachmentL@TObexUtilsMessageHandler@@SAXAAPAVCObexBufObject@@VTUid@@AAJAAVRFile@@@Z @ 7 NONAME ; void TObexUtilsMessageHandler::CreateInboxAttachmentL(class CObexBufObject * &, class TUid, long &, class RFile &) - ?CreateOutboxEntryL@TObexUtilsMessageHandler@@SAJABVTUid@@ABH@Z @ 8 NONAME ; long TObexUtilsMessageHandler::CreateOutboxEntryL(class TUid const &, int const &) - ?DeleteOutboxEntryL@TObexUtilsMessageHandler@@SAXABJ@Z @ 9 NONAME ; void TObexUtilsMessageHandler::DeleteOutboxEntryL(long const &) - ?GetCenRepKeyIntValueL@TObexUtilsMessageHandler@@SAHVTUid@@KAAH@Z @ 10 NONAME ; int TObexUtilsMessageHandler::GetCenRepKeyIntValueL(class TUid, unsigned long, int &) - ?GetFileSystemStatus@TObexUtilsMessageHandler@@SAHXZ @ 11 NONAME ; int TObexUtilsMessageHandler::GetFileSystemStatus(void) - ?GetMessageCentreDriveL@TObexUtilsMessageHandler@@SAHXZ @ 12 NONAME ; int TObexUtilsMessageHandler::GetMessageCentreDriveL(void) + ?ReadResourceL@TObexUtilsUiLayer@@SAXAAVTDes16@@ABH@Z @ 1 NONAME ; void TObexUtilsUiLayer::ReadResourceL(class TDes16 &, int const &) + ?SaveObjToInboxL@TObexUtilsMessageHandler@@SAXPAVCObexBufObject@@ABVTDesC16@@VTUid@@@Z @ 2 NONAME ; void TObexUtilsMessageHandler::SaveObjToInboxL(class CObexBufObject *, class TDesC16 const &, class TUid) + ?RemoveInboxEntriesL@TObexUtilsMessageHandler@@SAXAAPAVCObexBufObject@@J@Z @ 3 NONAME ; void TObexUtilsMessageHandler::RemoveInboxEntriesL(class CObexBufObject * &, long) + ?GetNumber@CObexUtilsOpaqueData@@QAEHAAI@Z @ 4 NONAME ; int CObexUtilsOpaqueData::GetNumber(unsigned int &) + ??0CObexUtilsOpaqueData@@QAE@ABVTDesC8@@@Z @ 5 NONAME ; CObexUtilsOpaqueData::CObexUtilsOpaqueData(class TDesC8 const &) + ?UpdateProgressDialog@CGlobalProgressDialog@@QAEXHH@Z @ 6 NONAME ; void CGlobalProgressDialog::UpdateProgressDialog(int, int) + ?AddEntryToInboxL@TObexUtilsMessageHandler@@SAXAAJAAV?$TBuf@$0BAA@@@@Z @ 7 NONAME ; void TObexUtilsMessageHandler::AddEntryToInboxL(long &, class TBuf<256> &) + ?CancelWaitDialogL@CObexUtilsDialog@@QAEXXZ @ 8 NONAME ; void CObexUtilsDialog::CancelWaitDialogL(void) + ?LaunchFileManagerL@TObexUtilsUiLayer@@SAXAAVTDesC16@@HH@Z @ 9 NONAME ; void TObexUtilsUiLayer::LaunchFileManagerL(class TDesC16 &, int, int) + ?CreateDefaultMtmServiceL@TObexUtilsMessageHandler@@SAXVTUid@@@Z @ 10 NONAME ; void TObexUtilsMessageHandler::CreateDefaultMtmServiceL(class TUid) + ?UpdateProgressDialogL@CObexUtilsDialog@@QAEXHH@Z @ 11 NONAME ; void CObexUtilsDialog::UpdateProgressDialogL(int, int) + ?GetCenRepKeyStringValueL@TObexUtilsMessageHandler@@SAHVTUid@@KAAVTDes16@@@Z @ 12 NONAME ; int TObexUtilsMessageHandler::GetCenRepKeyStringValueL(class TUid, unsigned long, class TDes16 &) ?GetMmcFileSystemStatus@TObexUtilsMessageHandler@@SAHXZ @ 13 NONAME ; int TObexUtilsMessageHandler::GetMmcFileSystemStatus(void) - ?GetNumber@CObexUtilsOpaqueData@@QAEHAAI@Z @ 14 NONAME ; int CObexUtilsOpaqueData::GetNumber(unsigned int &) - ?GetPubSubKeyIntValue@TObexUtilsMessageHandler@@SAHVTUid@@IAAH@Z @ 15 NONAME ; int TObexUtilsMessageHandler::GetPubSubKeyIntValue(class TUid, unsigned int, int &) - ?GetString@CObexUtilsOpaqueData@@QAEHAAV?$TBuf8@$0BAA@@@@Z @ 16 NONAME ; int CObexUtilsOpaqueData::GetString(class TBuf8<256> &) - ?IsString@CObexUtilsOpaqueData@@QAEHXZ @ 17 NONAME ; int CObexUtilsOpaqueData::IsString(void) - ?LaunchEditorApplicationL@TObexUtilsUiLayer@@SAHPAVCMsvEntry@@AAVCMsvSession@@@Z @ 18 NONAME ; int TObexUtilsUiLayer::LaunchEditorApplicationL(class CMsvEntry *, class CMsvSession &) - ?LaunchEditorApplicationOperationL@TObexUtilsUiLayer@@SAPAVCMsvOperation@@AAVCMsvSession@@PAVCMsvEntry@@AAVTRequestStatus@@@Z @ 19 NONAME ; class CMsvOperation * TObexUtilsUiLayer::LaunchEditorApplicationOperationL(class CMsvSession &, class CMsvEntry *, class TRequestStatus &) - ?LaunchProgressDialogL@CObexUtilsDialog@@QAEXPAVMObexUtilsProgressObserver@@HHH@Z @ 20 NONAME ; void CObexUtilsDialog::LaunchProgressDialogL(class MObexUtilsProgressObserver *, int, int, int) - ?LaunchQueryDialogL@CObexUtilsDialog@@QAEHABH@Z @ 21 NONAME ; int CObexUtilsDialog::LaunchQueryDialogL(int const &) - ?LaunchWaitDialogL@CObexUtilsDialog@@QAEXH@Z @ 22 NONAME ; void CObexUtilsDialog::LaunchWaitDialogL(int) - ?NewL@CGlobalDialog@@SAPAV1@PAVMGlobalNoteCallback@@@Z @ 23 NONAME ; class CGlobalDialog * CGlobalDialog::NewL(class MGlobalNoteCallback *) - ?NewL@CGlobalProgressDialog@@SAPAV1@PAVMGlobalProgressCallback@@@Z @ 24 NONAME ; class CGlobalProgressDialog * CGlobalProgressDialog::NewL(class MGlobalProgressCallback *) - ?NewL@CObexUtilsDialog@@SAPAV1@PAVMObexUtilsDialogObserver@@@Z @ 25 NONAME ; class CObexUtilsDialog * CObexUtilsDialog::NewL(class MObexUtilsDialogObserver *) - ?NewL@CObexUtilsPropertyNotifier@@SAPAV1@PAVMObexUtilsPropertyNotifyHandler@@W4TMemoryPropertyCheckType@@@Z @ 26 NONAME ; class CObexUtilsPropertyNotifier * CObexUtilsPropertyNotifier::NewL(class MObexUtilsPropertyNotifyHandler *, enum TMemoryPropertyCheckType) - ?NewLC@CGlobalDialog@@SAPAV1@PAVMGlobalNoteCallback@@@Z @ 27 NONAME ; class CGlobalDialog * CGlobalDialog::NewLC(class MGlobalNoteCallback *) - ?NewLC@CGlobalProgressDialog@@SAPAV1@PAVMGlobalProgressCallback@@@Z @ 28 NONAME ; class CGlobalProgressDialog * CGlobalProgressDialog::NewLC(class MGlobalProgressCallback *) - ?NewLC@CObexUtilsDialog@@SAPAV1@PAVMObexUtilsDialogObserver@@@Z @ 29 NONAME ; class CObexUtilsDialog * CObexUtilsDialog::NewLC(class MObexUtilsDialogObserver *) - ?OperationNotSupported@TObexUtilsUiLayer@@SAHXZ @ 30 NONAME ; int TObexUtilsUiLayer::OperationNotSupported(void) - ?ProcessFinished@CGlobalDialog@@QAEXXZ @ 31 NONAME ; void CGlobalDialog::ProcessFinished(void) - ?ProcessFinished@CGlobalProgressDialog@@QAEXXZ @ 32 NONAME ; void CGlobalProgressDialog::ProcessFinished(void) - ?ReadResourceL@TObexUtilsUiLayer@@SAXAAVTDes16@@ABH@Z @ 33 NONAME ; void TObexUtilsUiLayer::ReadResourceL(class TDes16 &, int const &) - ?RemoveInboxEntriesL@TObexUtilsMessageHandler@@SAXAAPAVCObexBufObject@@J@Z @ 34 NONAME ; void TObexUtilsMessageHandler::RemoveInboxEntriesL(class CObexBufObject * &, long) - ?SaveObjToInboxL@TObexUtilsMessageHandler@@SAXAAPAVCObexBufObject@@AAVRFile@@J@Z @ 35 NONAME ; void TObexUtilsMessageHandler::SaveObjToInboxL(class CObexBufObject * &, class RFile &, long) - ?SaveObjToInboxL@TObexUtilsMessageHandler@@SAXPAVCObexBufObject@@ABVTDesC16@@VTUid@@@Z @ 36 NONAME ; void TObexUtilsMessageHandler::SaveObjToInboxL(class CObexBufObject *, class TDesC16 const &, class TUid) - ?ShowErrorDialogL@CGlobalDialog@@QAEXH@Z @ 37 NONAME ; void CGlobalDialog::ShowErrorDialogL(int) - ?ShowErrorNoteL@TObexUtilsUiLayer@@SAXABH@Z @ 38 NONAME ; void TObexUtilsUiLayer::ShowErrorNoteL(int const &) - ?ShowGlobalConfirmationQueryL@TObexUtilsUiLayer@@SAXABH@Z @ 39 NONAME ; void TObexUtilsUiLayer::ShowGlobalConfirmationQueryL(int const &) - ?ShowInformationNoteL@TObexUtilsUiLayer@@SAXABH@Z @ 40 NONAME ; void TObexUtilsUiLayer::ShowInformationNoteL(int const &) - ?ShowNoteDialogL@CGlobalDialog@@QAEXHH@Z @ 41 NONAME ; void CGlobalDialog::ShowNoteDialogL(int, int) + ?GetPubSubKeyIntValue@TObexUtilsMessageHandler@@SAHVTUid@@IAAH@Z @ 14 NONAME ; int TObexUtilsMessageHandler::GetPubSubKeyIntValue(class TUid, unsigned int, int &) + ?IsBackupRunning@TObexUtilsUiLayer@@SAHXZ @ 15 NONAME ; int TObexUtilsUiLayer::IsBackupRunning(void) + ?CancelProgressDialogL@CObexUtilsDialog@@QAEXXZ @ 16 NONAME ; void CObexUtilsDialog::CancelProgressDialogL(void) + ?ProcessFinished@CGlobalProgressDialog@@QAEXXZ @ 17 NONAME ; void CGlobalProgressDialog::ProcessFinished(void) + ?AddEntryToInboxL@TObexUtilsMessageHandler@@SAXAAJAAV?$TBuf@$0BAA@@@PAV?$RArray@J@@@Z @ 18 NONAME ; void TObexUtilsMessageHandler::AddEntryToInboxL(long &, class TBuf<256> &, class RArray *) + ?CreateIconsL@TObexUtilsUiLayer@@SAXVTUid@@PAV?$CArrayPtr@V?$CArrayPtr@VCFbsBitmap@@@@@@@Z @ 19 NONAME ; void TObexUtilsUiLayer::CreateIconsL(class TUid, class CArrayPtr > *) + ?ShowProgressDialogNameSizeL@CGlobalProgressDialog@@QAEXAAVTDesC16@@_J@Z @ 20 NONAME ; void CGlobalProgressDialog::ShowProgressDialogNameSizeL(class TDesC16 &, long long) + ?GetFileSystemStatus@TObexUtilsMessageHandler@@SAHXZ @ 21 NONAME ; int TObexUtilsMessageHandler::GetFileSystemStatus(void) + ?NewL@CObexUtilsDialog@@SAPAV1@PAVMObexUtilsDialogObserver@@@Z @ 22 NONAME ; class CObexUtilsDialog * CObexUtilsDialog::NewL(class MObexUtilsDialogObserver *) + ?LaunchQueryDialogL@CObexUtilsDialog@@QAEHABH@Z @ 23 NONAME ; int CObexUtilsDialog::LaunchQueryDialogL(int const &) + ?CreateOutboxEntryL@TObexUtilsMessageHandler@@SAJABVTUid@@ABH@Z @ 24 NONAME ; long TObexUtilsMessageHandler::CreateOutboxEntryL(class TUid const &, int const &) + ?ShowGlobalConfirmationQueryL@TObexUtilsUiLayer@@SAXABH@Z @ 25 NONAME ; void TObexUtilsUiLayer::ShowGlobalConfirmationQueryL(int const &) + ?CreateInboxAttachmentL@TObexUtilsMessageHandler@@SAXAAPAVCObexBufObject@@VTUid@@AAJAAVRFile@@@Z @ 26 NONAME ; void TObexUtilsMessageHandler::CreateInboxAttachmentL(class CObexBufObject * &, class TUid, long &, class RFile &) + ?GetMessageCentreDriveL@TObexUtilsMessageHandler@@SAHXZ @ 27 NONAME ; int TObexUtilsMessageHandler::GetMessageCentreDriveL(void) + ?LaunchEditorApplicationL@TObexUtilsUiLayer@@SAXAAJ@Z @ 28 NONAME ; void TObexUtilsUiLayer::LaunchEditorApplicationL(long &) + ?GetCenRepKeyIntValueL@TObexUtilsMessageHandler@@SAHVTUid@@KAAH@Z @ 29 NONAME ; int TObexUtilsMessageHandler::GetCenRepKeyIntValueL(class TUid, unsigned long, int &) + ?LaunchWaitDialogL@CObexUtilsDialog@@QAEXH@Z @ 30 NONAME ; void CObexUtilsDialog::LaunchWaitDialogL(int) + ?ShowNoteDialogL@CGlobalDialog@@QAEXHH@Z @ 31 NONAME ; void CGlobalDialog::ShowNoteDialogL(int, int) + ?ShowGlobalConfirmationQueryPlainL@TObexUtilsUiLayer@@SAHABH@Z @ 32 NONAME ; int TObexUtilsUiLayer::ShowGlobalConfirmationQueryPlainL(int const &) + ?NewLC@CGlobalProgressDialog@@SAPAV1@PAVMGlobalProgressCallback@@@Z @ 33 NONAME ; class CGlobalProgressDialog * CGlobalProgressDialog::NewLC(class MGlobalProgressCallback *) + ?IsString@CObexUtilsOpaqueData@@QAEHXZ @ 34 NONAME ; int CObexUtilsOpaqueData::IsString(void) + ?CreateReceiveBufferAndRFileL@TObexUtilsMessageHandler@@SAHAAVRFile@@ABVTDesC16@@AAV?$TBuf@$0BAA@@@AAPAVCBufFlat@@H@Z @ 35 NONAME ; int TObexUtilsMessageHandler::CreateReceiveBufferAndRFileL(class RFile &, class TDesC16 const &, class TBuf<256> &, class CBufFlat * &, int) + ?LaunchEditorApplicationOperationL@TObexUtilsUiLayer@@SAPAVCMsvOperation@@AAVCMsvSession@@PAVCMsvEntry@@AAVTRequestStatus@@@Z @ 36 NONAME ; class CMsvOperation * TObexUtilsUiLayer::LaunchEditorApplicationOperationL(class CMsvSession &, class CMsvEntry *, class TRequestStatus &) + ?OperationNotSupported@TObexUtilsUiLayer@@SAHXZ @ 37 NONAME ; int TObexUtilsUiLayer::OperationNotSupported(void) + ?ProcessFinished@CGlobalDialog@@QAEXXZ @ 38 NONAME ; void CGlobalDialog::ProcessFinished(void) + ?UpdateBitmaps@TObexUtilsUiLayer@@SAXVTUid@@AAHAAV?$TBuf@$0BAA@@@11@Z @ 39 NONAME ; void TObexUtilsUiLayer::UpdateBitmaps(class TUid, int &, class TBuf<256> &, int &, int &) + ?ShowErrorDialogL@CGlobalDialog@@QAEXH@Z @ 40 NONAME ; void CGlobalDialog::ShowErrorDialogL(int) + ?ShowProgressDialogL@CGlobalProgressDialog@@QAEXH@Z @ 41 NONAME ; void CGlobalProgressDialog::ShowProgressDialogL(int) ?ShowNumberOfSendFileL@CObexUtilsDialog@@QAEXHH@Z @ 42 NONAME ; void CObexUtilsDialog::ShowNumberOfSendFileL(int, int) - ?ShowProgressDialogL@CGlobalProgressDialog@@QAEXH@Z @ 43 NONAME ; void CGlobalProgressDialog::ShowProgressDialogL(int) - ?UpdateBitmaps@TObexUtilsUiLayer@@SAXVTUid@@AAHAAV?$TBuf@$0BAA@@@11@Z @ 44 NONAME ; void TObexUtilsUiLayer::UpdateBitmaps(class TUid, int &, class TBuf<256> &, int &, int &) - ?UpdateProgressDialog@CGlobalProgressDialog@@QAEXHH@Z @ 45 NONAME ; void CGlobalProgressDialog::UpdateProgressDialog(int, int) - ?UpdateProgressDialogL@CObexUtilsDialog@@QAEXHH@Z @ 46 NONAME ; void CObexUtilsDialog::UpdateProgressDialogL(int, int) - ?ShowGlobalFileOpenConfirmationQueryL@TObexUtilsUiLayer@@SAHABHABVTDesC16@@@Z @ 47 NONAME ; int TObexUtilsUiLayer::ShowGlobalFileOpenConfirmationQueryL(int const &, class TDesC16 const &) - ?GetCenRepKeyStringValueL@TObexUtilsMessageHandler@@SAHVTUid@@KAAVTDes16@@@Z @ 48 NONAME ; int TObexUtilsMessageHandler::GetCenRepKeyStringValueL(class TUid, unsigned long, class TDes16 &) - ?LaunchEditorApplicationL@TObexUtilsUiLayer@@SAXAAJ@Z @ 49 NONAME ; void TObexUtilsUiLayer::LaunchEditorApplicationL(long &) - ?AddEntryToInboxL@TObexUtilsMessageHandler@@SAXAAJAAV?$TBuf@$0BAA@@@PAV?$RArray@J@@@Z @ 50 NONAME ; void TObexUtilsMessageHandler::AddEntryToInboxL(long &, class TBuf<256> &, class RArray *) - ?ShowProgressDialogNameSizeL@CGlobalProgressDialog@@QAEXAAVTDesC16@@_J@Z @ 51 NONAME ; void CGlobalProgressDialog::ShowProgressDialogNameSizeL(class TDesC16 &, long long) - ?ShowGlobalConfirmationQueryPlainL@TObexUtilsUiLayer@@SAHABH@Z @ 52 NONAME ; int TObexUtilsUiLayer::ShowGlobalConfirmationQueryPlainL(int const &) - ?CreateReceiveBufferAndRFileL@TObexUtilsMessageHandler@@SAHAAVRFile@@ABVTDesC16@@AAV?$TBuf@$0BAA@@@AAPAVCBufFlat@@H@Z @ 53 NONAME ; int TObexUtilsMessageHandler::CreateReceiveBufferAndRFileL(class RFile &, class TDesC16 const &, class TBuf<256> &, class CBufFlat * &, int) - ?UpdateEntryAttachmentL@TObexUtilsMessageHandler@@SAXAAV?$TBuf@$0BAA@@@PAVCMsvEntry@@@Z @ 54 NONAME ; void TObexUtilsMessageHandler::UpdateEntryAttachmentL(class TBuf<256> &, class CMsvEntry *) - ?CreateInboxAttachmentL@TObexUtilsMessageHandler@@SAXAAPAVCObexBufObject@@VTUid@@AAJAAVRFile@@ABVTDesC16@@@Z @ 55 NONAME ; void TObexUtilsMessageHandler::CreateInboxAttachmentL(class CObexBufObject * &, class TUid, long &, class RFile &, class TDesC16 const &) - ?RemoveTemporaryRFileL@TObexUtilsMessageHandler@@SAXABV?$TBuf@$0BAA@@@@Z @ 56 NONAME ; void TObexUtilsMessageHandler::RemoveTemporaryRFileL(class TBuf<256> const &) - ?LaunchFileManagerL@TObexUtilsUiLayer@@SAXAAVTDesC16@@HH@Z @ 57 NONAME ; void TObexUtilsUiLayer::LaunchFileManagerL(class TDesC16 &, int, int) - ?SaveFileToFileSystemL@TObexUtilsMessageHandler@@SAXAAPAVCObexBufObject@@VTUid@@AAJAAV?$TBuf@$0BAA@@@AAVRFile@@ABVTDesC16@@@Z @ 58 NONAME ; void TObexUtilsMessageHandler::SaveFileToFileSystemL(class CObexBufObject * &, class TUid, long &, class TBuf<256> &, class RFile &, class TDesC16 const &) - ?AddEntryToInboxL@TObexUtilsMessageHandler@@SAXAAJAAV?$TBuf@$0BAA@@@@Z @ 59 NONAME ; void TObexUtilsMessageHandler::AddEntryToInboxL(long &, class TBuf<256> &) + ?ShowErrorNoteL@TObexUtilsUiLayer@@SAXABH@Z @ 43 NONAME ; void TObexUtilsUiLayer::ShowErrorNoteL(int const &) + ?NewL@CObexUtilsPropertyNotifier@@SAPAV1@PAVMObexUtilsPropertyNotifyHandler@@W4TMemoryPropertyCheckType@@@Z @ 44 NONAME ; class CObexUtilsPropertyNotifier * CObexUtilsPropertyNotifier::NewL(class MObexUtilsPropertyNotifyHandler *, enum TMemoryPropertyCheckType) + ?ShowGlobalFileOpenConfirmationQueryL@TObexUtilsUiLayer@@SAHABHABVTDesC16@@@Z @ 45 NONAME ; int TObexUtilsUiLayer::ShowGlobalFileOpenConfirmationQueryL(int const &, class TDesC16 const &) + ?GetString@CObexUtilsOpaqueData@@QAEHAAV?$TBuf8@$0BAA@@@@Z @ 46 NONAME ; int CObexUtilsOpaqueData::GetString(class TBuf8<256> &) + ?UpdateEntryAttachmentL@TObexUtilsMessageHandler@@SAXAAV?$TBuf@$0BAA@@@PAVCMsvEntry@@@Z @ 47 NONAME ; void TObexUtilsMessageHandler::UpdateEntryAttachmentL(class TBuf<256> &, class CMsvEntry *) + ?NewL@CGlobalDialog@@SAPAV1@PAVMGlobalNoteCallback@@@Z @ 48 NONAME ; class CGlobalDialog * CGlobalDialog::NewL(class MGlobalNoteCallback *) + ?CreateInboxAttachmentL@TObexUtilsMessageHandler@@SAXAAPAVCObexBufObject@@VTUid@@AAJAAVRFile@@ABVTDesC16@@@Z @ 49 NONAME ; void TObexUtilsMessageHandler::CreateInboxAttachmentL(class CObexBufObject * &, class TUid, long &, class RFile &, class TDesC16 const &) + ?NewL@CGlobalProgressDialog@@SAPAV1@PAVMGlobalProgressCallback@@@Z @ 50 NONAME ; class CGlobalProgressDialog * CGlobalProgressDialog::NewL(class MGlobalProgressCallback *) + ?RemoveTemporaryRFileL@TObexUtilsMessageHandler@@SAXABV?$TBuf@$0BAA@@@@Z @ 51 NONAME ; void TObexUtilsMessageHandler::RemoveTemporaryRFileL(class TBuf<256> const &) + ?LaunchProgressDialogL@CObexUtilsDialog@@QAEXPAVMObexUtilsProgressObserver@@HHH@Z @ 52 NONAME ; void CObexUtilsDialog::LaunchProgressDialogL(class MObexUtilsProgressObserver *, int, int, int) + ?DeleteOutboxEntryL@TObexUtilsMessageHandler@@SAXABJ@Z @ 53 NONAME ; void TObexUtilsMessageHandler::DeleteOutboxEntryL(long const &) + ?ContextIcon@TObexUtilsUiLayer@@SAHABVTMsvEntry@@W4TContextMedia@@@Z @ 54 NONAME ; int TObexUtilsUiLayer::ContextIcon(class TMsvEntry const &, enum TContextMedia) + ?SaveFileToFileSystemL@TObexUtilsMessageHandler@@SAXAAPAVCObexBufObject@@VTUid@@AAJAAV?$TBuf@$0BAA@@@AAVRFile@@ABVTDesC16@@@Z @ 55 NONAME ; void TObexUtilsMessageHandler::SaveFileToFileSystemL(class CObexBufObject * &, class TUid, long &, class TBuf<256> &, class RFile &, class TDesC16 const &) + ?ShowInformationNoteL@TObexUtilsUiLayer@@SAXABH@Z @ 56 NONAME ; void TObexUtilsUiLayer::ShowInformationNoteL(int const &) + ?NewLC@CObexUtilsDialog@@SAPAV1@PAVMObexUtilsDialogObserver@@@Z @ 57 NONAME ; class CObexUtilsDialog * CObexUtilsDialog::NewLC(class MObexUtilsDialogObserver *) + ?LaunchEditorApplicationL@TObexUtilsUiLayer@@SAHPAVCMsvEntry@@AAVCMsvSession@@@Z @ 58 NONAME ; int TObexUtilsUiLayer::LaunchEditorApplicationL(class CMsvEntry *, class CMsvSession &) + ?SaveObjToInboxL@TObexUtilsMessageHandler@@SAXAAPAVCObexBufObject@@AAVRFile@@J@Z @ 59 NONAME ; void TObexUtilsMessageHandler::SaveObjToInboxL(class CObexBufObject * &, class RFile &, long) + ?NewLC@CGlobalDialog@@SAPAV1@PAVMGlobalNoteCallback@@@Z @ 60 NONAME ; class CGlobalDialog * CGlobalDialog::NewLC(class MGlobalNoteCallback *) diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexserviceman/utils/eabi/obexutilsu.DEF --- a/localconnectivityservice/obexserviceman/utils/eabi/obexutilsu.DEF Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexserviceman/utils/eabi/obexutilsu.DEF Fri Mar 19 09:42:38 2010 +0200 @@ -1,63 +1,63 @@ EXPORTS - _ZN16CObexUtilsDialog17CancelWaitDialogLEv @ 1 NONAME - _ZN16CObexUtilsDialog17LaunchWaitDialogLEi @ 2 NONAME - _ZN16CObexUtilsDialog21CancelProgressDialogLEv @ 3 NONAME - _ZN16CObexUtilsDialog21LaunchProgressDialogLEP26MObexUtilsProgressObserveriii @ 4 NONAME - _ZN16CObexUtilsDialog21UpdateProgressDialogLEii @ 5 NONAME - _ZN16CObexUtilsDialog4NewLEP24MObexUtilsDialogObserver @ 6 NONAME - _ZN16CObexUtilsDialog5NewLCEP24MObexUtilsDialogObserver @ 7 NONAME - _ZN17TObexUtilsUiLayer11ContextIconERK9TMsvEntry13TContextMedia @ 8 NONAME - _ZN17TObexUtilsUiLayer13ReadResourceLER6TDes16RKi @ 9 NONAME - _ZN17TObexUtilsUiLayer13UpdateBitmapsE4TUidRiR4TBufILi256EES1_S1_ @ 10 NONAME - _ZN17TObexUtilsUiLayer14ShowErrorNoteLERKi @ 11 NONAME - _ZN17TObexUtilsUiLayer20ShowInformationNoteLERKi @ 12 NONAME - _ZN17TObexUtilsUiLayer21OperationNotSupportedEv @ 13 NONAME - _ZN17TObexUtilsUiLayer24LaunchEditorApplicationLEP9CMsvEntryR11CMsvSession @ 14 NONAME - _ZN24TObexUtilsMessageHandler15SaveObjToInboxLERP14CObexBufObjectR5RFilel @ 15 NONAME - _ZN24TObexUtilsMessageHandler18CreateOutboxEntryLERK4TUidRKi @ 16 NONAME - _ZN24TObexUtilsMessageHandler18DeleteOutboxEntryLERKl @ 17 NONAME - _ZN24TObexUtilsMessageHandler19GetFileSystemStatusEv @ 18 NONAME - _ZN24TObexUtilsMessageHandler22GetMmcFileSystemStatusEv @ 19 NONAME - _ZN21CGlobalProgressDialog27ShowProgressDialogNameSizeLER7TDesC16x @ 20 NONAME + _ZN13CGlobalDialog15ProcessFinishedEv @ 1 NONAME + _ZN13CGlobalDialog15ShowNoteDialogLEii @ 2 NONAME + _ZN13CGlobalDialog16ShowErrorDialogLEi @ 3 NONAME + _ZN13CGlobalDialog4NewLEP19MGlobalNoteCallback @ 4 NONAME + _ZN13CGlobalDialog5NewLCEP19MGlobalNoteCallback @ 5 NONAME + _ZN16CObexUtilsDialog17CancelWaitDialogLEv @ 6 NONAME + _ZN16CObexUtilsDialog17LaunchWaitDialogLEi @ 7 NONAME + _ZN16CObexUtilsDialog18LaunchQueryDialogLERKi @ 8 NONAME + _ZN16CObexUtilsDialog21CancelProgressDialogLEv @ 9 NONAME + _ZN16CObexUtilsDialog21LaunchProgressDialogLEP26MObexUtilsProgressObserveriii @ 10 NONAME + _ZN16CObexUtilsDialog21ShowNumberOfSendFileLEii @ 11 NONAME + _ZN16CObexUtilsDialog21UpdateProgressDialogLEii @ 12 NONAME + _ZN16CObexUtilsDialog4NewLEP24MObexUtilsDialogObserver @ 13 NONAME + _ZN16CObexUtilsDialog5NewLCEP24MObexUtilsDialogObserver @ 14 NONAME + _ZN17TObexUtilsUiLayer11ContextIconERK9TMsvEntry13TContextMedia @ 15 NONAME + _ZN17TObexUtilsUiLayer12CreateIconsLE4TUidP9CArrayPtrIS1_I10CFbsBitmapEE @ 16 NONAME + _ZN17TObexUtilsUiLayer13ReadResourceLER6TDes16RKi @ 17 NONAME + _ZN17TObexUtilsUiLayer13UpdateBitmapsE4TUidRiR4TBufILi256EES1_S1_ @ 18 NONAME + _ZN17TObexUtilsUiLayer14ShowErrorNoteLERKi @ 19 NONAME + _ZN17TObexUtilsUiLayer15IsBackupRunningEv @ 20 NONAME _ZN17TObexUtilsUiLayer18LaunchFileManagerLER7TDesC16ii @ 21 NONAME - _ZN24TObexUtilsMessageHandler21RemoveTemporaryRFileLERK4TBufILi256EE @ 22 NONAME - _ZN24TObexUtilsMessageHandler21SaveFileToFileSystemLERP14CObexBufObject4TUidRlR4TBufILi256EER5RFileRK7TDesC16 @ 23 NONAME - _ZN24TObexUtilsMessageHandler22CreateInboxAttachmentLERP14CObexBufObject4TUidRlR5RFileRK7TDesC16 @ 24 NONAME - _ZN24TObexUtilsMessageHandler22UpdateEntryAttachmentLER4TBufILi256EEP9CMsvEntry @ 25 NONAME - _ZN17TObexUtilsUiLayer12CreateIconsLE4TUidP9CArrayPtrIS1_I10CFbsBitmapEE @ 26 NONAME - _ZN26CObexUtilsPropertyNotifier4NewLEP31MObexUtilsPropertyNotifyHandler24TMemoryPropertyCheckType @ 27 NONAME - _ZN24TObexUtilsMessageHandler24GetCenRepKeyStringValueLE4TUidmR6TDes16 @ 28 NONAME - _ZN17TObexUtilsUiLayer24LaunchEditorApplicationLERl @ 29 NONAME - _ZN16CObexUtilsDialog18LaunchQueryDialogLERKi @ 30 NONAME - _ZN16CObexUtilsDialog21ShowNumberOfSendFileLEii @ 31 NONAME - _ZN24TObexUtilsMessageHandler15SaveObjToInboxLEP14CObexBufObjectRK7TDesC164TUid @ 32 NONAME - _ZN24TObexUtilsMessageHandler19RemoveInboxEntriesLERP14CObexBufObjectl @ 33 NONAME - _ZN24TObexUtilsMessageHandler22CreateInboxAttachmentLERP14CObexBufObject4TUidRlR5RFile @ 34 NONAME - _ZN24TObexUtilsMessageHandler22GetMessageCentreDriveLEv @ 35 NONAME - _ZN24TObexUtilsMessageHandler20GetPubSubKeyIntValueE4TUidjRi @ 36 NONAME - _ZN24TObexUtilsMessageHandler21GetCenRepKeyIntValueLE4TUidmRi @ 37 NONAME - _ZN17TObexUtilsUiLayer33LaunchEditorApplicationOperationLER11CMsvSessionP9CMsvEntryR14TRequestStatus @ 38 NONAME - _ZN24TObexUtilsMessageHandler24CreateDefaultMtmServiceLE4TUid @ 39 NONAME - _ZN17TObexUtilsUiLayer28ShowGlobalConfirmationQueryLERKi @ 40 NONAME - _ZN20CObexUtilsOpaqueData8IsStringEv @ 41 NONAME - _ZN20CObexUtilsOpaqueData9GetNumberERj @ 42 NONAME - _ZN20CObexUtilsOpaqueData9GetStringER5TBuf8ILi256EE @ 43 NONAME - _ZN20CObexUtilsOpaqueDataC1ERK6TDesC8 @ 44 NONAME - _ZN20CObexUtilsOpaqueDataC2ERK6TDesC8 @ 45 NONAME - _ZN13CGlobalDialog15ProcessFinishedEv @ 46 NONAME - _ZN13CGlobalDialog15ShowNoteDialogLEii @ 47 NONAME - _ZN13CGlobalDialog16ShowErrorDialogLEi @ 48 NONAME - _ZN13CGlobalDialog4NewLEP19MGlobalNoteCallback @ 49 NONAME - _ZN13CGlobalDialog5NewLCEP19MGlobalNoteCallback @ 50 NONAME - _ZN21CGlobalProgressDialog15ProcessFinishedEv @ 51 NONAME - _ZN21CGlobalProgressDialog19ShowProgressDialogLEv @ 52 NONAME ABSENT - _ZN21CGlobalProgressDialog20UpdateProgressDialogEii @ 53 NONAME - _ZN21CGlobalProgressDialog4NewLEP23MGlobalProgressCallback @ 54 NONAME - _ZN21CGlobalProgressDialog5NewLCEP23MGlobalProgressCallback @ 55 NONAME - _ZN24TObexUtilsMessageHandler28CreateReceiveBufferAndRFileLER5RFileRK7TDesC16R4TBufILi256EERP8CBufFlati @ 56 NONAME - _ZN17TObexUtilsUiLayer33ShowGlobalConfirmationQueryPlainLERKi @ 57 NONAME - _ZN17TObexUtilsUiLayer36ShowGlobalFileOpenConfirmationQueryLERKiRK7TDesC16 @ 58 NONAME - _ZN24TObexUtilsMessageHandler16AddEntryToInboxLERlR4TBufILi256EEP6RArrayIlE @ 59 NONAME - _ZN21CGlobalProgressDialog19ShowProgressDialogLEi @ 60 NONAME - _ZN24TObexUtilsMessageHandler16AddEntryToInboxLERlR4TBufILi256EE @ 61 NONAME + _ZN17TObexUtilsUiLayer20ShowInformationNoteLERKi @ 22 NONAME + _ZN17TObexUtilsUiLayer21OperationNotSupportedEv @ 23 NONAME + _ZN17TObexUtilsUiLayer24LaunchEditorApplicationLEP9CMsvEntryR11CMsvSession @ 24 NONAME + _ZN17TObexUtilsUiLayer24LaunchEditorApplicationLERl @ 25 NONAME + _ZN17TObexUtilsUiLayer28ShowGlobalConfirmationQueryLERKi @ 26 NONAME + _ZN17TObexUtilsUiLayer33LaunchEditorApplicationOperationLER11CMsvSessionP9CMsvEntryR14TRequestStatus @ 27 NONAME + _ZN17TObexUtilsUiLayer33ShowGlobalConfirmationQueryPlainLERKi @ 28 NONAME + _ZN17TObexUtilsUiLayer36ShowGlobalFileOpenConfirmationQueryLERKiRK7TDesC16 @ 29 NONAME + _ZN20CObexUtilsOpaqueData8IsStringEv @ 30 NONAME + _ZN20CObexUtilsOpaqueData9GetNumberERj @ 31 NONAME + _ZN20CObexUtilsOpaqueData9GetStringER5TBuf8ILi256EE @ 32 NONAME + _ZN20CObexUtilsOpaqueDataC1ERK6TDesC8 @ 33 NONAME + _ZN20CObexUtilsOpaqueDataC2ERK6TDesC8 @ 34 NONAME + _ZN21CGlobalProgressDialog15ProcessFinishedEv @ 35 NONAME + _ZN21CGlobalProgressDialog19ShowProgressDialogLEi @ 36 NONAME + _ZN21CGlobalProgressDialog20UpdateProgressDialogEii @ 37 NONAME + _ZN21CGlobalProgressDialog27ShowProgressDialogNameSizeLER7TDesC16x @ 38 NONAME + _ZN21CGlobalProgressDialog4NewLEP23MGlobalProgressCallback @ 39 NONAME + _ZN21CGlobalProgressDialog5NewLCEP23MGlobalProgressCallback @ 40 NONAME + _ZN24TObexUtilsMessageHandler15SaveObjToInboxLEP14CObexBufObjectRK7TDesC164TUid @ 41 NONAME + _ZN24TObexUtilsMessageHandler15SaveObjToInboxLERP14CObexBufObjectR5RFilel @ 42 NONAME + _ZN24TObexUtilsMessageHandler16AddEntryToInboxLERlR4TBufILi256EE @ 43 NONAME + _ZN24TObexUtilsMessageHandler16AddEntryToInboxLERlR4TBufILi256EEP6RArrayIlE @ 44 NONAME + _ZN24TObexUtilsMessageHandler18CreateOutboxEntryLERK4TUidRKi @ 45 NONAME + _ZN24TObexUtilsMessageHandler18DeleteOutboxEntryLERKl @ 46 NONAME + _ZN24TObexUtilsMessageHandler19GetFileSystemStatusEv @ 47 NONAME + _ZN24TObexUtilsMessageHandler19RemoveInboxEntriesLERP14CObexBufObjectl @ 48 NONAME + _ZN24TObexUtilsMessageHandler20GetPubSubKeyIntValueE4TUidjRi @ 49 NONAME + _ZN24TObexUtilsMessageHandler21GetCenRepKeyIntValueLE4TUidmRi @ 50 NONAME + _ZN24TObexUtilsMessageHandler21RemoveTemporaryRFileLERK4TBufILi256EE @ 51 NONAME + _ZN24TObexUtilsMessageHandler21SaveFileToFileSystemLERP14CObexBufObject4TUidRlR4TBufILi256EER5RFileRK7TDesC16 @ 52 NONAME + _ZN24TObexUtilsMessageHandler22CreateInboxAttachmentLERP14CObexBufObject4TUidRlR5RFile @ 53 NONAME + _ZN24TObexUtilsMessageHandler22CreateInboxAttachmentLERP14CObexBufObject4TUidRlR5RFileRK7TDesC16 @ 54 NONAME + _ZN24TObexUtilsMessageHandler22GetMessageCentreDriveLEv @ 55 NONAME + _ZN24TObexUtilsMessageHandler22GetMmcFileSystemStatusEv @ 56 NONAME + _ZN24TObexUtilsMessageHandler22UpdateEntryAttachmentLER4TBufILi256EEP9CMsvEntry @ 57 NONAME + _ZN24TObexUtilsMessageHandler24CreateDefaultMtmServiceLE4TUid @ 58 NONAME + _ZN24TObexUtilsMessageHandler24GetCenRepKeyStringValueLE4TUidmR6TDes16 @ 59 NONAME + _ZN24TObexUtilsMessageHandler28CreateReceiveBufferAndRFileLER5RFileRK7TDesC16R4TBufILi256EERP8CBufFlati @ 60 NONAME + _ZN26CObexUtilsPropertyNotifier4NewLEP31MObexUtilsPropertyNotifyHandler24TMemoryPropertyCheckType @ 61 NONAME diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexserviceman/utils/group/obexutils.mmp --- a/localconnectivityservice/obexserviceman/utils/group/obexutils.mmp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexserviceman/utils/group/obexutils.mmp Fri Mar 19 09:42:38 2010 +0200 @@ -32,6 +32,11 @@ LANGUAGE_IDS END +OS_LAYER_SYSTEMINCLUDE +USERINCLUDE ../inc +NON_FOUNDATION_ADAPT_LAYER_SYSTEMINCLUDE + + SOURCEPATH ../src SOURCE obexutilsuilayer.cpp SOURCE obexutilslaunchwaiter.cpp @@ -48,12 +53,12 @@ SOURCE vMessageHandler.cpp #endif - -USERINCLUDE ../inc - SYSTEMINCLUDE ../../../inc ../../../../inc +#ifdef NO101APPDEPFIXES +APP_LAYER_SYSTEMINCLUDE +#else //NO101APPDEPFIXES MW_LAYER_SYSTEMINCLUDE -APP_LAYER_SYSTEMINCLUDE +#endif //NO101APPDEPFIXES // SMUT Unbranch #ifdef __BT_SAP SYSTEMINCLUDE /epoc32/include/ecom diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexserviceman/utils/inc/obexutilsglobalprogressdialog.h --- a/localconnectivityservice/obexserviceman/utils/inc/obexutilsglobalprogressdialog.h Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexserviceman/utils/inc/obexutilsglobalprogressdialog.h Fri Mar 19 09:42:38 2010 +0200 @@ -24,7 +24,7 @@ // INCLUDES #include #include -#include +#include #include // R_QGN_GRAF_WAIT_BAR_ANIM #include diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexserviceman/utils/inc/obexutilsuilayer.h --- a/localconnectivityservice/obexserviceman/utils/inc/obexutilsuilayer.h Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexserviceman/utils/inc/obexutilsuilayer.h Fri Mar 19 09:42:38 2010 +0200 @@ -25,7 +25,7 @@ #include #include #include -#include +#include // CONSTANTS @@ -55,6 +55,17 @@ EInfrared }; +/** +* Backup status. +* The value is controlled by FileManager +*/ +enum TFileManagerBkupStatusType + { + EFileManagerBkupStatusUnset = 0x00000000, + EFileManagerBkupStatusBackup = 0x00000001, + EFileManagerBkupStatusRestore = 0x00000002 + }; + // CLASS DECLARATION /** @@ -192,6 +203,10 @@ */ IMPORT_C static void CreateIconsL( TUid aMedia, CArrayPtr* aIconArrays); + /** + * Checks if backup process is running + */ + IMPORT_C TBool static IsBackupRunning(); /** * Prepares dialog for execution @@ -205,6 +220,13 @@ * return True if enabled */ TBool static IsCoverDisplayL(); + + /** + * Check if process with given id is active now + * return True if is active + */ + TBool static ProcessExists( const TSecureId& aSecureId ); + /** * A dummy class for opening CMsvSession. */ diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexserviceman/utils/src/obexutilsdialog.cpp --- a/localconnectivityservice/obexserviceman/utils/src/obexutilsdialog.cpp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexserviceman/utils/src/obexutilsdialog.cpp Fri Mar 19 09:42:38 2010 +0200 @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -201,7 +201,9 @@ if( iProgressDialog ) { + iProgressDialog->SetCallback(NULL); iProgressDialog->ProcessFinishedL(); + iProgressDialog = NULL; if ( iObexDialogTimer ) { diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexserviceman/utils/src/obexutilslaunchwaiter.cpp --- a/localconnectivityservice/obexserviceman/utils/src/obexutilslaunchwaiter.cpp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexserviceman/utils/src/obexutilslaunchwaiter.cpp Fri Mar 19 09:42:38 2010 +0200 @@ -25,7 +25,7 @@ #include // for memory and file selection dialogs #include #include // for getting drive root path -#include +#include #include #include #include diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexserviceman/utils/src/obexutilsmessagehandler.cpp --- a/localconnectivityservice/obexserviceman/utils/src/obexutilsmessagehandler.cpp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexserviceman/utils/src/obexutilsmessagehandler.cpp Fri Mar 19 09:42:38 2010 +0200 @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include @@ -926,8 +926,6 @@ // tempFullName will be updated in RenameFileL() TInt error = RenameFileL(tempFullName, filename, parse.DriveAndPath(), fsSess); - - if ( error != KErrNone ) { fsSess.Delete(tempFullName); // If rename fails, we remove the temp RFile object. @@ -1428,19 +1426,31 @@ const TDesC& aNewPath, RFs& aFileSession) { + // We move the file to the final location // CFileMan* fileMan= CFileMan::NewL(aFileSession); CleanupStack::PushL(fileMan); - - fileMan->Move(aFileName,aNewPath,CFileMan::ERecurse ); - CleanupStack::PopAndDestroy(fileMan); - + TPtrC tmpNewPath; TParse fileParse; fileParse.Set(aFileName, NULL, NULL); + TInt error = fileMan->Move(aFileName,aNewPath,CFileMan::ERecurse ); + + // if error while moving to new location, keep file in old location and change file name + if (error != KErrNone) + { + tmpNewPath.Set (fileParse.DriveAndPath()); + } + else + { + tmpNewPath.Set (aNewPath); + } + + CleanupStack::PopAndDestroy(fileMan); + TFileName tempFile; - tempFile.Append(aNewPath); + tempFile.Append(tmpNewPath); tempFile.Append(fileParse.NameAndExt()); aFileName = tempFile; @@ -1450,22 +1460,23 @@ TFileName newFullName; newFullName.Zero(); - newFullName.Append(aNewPath); + newFullName.Append(tmpNewPath); newFullName.Append(aNewFileName); - aFileSession.SetSessionPath(aNewPath); + aFileSession.SetSessionPath(tmpNewPath); while ( BaflUtils::FileExists(aFileSession, newFullName) ) { segmentNum++; User::LeaveIfError( RenameFileWithSegmentNumL(aNewFileName, segmentNum, segmentString) ); newFullName.Zero(); - newFullName.Append(aNewPath); + newFullName.Append(tmpNewPath); newFullName.Append(aNewFileName); } // rename the file. // - TInt error = aFileSession.Rename(aFileName, newFullName); + error = aFileSession.Rename(aFileName, newFullName); + aFileName = newFullName; return error; diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexserviceman/utils/src/obexutilsuilayer.cpp --- a/localconnectivityservice/obexserviceman/utils/src/obexutilsuilayer.cpp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexserviceman/utils/src/obexutilsuilayer.cpp Fri Mar 19 09:42:38 2010 +0200 @@ -22,12 +22,26 @@ #include "obexutilsdebug.h" #include -#include +#include #include #include #include #include +#ifdef NO101APPDEPFIXES #include +#else //NO101APPDEPFIXES +enum TMuiuConsts + { + EMbmMuiuQgn_prop_mce_ir_unread = 16402, + EMbmMuiuQgn_prop_mce_ir_unread_mask = 16403, + EMbmMuiuQgn_prop_mce_ir_read = 16404, + EMbmMuiuQgn_prop_mce_ir_read_mask = 16405, + EMbmMuiuQgn_prop_mce_bt_unread = 16406, + EMbmMuiuQgn_prop_mce_bt_unread_mask = 16407, + EMbmMuiuQgn_prop_mce_bt_read = 16408, + EMbmMuiuQgn_prop_mce_bt_read_mask = 16409 + }; +#endif //NO101APPDEPFIXES #include #include @@ -39,12 +53,13 @@ #include #include #include // Used to launch file manager in embedded mode. +#include //for checking backup status - +//Constants +const TInt KFileManagerUID3 = 0x101F84EB; /// File Manager application UID3 const TInt KUiNumberOfZoomStates = 2; // second for the mask const TInt KSortNumMax = 2; - // ============================ MEMBER FUNCTIONS =============================== @@ -95,7 +110,7 @@ inParams->AppendL(TAiwGenericParam( EGenericParamDir, TAiwVariant( aPath ) ) ); inParams->AppendL(TAiwGenericParam( EGenericParamDir, TAiwVariant( aSortMethod ) ) ); - CAknLaunchAppService* launchService = CAknLaunchAppService::NewL(TUid::Uid( 0x101F84EB ), // Use File Manager app UID directly + CAknLaunchAppService* launchService = CAknLaunchAppService::NewL(TUid::Uid( KFileManagerUID3 ), // Use File Manager app UID directly NULL, inParams ); CleanupStack::PopAndDestroy( inParams ); @@ -108,7 +123,7 @@ RApaLsSession apaLsSession; User::LeaveIfError( apaLsSession.Connect() ); CleanupClosePushL( apaLsSession ); - User::LeaveIfError( apaLsSession.GetAppInfo( appInfo, TUid::Uid( 0x101F84EB ) ) ); // Use File Manager app UID directly + User::LeaveIfError( apaLsSession.GetAppInfo( appInfo, TUid::Uid( KFileManagerUID3 ) ) ); // Use File Manager app UID directly CApaCommandLine* apaCmdLine = CApaCommandLine::NewLC(); apaCmdLine->SetExecutableNameL( appInfo.iFullName ); apaCmdLine->SetCommandL( EApaCommandOpen ); @@ -509,6 +524,32 @@ } // ----------------------------------------------------------------------------- +// TObexUtilsUiLayer::IsBackupRunning +// ----------------------------------------------------------------------------- +// +EXPORT_C TBool TObexUtilsUiLayer::IsBackupRunning() + { + const TUint32 KFileManagerBkupStatus = 0x00000001; + + TInt status = EFileManagerBkupStatusUnset; + TBool retValue = EFalse; + TInt err = RProperty::Get( TUid::Uid(KFileManagerUID3), KFileManagerBkupStatus, + status ); + if ( err == KErrNone ) + { + if ( status == EFileManagerBkupStatusBackup || + status == EFileManagerBkupStatusRestore ) + { + TSecureId fileManagerSecureId( KFileManagerUID3 ); + //only returning ETrue if backup process is still active + retValue = ProcessExists( fileManagerSecureId ); + } + } + + return retValue; + } + +// ----------------------------------------------------------------------------- // TObexUtilsUiLayer::PrepareDialogExecuteL // ----------------------------------------------------------------------------- // @@ -538,4 +579,28 @@ return coverDisplay; } +// ----------------------------------------------------------------------------- +// TObexUtilsUiLayer::ProcessExists +// ----------------------------------------------------------------------------- +// +TBool TObexUtilsUiLayer::ProcessExists( const TSecureId& aSecureId ) + { + _LIT( KFindPattern, "*" ); + TFindProcess finder(KFindPattern); + TFullName processName; + while( finder.Next( processName ) == KErrNone ) + { + RProcess process; + if ( process.Open( processName ) == KErrNone ) + { + TSecureId processId( process.SecureId() ); + process.Close(); + if( processId == aSecureId ) + { + return ETrue; + } + } + } + return EFalse; + } // End of File diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexserviceman/utils/src/vMessageHandler.cpp --- a/localconnectivityservice/obexserviceman/utils/src/vMessageHandler.cpp Tue Feb 02 00:45:58 2010 +0200 +++ b/localconnectivityservice/obexserviceman/utils/src/vMessageHandler.cpp Fri Mar 19 09:42:38 2010 +0200 @@ -22,17 +22,21 @@ #include "obexutilsdebug.h" #include "etelmm.h" #include -#include // KUidMsgTypeSMS -#include +#include // KUidMsgTypeSMS +#ifdef NO101APPDEPFIXES_NEW +#include +#endif //NO101APPDEPFIXES_NEW + #include #include #include -#include +#include +#ifdef NO101APPDEPFIXES_NEW // SMUT Unbranch -#include - +#include +#endif //NO101APPDEPFIXES_NEW // ================= MEMBER FUNCTIONS ======================= TBool CSapVMessageParser::HandleMessageL(CObexBufObject* aReceivedObject, const TUid aMtmID, @@ -429,8 +433,12 @@ // void CSapVMessageParser::SaveSmsToInboxL(CMsvSession* aMsvSession, CRichText* aMessage) { - FLOG( _L( " CSapVMessageParser: SaveSmsToInboxL\t" ) ); - + #ifndef NO101APPDEPFIXES_NEW + (void) aMsvSession; + (void) aMessage; + #endif //NO101APPDEPFIXES_NEW + #ifdef NO101APPDEPFIXES_NEW + FLOG( _L( " CSapVMessageParser: SaveSmsToInboxL\t" ) ); CSmsHeader* header=CSmsHeader::NewL(CSmsPDU::ESmsDeliver, *aMessage ); CleanupStack::PushL(header); // 1st push header->SetFromAddressL(Address()); @@ -505,6 +513,7 @@ CleanupStack::PopAndDestroy(header); FLOG( _L( " CSapVMessageParser: SaveSmsToInboxL: Done\t" ) ); + #endif //NO101APPDEPFIXES_NEW } // --------------------------------------------------------- @@ -514,6 +523,12 @@ // void CSapVMessageParser::SaveSmsToSentL(CMsvSession* aMsvSession, CRichText* aMessage) { + #ifndef NO101APPDEPFIXES_NEW + (void) aMsvSession; + (void) aMessage; + #endif //NO101APPDEPFIXES_NEW + + #ifdef NO101APPDEPFIXES_NEW FLOG( _L( " CSapVMessageParser: SaveSmsToSentL\t" ) ); CSmsHeader* header = CSmsHeader::NewL( CSmsPDU::ESmsSubmit, *aMessage ); @@ -607,6 +622,7 @@ CleanupStack::PopAndDestroy(header); FLOG( _L( " CSapVMessageParser: SaveSmsToSentL: Done\t" ) ); + #endif //NO101APPDEPFIXES_NEW } // End of File diff -r 388a17646e40 -r 0feebc799606 shortlinkconn_plat/obex_service_plugin_api/inc/SrcsInterface.h --- a/shortlinkconn_plat/obex_service_plugin_api/inc/SrcsInterface.h Tue Feb 02 00:45:58 2010 +0200 +++ b/shortlinkconn_plat/obex_service_plugin_api/inc/SrcsInterface.h Fri Mar 19 09:42:38 2010 +0200 @@ -111,7 +111,7 @@ TUid iDtor_ID_Key; }; -#include "srcsinterface.inl" +#include "SrcsInterface.inl" #endif