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

Increment: Improve flow of LocalFileTransfer activity

Browse Source 
- File receiver device can not initiate connection anymore
- Activity closes on both devices once transfer is complete
This commit is contained in:
Aditya-Sood 2019-06-23 19:26:14 +05:30
parent 459a087728
commit 2066db6bd9
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java
View File

@ -77,6 +77,7 @@ public class DeviceListFragment extends ListFragment implements WifiP2pManager.P
private boolean fileSender = false; private boolean fileSender = false;
private ArrayList<Uri> fileUriList; private ArrayList<Uri> fileUriList;
private int totalFiles = -1; private int totalFiles = -1;
private int totalFilesSent = 0;
private ArrayList<String> fileNames; private ArrayList<String> fileNames;
@Override @Override
@ -141,6 +142,9 @@ public class DeviceListFragment extends ListFragment implements WifiP2pManager.P
@Override @Override
public void onListItemClick(ListView l, View v, int position, long id) { public void onListItemClick(ListView l, View v, int position, long id) {
if(!isFileSender())
return;
selectedPeerDevice = (WifiP2pDevice) getListAdapter().getItem(position); selectedPeerDevice = (WifiP2pDevice) getListAdapter().getItem(position);
Toast.makeText(getActivity(), selectedPeerDevice.deviceName, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), selectedPeerDevice.deviceName, Toast.LENGTH_SHORT).show();
@ -232,6 +236,14 @@ public class DeviceListFragment extends ListFragment implements WifiP2pManager.P
return fileUriList; return fileUriList;
} }
public void incrementTotalFilesSent() {
this.totalFilesSent++;
}
public boolean allFilesSent() {
return (totalFilesSent == totalFiles);
}
private void startFileTransfer() { private void startFileTransfer() {
if(groupInfo.groupFormed && !fileSender) { if(groupInfo.groupFormed && !fileSender) {
new FileServerAsyncTask(getActivity(), this).execute(); new FileServerAsyncTask(getActivity(), this).execute();
@ -553,6 +565,16 @@ public class DeviceListFragment extends ListFragment implements WifiP2pManager.P
return ""; return "";
} }
} }
@Override
protected void onPostExecute(String s) {
//
deviceListFragment.incrementTotalFilesSent();
if(deviceListFragment.allFilesSent()) {
deviceListFragment.getActivity().finish();
}
}
} }
public static class FileServerAsyncTask extends AsyncTask<Void, Void, String> { public static class FileServerAsyncTask extends AsyncTask<Void, Void, String> {
@ -612,6 +634,7 @@ public class DeviceListFragment extends ListFragment implements WifiP2pManager.P
super.onPostExecute(s); super.onPostExecute(s);
Toast.makeText(context, "File transfer complete", Toast.LENGTH_LONG).show(); Toast.makeText(context, "File transfer complete", Toast.LENGTH_LONG).show();
Log.d(LocalFileTransferActivity.TAG, "File transfer complete"); Log.d(LocalFileTransferActivity.TAG, "File transfer complete");
deviceListFragment.getActivity().finish();
/*File recvFile = new File(filePath); /*File recvFile = new File(filePath);
Uri fileUri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID+".fileprovider",recvFile); Uri fileUri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID+".fileprovider",recvFile);