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 refactor

Browse Source 
- Changed method names & a signature
- Made public variables private
This commit is contained in:
Aditya-Sood 2019-08-04 15:28:44 +05:30
parent bfd24a42d5
commit 451472ff82
4 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java
View File

@ -83,10 +83,9 @@ public class LocalFileTransferActivity extends AppCompatActivity implements
@BindView(R.id.text_view_empty_peer_list) TextView textViewPeerDevices;
@BindView(R.id.recycler_view_transfer_files) RecyclerView filesRecyclerView;
private ArrayList<Uri> fileUriArrayList;// For sender device, stores uris of the files
public boolean isFileSender = false; // Whether the device is the file sender or not
private boolean isFileSender = false; // Whether the device is the file sender or not
public @NonNull WifiDirectManager wifiDirectManager = new WifiDirectManager(this);
private @NonNull WifiDirectManager wifiDirectManager = new WifiDirectManager(this);
private ArrayList<FileItem> filesForTransfer = new ArrayList<>();
private FileListAdapter fileListAdapter;
@ -113,6 +112,7 @@ public class LocalFileTransferActivity extends AppCompatActivity implements
* activity, without any file Uris
* */
Intent filesIntent = getIntent();
ArrayList<Uri> fileUriArrayList;
fileUriArrayList = filesIntent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);
isFileSender = (fileUriArrayList != null && fileUriArrayList.size() > 0);
@ -136,7 +136,7 @@ public class LocalFileTransferActivity extends AppCompatActivity implements
displayFileTransferProgress(filesForTransfer);
}
wifiDirectManager.createWifiDirectManager(sharedPreferenceUtil, alertDialogShower, fileUriArrayList, filesForTransfer);
wifiDirectManager.createWifiDirectManager(sharedPreferenceUtil, alertDialogShower, filesForTransfer, fileUriArrayList);
}
@OnItemClick(R.id.list_peer_devices)
@ -190,7 +190,6 @@ public class LocalFileTransferActivity extends AppCompatActivity implements
}
}
/* Helper methods used in the activity */
@Override
public void onUserDeviceDetailsAvailable(@Nullable WifiP2pDevice userDevice) { // Update UI with user device's details
if (userDevice != null) {
@ -228,17 +227,11 @@ public class LocalFileTransferActivity extends AppCompatActivity implements
this.hasSenderStartedConnection = true;
}
/*public void changeStatus(int itemIndex, @FileItem.FileStatus int status) {
filesForTransfer.get(itemIndex).setFileStatus(status);
fileListAdapter.notifyItemChanged(itemIndex);
}*/
@Override
public void onFileStatusChanged(int itemIndex) {
fileListAdapter.notifyItemChanged(itemIndex);
}
/* From WifiDirectManager.Callbacks interface */
@Override
public void updateListOfAvailablePeers(@NonNull WifiP2pDeviceList peers) {
availablePeerDevices.clear();

4
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/PeerGroupHandshakeAsyncTask.java
View File

@ -1,11 +1,9 @@
package org.kiwix.kiwixmobile.zim_manager.local_file_transfer;
import android.net.Uri;
import android.net.wifi.p2p.WifiP2pInfo;
import android.os.AsyncTask;
import android.util.Log;
import java.lang.ref.WeakReference;
import org.kiwix.kiwixmobile.BuildConfig;
import java.io.InputStream;
@ -137,7 +135,7 @@ class PeerGroupHandshakeAsyncTask extends AsyncTask<Void, Void, InetAddress> {
}
}
wifiDirectManager.setFileItems(fileItems);
wifiDirectManager.setFilesForTransfer(fileItems);
}
} catch (Exception e) {
e.printStackTrace();

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

@ -59,7 +59,7 @@ class ReceiverDeviceAsyncTask extends AsyncTask<Void, Integer, Boolean> {
for (int currentFile = 1; currentFile <= totalFileCount && !isCancelled(); currentFile++) {
fileItemIndex = currentFile - 1;
ArrayList<FileItem> fileItems = wifiDirectManager.getFileItems();
ArrayList<FileItem> fileItems = wifiDirectManager.getFilesForTransfer();
incomingFileName = fileItems.get(fileItemIndex).getFileName();
try (Socket client = serverSocket.accept()) {

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

@ -83,8 +83,8 @@ public class WifiDirectManager implements WifiP2pManager.ChannelListener, WifiP2
/* Initialisations for using the WiFi P2P API */
public void createWifiDirectManager(@NonNull SharedPreferenceUtil sharedPreferenceUtil,
@NonNull AlertDialogShower alertDialogShower, @Nullable ArrayList<Uri> fileUriArrayList,
@Nullable ArrayList<FileItem> filesForTransfer) {
@NonNull AlertDialogShower alertDialogShower, @Nullable ArrayList<FileItem> filesForTransfer,
@Nullable ArrayList<Uri> fileUriArrayList) {
this.sharedPreferenceUtil = sharedPreferenceUtil;
this.alertDialogShower = alertDialogShower;
this.fileUriArrayList = fileUriArrayList;
@ -274,11 +274,11 @@ public class WifiDirectManager implements WifiP2pManager.ChannelListener, WifiP2
this.totalFilesForTransfer = totalFilesForTransfer;
}
public @NonNull ArrayList<FileItem> getFileItems() {
public @NonNull ArrayList<FileItem> getFilesForTransfer() {
return filesForTransfer;
}
public void setFileItems(@NonNull ArrayList<FileItem> fileItems) {
public void setFilesForTransfer(@NonNull ArrayList<FileItem> fileItems) {
this.filesForTransfer = fileItems;
}