Refactor: Change location of constants

This commit is contained in:
Aditya-Sood 2019-07-30 18:04:50 +05:30
parent 2e41f51fc8
commit d02c940baa
7 changed files with 9 additions and 8 deletions

View File

@ -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;

View File

@ -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<Void, Void, InetAddress> {
private static final String TAG = "PeerGrpHndshakeAsyncTsk";
private static int PEER_HANDSHAKE_PORT = 8009;
private final String HANDSHAKE_MESSAGE = "Request Kiwix File Sharing";
private WeakReference<LocalFileTransferActivity> weakReferenceToActivity;

View File

@ -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;

View File

@ -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() {

View File

@ -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() {

View File

@ -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;

View File

@ -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;