kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-22 03:54:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: Extract method & use showToast() for all toasts

Browse Source
This commit is contained in:
Aditya-Sood 2019-07-01 20:13:48 +05:30
parent 1dcffa41bd
commit 7473e12db9
5 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java
View File

@ -37,6 +37,8 @@ import java.net.InetAddress;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.LocalFileTransferActivity.showToast;
/** /**
* Part of the local file sharing module, this fragment is responsible for displaying details of * Part of the local file sharing module, this fragment is responsible for displaying details of
* the user device and the list of available peer devices, and once the user taps on a particular * the user device and the list of available peer devices, and once the user taps on a particular
@ -201,7 +203,7 @@ public class DeviceListFragment extends ListFragment implements WifiP2pManager.P
public void setClientAddress(InetAddress clientAddress) { public void setClientAddress(InetAddress clientAddress) {
if(clientAddress == null) { if(clientAddress == null) {
// null is returned only in case of a failed handshake // null is returned only in case of a failed handshake
Toast.makeText(localFileTransferActivity, "Selected device not cooperating for transfer", Toast.LENGTH_LONG).show(); showToast(localFileTransferActivity, "Selected device not cooperating for transfer", Toast.LENGTH_LONG);
localFileTransferActivity.closeLocalFileTransferActivity(); localFileTransferActivity.closeLocalFileTransferActivity();
return; return;
} }
@ -218,13 +220,13 @@ public class DeviceListFragment extends ListFragment implements WifiP2pManager.P
displayTransferProgressFragment(); displayTransferProgressFragment();
new ReceiverDeviceAsyncTask(this, transferProgressFragment).execute(); new ReceiverDeviceAsyncTask(this, transferProgressFragment).execute();
Toast.makeText(localFileTransferActivity, "Preparing to receive files...", Toast.LENGTH_SHORT).show(); showToast(localFileTransferActivity, "Preparing to receive files...", Toast.LENGTH_SHORT);
} else if(groupInfo.groupFormed) { } else if(groupInfo.groupFormed) {
{ {
Log.d(LocalFileTransferActivity.TAG, "Starting file transfer"); Log.d(LocalFileTransferActivity.TAG, "Starting file transfer");
Toast.makeText(localFileTransferActivity, "Starting file transfer...", Toast.LENGTH_SHORT).show(); showToast(localFileTransferActivity, "Starting file transfer...", Toast.LENGTH_SHORT);
if(groupInfo.isGroupOwner) fileReceiverDeviceAddress = selectedPeerDeviceInetAddress; if(groupInfo.isGroupOwner) fileReceiverDeviceAddress = selectedPeerDeviceInetAddress;
else fileReceiverDeviceAddress = groupInfo.groupOwnerAddress; else fileReceiverDeviceAddress = groupInfo.groupOwnerAddress;

35
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java
View File

@ -153,12 +153,12 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi
manager.discoverPeers(channel, new WifiP2pManager.ActionListener() { manager.discoverPeers(channel, new WifiP2pManager.ActionListener() {
@Override @Override
public void onSuccess() { public void onSuccess() {
Toast.makeText(LocalFileTransferActivity.this, "Discovery Initiated", Toast.LENGTH_SHORT).show(); showToast(LocalFileTransferActivity.this, "Discovery Initiated", Toast.LENGTH_SHORT);
} }
@Override @Override
public void onFailure(int reason) { public void onFailure(int reason) {
Toast.makeText(LocalFileTransferActivity.this, "Discovery Failed: " + getErrorMessage(reason), Toast.LENGTH_SHORT).show(); showToast(LocalFileTransferActivity.this, "Discovery Failed: " + getErrorMessage(reason), Toast.LENGTH_SHORT);
} }
}); });
return true; return true;
@ -222,6 +222,10 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi
deviceListFragment.clearPeers(); deviceListFragment.clearPeers();
} }
} }
static void showToast(Context context, String text, int duration) {
Toast.makeText(context, text, duration).show();
}
/* From WifiP2pManager.ChannelListener interface */ /* From WifiP2pManager.ChannelListener interface */
@ -229,13 +233,13 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi
public void onChannelDisconnected() { public void onChannelDisconnected() {
// Upon disconnection, retry one more time // Upon disconnection, retry one more time
if(manager != null && !retryChannel) { if(manager != null && !retryChannel) {
Toast.makeText(this, "Channel lost, trying again", Toast.LENGTH_LONG).show(); showToast(this, "Channel lost, trying again", Toast.LENGTH_LONG);
resetData(); resetData();
retryChannel = true; retryChannel = true;
manager.initialize(this, getMainLooper(), this); manager.initialize(this, getMainLooper(), this);
} else { } else {
Toast.makeText(this, "Severe! Try Disable/Re-enable WiFi P2P", Toast.LENGTH_LONG).show(); showToast(this, "Severe! Try Disable/Re-enable WiFi P2P", Toast.LENGTH_LONG);
} }
} }
@ -258,15 +262,15 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi
@Override @Override
public void onSuccess() { public void onSuccess() {
Toast.makeText(LocalFileTransferActivity.this, "Aborting connection", showToast(LocalFileTransferActivity.this, "Aborting connection",
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT);
} }
@Override @Override
public void onFailure(int reasonCode) { public void onFailure(int reasonCode) {
Toast.makeText(LocalFileTransferActivity.this, showToast(LocalFileTransferActivity.this,
"Connect abort request failed. Reason : " + getErrorMessage(reasonCode), "Connect abort request failed. Reason : " + getErrorMessage(reasonCode),
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT);
} }
}); });
} }
@ -287,7 +291,7 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi
@Override @Override
public void onFailure(int reason) { public void onFailure(int reason) {
Toast.makeText(LocalFileTransferActivity.this, "Connection failed: " + getErrorMessage(reason), Toast.LENGTH_LONG).show(); showToast(LocalFileTransferActivity.this, "Connection failed: " + getErrorMessage(reason), Toast.LENGTH_LONG);
} }
}); });
} }
@ -378,7 +382,7 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi
if (grantResults[0] != PackageManager.PERMISSION_GRANTED) { if (grantResults[0] != PackageManager.PERMISSION_GRANTED) {
Log.e(TAG, "Location permission not granted"); Log.e(TAG, "Location permission not granted");
Toast.makeText(this, "Cannot locate peer devices without location permissions", Toast.LENGTH_LONG).show(); showToast(this, "Cannot locate peer devices without location permissions", Toast.LENGTH_LONG);
closeLocalFileTransferActivity(); closeLocalFileTransferActivity();
break; break;
} }
@ -388,7 +392,7 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi
if (grantResults[0] != PackageManager.PERMISSION_GRANTED) { if (grantResults[0] != PackageManager.PERMISSION_GRANTED) {
Log.e(TAG, "Storage write permission not granted"); Log.e(TAG, "Storage write permission not granted");
Toast.makeText(this, "Cannot access zim files without storage permission", Toast.LENGTH_LONG).show(); showToast(this, "Cannot access zim files without storage permission", Toast.LENGTH_LONG);
closeLocalFileTransferActivity(); closeLocalFileTransferActivity();
break; break;
} }
@ -439,7 +443,7 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi
.setNegativeButton("No", new DialogInterface.OnClickListener() { .setNegativeButton("No", new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
Toast.makeText(getActivity(), "Cannot discover peers without location services", Toast.LENGTH_SHORT).show(); showToast(getActivity(), "Cannot discover peers without location services", Toast.LENGTH_SHORT);
} }
}); });
@ -474,7 +478,7 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi
.setNegativeButton("No", new DialogInterface.OnClickListener() { .setNegativeButton("No", new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
Toast.makeText(getActivity(), "Cannot discover peers without WiFi ON", Toast.LENGTH_SHORT).show(); showToast(getActivity(), "Cannot discover peers without WiFi ON", Toast.LENGTH_SHORT);
} }
}); });
@ -492,20 +496,21 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi
if(!(locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER) || locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER))) { if(!(locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER) || locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER))) {
// If neither provider is enabled // If neither provider is enabled
Toast.makeText(this, "Cannot discover peers without location services", Toast.LENGTH_LONG).show(); showToast(this, "Cannot discover peers without location services", Toast.LENGTH_LONG);
} }
break; break;
} }
case REQUEST_ENABLE_WIFI_P2P: { case REQUEST_ENABLE_WIFI_P2P: {
if(!isWifiP2pEnabled()) { if(!isWifiP2pEnabled()) {
Toast.makeText(this, "Cannot discover peers without WiFi ON", Toast.LENGTH_LONG).show(); showToast(this, "Cannot discover peers without WiFi ON", Toast.LENGTH_LONG);
} }
break; break;
} }
} }
} }
//TODO: Remove
private void showNeutralDialog(String dialogMessage) { private void showNeutralDialog(String dialogMessage) {
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction(); FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
Fragment prev = getSupportFragmentManager().findFragmentByTag("NeutralDialog"); Fragment prev = getSupportFragmentManager().findFragmentByTag("NeutralDialog");

5
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/ReceiverDeviceAsyncTask.java
View File

@ -15,6 +15,7 @@ import java.util.ArrayList;
import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.DeviceListFragment.FILE_TRANSFER_PORT; import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.DeviceListFragment.FILE_TRANSFER_PORT;
import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.DeviceListFragment.copyToOutputStream; import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.DeviceListFragment.copyToOutputStream;
import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.LocalFileTransferActivity.showToast;
/** /**
* Helper class for the local file sharing module, used in {@link DeviceListFragment}. * Helper class for the local file sharing module, used in {@link DeviceListFragment}.
@ -95,9 +96,9 @@ class ReceiverDeviceAsyncTask extends AsyncTask<Void, Short, Boolean> {
if(BuildConfig.DEBUG) Log.d(TAG, "File transfer complete"); if(BuildConfig.DEBUG) Log.d(TAG, "File transfer complete");
if(allFilesReceived) { if(allFilesReceived) {
Toast.makeText(deviceListFragment.getActivity(), "File transfer complete", Toast.LENGTH_LONG).show(); showToast(deviceListFragment.getActivity(), "File transfer complete", Toast.LENGTH_LONG);
} else { } else {
Toast.makeText(deviceListFragment.getActivity(), "An error was encountered during transfer", Toast.LENGTH_LONG).show(); showToast(deviceListFragment.getActivity(), "An error was encountered during transfer", Toast.LENGTH_LONG);
} }
((LocalFileTransferActivity) deviceListFragment.getActivity()).closeLocalFileTransferActivity(); ((LocalFileTransferActivity) deviceListFragment.getActivity()).closeLocalFileTransferActivity();

5
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/SenderDeviceAsyncTask.java
View File

@ -16,6 +16,7 @@ import java.net.Socket;
import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.DeviceListFragment.FILE_TRANSFER_PORT; import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.DeviceListFragment.FILE_TRANSFER_PORT;
import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.DeviceListFragment.getFileName; import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.DeviceListFragment.getFileName;
import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.LocalFileTransferActivity.showToast;
/** /**
* Helper class for the local file sharing module, used in {@link DeviceListFragment}. * Helper class for the local file sharing module, used in {@link DeviceListFragment}.
@ -96,12 +97,12 @@ class SenderDeviceAsyncTask extends AsyncTask<Uri, Void, Boolean> {
if(fileSendSuccessful) { if(fileSendSuccessful) {
transferProgressFragment.changeStatus(fileItemIndex, FileItem.SENT); transferProgressFragment.changeStatus(fileItemIndex, FileItem.SENT);
} else { } else {
Toast.makeText(deviceListFragment.getActivity(), "Error sending file "+ getFileName(deviceListFragment.getFileUriList().get(fileItemIndex)), Toast.LENGTH_SHORT).show(); showToast(deviceListFragment.getActivity(), "Error sending file "+ getFileName(deviceListFragment.getFileUriList().get(fileItemIndex)), Toast.LENGTH_SHORT);
transferProgressFragment.changeStatus(fileItemIndex, FileItem.ERROR); transferProgressFragment.changeStatus(fileItemIndex, FileItem.ERROR);
} }
if(deviceListFragment.allFilesSent()) { if(deviceListFragment.allFilesSent()) {
Toast.makeText(deviceListFragment.getActivity(), "All files transferred", Toast.LENGTH_SHORT).show(); showToast(deviceListFragment.getActivity(), "All files transferred", Toast.LENGTH_SHORT);
deviceListFragment.getActivity().finish(); deviceListFragment.getActivity().finish();
} }
} }

4
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/WifiDirectBroadcastReceiver.java
View File

@ -11,6 +11,8 @@ import android.widget.Toast;
import org.kiwix.kiwixmobile.R; import org.kiwix.kiwixmobile.R;
import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.LocalFileTransferActivity.showToast;
/** /**
* Helper class for the local file sharing module. * Helper class for the local file sharing module.
* *
@ -42,7 +44,7 @@ public class WifiDirectBroadcastReceiver extends BroadcastReceiver {
wifiActivity.setWifiP2pEnabled(true); wifiActivity.setWifiP2pEnabled(true);
} else { } else {
wifiActivity.setWifiP2pEnabled(false); wifiActivity.setWifiP2pEnabled(false);
Toast.makeText(wifiActivity, "Cannot discover peers without WiFi", Toast.LENGTH_SHORT).show(); showToast(wifiActivity, "Cannot discover peers without WiFi", Toast.LENGTH_SHORT);
wifiActivity.resetPeers(); wifiActivity.resetPeers();
} }
Log.d(LocalFileTransferActivity.TAG, "WiFi P2P state changed - " + wifiP2pState); Log.d(LocalFileTransferActivity.TAG, "WiFi P2P state changed - " + wifiP2pState);