From d02c940baa790428524ce3940303e39487e76eed Mon Sep 17 00:00:00 2001 From: Aditya-Sood Date: Tue, 30 Jul 2019 18:04:50 +0530 Subject: [PATCH] Refactor: Change location of constants --- .../local_file_transfer/LocalFileTransferActivity.java | 3 --- .../local_file_transfer/PeerGroupHandshakeAsyncTask.java | 2 +- .../local_file_transfer/ReceiverDeviceAsyncTask.java | 2 +- .../RequestEnableLocationServicesDialog.java | 3 ++- .../RequestEnableWifiP2pServicesDialog.java | 4 +++- .../local_file_transfer/SenderDeviceAsyncTask.java | 2 +- .../zim_manager/local_file_transfer/WifiDirectManager.java | 1 + 7 files changed, 9 insertions(+), 8 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 3cb0b4854..89c02e48f 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 @@ -78,9 +78,6 @@ public class LocalFileTransferActivity extends AppCompatActivity implements private static final int PERMISSION_REQUEST_CODE_COARSE_LOCATION = 1; private static final int PERMISSION_REQUEST_CODE_STORAGE_WRITE_ACCESS = 2; - public static int PEER_HANDSHAKE_PORT = 8009; - public static int FILE_TRANSFER_PORT = 8008; - @Inject SharedPreferenceUtil sharedPreferenceUtil; @Inject AlertDialogShower alertDialogShower; 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 75ca7bdfb..1e975b994 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 @@ -19,7 +19,6 @@ import java.net.Socket; import java.util.ArrayList; import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.FileItem.FileStatus.TO_BE_SENT; -import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.LocalFileTransferActivity.PEER_HANDSHAKE_PORT; import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.LocalFileTransferActivity.getFileName; /** @@ -38,6 +37,7 @@ import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.LocalFileTra class PeerGroupHandshakeAsyncTask extends AsyncTask { private static final String TAG = "PeerGrpHndshakeAsyncTsk"; + private static int PEER_HANDSHAKE_PORT = 8009; private final String HANDSHAKE_MESSAGE = "Request Kiwix File Sharing"; private WeakReference weakReferenceToActivity; 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 0f1c1743a..37be14913 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 @@ -17,7 +17,7 @@ import java.util.ArrayList; import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.FileItem.FileStatus.SENDING; import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.FileItem.FileStatus.SENT; -import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.LocalFileTransferActivity.FILE_TRANSFER_PORT; +import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.WifiDirectManager.FILE_TRANSFER_PORT; import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.LocalFileTransferActivity.copyToOutputStream; import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.LocalFileTransferActivity.showToast; diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/RequestEnableLocationServicesDialog.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/RequestEnableLocationServicesDialog.java index bb8f74b11..1ca203b15 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/RequestEnableLocationServicesDialog.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/RequestEnableLocationServicesDialog.java @@ -12,6 +12,7 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; import org.kiwix.kiwixmobile.R; +import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.LocalFileTransferActivity.REQUEST_ENABLE_LOCATION_SERVICES; import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.LocalFileTransferActivity.showToast; public class RequestEnableLocationServicesDialog extends DialogFragment { @@ -28,7 +29,7 @@ public class RequestEnableLocationServicesDialog extends DialogFragment { @Override public void onClick(DialogInterface paramDialogInterface, int paramInt) { startActivityForResult(new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS), - LocalFileTransferActivity.REQUEST_ENABLE_LOCATION_SERVICES); + REQUEST_ENABLE_LOCATION_SERVICES); } }) .setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() { diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/RequestEnableWifiP2pServicesDialog.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/RequestEnableWifiP2pServicesDialog.java index 28bc0553b..2fc4d4b97 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/RequestEnableWifiP2pServicesDialog.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/RequestEnableWifiP2pServicesDialog.java @@ -12,6 +12,7 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; import org.kiwix.kiwixmobile.R; +import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.LocalFileTransferActivity.REQUEST_ENABLE_WIFI_P2P; import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.LocalFileTransferActivity.showToast; public class RequestEnableWifiP2pServicesDialog extends DialogFragment { @@ -27,7 +28,8 @@ public class RequestEnableWifiP2pServicesDialog extends DialogFragment { .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface paramDialogInterface, int paramInt) { - startActivity(new Intent(Settings.ACTION_WIFI_SETTINGS)); + startActivityForResult(new Intent(Settings.ACTION_WIFI_SETTINGS), + REQUEST_ENABLE_WIFI_P2P); } }) .setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() { diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/SenderDeviceAsyncTask.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/SenderDeviceAsyncTask.java index 2bd49bea7..5ac11bf04 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/SenderDeviceAsyncTask.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/SenderDeviceAsyncTask.java @@ -17,7 +17,7 @@ import java.net.InetSocketAddress; import java.net.Socket; import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.FileItem.FileStatus.*; -import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.LocalFileTransferActivity.FILE_TRANSFER_PORT; +import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.WifiDirectManager.FILE_TRANSFER_PORT; import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.LocalFileTransferActivity.copyToOutputStream; import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.LocalFileTransferActivity.getFileName; import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.LocalFileTransferActivity.showToast; 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 573b923a9..b69e886d7 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 @@ -32,6 +32,7 @@ public class WifiDirectManager implements WifiP2pManager.ChannelListener, WifiP2 WifiDirectBroadcastReceiver.BroadcastListener { private static final String TAG = "WifiDirectManager"; + public static int FILE_TRANSFER_PORT = 8008; @NonNull LocalFileTransferActivity activity;