equal
deleted
inserted
replaced
16 */ |
16 */ |
17 |
17 |
18 |
18 |
19 |
19 |
20 #include "iaupdatersilentlauncher.h" |
20 #include "iaupdatersilentlauncher.h" |
21 #include "SWInstDefs.h" |
|
22 #include "iaupdaterdefs.h" |
21 #include "iaupdaterdefs.h" |
23 #include "iaupdatedebug.h" |
22 #include "iaupdatedebug.h" |
24 |
23 |
25 // ======== LOCAL FUNCTIONS ======== |
24 // ======== LOCAL FUNCTIONS ======== |
26 |
25 |
43 // |
42 // |
44 void CIAUpdaterSilentLauncher::ConstructL() |
43 void CIAUpdaterSilentLauncher::ConstructL() |
45 { |
44 { |
46 |
45 |
47 iOptionsPckg = Usif::COpaqueNamedParams::NewL(); |
46 iOptionsPckg = Usif::COpaqueNamedParams::NewL(); |
48 iResults = Usif::COpaqueNamedParams::NewL(); |
|
49 |
47 |
50 UsifSilentInstallOptionsL( iOptionsPckg ); |
48 UsifSilentInstallOptionsL( iOptionsPckg ); |
51 |
49 |
52 } |
50 } |
53 |
51 |
73 CIAUpdaterSilentLauncher::~CIAUpdaterSilentLauncher() |
71 CIAUpdaterSilentLauncher::~CIAUpdaterSilentLauncher() |
74 { |
72 { |
75 iLauncher.Close(); |
73 iLauncher.Close(); |
76 |
74 |
77 delete iOptionsPckg; |
75 delete iOptionsPckg; |
78 delete iResults; |
|
79 |
76 |
80 } |
77 } |
81 |
78 |
82 // ----------------------------------------------------------------------------- |
79 // ----------------------------------------------------------------------------- |
83 // CIAUpdaterSilentLauncher::InstallL |
80 // CIAUpdaterSilentLauncher::InstallL |
84 // Perform installation. |
81 // Perform installation. |
85 // ----------------------------------------------------------------------------- |
82 // ----------------------------------------------------------------------------- |
86 // |
83 // |
87 void CIAUpdaterSilentLauncher::InstallL( const TDesC& aFile, TRequestStatus& aStatus ) |
84 void CIAUpdaterSilentLauncher::InstallL ( const TDesC& aFile, |
|
85 TRequestStatus& aStatus, Usif::COpaqueNamedParams* aResults ) |
88 { |
86 { |
89 IAUPDATE_TRACE("[IAUpdater] CIAUpdaterSilentLauncher::InstallL() begin"); |
87 IAUPDATE_TRACE("[IAUpdater] CIAUpdaterSilentLauncher::InstallL() begin"); |
90 |
88 |
91 if ( !iConnected ) |
89 if ( !iConnected ) |
92 { |
90 { |
95 iConnected = ETrue; |
93 iConnected = ETrue; |
96 } |
94 } |
97 |
95 |
98 // Launch the installation |
96 // Launch the installation |
99 IAUPDATE_TRACE("[IAUpdater] Launch silent install"); |
97 IAUPDATE_TRACE("[IAUpdater] Launch silent install"); |
100 iLauncher.Install( aFile, *iOptionsPckg, *iResults, aStatus ); |
98 iLauncher.Install( aFile, *iOptionsPckg, *aResults, aStatus ); |
101 |
99 |
102 IAUPDATE_TRACE("[IAUpdater] CIAUpdaterSilentLauncher::InstallL() end"); |
100 IAUPDATE_TRACE("[IAUpdater] CIAUpdaterSilentLauncher::InstallL() end"); |
103 } |
101 } |
104 |
102 |
105 // ----------------------------------------------------------------------------- |
103 // ----------------------------------------------------------------------------- |
160 |
158 |
161 // This only affects Java applications. |
159 // This only affects Java applications. |
162 aOptions->AddIntL( Usif::KSifInParam_AllowDownload, Usif::EAllowed ); |
160 aOptions->AddIntL( Usif::KSifInParam_AllowDownload, Usif::EAllowed ); |
163 |
161 |
164 // Where to save. |
162 // Where to save. |
165 //aOptions->AddIntL( Usif::KSifInParam_Drive, EDriveC ); |
163 // Notice! Here we use always the same drive for the IAD. |
|
164 // So, this will not change automatically according to the disk spaces |
|
165 // and when new memory cards are inserted into the phone. |
|
166 // TODO: remove comment when parameter buffer increased in USIF |
|
167 TDriveUnit driveUnit(IAUpdaterDefs::KIAUpdaterDrive); |
|
168 //aOptions->AddIntL( Usif::KSifInParam_Drive, driveUnit ); |
166 |
169 |
167 // Choose the phone language. |
170 // Choose the phone language. |
|
171 // TODO: remove comment when parameter buffer increased in USIF |
168 TLanguage lang = User::Language(); |
172 TLanguage lang = User::Language(); |
169 //aOptions->AddIntL( Usif::KSifInParam_Languages, lang ); // User::Language() ); |
173 //aOptions->AddIntL( Usif::KSifInParam_Languages, lang ); |
170 |
174 |
171 //aOptions->AddIntL( Usif::KSifInParam_Drive, IAUpdateUtils::DriveToInstallL( aUid, aSize ) ); |
|
172 } |
175 } |
173 |
176 |
174 |
177 |
175 // ======== GLOBAL FUNCTIONS ======== |
178 // ======== GLOBAL FUNCTIONS ======== |
176 |
179 |