134 iSuplStorageSettings->RemoveObserver(); |
134 iSuplStorageSettings->RemoveObserver(); |
135 iSuplStorageSettings->RemoveSessionObserver(); |
135 iSuplStorageSettings->RemoveSessionObserver(); |
136 } |
136 } |
137 |
137 |
138 delete iSuplStorageSettings; |
138 delete iSuplStorageSettings; |
139 delete iSettingsLauncher; |
139 //delete iSettingsLauncher; |
140 delete iNotifier; |
140 delete iNotifier; |
141 iMobilePhone.Close(); |
141 iMobilePhone.Close(); |
142 iTelServer.Close(); |
142 iTelServer.Close(); |
143 iIMSI.Close(); |
143 iIMSI.Close(); |
144 iUIRequestArray.Close(); |
144 iUIRequestArray.Close(); |
167 |
167 |
168 iSuplStorageSettings = CSuplSettingsInternal::NewL(); |
168 iSuplStorageSettings = CSuplSettingsInternal::NewL(); |
169 iSuplStorageSettings->SetObserverL(*this); |
169 iSuplStorageSettings->SetObserverL(*this); |
170 iSuplStorageSettings->SetSessionObserverL(*this); |
170 iSuplStorageSettings->SetSessionObserverL(*this); |
171 |
171 |
172 iSettingsLauncher = COMASuplSettingsLauncher::NewL( *this ); |
172 //iSettingsLauncher = COMASuplSettingsLauncher::NewL( *this ); |
173 |
173 |
174 TRAPD(err,iOMASuplAsnHandlerBaseImpl = COMASuplAsnHandlerBase::NewL(2);) |
174 TRAPD(err,iOMASuplAsnHandlerBaseImpl = COMASuplAsnHandlerBase::NewL(2);) |
175 TBuf<64> buf(_L("ASN Plugin 2.0 loaded with error : ")); |
175 TBuf<64> buf(_L("ASN Plugin 2.0 loaded with error : ")); |
176 buf.AppendNum(err); |
176 buf.AppendNum(err); |
177 iTrace->Trace(buf,KTraceFileName, __LINE__); |
177 iTrace->Trace(buf,KTraceFileName, __LINE__); |
255 iCommManager = aCommManager; |
255 iCommManager = aCommManager; |
256 |
256 |
257 //Connect to ETel |
257 //Connect to ETel |
258 User::LeaveIfError(ConnectToETelL()); |
258 User::LeaveIfError(ConnectToETelL()); |
259 |
259 |
260 ReadSuplUsage(); |
260 //ReadSuplUsage(); |
261 |
261 |
262 if(iSuplEcomEventWatcher) |
262 if(iSuplEcomEventWatcher) |
263 { |
263 { |
264 iTrace->Trace(_L("NotifyOnPlugInUnInstallation starting"), KTraceFileName, __LINE__); |
264 iTrace->Trace(_L("NotifyOnPlugInUnInstallation starting"), KTraceFileName, __LINE__); |
265 iSuplEcomEventWatcher->NotifyOnPlugInUnInstallation(); |
265 iSuplEcomEventWatcher->NotifyOnPlugInUnInstallation(); |
1249 void COMASUPLProtocolManager2::HandleSuplSettingsChangeL(TSuplSettingsEventType aEvent,TInt /*aSlpId*/) |
1249 void COMASUPLProtocolManager2::HandleSuplSettingsChangeL(TSuplSettingsEventType aEvent,TInt /*aSlpId*/) |
1250 { |
1250 { |
1251 if( aEvent == MSuplSettingsObserver::ESuplSettingsEventSuplUsageChange) |
1251 if( aEvent == MSuplSettingsObserver::ESuplSettingsEventSuplUsageChange) |
1252 { |
1252 { |
1253 iTrace->Trace(_L("Setting Changed.SUPL Usage changed.. Reeading once again..."), KTraceFileName, __LINE__); |
1253 iTrace->Trace(_L("Setting Changed.SUPL Usage changed.. Reeading once again..."), KTraceFileName, __LINE__); |
1254 ReadSuplUsage(); |
1254 //ReadSuplUsage(); |
1255 } |
1255 } |
1256 else if( aEvent == MSuplSettingsObserver::ESuplSettingsEventCommParameterChange) |
1256 else if( aEvent == MSuplSettingsObserver::ESuplSettingsEventCommParameterChange) |
1257 { |
1257 { |
1258 iTrace->Trace(_L("Setting Changed.Communication Parameters changed.. Reeading once again..."), KTraceFileName, __LINE__); |
1258 iTrace->Trace(_L("Setting Changed.Communication Parameters changed.. Reeading once again..."), KTraceFileName, __LINE__); |
1259 |
1259 |
|
1260 } |
|
1261 } |
|
1262 |
|
1263 // ----------------------------------------------------------------------------- |
|
1264 // COMASUPLProtocolManager2::HandleSuplTriggerStatusChangeL |
|
1265 // notifier for settings changes. |
|
1266 // ----------------------------------------------------------------------------- |
|
1267 void COMASUPLProtocolManager2::HandleSuplTriggerStatusChangeL(CSuplSettings::TSuplTriggerStatus aSuplTriggerStatus) |
|
1268 { |
|
1269 iTrace->Trace(_L("Setting Changed.SUPL Trigger Status Changed..."), KTraceFileName, __LINE__); |
|
1270 if( aSuplTriggerStatus == CSuplSettings::ESuplTriggerOff) |
|
1271 { |
|
1272 iTrace->Trace(_L("Setting Changed.SUPL Trigger Status to OFF..."), KTraceFileName, __LINE__); |
|
1273 TInt TotalSession = iSuplSessions.Count(); |
|
1274 for(TInt cnt = 0; cnt < TotalSession; ++cnt) |
|
1275 { |
|
1276 iTrace->Trace(_L("Cancelling Trigger Session..."), KTraceFileName, __LINE__); |
|
1277 COMASuplSession* OMAsuplSession = static_cast<COMASuplSession*>(iSuplSessions[cnt]); |
|
1278 OMAsuplSession->CancelTriggerSession(); |
|
1279 } |
1260 } |
1280 } |
1261 } |
1281 } |
1262 |
1282 |
1263 // ----------------------------------------------------------------------------- |
1283 // ----------------------------------------------------------------------------- |
1264 // COMASUPLProtocolManager2::LogPacket |
1284 // COMASUPLProtocolManager2::LogPacket |
1740 iPreviousMessageLength = 0 ; |
1760 iPreviousMessageLength = 0 ; |
1741 iIsPreviouslyDecodingFailed = EFalse; |
1761 iIsPreviouslyDecodingFailed = EFalse; |
1742 } |
1762 } |
1743 |
1763 |
1744 |
1764 |
1745 // ----------------------------------------------------------------------------- |
|
1746 // COMASUPLProtocolManager2::LaunchSettingsUI |
|
1747 // |
|
1748 // |
|
1749 // ----------------------------------------------------------------------------- |
|
1750 // |
|
1751 TInt COMASUPLProtocolManager2::LaunchSettingsUI(MOMASuplUICompletionObserver* aObserver,const TDesC& aForHslp) |
|
1752 { |
|
1753 iTrace->Trace(_L("COMASUPLProtocolManager2::LaunchSettingsUI"), KTraceFileName, __LINE__); |
|
1754 |
|
1755 if (iSuplSettings->IsUIActive()) |
|
1756 return KErrInUse; |
|
1757 iSessnUIObserver = aObserver; |
|
1758 iSuplSettings->SetUIActive(ETrue); |
|
1759 |
|
1760 if(iUIRequestArray.Count() <= 0 ) |
|
1761 { |
|
1762 iTrace->Trace(_L("COMASUPLProtocolManager2::LaunchSettingsUI"), KTraceFileName, __LINE__); |
|
1763 iUIRequestArray.Append(aObserver); |
|
1764 iSuplSettings->SetUIActive(ETrue); |
|
1765 iCurrentlyUsedHslp.Copy(aForHslp); |
|
1766 return iSettingsLauncher->LaunchSettings(); |
|
1767 } |
|
1768 else if(iCurrentlyUsedHslp.Compare(aForHslp) == KErrNone) |
|
1769 { |
|
1770 iUIRequestArray.Append(aObserver); |
|
1771 } |
|
1772 else |
|
1773 { |
|
1774 return KErrInUse; |
|
1775 } |
|
1776 |
|
1777 return KErrNone; |
|
1778 } |
|
1779 |
|
1780 // ----------------------------------------------------------------------------- |
|
1781 // COMASUPLProtocolManager2::SettingsUICompletedL |
|
1782 // |
|
1783 // |
|
1784 // ----------------------------------------------------------------------------- |
|
1785 // |
|
1786 void COMASUPLProtocolManager2::SettingsUICompletedL(TInt aError) |
|
1787 { |
|
1788 iTrace->Trace(_L("COMASUPLProtocolManager2::SettingsUICompletedL"), KTraceFileName, __LINE__); |
|
1789 iSuplSettings->SetUIActive(EFalse); |
|
1790 |
|
1791 if (iDeInitDone) |
|
1792 { |
|
1793 iTrace->Trace(_L("COMASUPLProtocolManager2::SettingsUICompletedL, de-init done. Completing request"), KTraceFileName, __LINE__); |
|
1794 iDeInitDone = EFalse; |
|
1795 User::RequestComplete(iDeInitRequestStatus,KErrNone); |
|
1796 } |
|
1797 else |
|
1798 { |
|
1799 for(TInt i = 0; i < iUIRequestArray.Count(); i++) |
|
1800 { |
|
1801 iTrace->Trace(_L("COMASUPLProtocolManager2::SettingsUICompletedL,Forwarding ConnRerquestor "), KTraceFileName, __LINE__); |
|
1802 MOMASuplUICompletionObserver* observer = iUIRequestArray[i]; |
|
1803 observer->SettingsUICompletedL(aError); |
|
1804 } |
|
1805 } |
|
1806 |
|
1807 iCurrentlyUsedHslp.Copy(_L("")); |
|
1808 iUIRequestArray.Reset(); |
|
1809 } |
|
1810 |
|
1811 |
1765 |
1812 // ----------------------------------------------------------------------------- |
1766 // ----------------------------------------------------------------------------- |
1813 // COMASUPLProtocolManager2::DeInitialize |
1767 // COMASUPLProtocolManager2::DeInitialize |
1814 // |
1768 // |
1815 // |
1769 // |
1869 // |
1823 // |
1870 // |
1824 // |
1871 // ----------------------------------------------------------------------------- |
1825 // ----------------------------------------------------------------------------- |
1872 // |
1826 // |
1873 |
1827 |
1874 TInt COMASUPLProtocolManager2::LaunchSuplUsageSettingsUI(MOMASuplUICompletionObserver* aObserver, TBool aRoaming) |
1828 /*TInt COMASUPLProtocolManager2::LaunchSuplUsageSettingsUI(MOMASuplUICompletionObserver* aObserver, TBool aRoaming) |
1875 { |
1829 { |
1876 iTrace->Trace(_L("COMASUPLProtocolManager2::LaunchSuplUsageSettingsUI"), KTraceFileName, __LINE__); |
1830 iTrace->Trace(_L("COMASUPLProtocolManager2::LaunchSuplUsageSettingsUI"), KTraceFileName, __LINE__); |
1877 if (iSuplSettings->IsUIActive() && !iTimeOutDialogPresent) |
1831 if (iSuplSettings->IsUIActive() && !iTimeOutDialogPresent) |
1878 return KErrInUse; |
1832 return KErrInUse; |
1879 // If timeout dialog is present, close it |
1833 // If timeout dialog is present, close it |
1884 iSettingsLauncher->Cancel(); |
1838 iSettingsLauncher->Cancel(); |
1885 } |
1839 } |
1886 iSessnUIObserver = aObserver; |
1840 iSessnUIObserver = aObserver; |
1887 iSuplSettings->SetUIActive(ETrue); |
1841 iSuplSettings->SetUIActive(ETrue); |
1888 return iSettingsLauncher->LaunchSuplUsageSettingsUI(aRoaming); |
1842 return iSettingsLauncher->LaunchSuplUsageSettingsUI(aRoaming); |
1889 } |
1843 }*/ |
1890 |
1844 |
1891 // ----------------------------------------------------------------------------- |
1845 // ----------------------------------------------------------------------------- |
1892 // COMASUPLProtocolManager2::SettingsUsageUICompletedL |
1846 // COMASUPLProtocolManager2::SettingsUsageUICompletedL |
1893 // |
1847 // |
1894 // |
1848 // |
1895 // ----------------------------------------------------------------------------- |
1849 // ----------------------------------------------------------------------------- |
1896 // |
1850 // |
1897 void COMASUPLProtocolManager2::SettingsUsageUICompletedL(TInt aError) |
1851 /*void COMASUPLProtocolManager2::SettingsUsageUICompletedL(TInt aError) |
1898 { |
1852 { |
1899 iTrace->Trace(_L("COMASUPLProtocolManager2::SettingsUsageUICompletedL"), KTraceFileName, __LINE__); |
1853 iTrace->Trace(_L("COMASUPLProtocolManager2::SettingsUsageUICompletedL"), KTraceFileName, __LINE__); |
1900 iSuplSettings->SetUIActive(EFalse); |
1854 iSuplSettings->SetUIActive(EFalse); |
1901 |
1855 |
1902 if (iDeInitDone) |
1856 if (iDeInitDone) |
1910 if (iSessnUIObserver) |
1864 if (iSessnUIObserver) |
1911 iSessnUIObserver->SettingsUsageUICompletedL(aError); |
1865 iSessnUIObserver->SettingsUsageUICompletedL(aError); |
1912 } |
1866 } |
1913 |
1867 |
1914 CheckOutstandingUsageUIRequestsL(); |
1868 CheckOutstandingUsageUIRequestsL(); |
1915 } |
1869 }*/ |
1916 |
1870 |
1917 // ----------------------------------------------------------------------------- |
1871 // ----------------------------------------------------------------------------- |
1918 // COMASUPLProtocolManager2::ReadSuplUsage |
1872 // COMASUPLProtocolManager2::ReadSuplUsage |
1919 // Reads Supl Usage from Central Repository |
1873 // Reads Supl Usage from Central Repository |
1920 // |
1874 // |
1921 // ----------------------------------------------------------------------------- |
1875 // ----------------------------------------------------------------------------- |
1922 // |
1876 // |
1923 void COMASUPLProtocolManager2::ReadSuplUsage() |
1877 /*void COMASUPLProtocolManager1::ReadSuplUsage() |
1924 { |
1878 { |
1925 iTrace->Trace(_L("COMASUPLProtocolManager2::ReadSuplUsage start"), KTraceFileName, __LINE__); |
1879 iTrace->Trace(_L("COMASUPLProtocolManager2::ReadSuplUsage start"), KTraceFileName, __LINE__); |
1926 CSuplSettings::TSuplSettingsUsage suplUsage; |
1880 CSuplSettings::TSuplSettingsUsage suplUsage; |
1927 TInt err = iSuplStorageSettings->GetSuplUsage(suplUsage); |
1881 TInt err = iSuplStorageSettings->GetSuplUsage(suplUsage); |
1928 if(err == KErrNone ) |
1882 if(err == KErrNone ) |
1929 { |
1883 { |
1930 iSuplSettings->SetSUPLUsage(suplUsage); |
1884 iSuplSettings->SetSUPLUsage(suplUsage); |
1931 } |
1885 } |
1932 iTrace->Trace(_L("COMASUPLProtocolManager2::ReadSuplUsage end"), KTraceFileName, __LINE__); |
1886 iTrace->Trace(_L("COMASUPLProtocolManager2::ReadSuplUsage end"), KTraceFileName, __LINE__); |
1933 } |
1887 }*/ |
1934 |
1888 |
1935 void COMASUPLProtocolManager2::UpdateAllSubSessnsInSameSession(TInt aIpcSessionId) |
1889 void COMASUPLProtocolManager2::UpdateAllSubSessnsInSameSession(TInt aIpcSessionId) |
1936 { |
1890 { |
1937 TInt TotalSession = iSuplSessions.Count(); |
1891 TInt TotalSession = iSuplSessions.Count(); |
1938 COMASuplSession* OMAsuplSession = NULL; |
1892 COMASuplSession* OMAsuplSession = NULL; |
2059 // COMASUPLProtocolManager2::LaunchSuplDialogTimeoutUI |
2013 // COMASUPLProtocolManager2::LaunchSuplDialogTimeoutUI |
2060 // |
2014 // |
2061 // |
2015 // |
2062 // ----------------------------------------------------------------------------- |
2016 // ----------------------------------------------------------------------------- |
2063 // |
2017 // |
2064 TInt COMASUPLProtocolManager2::LaunchSuplDialogTimeoutUI(MOMASuplUICompletionObserver* aObserver ) |
2018 /*TInt COMASUPLProtocolManager2::LaunchSuplDialogTimeoutUI(MOMASuplUICompletionObserver* aObserver ) |
2065 { |
2019 { |
2066 iTrace->Trace(_L("COMASUPLProtocolManager2::LaunchTimeOutUI"), KTraceFileName, __LINE__); |
2020 iTrace->Trace(_L("COMASUPLProtocolManager2::LaunchTimeOutUI"), KTraceFileName, __LINE__); |
2067 |
2021 |
2068 iSessnUIObserver = aObserver; |
2022 iSessnUIObserver = aObserver; |
2069 if (iSuplSettings->IsUIActive()) |
2023 if (iSuplSettings->IsUIActive()) |
2073 } |
2027 } |
2074 |
2028 |
2075 iSuplSettings->SetUIActive(ETrue); |
2029 iSuplSettings->SetUIActive(ETrue); |
2076 iTimeOutDialogPresent = ETrue; |
2030 iTimeOutDialogPresent = ETrue; |
2077 return iSettingsLauncher->LaunchSessionTimeOutDialog(); |
2031 return iSettingsLauncher->LaunchSessionTimeOutDialog(); |
2078 } |
2032 }*/ |
2079 |
2033 |
2080 // ----------------------------------------------------------------------------- |
2034 // ----------------------------------------------------------------------------- |
2081 // COMASUPLProtocolManager2::SettingsTimeOutUICompletedL |
2035 // COMASUPLProtocolManager2::SettingsTimeOutUICompletedL |
2082 // |
2036 // |
2083 // |
2037 // |
2084 // ----------------------------------------------------------------------------- |
2038 // ----------------------------------------------------------------------------- |
2085 // |
2039 // |
2086 void COMASUPLProtocolManager2::SettingsTimeOutUICompletedL(TInt aError) |
2040 /*void COMASUPLProtocolManager2::SettingsTimeOutUICompletedL(TInt aError) |
2087 { |
2041 { |
2088 iTrace->Trace(_L("COMASUPLProtocolManager2::SettingsTimeOutUICompletedL"), KTraceFileName, __LINE__); |
2042 iTrace->Trace(_L("COMASUPLProtocolManager2::SettingsTimeOutUICompletedL"), KTraceFileName, __LINE__); |
2089 iSuplSettings->SetUIActive(EFalse); |
2043 iSuplSettings->SetUIActive(EFalse); |
2090 iTimeOutDialogPresent = EFalse; |
2044 iTimeOutDialogPresent = EFalse; |
2091 |
2045 |
2098 else |
2052 else |
2099 { |
2053 { |
2100 if (iSessnUIObserver) |
2054 if (iSessnUIObserver) |
2101 iSessnUIObserver->SettingsTimeOutUICompletedL(aError); |
2055 iSessnUIObserver->SettingsTimeOutUICompletedL(aError); |
2102 } |
2056 } |
2103 } |
2057 }*/ |
2104 |
2058 |
2105 // ----------------------------------------------------------------------------- |
2059 // ----------------------------------------------------------------------------- |
2106 // COMASUPLProtocolManager2::GetLastUsedAccessPoint |
2060 // COMASUPLProtocolManager2::GetLastUsedAccessPoint |
2107 // |
2061 // |
2108 // |
2062 // |
2109 // ----------------------------------------------------------------------------- |
2063 // ----------------------------------------------------------------------------- |
2110 // |
2064 // |
2111 TInt COMASUPLProtocolManager2::GetLastUsedAccessPoint(TDes& aLastlyUsedAccessPoint,TUint32& iIAPId) |
2065 TInt COMASUPLProtocolManager2::GetLastUsedAccessPoint(TDes& /*aLastlyUsedAccessPoint*/,TUint32& /*iIAPId*/) |
2112 { |
2066 { |
2113 return iSettingsLauncher->GetIAPName(aLastlyUsedAccessPoint,iIAPId); |
2067 //return iSettingsLauncher->GetIAPName(aLastlyUsedAccessPoint,iIAPId); |
|
2068 return KErrNone; |
2114 } |
2069 } |
2115 |
2070 |
2116 // ----------------------------------------------------------------------------- |
2071 // ----------------------------------------------------------------------------- |
2117 // COMASUPLProtocolManager2::PrintHex |
2072 // COMASUPLProtocolManager2::PrintHex |
2118 // |
2073 // |