equal
deleted
inserted
replaced
21 #include <msvsysagentaction.h> |
21 #include <msvsysagentaction.h> |
22 #include <txtrich.h> |
22 #include <txtrich.h> |
23 #include <logsmspdudata.h> |
23 #include <logsmspdudata.h> |
24 #include <smsulog.h> |
24 #include <smsulog.h> |
25 #include <logwraplimits.h> |
25 #include <logwraplimits.h> |
26 #include <exterror.h> |
|
27 |
26 |
28 #include "SMSSendSession.h" |
27 #include "SMSSendSession.h" |
29 #include "SMSSPAN.H" |
28 #include "SMSSPAN.H" |
30 |
29 |
31 CSmsOutboxSend* CSmsOutboxSend::NewL(CMsvServerEntry& aServerEntry, CMsvScheduleSend& aScheduleSend, RFs& aFs) |
30 CSmsOutboxSend* CSmsOutboxSend::NewL(CMsvServerEntry& aServerEntry, CMsvScheduleSend& aScheduleSend, RFs& aFs) |
209 #endif |
208 #endif |
210 case ESmsOutboxSendStateSending: |
209 case ESmsOutboxSendStateSending: |
211 { |
210 { |
212 if (iCurrentMessage) |
211 if (iCurrentMessage) |
213 { |
212 { |
214 if( (iProgress.iError == KErrGsmSMSShortMessageTransferRejected) || (iProgress.iError == KErrGsmSMSInvalidMandatoryInformation) || (iProgress.iError == KErrGsmSMSUnidentifiedSubscriber) || |
213 SMSSLOG(FLogFormat(_L8("CSmsOutboxSend::DoRunL(), error for ReSchedule %d"), iProgress.iError)); |
215 (iProgress.iError == KErrGsmSMSUnknownSubscriber) || (iProgress.iError == KErrGsmSMSNetworkOutOfOrder) ) |
214 ReScheduleFailedMessageL(); |
216 { |
|
217 DoComplete(iProgress.iError); |
|
218 } |
|
219 else |
|
220 { |
|
221 ReScheduleFailedMessageL(); |
|
222 } |
|
223 } |
215 } |
224 else |
216 else |
225 { |
217 { |
226 __ASSERT_DEBUG(iProgress.iError == KErrNotFound, Panic(KSmssPanicUnexpectedErrorCode)); |
218 __ASSERT_DEBUG(iProgress.iError == KErrNotFound, Panic(KSmssPanicUnexpectedErrorCode)); |
227 } |
219 } |
521 } |
513 } |
522 |
514 |
523 _LIT16(KComma, ","); |
515 _LIT16(KComma, ","); |
524 |
516 |
525 RBuf16 buffer; |
517 RBuf16 buffer; |
526 buffer.Create(size+num); |
518 buffer.CreateL(size+num); |
527 if(num > 0) |
519 if(num > 0) |
528 { |
520 { |
529 rcpt = numbers[0]; |
521 rcpt = numbers[0]; |
530 buffer.Append(rcpt->Address()); |
522 buffer.Append(rcpt->Address()); |
531 } |
523 } |