Commits

A Kruger committed 979af9a

Fixes for running the TunnelService in the new namespace, and with service binding.

Comments (0)

Files changed (2)

Android/PsiphonAndroid/AndroidManifest.xml

             android:label="@string/app_name">
         </activity>
         <service 
-            android:name=".TunnelService"
+            android:name=".psiphonlibrary.TunnelService"
             android:label="@string/app_name"
             android:exported="false" >
         </service>

Android/PsiphonAndroid/src/com/psiphon3/StatusActivity.java

     		m_tunnelService = binder.getService();
     		m_boundToTunnelService = true;
     		m_tunnelService.setEventsInterface(m_eventsInterface);
+    		startService(new Intent(StatusActivity.this, TunnelService.class));
     	}
     	
     	@Override
     {
     	Intent intent = new Intent(context, TunnelService.class);
     	bindService(intent, m_tunnelServiceConnection, Context.BIND_AUTO_CREATE);
-    	startService(intent);
     }
     
     private void stopTunnelService(Context context)