1810 |
1810 |
1811 if ( RMobileCall::KCallAlternating & mobileCallInfo->iValid ) |
1811 if ( RMobileCall::KCallAlternating & mobileCallInfo->iValid ) |
1812 { |
1812 { |
1813 iMobileCallInfo.iAlternatingCall = mobileCallInfo->iAlternatingCall; |
1813 iMobileCallInfo.iAlternatingCall = mobileCallInfo->iAlternatingCall; |
1814 } |
1814 } |
1815 |
1815 |
|
1816 // If a Mobile Originated call, take Alpha ID and Icon ID values from iCallParams, if valid. |
|
1817 if ( iMobileCallInfo.iRemoteParty.iDirection == RMobileCall::EMobileOriginated) |
|
1818 { |
|
1819 // Set the Alpha ID, if not set. |
|
1820 if ( iMobileCallInfo.iAlphaId.Length() <= 0 && |
|
1821 iCallParams.iAlphaId.Length() > 0 && |
|
1822 iCallParams.iAlphaId.Length() <= RMobileCall::KAlphaIdMaxSize ) |
|
1823 { |
|
1824 iMobileCallInfo.iAlphaId.Zero(); |
|
1825 iMobileCallInfo.iAlphaId.Copy(iCallParams.iAlphaId ); |
|
1826 iMobileCallInfo.iValid |= RMobileCall::KCallAlphaId; |
|
1827 } |
|
1828 // Set the Icon ID, if not set. |
|
1829 if ( iMobileCallInfo.iIconId.iIdentifier == 0 && |
|
1830 iMobileCallInfo.iIconId.iQualifier == RMobileCall::EIconQualifierNotSet && |
|
1831 iCallParams.iIconId.iIdentifier > 0 && |
|
1832 iCallParams.iIconId.iQualifier != RMobileCall::EIconQualifierNotSet ) |
|
1833 { |
|
1834 iMobileCallInfo.iIconId.iIdentifier = iCallParams.iIconId.iIdentifier; |
|
1835 iMobileCallInfo.iIconId.iQualifier = iCallParams.iIconId.iQualifier; |
|
1836 iMobileCallInfo.iValid |= RMobileCall::KCallIconId; |
|
1837 } |
|
1838 } |
1816 |
1839 |
1817 // TMobileCallInfoV3 |
1840 // TMobileCallInfoV3 |
1818 if ( (KETelExtMultimodeV3 == extensionId) || |
1841 if ( (KETelExtMultimodeV3 == extensionId) || |
1819 (KEtelExtMultimodeV7 == extensionId) || |
1842 (KEtelExtMultimodeV7 == extensionId) || |
1820 (KEtelExtMultimodeV8 == extensionId)) |
1843 (KEtelExtMultimodeV8 == extensionId)) |
1842 { |
1865 { |
1843 // TCallParamOrigin iCallParamOrigin; |
1866 // TCallParamOrigin iCallParamOrigin; |
1844 iMobileCallInfo.iCallParamOrigin = mobileCallInfoV7->iCallParamOrigin; |
1867 iMobileCallInfo.iCallParamOrigin = mobileCallInfoV7->iCallParamOrigin; |
1845 } |
1868 } |
1846 |
1869 |
1847 if(RMobileCall::KCallIconId & mobileCallInfo->iValid) |
1870 // Set the Alpha ID if call is not Mobile Originated. |
|
1871 // If MO, the Alpha ID would be set above from iCallParams |
|
1872 if(RMobileCall::KCallIconId & mobileCallInfo->iValid && |
|
1873 iMobileCallInfo.iRemoteParty.iDirection != RMobileCall::EMobileOriginated) |
1848 { |
1874 { |
1849 // TIconId iIconId; |
1875 // TIconId iIconId; |
1850 iMobileCallInfo.iIconId.iIdentifier = mobileCallInfoV7->iIconId.iIdentifier; |
1876 iMobileCallInfo.iIconId.iIdentifier = mobileCallInfoV7->iIconId.iIdentifier; |
1851 iMobileCallInfo.iIconId.iQualifier = mobileCallInfoV7->iIconId.iQualifier; |
1877 iMobileCallInfo.iIconId.iQualifier = mobileCallInfoV7->iIconId.iQualifier; |
1852 } |
1878 } |
1853 |
1879 |
1854 if(RMobileCall::KCallAlphaId & mobileCallInfo->iValid) |
1880 // Set the Icon ID if call is not Mobile Originated. |
|
1881 // If MO, Icon ID would be set above from iCallParams |
|
1882 if(RMobileCall::KCallAlphaId & mobileCallInfo->iValid && |
|
1883 iMobileCallInfo.iRemoteParty.iDirection != RMobileCall::EMobileOriginated) |
1855 { |
1884 { |
1856 // TAlphaIdBuf iAlphaId; |
1885 // TAlphaIdBuf iAlphaId; |
1857 iMobileCallInfo.iAlphaId.Zero(); |
1886 iMobileCallInfo.iAlphaId.Zero(); |
1858 iMobileCallInfo.iAlphaId.Copy( mobileCallInfoV7->iAlphaId ); |
1887 iMobileCallInfo.iAlphaId.Copy( mobileCallInfoV7->iAlphaId ); |
1859 } |
1888 } |