javamanager/javainstaller/installer/src.s60/applicationregistrator/sifnotifier.cpp
equal
deleted
inserted
replaced
21 #include "javasymbianoslayer.h" // for CleanupResetAndDestroyPushL |
21 #include "javasymbianoslayer.h" // for CleanupResetAndDestroyPushL |
22 #include "logger.h" |
22 #include "logger.h" |
23 |
23 |
24 #if defined(SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK) && defined(RD_JAVA_USIF_NOTIFY_PROGRESS) |
24 #if defined(SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK) && defined(RD_JAVA_USIF_NOTIFY_PROGRESS) |
25 |
25 |
26 #include <usif/sifnotification.h> |
26 #include <usif/sif/sifnotification.h> |
27 #include <usif/usifcommon.h> |
27 #include <usif/usifcommon.h> |
28 |
28 |
29 // Helper macro for logging a TDesC. |
29 // Helper macro for logging a TDesC. |
30 #define LOG_TDESC_L(compIdParam, logLevelParam, msgParam, tdescParam) \ |
30 #define LOG_TDESC_L(compIdParam, logLevelParam, msgParam, tdescParam) \ |
31 { \ |
31 { \ |
115 CSifOperationStartData::NewLC( |
115 CSifOperationStartData::NewLC( |
116 *globalComponentId, *componentName, applicationNames, applicationIcons, |
116 *globalComponentId, *componentName, applicationNames, applicationIcons, |
117 aComponentSize, /*aIconPath=*/ (NULL != aIconDir? *iconDir: KNullDesC()), |
117 aComponentSize, /*aIconPath=*/ (NULL != aIconDir? *iconDir: KNullDesC()), |
118 /*aComponentIcon=*/ KNullDesC(), Usif::KSoftwareTypeJava); |
118 /*aComponentIcon=*/ KNullDesC(), Usif::KSoftwareTypeJava); |
119 |
119 |
120 User::LeaveIfError(aNotifier->PublishStart(*startData)); |
120 aNotifier->PublishStartL(*startData); |
121 |
121 |
122 CleanupStack::PopAndDestroy(startData); |
122 CleanupStack::PopAndDestroy(startData); |
123 |
123 |
124 CleanupStack::PopAndDestroy(&applicationIcons); |
124 CleanupStack::PopAndDestroy(&applicationIcons); |
125 CleanupStack::PopAndDestroy(&applicationNames); |
125 CleanupStack::PopAndDestroy(&applicationNames); |
176 |
176 |
177 CSifOperationEndData *endData = CSifOperationEndData::NewLC( |
177 CSifOperationEndData *endData = CSifOperationEndData::NewLC( |
178 *globalComponentId, (TErrorCategory)aErrCategory, aErrCode, |
178 *globalComponentId, (TErrorCategory)aErrCategory, aErrCode, |
179 *errMsg, *errMsgDetails); |
179 *errMsg, *errMsgDetails); |
180 |
180 |
181 User::LeaveIfError(aNotifier->PublishCompletion(*endData)); |
181 aNotifier->PublishCompletionL(*endData); |
182 |
182 |
183 CleanupStack::PopAndDestroy(endData); |
183 CleanupStack::PopAndDestroy(endData); |
184 |
184 |
185 if (NULL != aErrMsg) |
185 if (NULL != aErrMsg) |
186 { |
186 { |
223 HBufC *globalComponentId = CreateHBufCFromJavaStringLC(aEnv, aGlobalComponentId); |
223 HBufC *globalComponentId = CreateHBufCFromJavaStringLC(aEnv, aGlobalComponentId); |
224 CSifOperationProgressData *progressData = CSifOperationProgressData::NewLC( |
224 CSifOperationProgressData *progressData = CSifOperationProgressData::NewLC( |
225 *globalComponentId, (TSifOperationPhase)aOperation, |
225 *globalComponentId, (TSifOperationPhase)aOperation, |
226 (TSifOperationSubPhase)aSubOperation, aCurrent, aTotal); |
226 (TSifOperationSubPhase)aSubOperation, aCurrent, aTotal); |
227 |
227 |
228 User::LeaveIfError(aNotifier->PublishProgress(*progressData)); |
228 aNotifier->PublishProgressL(*progressData); |
229 |
229 |
230 CleanupStack::PopAndDestroy(progressData); |
230 CleanupStack::PopAndDestroy(progressData); |
231 CleanupStack::PopAndDestroy(globalComponentId); |
231 CleanupStack::PopAndDestroy(globalComponentId); |
232 __UHEAP_MARKEND; |
232 __UHEAP_MARKEND; |
233 } |
233 } |