51 #include <cmcommonconstants.h> |
51 #include <cmcommonconstants.h> |
52 #include "cmmanagerimpl.h" |
52 #include "cmmanagerimpl.h" |
53 #include "cmpwlanactivewaiter.h" |
53 #include "cmpwlanactivewaiter.h" |
54 |
54 |
55 #include <wifiprotuiinprocess.h> |
55 #include <wifiprotuiinprocess.h> |
|
56 #include <utf.h> |
56 |
57 |
57 using namespace CMManager; |
58 using namespace CMManager; |
58 |
59 |
59 #include "wapisecuritysettingsui.h" |
60 #include "wapisecuritysettingsui.h" |
60 |
61 |
1652 if ( retval ) |
1653 if ( retval ) |
1653 { |
1654 { |
1654 // We have to convert the 8-bit SSID to 16-bit for CommsDat. |
1655 // We have to convert the 8-bit SSID to 16-bit for CommsDat. |
1655 HBufC* ssid16 = HBufC::NewLC( ssid.Length() ); |
1656 HBufC* ssid16 = HBufC::NewLC( ssid.Length() ); |
1656 TPtr ssid16Ptr( ssid16->Des() ); |
1657 TPtr ssid16Ptr( ssid16->Des() ); |
1657 ssid16Ptr.Copy( ssid ); |
1658 |
1658 |
1659 // save iap name as unicode |
|
1660 TInt error = CnvUtfConverter::ConvertToUnicodeFromUtf8( ssid16Ptr, ssid ); |
|
1661 if ( error ) |
|
1662 { |
|
1663 ssid16Ptr.Copy( ssid ); |
|
1664 } |
1659 SetStringAttributeL( ECmName, *ssid16 ); |
1665 SetStringAttributeL( ECmName, *ssid16 ); |
|
1666 |
|
1667 // save ssid as UTF8 |
|
1668 ssid16Ptr.Zero(); |
|
1669 ssid16Ptr.FillZ(); |
|
1670 ssid16Ptr.Copy( ssid ); |
1660 SetStringAttributeL( EWlanSSID, *ssid16 ); |
1671 SetStringAttributeL( EWlanSSID, *ssid16 ); |
1661 // ConvertWLANConnectionStatesL( )converts WLAN connection state |
1672 // ConvertWLANConnectionStatesL( )converts WLAN connection state |
1662 // (TWlanConnectionMode) into EInfra or EAdhoc (TWlanNetMode) |
1673 // (TWlanConnectionMode) into EInfra or EAdhoc (TWlanNetMode) |
1663 SetIntAttributeL( EWlanConnectionMode, |
1674 SetIntAttributeL( EWlanConnectionMode, |
1664 (TUint32) ConvertWLANConnectionStatesL( connectionMode ) ); |
1675 (TUint32) ConvertWLANConnectionStatesL( connectionMode ) ); |
1761 if ( searchWlanReturn == KErrNotFound ) |
1772 if ( searchWlanReturn == KErrNotFound ) |
1762 { |
1773 { |
1763 // no Wlan network found, continuing process... |
1774 // no Wlan network found, continuing process... |
1764 HBufC* ssid16 = HBufC::NewLC( ssid.Length() ); |
1775 HBufC* ssid16 = HBufC::NewLC( ssid.Length() ); |
1765 TPtr ssid16Ptr( ssid16->Des() ); |
1776 TPtr ssid16Ptr( ssid16->Des() ); |
1766 ssid16Ptr.Copy( ssid ); |
1777 |
1767 // write ssid and go on... |
1778 // save iap name as unicode |
|
1779 TInt error = CnvUtfConverter::ConvertToUnicodeFromUtf8( ssid16Ptr, ssid ); |
|
1780 if ( error ) |
|
1781 { |
|
1782 ssid16Ptr.Copy( ssid ); |
|
1783 } |
1768 SetStringAttributeL( ECmName, *ssid16 ); |
1784 SetStringAttributeL( ECmName, *ssid16 ); |
|
1785 |
|
1786 // save ssid as UTF8 |
|
1787 ssid16Ptr.Zero(); |
|
1788 ssid16Ptr.FillZ(); |
|
1789 ssid16Ptr.Copy( ssid ); |
|
1790 |
|
1791 // write ssid and go on... |
1769 SetStringAttributeL( EWlanSSID, *ssid16 ); |
1792 SetStringAttributeL( EWlanSSID, *ssid16 ); |
1770 CleanupStack::PopAndDestroy( ssid16 ); |
1793 CleanupStack::PopAndDestroy( ssid16 ); |
1771 retval = ProceedWithManualL( ETrue ); // revert to fully manual... |
1794 retval = ProceedWithManualL( ETrue ); // revert to fully manual... |
1772 } |
1795 } |
1773 else |
1796 else |
2004 retVal = TCmCommonUi::ShowConfirmationQueryWithInputL( |
2027 retVal = TCmCommonUi::ShowConfirmationQueryWithInputL( |
2005 R_QTN_WLAN_PRMPT_NETWORK_NAME, |
2028 R_QTN_WLAN_PRMPT_NETWORK_NAME, |
2006 aNwName ); |
2029 aNwName ); |
2007 if ( retVal ) |
2030 if ( retVal ) |
2008 { |
2031 { |
|
2032 // save iap name as unicode |
2009 SetStringAttributeL( ECmName, aNwName ); |
2033 SetStringAttributeL( ECmName, aNwName ); |
|
2034 |
|
2035 // save ssid as UTF8 |
|
2036 TWlanSsid ssid; |
|
2037 TInt err = CnvUtfConverter::ConvertFromUnicodeToUtf8( ssid, aNwName ); |
|
2038 if ( err == KErrNone ) |
|
2039 { |
|
2040 aNwName.Copy( ssid ); |
|
2041 } |
2010 SetStringAttributeL( EWlanSSID, aNwName ); |
2042 SetStringAttributeL( EWlanSSID, aNwName ); |
2011 |
2043 |
2012 retVal = ETrue; |
2044 retVal = ETrue; |
2013 } |
2045 } |
2014 return retVal; |
2046 return retVal; |
2015 } |
2047 } |
2016 |
2048 |