From 4e7a2e03c2957184e4ac59c2d901d958fd752092 Mon Sep 17 00:00:00 2001 From: Aditya-Sood Date: Sun, 11 Aug 2019 18:22:58 +0530 Subject: [PATCH] Minor refactors --- .../local_file_transfer/LocalFileTransferActivity.java | 7 +------ .../local_file_transfer/ReceiverDeviceAsyncTask.java | 4 ++-- .../zim_manager/local_file_transfer/WifiDirectManager.java | 4 ---- 3 files changed, 3 insertions(+), 12 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 3356564ee..c46c43586 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 @@ -117,12 +117,7 @@ public class LocalFileTransferActivity extends AppCompatActivity implements setSupportActionBar(actionBar); actionBar.setNavigationIcon(R.drawable.ic_close_white_24dp); - actionBar.setNavigationOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + actionBar.setNavigationOnClickListener(v -> finish()); listViewPeerDevices.setAdapter( new WifiPeerListAdapter(this, R.layout.row_peer_device, availablePeerDevices)); 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 67be854aa..1aa9bd4b9 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 @@ -46,7 +46,7 @@ class ReceiverDeviceAsyncTask extends AsyncTask { try (ServerSocket serverSocket = new ServerSocket(FILE_TRANSFER_PORT)) { Log.d(TAG, "Server: Socket opened at " + FILE_TRANSFER_PORT); - final String KIWIX_ROOT = wifiDirectManager.getZimStorageRootPath(); + final String zimStorageRootPath = wifiDirectManager.getZimStorageRootPath(); int totalFileCount = wifiDirectManager.getTotalFilesForTransfer(); boolean result = true; int fileItemIndex; @@ -62,7 +62,7 @@ class ReceiverDeviceAsyncTask extends AsyncTask { if (BuildConfig.DEBUG) Log.d(TAG, "Server: Client connected for file " + currentFile); publishProgress(fileItemIndex, SENDING); - final File clientNoteFileLocation = new File(KIWIX_ROOT + incomingFileName); + final File clientNoteFileLocation = new File(zimStorageRootPath + incomingFileName); File dirs = new File(clientNoteFileLocation.getParent()); if (!dirs.exists() && !dirs.mkdirs()) { Log.d(TAG, "ERROR: Required parent directories couldn't be created"); 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 fbe1e0407..f10ca2e2a 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 @@ -301,10 +301,6 @@ public class WifiDirectManager implements WifiP2pManager.ChannelListener, WifiP2 this.filesSent++; } - public boolean allFilesSent() { - return (filesSent == totalFilesForTransfer); - } - public @NonNull String getZimStorageRootPath() { return (sharedPreferenceUtil.getPrefStorage() + "/Kiwix/"); }