equal
deleted
inserted
replaced
761 EMsgAddressControl, |
761 EMsgAddressControl, |
762 EMsgAppendControl, |
762 EMsgAppendControl, |
763 EMsgHeader ); |
763 EMsgHeader ); |
764 // take the number |
764 // take the number |
765 iNumber = iSmsHeader->FromAddress(); |
765 iNumber = iSmsHeader->FromAddress(); |
|
766 if ( !iFlags.iIsEmailMessage ) |
|
767 { |
|
768 iFlags.iValidSenderNumber = CommonPhoneParser::IsValidPhoneNumber( |
|
769 iNumber, CommonPhoneParser::ESMSNumber ); |
|
770 } |
|
771 else |
|
772 { |
|
773 iFlags.iValidSenderNumber = |
|
774 MsvUiServiceUtilities::IsValidEmailAddressL( |
|
775 iRecipientstring ); |
|
776 } |
766 break; |
777 break; |
767 default: |
778 default: |
768 #if defined ( _DEBUG ) |
779 #if defined ( _DEBUG ) |
769 Panic( EMsgSmsViewerUnknownSmsPduType ); |
780 Panic( EMsgSmsViewerUnknownSmsPduType ); |
770 #else |
781 #else |
882 // Tests if normal message |
893 // Tests if normal message |
883 if ( !iFlags.iBioMsg || !iFlags.iGms ) |
894 if ( !iFlags.iBioMsg || !iFlags.iGms ) |
884 { |
895 { |
885 // Prepare FindItem |
896 // Prepare FindItem |
886 iFindItemMenu = CFindItemMenu::NewL( EFindItemMenuPlaceHolder ); |
897 iFindItemMenu = CFindItemMenu::NewL( EFindItemMenuPlaceHolder ); |
|
898 iFindItemMenu->SetCallSubMenuVisibility ( EFalse ); // Click-To-Call |
887 iFindItemMenu->AttachItemFinderMenuL( R_SMSV_OPTIONSMENUPANE ); |
899 iFindItemMenu->AttachItemFinderMenuL( R_SMSV_OPTIONSMENUPANE ); |
888 } |
900 } |
889 } |
901 } |
890 |
902 |
891 // ...then construct the menu itself. There are two menu-resources, |
903 // ...then construct the menu itself. There are two menu-resources, |
3116 EMsgAppendControl, |
3128 EMsgAppendControl, |
3117 EMsgHeader ); |
3129 EMsgHeader ); |
3118 } |
3130 } |
3119 // take the number |
3131 // take the number |
3120 iNumber = iSmsHeader->FromAddress(); |
3132 iNumber = iSmsHeader->FromAddress(); |
|
3133 if ( !iFlags.iIsEmailMessage ) |
|
3134 { |
|
3135 iFlags.iValidSenderNumber = CommonPhoneParser::IsValidPhoneNumber( |
|
3136 iNumber, CommonPhoneParser::ESMSNumber ); |
|
3137 } |
|
3138 else |
|
3139 { |
|
3140 iFlags.iValidSenderNumber = |
|
3141 MsvUiServiceUtilities::IsValidEmailAddressL( |
|
3142 iRecipientstring ); |
|
3143 } |
3121 break; |
3144 break; |
3122 default: |
3145 default: |
3123 #if defined ( _DEBUG ) |
3146 #if defined ( _DEBUG ) |
3124 Panic( EMsgSmsViewerUnknownSmsPduType ); |
3147 Panic( EMsgSmsViewerUnknownSmsPduType ); |
3125 #else |
3148 #else |