equal
deleted
inserted
replaced
73 if (IsActive()) |
73 if (IsActive()) |
74 { |
74 { |
75 Cancel(); |
75 Cancel(); |
76 } |
76 } |
77 |
77 |
78 mComms.unregisterListener(PLUGIN_ID_JAVA_CERT_STORE_ECOM_C,this); |
|
79 mComms.unregisterDefaultListener(this); |
78 mComms.unregisterDefaultListener(this); |
80 mComms.disconnect(); |
79 mComms.disconnect(); |
81 mCertsData.ResetAndDestroy(); |
80 mCertsData.ResetAndDestroy(); |
82 mUiThread.Close(); |
81 mUiThread.Close(); |
83 } |
82 } |
174 return; |
173 return; |
175 |
174 |
176 case EPreDeleting: |
175 case EPreDeleting: |
177 SendDeleteMsg(status); |
176 SendDeleteMsg(status); |
178 return; |
177 return; |
179 |
178 |
180 default: |
179 default: |
181 //Do nothing. |
180 //Do nothing. |
182 break; |
181 break; |
183 } |
182 } |
184 |
183 |
249 if (!certData->mCanDelete) |
248 if (!certData->mCanDelete) |
250 { |
249 { |
251 User::RequestComplete(pRequestStatus,KErrArgument); |
250 User::RequestComplete(pRequestStatus,KErrArgument); |
252 return; |
251 return; |
253 } |
252 } |
254 |
253 |
255 mState = EPreDeleting; |
254 mState = EPreDeleting; |
256 mTempCertData = certData; |
255 mTempCertData = certData; |
257 HandleDeleteDisableQuery(aStatus, false /* disableCertQuery */); |
256 HandleDeleteDisableQuery(aStatus, false /* disableCertQuery */); |
258 } |
257 } |
259 |
258 |
386 } |
385 } |
387 |
386 |
388 TBool validRequest = validateCertAttrFilter(aFilter); |
387 TBool validRequest = validateCertAttrFilter(aFilter); |
389 if (!validRequest) |
388 if (!validRequest) |
390 { |
389 { |
391 ELOG(EJavaSecurity,"No certificates matching the filter supplied"); |
390 LOG(EJavaSecurity, EInfo, "No certificates matching the filter supplied"); |
392 User::RequestComplete(pRequestStatus,KErrNone); |
391 User::RequestComplete(pRequestStatus,KErrNone); |
393 return; |
392 return; |
394 } |
393 } |
395 |
394 |
396 if (0 < mCertsData.Count()) |
395 if (0 < mCertsData.Count()) |
488 if (!flag) |
487 if (!flag) |
489 { |
488 { |
490 return; |
489 return; |
491 } |
490 } |
492 |
491 |
|
492 TInt err = KErrNone; |
493 if (!certData->mIsDisabled) |
493 if (!certData->mIsDisabled) |
494 { |
494 { |
495 aApplications.Append(KMidletInstallApplicabilityUid); |
495 err = aApplications.Append(KMidletInstallApplicabilityUid); |
496 } |
496 } |
497 |
497 |
498 User::RequestComplete(pRequestStatus,KErrNone); |
498 User::RequestComplete(pRequestStatus, err); |
499 } |
499 } |
500 |
500 |
501 /** |
501 /** |
502 * |
502 * |
503 */ |
503 */ |
834 errTxt.append(java::util::JavaCommonUtils::intToString(err)); |
834 errTxt.append(java::util::JavaCommonUtils::intToString(err)); |
835 ELOG1(EJavaSecurity, "ERROR!!! %s",errTxt.c_str()); |
835 ELOG1(EJavaSecurity, "ERROR!!! %s",errTxt.c_str()); |
836 User::RequestComplete(aRequestStatus,KErrCommsBreak); |
836 User::RequestComplete(aRequestStatus,KErrCommsBreak); |
837 return EFalse; |
837 return EFalse; |
838 } |
838 } |
839 |
839 |
840 return ETrue; |
840 return ETrue; |
841 } |
841 } |
842 |
842 |
843 /** |
843 /** |
844 * |
844 * |
970 { |
970 { |
971 //SendDeleteCommsMsg() operation calls RequestComplete() |
971 //SendDeleteCommsMsg() operation calls RequestComplete() |
972 //operation in the error situation. |
972 //operation in the error situation. |
973 return; |
973 return; |
974 } |
974 } |
975 aCertDataObj.mDeleted = ETrue; |
975 aCertDataObj.mDeleted = ETrue; |
976 |
976 |
977 User::RequestComplete(aRequestStatus,KErrNone); |
977 User::RequestComplete(aRequestStatus,KErrNone); |
978 } |
978 } |
979 |
979 |
980 ///////////////////////////////////////////////////////////////////////////////// |
980 ///////////////////////////////////////////////////////////////////////////////// |