|
@@ -207,20 +207,20 @@ public class WiFiP2pSyncActivity extends Activity implements AdapterView.OnItemC
|
|
|
|
|
|
@Override
|
|
|
public void discoveredDevices(List<WifiP2pDevice> peers) {
|
|
|
- Log.d("DEBUG_WiFiP2pSyncActivity", "Actualise devices list");
|
|
|
+ Log.d("DEBUG_WiFiP2p", "Activity - Actualise devices list");
|
|
|
this.activity.updateDeviceListView(peers);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public void wifiP2pIsEnabled(boolean enabled) {
|
|
|
String tmp = enabled? "enabled" : "disabled";
|
|
|
- Log.d("DEBUG_WiFiP2pSyncActivity", "Peer to peer is " + tmp + ".");
|
|
|
+ Log.d("DEBUG_WiFiP2p", "Activity - Peer to peer is " + tmp + ".");
|
|
|
this.activity.setWifiDirectAvailable(enabled);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public void didConnect(boolean isHost, WifiP2pInfo connectionInfo) {
|
|
|
- Log.d("DEBUG_WiFiP2pSyncActivity", "Did connect");
|
|
|
+ Log.d("DEBUG_WiFiP2p", "Activity - Did connect");
|
|
|
|
|
|
this.activity.progressDialog.setMessage(PROGRESS_MESSAGE_LOADING);
|
|
|
if (!this.activity.progressDialog.isShowing()){
|
|
@@ -229,17 +229,17 @@ public class WiFiP2pSyncActivity extends Activity implements AdapterView.OnItemC
|
|
|
|
|
|
this.activity.setHost(isHost);
|
|
|
if (isHost){
|
|
|
- Log.d("DEBUG_WiFiP2pSyncActivity", "Connected as HOST");
|
|
|
+ Log.d("DEBUG_WiFiP2p", "Activity - Connected as HOST");
|
|
|
this.activity.startHost();
|
|
|
} else {
|
|
|
- Log.d("DEBUG_WiFiP2pSyncActivity", "Connected as Client");
|
|
|
+ Log.d("DEBUG_WiFiP2p", "Activity - Connected as Client");
|
|
|
this.activity.startClient(connectionInfo);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public void failedToConnect() {
|
|
|
- Log.d("DEBUG_WiFiP2pSyncActivity", "Failed to connect");
|
|
|
+ Log.d("DEBUG_WiFiP2p", "Activity - Failed to connect");
|
|
|
Toast.makeText(this.activity, COULD_NOT_CONNECT_MESSAGE , Toast.LENGTH_LONG).show();
|
|
|
if (this.activity.progressDialog != null){
|
|
|
this.activity.progressDialog.dismiss();
|
|
@@ -248,7 +248,7 @@ public class WiFiP2pSyncActivity extends Activity implements AdapterView.OnItemC
|
|
|
|
|
|
@Override
|
|
|
public void didDisconnect() {
|
|
|
- Log.d("DEBUG_WiFiP2pSyncActivity", "Did disconnect");
|
|
|
+ Log.d("DEBUG_WiFiP2p", "Activity - Did disconnect");
|
|
|
if (this.activity.progressDialog != null){
|
|
|
this.activity.progressDialog.dismiss();
|
|
|
}
|
|
@@ -256,7 +256,7 @@ public class WiFiP2pSyncActivity extends Activity implements AdapterView.OnItemC
|
|
|
|
|
|
@Override
|
|
|
public void failedToDisconnect() {
|
|
|
- Log.d("DEBUG_WiFiP2pSyncActivity", "Failed to disconnect");
|
|
|
+ Log.d("DEBUG_WiFiP2p", "Activity - Failed to disconnect");
|
|
|
//Toast.makeText(this.activity, "Could not disconnect with device. Retry.", Toast.LENGTH_LONG).show();
|
|
|
// Other device did disconnect a while before.
|
|
|
if (this.activity.progressDialog != null &&
|
|
@@ -271,7 +271,7 @@ public class WiFiP2pSyncActivity extends Activity implements AdapterView.OnItemC
|
|
|
|
|
|
@Override
|
|
|
public void ownDeviceInformationIsUpdated(WifiP2pDevice device) {
|
|
|
- Log.d("DEBUG_WiFiP2pSyncActivity", "Updated device " + device.deviceName + " " + device.deviceAddress + ".");
|
|
|
+ Log.d("DEBUG_WiFiP2p", "Activity - Updated device " + device.deviceName + " " + device.deviceAddress + ".");
|
|
|
this.activity.updateOwnDeviceInformation(device);
|
|
|
this.activity.searchForDevices();
|
|
|
}
|
|
@@ -372,7 +372,7 @@ public class WiFiP2pSyncActivity extends Activity implements AdapterView.OnItemC
|
|
|
return this;
|
|
|
}
|
|
|
}.init(this.mLstP2PDevices));
|
|
|
- Log.d("DEBUG_WiFiP2pSyncActivity", " Discovered "+peers.size()+" devices.");
|
|
|
+ Log.d("DEBUG_WiFiP2p", "Activity - Discovered "+peers.size()+" devices.");
|
|
|
|
|
|
if (peers.size() == 0){
|
|
|
this.searchForDevices();
|
|
@@ -386,13 +386,13 @@ public class WiFiP2pSyncActivity extends Activity implements AdapterView.OnItemC
|
|
|
{
|
|
|
|
|
|
//if (this.hostTask == null || this.hostTask.isInterrupted()){
|
|
|
- Log.d("DEBUG_WiFiP2pSyncActivity", "Starting HOST Task");
|
|
|
+ Log.d("DEBUG_WiFiP2p", "Activity - Starting HOST Task");
|
|
|
//Toast.makeText(this, PERFORMING_TASK_AS_HOST , Toast.LENGTH_SHORT).show();
|
|
|
this.hostTask = new SyncHostTask(this.ownDevice, this.syncCompletionListener(), getApplicationContext());
|
|
|
this.executingTask = this.hostTask;
|
|
|
this.hostTask.execute();
|
|
|
//} else {
|
|
|
- // Log.d("DEBUG_WiFiP2pSyncActivity", "Preventing third device for any syncing.");
|
|
|
+ // Log.d("DEBUG_WiFiP2p", "Activity - Preventing third device for any syncing.");
|
|
|
//}
|
|
|
}
|
|
|
|
|
@@ -402,7 +402,7 @@ public class WiFiP2pSyncActivity extends Activity implements AdapterView.OnItemC
|
|
|
*/
|
|
|
private void startClient(WifiP2pInfo info)
|
|
|
{
|
|
|
- Log.d("DEBUG_WiFiP2pSyncActivity", "Starting CLIENT Task");
|
|
|
+ Log.d("DEBUG_WiFiP2p", "Activity - Starting CLIENT Task");
|
|
|
this.clientTask = new SyncClientTask( info.groupOwnerAddress.getHostAddress(),this.ownDevice, this.syncCompletionListener(), getApplicationContext() );
|
|
|
this.executingTask = this.clientTask;
|
|
|
this.clientTask.execute();
|