PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make VpnSettings use new synchronous VpnService API.

Browse Source 
Change-Id: Ib400c968981f9f8642a1452011faaade0d5bde57
This commit is contained in:
Hung-ying Tyan
2011-01-19 16:49:47 +08:00
parent 9b37821d67
commit 62cc79ef96
3 changed files with 16 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
src/com/android/settings/vpn/AuthenticationActor.java
View File

@@ -19,16 +19,10 @@ package com.android.settings.vpn;
import com.android.settings.R;
import android.app.Dialog;
import android.content.ComponentName;
import android.content.Context;
import android.content.ServiceConnection;
import android.net.vpn.IVpnService;
import android.net.vpn.VpnManager;
import android.net.vpn.VpnProfile;
import android.net.vpn.VpnState;
import android.os.ConditionVariable;
import android.os.IBinder;
import android.os.RemoteException;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
@@ -117,102 +111,13 @@ public class AuthenticationActor implements VpnProfileActor {
return mContext;
}
private void connect(final String username, final String password) {
mVpnManager.startVpnService();
ServiceConnection c = new ServiceConnection() {
public void onServiceConnected(ComponentName className,
IBinder service) {
try {
boolean success = IVpnService.Stub.asInterface(service)
.connect(mProfile, username, password);
if (!success) {
Log.d(TAG, "~~~~~~ connect() failed!");
} else {
Log.d(TAG, "~~~~~~ connect() succeeded!");
}
} catch (Throwable e) {
Log.e(TAG, "connect()", e);
broadcastConnectivity(VpnState.IDLE,
VpnManager.VPN_ERROR_CONNECTION_FAILED);
} finally {
mContext.unbindService(this);
}
}
public void onServiceDisconnected(ComponentName className) {
checkStatus();
}
};
if (!bindService(c)) {
broadcastConnectivity(VpnState.IDLE,
VpnManager.VPN_ERROR_CONNECTION_FAILED);
}
private void connect(String username, String password) {
mVpnManager.connect(mProfile, username, password);
}
//@Override
public void disconnect() {
ServiceConnection c = new ServiceConnection() {
public void onServiceConnected(ComponentName className,
IBinder service) {
try {
IVpnService.Stub.asInterface(service).disconnect();
} catch (RemoteException e) {
Log.e(TAG, "disconnect()", e);
checkStatus();
} finally {
mContext.unbindService(this);
}
}
public void onServiceDisconnected(ComponentName className) {
checkStatus();
}
};
if (!bindService(c)) {
checkStatus();
}
}
//@Override
public void checkStatus() {
final ConditionVariable cv = new ConditionVariable();
cv.close();
ServiceConnection c = new ServiceConnection() {
public synchronized void onServiceConnected(ComponentName className,
IBinder service) {
cv.open();
try {
IVpnService.Stub.asInterface(service).checkStatus(mProfile);
} catch (RemoteException e) {
Log.e(TAG, "checkStatus()", e);
broadcastConnectivity(VpnState.IDLE);
} finally {
mContext.unbindService(this);
}
}
public void onServiceDisconnected(ComponentName className) {
cv.open();
broadcastConnectivity(VpnState.IDLE);
mContext.unbindService(this);
}
};
if (bindService(c)) {
// wait for a second, let status propagate
if (!cv.block(1000)) broadcastConnectivity(VpnState.IDLE);
}
}
private boolean bindService(ServiceConnection c) {
return mVpnManager.bindVpnService(c);
}
private void broadcastConnectivity(VpnState s) {
mVpnManager.broadcastConnectivity(mProfile.getName(), s);
}
private void broadcastConnectivity(VpnState s, int errorCode) {
mVpnManager.broadcastConnectivity(mProfile.getName(), s, errorCode);
mVpnManager.disconnect();
}
private void setSavedUsername(String name) throws IOException {