equal
deleted
inserted
replaced
203 int MsgUnifiedEditorAddress::addressCount() |
203 int MsgUnifiedEditorAddress::addressCount() |
204 { |
204 { |
205 return mAddressEdit->addresses().count(); |
205 return mAddressEdit->addresses().count(); |
206 } |
206 } |
207 |
207 |
208 void MsgUnifiedEditorAddress::setAddresses(ConvergedMessageAddressList addrlist) |
208 void MsgUnifiedEditorAddress::setAddresses(ConvergedMessageAddressList addrlist,bool aSkipCheck) |
209 { |
209 { |
210 // avoid processing if no info available |
210 // avoid processing if no info available |
211 if(addrlist.count() == 0) |
211 if(addrlist.count() == 0) |
212 { |
212 { |
213 return; |
213 return; |
241 int invalidCount= 0; |
241 int invalidCount= 0; |
242 QString invalidContacts; |
242 QString invalidContacts; |
243 for(int i = 0; i < count; i++ ) |
243 for(int i = 0; i < count; i++ ) |
244 { |
244 { |
245 bool isValid = false; |
245 bool isValid = false; |
246 isValid = checkValidAddress(addrlist.at(i)->address()); |
246 if(!aSkipCheck) |
|
247 { |
|
248 isValid = checkValidAddress(addrlist.at(i)->address()); |
|
249 } |
|
250 else |
|
251 { |
|
252 // no need to validate, assume correct |
|
253 isValid = true; |
|
254 } |
247 if(!isValid) |
255 if(!isValid) |
248 { |
256 { |
249 invalidCount ++; |
257 invalidCount ++; |
250 // append the comma till last but one contact. |
258 // append the comma till last but one contact. |
251 // add the invalid ocntacts to the " , " seperated string. |
259 // add the invalid ocntacts to the " , " seperated string. |
252 if(invalidCount > 1) |
260 if(invalidCount > 1) |
253 { |
261 { |
254 invalidContacts.append(COMMA_SEPERATOR); |
262 invalidContacts.append(COMMA_SEPERATOR); |
255 } |
263 } |
256 invalidContacts.append(addrlist.at(i)->alias()); |
264 if(addrlist[i]->alias().isEmpty()) |
|
265 invalidContacts.append(addrlist.at(i)->address()); |
|
266 else |
|
267 invalidContacts.append(addrlist.at(i)->alias()); |
257 } |
268 } |
258 else |
269 else |
259 { |
270 { |
260 mAddressMap.insertMulti(addrlist[i]->address(), addrlist[i]->alias()); |
271 mAddressMap.insertMulti(addrlist[i]->address(), addrlist[i]->alias()); |
261 if(!addrlist[i]->alias().isEmpty()) |
272 if(!addrlist[i]->alias().isEmpty()) |
269 } |
280 } |
270 } |
281 } |
271 if(invalidCount) |
282 if(invalidCount) |
272 { |
283 { |
273 QString invalidStr; |
284 QString invalidStr; |
274 (invalidCount == 1)?(invalidStr = QString(LOC_INVALID_RECIPIENT_NOT_ADDED)) :(invalidStr = QString(LOC_INVALID_RECIPIENTS_NOT_ADDED)); |
285 (invalidCount == 1)?(invalidStr = QString(LOC_INVALID_RECIPIENT_NOT_ADDED.arg(invalidContacts))) :(invalidStr = QString(LOC_INVALID_RECIPIENTS_NOT_ADDED.arg(invalidContacts))); |
275 // append line seperator |
286 HbMessageBox::information(invalidStr, 0, 0, HbMessageBox::Ok); |
276 invalidStr.append("<br>"); |
287 } |
277 invalidStr.append(invalidContacts); |
288 |
278 HbMessageBox::information(invalidStr, 0, 0, HbMessageBox::Ok); |
|
279 } |
|
280 |
289 |
281 // addition operation complete, reset flags |
290 // addition operation complete, reset flags |
282 mAboutToExceedMaxSmsRecipients = false; |
291 mAboutToExceedMaxSmsRecipients = false; |
283 mAboutToExceedMaxMmsRecipients = false; |
292 mAboutToExceedMaxMmsRecipients = false; |
284 mExceedsMaxMmsRecipientsBy = 0; |
293 mExceedsMaxMmsRecipientsBy = 0; |