sipplugins/sippsystemstatemonitor/src/sipsystemstatemonitorimpl.cpp
branchRCL_3
changeset 4 c2e8c8b73582
parent 2 1e1cc61f56c3
--- a/sipplugins/sippsystemstatemonitor/src/sipsystemstatemonitorimpl.cpp	Mon Mar 15 12:42:05 2010 +0200
+++ b/sipplugins/sippsystemstatemonitor/src/sipsystemstatemonitorimpl.cpp	Wed Mar 31 22:10:27 2010 +0300
@@ -18,7 +18,6 @@
 
 //  INCLUDE FILES
 #include "sipsystemstatemonitorimpl.h"
-#include "CSystemStateConnUsagePermissionMonitor.h"
 #include "sipdevicestateaware.h"
 #include "siprfsmonitorao.h"
 #include "sipvpnmonitorao.h"
@@ -45,8 +44,6 @@
 void CSipSystemStateMonitorImpl::ConstructL()
     {
     iMonitorAo = CSipSystemStateMonitorAo::NewL();
-    iUsagePermissionMonitor = 
-        CSystemStateConnUsagePermissionMonitor::NewL();
     iSipDeviceAwareObject = CSipDeviceStateAware::NewL();
     }
 
@@ -73,7 +70,6 @@
 		
     delete iMonitorAo;
     iSnapMonitors.ResetAndDestroy();
-    delete iUsagePermissionMonitor;
     delete iRfsMonitor;
 	delete iSipDeviceAwareObject;
     }
@@ -106,12 +102,8 @@
         CSipSnapAvailabilityMonitor* monitor = FindSnapMonitorById( aObjectId );
         if ( !monitor )
             {
-            TInt permissionToUseNetwork = 
-                iUsagePermissionMonitor->CurrentUsagePermission();
-            User::LeaveIfError( permissionToUseNetwork ); 
             monitor = CSipSnapAvailabilityMonitor::NewLC( 
-                aObjectId, permissionToUseNetwork, aObserver );
-            iUsagePermissionMonitor->AddObserverL( *monitor );
+                aObjectId, aObserver );
             iSnapMonitors.AppendL( monitor );
             CleanupStack::Pop( monitor );
             }
@@ -159,8 +151,7 @@
         {
         CSipSnapAvailabilityMonitor* monitor = FindSnapMonitorById( aObjectId );
         if ( monitor )
-            {
-            iUsagePermissionMonitor->RemoveObserver( *monitor );
+            {            
             monitor->RemoveObserver( aObserver );
             if ( !monitor->HasObservers() )
                 {
@@ -200,16 +191,8 @@
     else if ( aVariable == ESnapAvailability )
         {
         CSipSnapAvailabilityMonitor* monitor = FindSnapMonitorById( aObjectId );
-        if ( monitor )
-            {
-            TInt permissionToUseNetwork = 
-                iUsagePermissionMonitor->CurrentUsagePermission();
-            if ( permissionToUseNetwork < 0 )
-                {
-                return permissionToUseNetwork;
-                }        
-            return permissionToUseNetwork && monitor->SnapAvailability();
-            }
+        if ( monitor )        
+            return monitor->SnapAvailability();
         }
     else if ( aVariable == ERfsState )
         {