kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-23 04:33:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor cancelAsyncTasks()

Browse Source
This commit is contained in:
Aditya-Sood 2019-08-11 14:46:03 +05:30
parent cb944bb88f
commit d326deb4f3
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/WifiDirectManager.java
View File

@ -11,6 +11,7 @@ import android.net.wifi.p2p.WifiP2pDevice;
import android.net.wifi.p2p.WifiP2pDeviceList; import android.net.wifi.p2p.WifiP2pDeviceList;
import android.net.wifi.p2p.WifiP2pInfo; import android.net.wifi.p2p.WifiP2pInfo;
import android.net.wifi.p2p.WifiP2pManager; import android.net.wifi.p2p.WifiP2pManager;
import android.os.AsyncTask;
import android.os.Build; import android.os.Build;
import android.util.Log; import android.util.Log;
import android.widget.Toast; import android.widget.Toast;
@ -63,7 +64,7 @@ public class WifiDirectManager implements WifiP2pManager.ChannelListener, WifiP2
private WifiP2pDevice senderSelectedPeerDevice = null; private WifiP2pDevice senderSelectedPeerDevice = null;
private PeerGroupHandshakeAsyncTask peerGroupHandshakeAsyncTask; private PeerGroupHandshakeAsyncTask peerGroupHandshakeAsyncTask;
private SenderDeviceAsyncTask senderDeviceAsyncTaskArray; private SenderDeviceAsyncTask senderDeviceAsyncTask;
private ReceiverDeviceAsyncTask receiverDeviceAsyncTask; private ReceiverDeviceAsyncTask receiverDeviceAsyncTask;
private InetAddress selectedPeerDeviceInetAddress; private InetAddress selectedPeerDeviceInetAddress;
@ -356,8 +357,8 @@ public class WifiDirectManager implements WifiP2pManager.ChannelListener, WifiP2
(isGroupOwner()) ? selectedPeerDeviceInetAddress : getGroupOwnerAddress(); (isGroupOwner()) ? selectedPeerDeviceInetAddress : getGroupOwnerAddress();
displayToast(R.string.preparing_files, Toast.LENGTH_LONG); displayToast(R.string.preparing_files, Toast.LENGTH_LONG);
senderDeviceAsyncTaskArray = new SenderDeviceAsyncTask(this, activity); senderDeviceAsyncTask = new SenderDeviceAsyncTask(this, activity);
senderDeviceAsyncTaskArray.execute(fileUriArrayList.toArray(new Uri[0])); senderDeviceAsyncTask.execute(fileUriArrayList.toArray(new Uri[0]));
} }
} }
} }
@ -367,21 +368,16 @@ public class WifiDirectManager implements WifiP2pManager.ChannelListener, WifiP2
((Callbacks) activity).onFileStatusChanged(itemIndex); ((Callbacks) activity).onFileStatusChanged(itemIndex);
} }
private void cancelAsyncTasks() { private void cancelAsyncTasks(AsyncTask... tasks) {
if (peerGroupHandshakeAsyncTask != null) { for (AsyncTask asyncTask : tasks) {
peerGroupHandshakeAsyncTask.cancel(true); if (asyncTask != null) {
asyncTask.cancel(true);
} }
if (senderDeviceAsyncTaskArray != null) {
senderDeviceAsyncTaskArray.cancel(true);
} else if (receiverDeviceAsyncTask != null) {
receiverDeviceAsyncTask.cancel(true);
} }
} }
public void destroyWifiDirectManager() { public void destroyWifiDirectManager() {
cancelAsyncTasks(); cancelAsyncTasks(peerGroupHandshakeAsyncTask, senderDeviceAsyncTask, receiverDeviceAsyncTask);
if (!isFileSender) { if (!isFileSender) {
disconnect(); disconnect();