Add support for cancelling connection
Change-Id: Iba4a002ab86e62d87ae1175b75c203d3a86ad7c6
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d080d59..cbfc9a0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1417,6 +1417,10 @@
<string name="wifi_p2p_disconnect_message">If you disconnect, your connection with <xliff:g id="peer_name">%1$s</xliff:g> will end.</string>
<!-- Message test for disconnection from multiple devices-->
<string name="wifi_p2p_disconnect_multiple_message">If you disconnect, your connection with <xliff:g id="peer_name">%1$s</xliff:g> and <xliff:g id="peer_count">%2$s</xliff:g> other devices will end.</string>
+ <!-- Title for cancel connect dialog -->
+ <string name="wifi_p2p_cancel_connect_title">Cancel invitation?</string>
+ <!-- Message test for disconnection from one device-->
+ <string name="wifi_p2p_cancel_connect_message">Do you want to cancel invitation to connect with <xliff:g id="peer_name">%1$s</xliff:g>?</string>
<!-- Wifi AP settings-->
<!-- Label for wifi tether checkbox. Toggles Access Point on/off -->
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index 0e4be13..7c1fd25 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -72,6 +72,7 @@
private WifiP2pManager mWifiP2pManager;
private WifiP2pManager.Channel mChannel;
private OnClickListener mDisconnectListener;
+ private OnClickListener mCancelConnectListener;
private WifiP2pPeer mSelectedWifiPeer;
private boolean mWifiP2pEnabled;
@@ -82,6 +83,7 @@
private Preference mThisDevicePref;
private static final int DIALOG_DISCONNECT = 1;
+ private static final int DIALOG_CANCEL_CONNECT = 2;
private WifiP2pDevice mThisDevice;
private WifiP2pDeviceList mPeers = new WifiP2pDeviceList();
@@ -170,6 +172,26 @@
}
};
+ //cancel connect dialog listener
+ mCancelConnectListener = new OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ if (which == DialogInterface.BUTTON_POSITIVE) {
+ if (mWifiP2pManager != null) {
+ mWifiP2pManager.cancelConnect(mChannel,
+ new WifiP2pManager.ActionListener() {
+ public void onSuccess() {
+ if (DBG) Log.d(TAG, " cancel connect success");
+ }
+ public void onFailure(int reason) {
+ if (DBG) Log.d(TAG, " cancel connect fail " + reason);
+ }
+ });
+ }
+ }
+ }
+ };
+
setHasOptionsMenu(true);
final PreferenceScreen preferenceScreen = getPreferenceScreen();
@@ -248,6 +270,8 @@
mSelectedWifiPeer = (WifiP2pPeer) preference;
if (mSelectedWifiPeer.device.status == WifiP2pDevice.CONNECTED) {
showDialog(DIALOG_DISCONNECT);
+ } else if (mSelectedWifiPeer.device.status == WifiP2pDevice.INVITED) {
+ showDialog(DIALOG_CANCEL_CONNECT);
} else {
WifiP2pConfig config = new WifiP2pConfig();
config.deviceAddress = mSelectedWifiPeer.device.deviceAddress;
@@ -298,6 +322,19 @@
.setNegativeButton(getActivity().getString(R.string.dlg_cancel), null)
.create();
return dialog;
+ } else if (id == DIALOG_CANCEL_CONNECT) {
+ int stringId = R.string.wifi_p2p_cancel_connect_message;
+ String deviceName = TextUtils.isEmpty(mSelectedWifiPeer.device.deviceName) ?
+ mSelectedWifiPeer.device.deviceAddress :
+ mSelectedWifiPeer.device.deviceName;
+
+ AlertDialog dialog = new AlertDialog.Builder(getActivity())
+ .setTitle(R.string.wifi_p2p_cancel_connect_title)
+ .setMessage(getActivity().getString(stringId, deviceName))
+ .setPositiveButton(getActivity().getString(R.string.dlg_ok), mCancelConnectListener)
+ .setNegativeButton(getActivity().getString(R.string.dlg_cancel), null)
+ .create();
+ return dialog;
}
return null;
}