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

Minor code cleanup

Browse Source
This commit is contained in:
Aditya-Sood 2019-08-04 17:43:12 +05:30
parent e6fa97abba
commit 39afa4b830
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/ReceiverDeviceAsyncTask.java
View File

@ -37,7 +37,7 @@ class ReceiverDeviceAsyncTask extends AsyncTask<Void, Integer, Boolean> {
private WifiDirectManager wifiDirectManager; private WifiDirectManager wifiDirectManager;
private String incomingFileName; private String incomingFileName;
public ReceiverDeviceAsyncTask(WifiDirectManager wifiDirectManager, LocalFileTransferActivity localFileTransferActivity) { public ReceiverDeviceAsyncTask(WifiDirectManager wifiDirectManager) {
this.wifiDirectManager = wifiDirectManager; this.wifiDirectManager = wifiDirectManager;
} }

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

@ -326,20 +326,17 @@ public class WifiDirectManager implements WifiP2pManager.ChannelListener, WifiP2
if (isGroupFormed() && !isFileSender) { if (isGroupFormed() && !isFileSender) {
((Callbacks) activity).onFilesForTransferAvailable(filesForTransfer); ((Callbacks) activity).onFilesForTransferAvailable(filesForTransfer);
receiverDeviceAsyncTask = new ReceiverDeviceAsyncTask(this, activity); receiverDeviceAsyncTask = new ReceiverDeviceAsyncTask(this);
receiverDeviceAsyncTask.execute(); receiverDeviceAsyncTask.execute();
} else if (isGroupFormed()) { // && isFileSender } else if (isGroupFormed()) { // && isFileSender
{ {
Log.d(LocalFileTransferActivity.TAG, "Starting file transfer"); Log.d(LocalFileTransferActivity.TAG, "Starting file transfer");
fileReceiverDeviceAddress = fileReceiverDeviceAddress =
(isGroupOwner()) ? selectedPeerDeviceInetAddress (isGroupOwner()) ? selectedPeerDeviceInetAddress : getGroupOwnerAddress();
: getGroupOwnerAddress();
// Hack for allowing slower receiver devices to setup server before sender device requests to connect
showToast(activity, R.string.preparing_files, Toast.LENGTH_LONG); showToast(activity, R.string.preparing_files, Toast.LENGTH_LONG);
//for (int i = 0; i < 20000000; i++) ;
senderDeviceAsyncTaskArray = new SenderDeviceAsyncTask(this, activity); senderDeviceAsyncTaskArray = new SenderDeviceAsyncTask(this, activity);
senderDeviceAsyncTaskArray.execute(fileUriArrayList.toArray(new Uri[0])); senderDeviceAsyncTaskArray.execute(fileUriArrayList.toArray(new Uri[0]));
} }
@ -391,7 +388,7 @@ public class WifiDirectManager implements WifiP2pManager.ChannelListener, WifiP2
}); });
} }
public void closeChannel() { void closeChannel() {
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) { if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
channel.close(); channel.close();
} }