18 #include <e32std.h> |
18 #include <e32std.h> |
19 #include <memory> |
19 #include <memory> |
20 |
20 |
21 #include <javausermessages.rsg> |
21 #include <javausermessages.rsg> |
22 |
22 |
23 #include <avkon.rsg> |
|
24 #include <AknGlobalConfirmationQuery.h> |
|
25 #include <stringresourcereader.h> |
23 #include <stringresourcereader.h> |
26 #include <StringLoader.h> |
24 #include <StringLoader.h> |
27 #include <data_caging_path_literals.hrh> |
25 #include <data_caging_path_literals.hrh> |
28 |
26 |
29 #ifndef SYMBIAN_ENABLE_SPLIT_HEADERS |
27 #ifndef SYMBIAN_ENABLE_SPLIT_HEADERS |
41 #include "javacertstoretoken.h" |
39 #include "javacertstoretoken.h" |
42 #include "javacommonutils.h" |
40 #include "javacommonutils.h" |
43 #include "s60commonutils.h" |
41 #include "s60commonutils.h" |
44 #include "securitycommsmessagedefs.h" |
42 #include "securitycommsmessagedefs.h" |
45 |
43 |
|
44 #ifdef RD_JAVA_S60_RELEASE_10_1_ONWARDS |
|
45 #include "confirmquery.h" |
|
46 #else |
|
47 #include <avkon.rsg> |
|
48 #include <AknGlobalConfirmationQuery.h> |
|
49 #endif |
46 |
50 |
47 |
51 |
48 //_LIT(KMIDP2TrustRoot, "J2ME MIDP2 Trust Root"); |
52 //_LIT(KMIDP2TrustRoot, "J2ME MIDP2 Trust Root"); |
49 _LIT(KMIDP2TrustRoot, "Java Trust Root"); |
53 _LIT(KMIDP2TrustRoot, "Java Trust Root"); |
50 _LIT(KJavaUserMessagesResourceFileName, "javausermessages.rsc"); |
54 _LIT(KJavaUserMessagesResourceFileName, "javausermessages.rsc"); |
58 |
62 |
59 /** |
63 /** |
60 * |
64 * |
61 */ |
65 */ |
62 CJavaCertStoreImpl::CJavaCertStoreImpl(CJavaCertStoreToken& aToken) |
66 CJavaCertStoreImpl::CJavaCertStoreImpl(CJavaCertStoreToken& aToken) |
63 : CActive(EPriorityNormal),mToken(aToken),mClientStatus(NULL),mState(EInitial),mQuery(0),mTempCertData(0) |
67 : CActive(EPriorityNormal),mToken(aToken),mClientStatus(NULL),mState(EInitial),mTempCertData(0) |
64 { |
68 { |
|
69 #ifndef RD_JAVA_S60_RELEASE_10_1_ONWARDS |
|
70 mQuery.reset(0); |
|
71 #endif |
65 } |
72 } |
66 |
73 |
67 /** |
74 /** |
68 * |
75 * |
69 */ |
76 */ |
875 { |
882 { |
876 mClientStatus = &aRequestStatus; |
883 mClientStatus = &aRequestStatus; |
877 SetActive(); |
884 SetActive(); |
878 return; |
885 return; |
879 } |
886 } |
|
887 #ifndef RD_JAVA_S60_RELEASE_10_1_ONWARDS |
880 delete mQuery.release(); |
888 delete mQuery.release(); |
|
889 #endif |
881 mState = EInitial; |
890 mState = EInitial; |
882 TRequestStatus* pRequestStatus = &aRequestStatus; |
891 TRequestStatus* pRequestStatus = &aRequestStatus; |
883 User::RequestComplete(pRequestStatus,KErrCancel); |
892 User::RequestComplete(pRequestStatus,KErrCancel); |
884 } |
893 } |
885 |
894 |
892 KJavaUserMessagesResourceFileName); |
901 KJavaUserMessagesResourceFileName); |
893 |
902 |
894 std::auto_ptr<CStringResourceReader> reader(CStringResourceReader::NewL(resourceFileName)); |
903 std::auto_ptr<CStringResourceReader> reader(CStringResourceReader::NewL(resourceFileName)); |
895 std::auto_ptr<HBufC> queryPrompt(reader->ReadResourceString(resourceId).AllocL()); |
904 std::auto_ptr<HBufC> queryPrompt(reader->ReadResourceString(resourceId).AllocL()); |
896 |
905 |
|
906 #ifndef RD_JAVA_S60_RELEASE_10_1_ONWARDS |
897 mQuery.reset(CAknGlobalConfirmationQuery::NewL()); |
907 mQuery.reset(CAknGlobalConfirmationQuery::NewL()); |
898 mQuery->ShowConfirmationQueryL(iStatus,queryPrompt->Des(),R_AVKON_SOFTKEYS_OK_CANCEL); |
908 mQuery->ShowConfirmationQueryL(iStatus,queryPrompt->Des(),R_AVKON_SOFTKEYS_OK_CANCEL); |
|
909 #else |
|
910 int completeStatus = KErrCancel; |
|
911 ConfirmQuery* query = new ConfirmQuery(); |
|
912 QString queryText = QString::fromStdWString( |
|
913 std::wstring((wchar_t*) queryPrompt->Ptr(), |
|
914 queryPrompt->Length())); |
|
915 if (query->accept(queryText)) |
|
916 { |
|
917 completeStatus = KErrNone; |
|
918 } |
|
919 delete query; query = NULL; |
|
920 TRequestStatus* status = &iStatus; |
|
921 User::RequestComplete(status, completeStatus); |
|
922 #endif |
|
923 |
899 } |
924 } |
900 |
925 |
901 /** |
926 /** |
902 * |
927 * |
903 */ |
928 */ |
904 void CJavaCertStoreImpl::SendDisableMsg(TInt aStatus) |
929 void CJavaCertStoreImpl::SendDisableMsg(TInt aStatus) |
905 { |
930 { |
906 |
931 |
907 mState = EInitial; |
932 mState = EInitial; |
|
933 #ifndef RD_JAVA_S60_RELEASE_10_1_ONWARDS |
908 delete mQuery.release(); |
934 delete mQuery.release(); |
|
935 #endif |
909 mState = EInitial; |
936 mState = EInitial; |
|
937 #ifndef RD_JAVA_S60_RELEASE_10_1_ONWARDS |
910 if (EAknSoftkeyOk != aStatus) |
938 if (EAknSoftkeyOk != aStatus) |
|
939 #else |
|
940 if (KErrNone != aStatus) |
|
941 #endif |
911 { |
942 { |
912 User::RequestComplete(mClientStatus,KErrCancel); |
943 User::RequestComplete(mClientStatus,KErrCancel); |
913 return; |
944 return; |
914 } |
945 } |
915 HandleSendingEnableDisableMsg(mClientStatus,EPreDisabling,*mTempCertData); |
946 HandleSendingEnableDisableMsg(mClientStatus,EPreDisabling,*mTempCertData); |
920 */ |
951 */ |
921 void CJavaCertStoreImpl::SendDeleteMsg(TInt aStatus) |
952 void CJavaCertStoreImpl::SendDeleteMsg(TInt aStatus) |
922 { |
953 { |
923 |
954 |
924 mState = EInitial; |
955 mState = EInitial; |
|
956 #ifndef RD_JAVA_S60_RELEASE_10_1_ONWARDS |
925 delete mQuery.release(); |
957 delete mQuery.release(); |
|
958 #endif |
926 mState = EInitial; |
959 mState = EInitial; |
|
960 #ifndef RD_JAVA_S60_RELEASE_10_1_ONWARDS |
927 if (EAknSoftkeyOk != aStatus) |
961 if (EAknSoftkeyOk != aStatus) |
|
962 #else |
|
963 if (KErrNone != aStatus) |
|
964 #endif |
928 { |
965 { |
929 User::RequestComplete(mClientStatus,KErrCancel); |
966 User::RequestComplete(mClientStatus,KErrCancel); |
930 return; |
967 return; |
931 } |
968 } |
932 HandleSendingDeleteMsg(mClientStatus,*mTempCertData); |
969 HandleSendingDeleteMsg(mClientStatus,*mTempCertData); |