equal
deleted
inserted
replaced
17 */ |
17 */ |
18 |
18 |
19 |
19 |
20 #include <iostream> |
20 #include <iostream> |
21 #include <unistd.h> |
21 #include <unistd.h> |
|
22 #include <usiferror.h> |
22 |
23 |
23 #include "comms.h" |
24 #include "comms.h" |
24 #include "javasymbianoslayer.h" |
25 #include "javasymbianoslayer.h" |
25 #include "logger.h" |
26 #include "logger.h" |
26 #include "resultsserver.h" |
27 #include "resultsserver.h" |
42 iStringPairs.clear(); |
43 iStringPairs.clear(); |
43 } |
44 } |
44 |
45 |
45 int ResultsServer::start() |
46 int ResultsServer::start() |
46 { |
47 { |
|
48 // Write reasonable error codes to iResults that can be used if |
|
49 // Java Installer never returns InstallerResultMessage. |
|
50 // If InstallerResultMessage is received the values will be overwritten. |
|
51 TRAPD(err, iResults.AddIntL(KSifOutParam_ErrCategory, EUnexpectedError)); |
|
52 if (KErrNone != err) |
|
53 { |
|
54 ELOG1(EJavaInstaller, |
|
55 "ResultsServer::start iResults.AddIntL ErrCategory err %d", err); |
|
56 } |
|
57 |
|
58 TRAP(err, iResults.AddIntL(KSifOutParam_ErrCode, KErrUnknown)); |
|
59 if (KErrNone != err) |
|
60 { |
|
61 ELOG1(EJavaInstaller, |
|
62 "ResultsServer::start iResults.AddIntL ErrCode err %d", err); |
|
63 } |
|
64 |
|
65 TRAP(err, iResults.AddIntL(KSifOutParam_ExtendedErrCode, 0)); |
|
66 if (KErrNone != err) |
|
67 { |
|
68 ELOG1(EJavaInstaller, |
|
69 "ResultsServer::start iResults.AddIntL ExtendedErrCode err %d", err); |
|
70 } |
|
71 |
|
72 // TODO: return also localized error message from usif |
|
73 // common localization file after the localized strings are available |
|
74 |
47 iRunning = 1; |
75 iRunning = 1; |
48 iComms.registerDefaultListener(this); |
76 iComms.registerDefaultListener(this); |
49 return iComms.start(IPC_ADDRESS_JAVA_SIF_PLUGIN_C); |
77 return iComms.start(IPC_ADDRESS_JAVA_SIF_PLUGIN_C); |
50 } |
78 } |
51 |
79 |
116 int result = iIntPairs[L"result"]; |
144 int result = iIntPairs[L"result"]; |
117 |
145 |
118 if (KErrNone != result) |
146 if (KErrNone != result) |
119 { |
147 { |
120 // return common error information |
148 // return common error information |
121 TRAP(err, iResults.AddIntL(KSifOutParam_ExtendedErrCode, result)); |
|
122 if (KErrNone != err) |
|
123 { |
|
124 ELOG1(EJavaInstaller, |
|
125 "ResultsServer::processMessage iResults.AddIntL ExtendedErrCode err %d", |
|
126 err); |
|
127 } |
|
128 |
|
129 TRAP(err, iResults.AddIntL(KSifOutParam_ErrCode, result)); |
149 TRAP(err, iResults.AddIntL(KSifOutParam_ErrCode, result)); |
130 if (KErrNone != err) |
150 if (KErrNone != err) |
131 { |
151 { |
132 ELOG1(EJavaInstaller, |
152 ELOG1(EJavaInstaller, |
133 "ResultsServer::processMessage iResults.AddIntL ErrCode err %d", err); |
153 "ResultsServer::processMessage iResults.AddIntL ErrCode err %d", err); |
195 result); |
215 result); |
196 } |
216 } |
197 } |
217 } |
198 else |
218 else |
199 { |
219 { |
200 // operation succeeded |
220 // Operation succeeded |
|
221 |
|
222 // Overwrite (reset) the default error values set for the case where no |
|
223 // InstallerResultMessage is never received |
|
224 TRAPD(err, iResults.AddIntL(KSifOutParam_ErrCategory, 0)); |
|
225 if (KErrNone != err) |
|
226 { |
|
227 ELOG1(EJavaInstaller, |
|
228 "ResultsServer::processMessage iResults.AddIntL ErrCategory err %d", err); |
|
229 } |
|
230 |
|
231 TRAP(err, iResults.AddIntL(KSifOutParam_ErrCode, 0)); |
|
232 if (KErrNone != err) |
|
233 { |
|
234 ELOG1(EJavaInstaller, |
|
235 "ResultsServer::processMessage iResults.AddIntL ErrCode err %d", err); |
|
236 } |
|
237 |
201 |
238 |
202 if (INSTALL_OPERATION == operation) |
239 if (INSTALL_OPERATION == operation) |
203 { |
240 { |
204 // Return the component ids of the installed Java application. |
241 // Return the component ids of the installed Java application. |
205 TComponentId resultComponentId = iIntPairs[L"suite-cid"]; |
242 TComponentId resultComponentId = iIntPairs[L"suite-cid"]; |