From 451472ff8218486d52db868798d720be5bf49c6e Mon Sep 17 00:00:00 2001 From: Aditya-Sood Date: Sun, 4 Aug 2019 15:28:44 +0530 Subject: [PATCH] Minor refactor - Changed method names & a signature - Made public variables private --- .../LocalFileTransferActivity.java | 15 ++++----------- .../PeerGroupHandshakeAsyncTask.java | 4 +--- .../ReceiverDeviceAsyncTask.java | 2 +- .../local_file_transfer/WifiDirectManager.java | 8 ++++---- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java index 4a8a3a4fc..72439c5ad 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java @@ -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 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 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 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(); diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/PeerGroupHandshakeAsyncTask.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/PeerGroupHandshakeAsyncTask.java index 259af315c..4b08ec2b5 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/PeerGroupHandshakeAsyncTask.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/PeerGroupHandshakeAsyncTask.java @@ -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 { } } - wifiDirectManager.setFileItems(fileItems); + wifiDirectManager.setFilesForTransfer(fileItems); } } catch (Exception e) { e.printStackTrace(); diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/ReceiverDeviceAsyncTask.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/ReceiverDeviceAsyncTask.java index 3e17d71ea..81d889c41 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/ReceiverDeviceAsyncTask.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/ReceiverDeviceAsyncTask.java @@ -59,7 +59,7 @@ class ReceiverDeviceAsyncTask extends AsyncTask { for (int currentFile = 1; currentFile <= totalFileCount && !isCancelled(); currentFile++) { fileItemIndex = currentFile - 1; - ArrayList fileItems = wifiDirectManager.getFileItems(); + ArrayList fileItems = wifiDirectManager.getFilesForTransfer(); incomingFileName = fileItems.get(fileItemIndex).getFileName(); try (Socket client = serverSocket.accept()) { diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/WifiDirectManager.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/WifiDirectManager.java index 37ac6d9a4..355e24615 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/WifiDirectManager.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/WifiDirectManager.java @@ -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 fileUriArrayList, - @Nullable ArrayList filesForTransfer) { + @NonNull AlertDialogShower alertDialogShower, @Nullable ArrayList filesForTransfer, + @Nullable ArrayList 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 getFileItems() { + public @NonNull ArrayList getFilesForTransfer() { return filesForTransfer; } - public void setFileItems(@NonNull ArrayList fileItems) { + public void setFilesForTransfer(@NonNull ArrayList fileItems) { this.filesForTransfer = fileItems; }