124 |
124 |
125 if (!iResults) |
125 if (!iResults) |
126 { |
126 { |
127 iResults = Usif::COpaqueNamedParams::NewL(); |
127 iResults = Usif::COpaqueNamedParams::NewL(); |
128 } |
128 } |
129 /* |
|
130 if (iResults) |
|
131 { |
|
132 delete (iResults); |
|
133 iResults = 0; |
|
134 } |
|
135 iResults = Usif::COpaqueNamedParams::NewL(); |
|
136 |
|
137 if (iArguments) |
|
138 { |
|
139 delete (iArguments); |
|
140 iArguments = 0; |
|
141 } |
|
142 iArguments = Usif::COpaqueNamedParams::NewL(); |
|
143 |
|
144 // Silent installation request |
|
145 |
|
146 TBool iSet = ETrue; |
|
147 |
|
148 enum TSifPolicy |
|
149 { |
|
150 EAllowed = 0, |
|
151 ENotAllowed = 1, |
|
152 EUserConfirm = 2 |
|
153 }; |
|
154 |
|
155 if (iSet) |
|
156 iArguments->AddIntL( Usif::KSifInParam_InstallSilently, ETrue ); |
|
157 else |
|
158 iArguments->AddIntL( Usif::KSifInParam_InstallSilently, EFalse ); |
|
159 if (iSet) |
|
160 iArguments->AddIntL( Usif::KSifInParam_PerformOCSP, Usif::ENotAllowed ); |
|
161 if (iSet) |
|
162 iArguments->AddIntL( Usif::KSifInParam_AllowUpgrade, Usif::EAllowed ); |
|
163 if (iSet) |
|
164 iArguments->AddIntL( Usif::KSifInParam_AllowUntrusted, Usif::ENotAllowed ); |
|
165 if (iSet) |
|
166 iArguments->AddIntL( Usif::KSifInParam_GrantCapabilities, Usif::ENotAllowed ); |
|
167 if (iSet) |
|
168 iArguments->AddIntL( Usif::KSifInParam_InstallOptionalItems, Usif::EAllowed ); |
|
169 if (iSet) |
|
170 iArguments->AddIntL( Usif::KSifInParam_IgnoreOCSPWarnings, Usif::EAllowed ); |
|
171 //iArguments->AddIntL( Usif::KSifInParam_PackageInfo, ETrue ); |
|
172 if (iSet) |
|
173 iArguments->AddIntL( Usif::KSifInParam_AllowAppShutdown, Usif::EAllowed ); |
|
174 if (iSet) |
|
175 iArguments->AddIntL( Usif::KSifInParam_AllowDownload, Usif::EAllowed ); |
|
176 if (iSet) |
|
177 iArguments->AddIntL( Usif::KSifInParam_AllowOverwrite, Usif::EAllowed ); |
|
178 |
|
179 |
|
180 //iArguments->AddIntL(Usif::KSifInParam_InstallSilently, 1); |
|
181 //iArguments->AddIntL( Usif::KSifInParam_DisplayPackageInfo, ETrue ); |
|
182 |
|
183 iInstaller.Install(aFile, *iArguments, *iResults, iStatus); |
|
184 */ |
|
185 |
129 |
186 iInstaller.Install( aFile, *aSilentInstallOptions, *iResults, iStatus ); |
130 iInstaller.Install( aFile, *aSilentInstallOptions, *iResults, iStatus ); |
187 |
|
188 |
131 |
189 SetActive(); |
132 SetActive(); |
190 } |
133 } |
191 |
134 |
192 |
135 |
242 } |
185 } |
243 |
186 |
244 |
187 |
245 TInt CNcdSilentInstallActiveObserver::ConvertErrorCode( TInt aErrorCode ) |
188 TInt CNcdSilentInstallActiveObserver::ConvertErrorCode( TInt aErrorCode ) |
246 { |
189 { |
247 /* |
|
248 switch ( aErrorCode ) |
|
249 { |
|
250 case SwiUI::KSWInstErrUserCancel: |
|
251 // To simplify the cancel response and cancel handling, |
|
252 // convert the error code to normal cancel error code. |
|
253 aErrorCode = KErrCancel; |
|
254 break; |
|
255 |
|
256 case SwiUI::KSWInstErrInsufficientMemory: |
|
257 // To simplify the insufficient memory response and its handling, |
|
258 // convert the error code to normal no memory code. |
|
259 aErrorCode = KErrNoMemory; |
|
260 break; |
|
261 |
|
262 default: |
|
263 // Nothing to do here. |
|
264 break; |
|
265 } |
|
266 */ |
|
267 |
|
268 return aErrorCode; |
190 return aErrorCode; |
269 } |
191 } |
270 |
192 |