Minor refactor

- 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

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

View File

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

View File

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

View File

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