equal
deleted
inserted
replaced
857 parValues.ResetAndDestroy(); |
857 parValues.ResetAndDestroy(); |
858 return err; |
858 return err; |
859 } |
859 } |
860 |
860 |
861 parValues.ResetAndDestroy(); |
861 parValues.ResetAndDestroy(); |
862 aParamValues.ResetAndDestroy(); |
862 //coverity[deref_ptr_in_call] |
863 TInt error = iSuplStorageSettings->GetAllSlp(parValues); //handle return value... |
863 TInt error = iSuplStorageSettings->GetAllSlp(parValues); //handle return value... |
864 if (error!=KErrNone) |
864 if (error!=KErrNone) |
865 { |
865 { |
866 delete serverAddress; |
866 delete serverAddress; |
867 delete iapName; |
867 delete iapName; |
903 aParamValues.Append(params); |
903 aParamValues.Append(params); |
904 } |
904 } |
905 delete serverAddress; |
905 delete serverAddress; |
906 delete iapName; |
906 delete iapName; |
907 aParamValues.Close(); |
907 aParamValues.Close(); |
|
908 //coverity[check_after_deref] |
908 if (iSuplStorageSettings) |
909 if (iSuplStorageSettings) |
909 { |
910 { |
910 delete iSuplStorageSettings; |
911 delete iSuplStorageSettings; |
911 iSuplStorageSettings = NULL; |
912 iSuplStorageSettings = NULL; |
912 } |
913 } |
1023 TInt aRequestId |
1024 TInt aRequestId |
1024 ) |
1025 ) |
1025 { |
1026 { |
1026 __ASSERT_ALWAYS(SubSessionHandle(), |
1027 __ASSERT_ALWAYS(SubSessionHandle(), |
1027 User::Panic(KSuplClientFault, ESuplServerBadHandle)); |
1028 User::Panic(KSuplClientFault, ESuplServerBadHandle)); |
1028 |
1029 |
|
1030 |
|
1031 if(!CheckSuplTriggerServiceStatus()) //To check that triggering service is allowed by user... |
|
1032 { |
|
1033 TRequestStatus *status = &aStatus; |
|
1034 User::RequestComplete(status,KErrNotSupported); |
|
1035 return; |
|
1036 } |
|
1037 |
1029 if( iSuplService != ESUPL_2_0 ) |
1038 if( iSuplService != ESUPL_2_0 ) |
1030 { |
1039 { |
1031 TRequestStatus *status = &aStatus; |
1040 TRequestStatus *status = &aStatus; |
1032 User::RequestComplete(status,KErrNotSupported); |
1041 User::RequestComplete(status,KErrNotSupported); |
1033 return; |
1042 return; |
1092 ) |
1101 ) |
1093 { |
1102 { |
1094 __ASSERT_ALWAYS(SubSessionHandle(), |
1103 __ASSERT_ALWAYS(SubSessionHandle(), |
1095 User::Panic(KSuplClientFault, ESuplServerBadHandle)); |
1104 User::Panic(KSuplClientFault, ESuplServerBadHandle)); |
1096 |
1105 |
|
1106 if(!CheckSuplTriggerServiceStatus()) //To check that triggering service is allowed by user... |
|
1107 { |
|
1108 TRequestStatus *status = &aStatus; |
|
1109 User::RequestComplete(status,KErrNotSupported); |
|
1110 return; |
|
1111 } |
|
1112 |
1097 if( iSuplService != ESUPL_2_0 ) |
1113 if( iSuplService != ESUPL_2_0 ) |
1098 { |
1114 { |
1099 TRequestStatus *status = &aStatus; |
1115 TRequestStatus *status = &aStatus; |
1100 User::RequestComplete(status,KErrNotSupported); |
1116 User::RequestComplete(status,KErrNotSupported); |
1101 return; |
1117 return; |
1191 TSuplTriggerFireInfo& aFireInfo) |
1207 TSuplTriggerFireInfo& aFireInfo) |
1192 { |
1208 { |
1193 __ASSERT_ALWAYS(SubSessionHandle(), |
1209 __ASSERT_ALWAYS(SubSessionHandle(), |
1194 User::Panic(KSuplClientFault, ESuplServerBadHandle)); |
1210 User::Panic(KSuplClientFault, ESuplServerBadHandle)); |
1195 |
1211 |
|
1212 if(!CheckSuplTriggerServiceStatus()) //To check that triggering service is allowed by user... |
|
1213 { |
|
1214 TRequestStatus *status = &aStatus; |
|
1215 User::RequestComplete(status,KErrNotSupported); |
|
1216 return; |
|
1217 } |
|
1218 |
1196 if( iSuplService != ESUPL_2_0 ) |
1219 if( iSuplService != ESUPL_2_0 ) |
1197 { |
1220 { |
1198 TRequestStatus *status = &aStatus; |
1221 TRequestStatus *status = &aStatus; |
1199 User::RequestComplete(status,KErrNotSupported); |
1222 User::RequestComplete(status,KErrNotSupported); |
1200 return; |
1223 return; |
1230 iNotifyRequestCtr++; |
1253 iNotifyRequestCtr++; |
1231 |
1254 |
1232 SendReceive(ESuplTerminalSubssnNotifyTriggerFired, args, aStatus); |
1255 SendReceive(ESuplTerminalSubssnNotifyTriggerFired, args, aStatus); |
1233 } |
1256 } |
1234 |
1257 |
|
1258 // --------------------------------------------------------- |
|
1259 // RSuplTerminalSubSession::CheckSuplTriggerServiceStatus |
|
1260 // |
|
1261 // (other items were commented in a header). |
|
1262 // --------------------------------------------------------- |
|
1263 // |
|
1264 TBool RSuplTerminalSubSession::CheckSuplTriggerServiceStatus() |
|
1265 { |
|
1266 |
|
1267 delete iSuplStorageSettings; |
|
1268 iSuplStorageSettings = NULL; |
|
1269 |
|
1270 CSuplSettings::TSuplTriggerStatus suplTriggerStatus; |
|
1271 |
|
1272 // create local object iSuplStorageSettings |
|
1273 TRAPD(err,iSuplStorageSettings = CSuplSettings::NewL()); |
|
1274 if(err == KErrNone) |
|
1275 { |
|
1276 iSuplStorageSettings->GetSuplTriggeredServiceStatus(suplTriggerStatus); |
|
1277 delete iSuplStorageSettings; |
|
1278 iSuplStorageSettings = NULL; |
|
1279 |
|
1280 if(suplTriggerStatus == CSuplSettings::ESuplTriggerOn) |
|
1281 { |
|
1282 return ETrue; |
|
1283 } |
|
1284 else |
|
1285 { |
|
1286 return EFalse; |
|
1287 } |
|
1288 } |
|
1289 else |
|
1290 { |
|
1291 return ETrue; |
|
1292 } |
|
1293 } |
|
1294 |
1235 // end of file |
1295 // end of file |