diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java index 13fdbeda5..fe3a6780e 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java @@ -37,6 +37,8 @@ import java.net.InetAddress; import java.util.ArrayList; 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 * 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) { if(clientAddress == null) { // 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(); return; } @@ -218,13 +220,13 @@ public class DeviceListFragment extends ListFragment implements WifiP2pManager.P displayTransferProgressFragment(); 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) { { 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; else fileReceiverDeviceAddress = groupInfo.groupOwnerAddress; 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 cc449adc4..48726b74a 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 @@ -153,12 +153,12 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi manager.discoverPeers(channel, new WifiP2pManager.ActionListener() { @Override public void onSuccess() { - Toast.makeText(LocalFileTransferActivity.this, "Discovery Initiated", Toast.LENGTH_SHORT).show(); + showToast(LocalFileTransferActivity.this, "Discovery Initiated", Toast.LENGTH_SHORT); } @Override 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; @@ -222,6 +222,10 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi deviceListFragment.clearPeers(); } } + + static void showToast(Context context, String text, int duration) { + Toast.makeText(context, text, duration).show(); + } /* From WifiP2pManager.ChannelListener interface */ @@ -229,13 +233,13 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi public void onChannelDisconnected() { // Upon disconnection, retry one more time 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(); retryChannel = true; manager.initialize(this, getMainLooper(), this); } 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 public void onSuccess() { - Toast.makeText(LocalFileTransferActivity.this, "Aborting connection", - Toast.LENGTH_SHORT).show(); + showToast(LocalFileTransferActivity.this, "Aborting connection", + Toast.LENGTH_SHORT); } @Override public void onFailure(int reasonCode) { - Toast.makeText(LocalFileTransferActivity.this, + showToast(LocalFileTransferActivity.this, "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 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) { 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(); break; } @@ -388,7 +392,7 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi if (grantResults[0] != PackageManager.PERMISSION_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(); break; } @@ -439,7 +443,7 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi .setNegativeButton("No", new DialogInterface.OnClickListener() { @Override 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() { @Override 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 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; } case REQUEST_ENABLE_WIFI_P2P: { 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; } } } + //TODO: Remove private void showNeutralDialog(String dialogMessage) { FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction(); Fragment prev = getSupportFragmentManager().findFragmentByTag("NeutralDialog"); 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 7fd1a0713..916b9671f 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 @@ -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.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}. @@ -95,9 +96,9 @@ class ReceiverDeviceAsyncTask extends AsyncTask { if(BuildConfig.DEBUG) Log.d(TAG, "File transfer complete"); if(allFilesReceived) { - Toast.makeText(deviceListFragment.getActivity(), "File transfer complete", Toast.LENGTH_LONG).show(); + showToast(deviceListFragment.getActivity(), "File transfer complete", Toast.LENGTH_LONG); } 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(); 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 d52de9a41..6642f4e16 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 @@ -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.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}. @@ -96,12 +97,12 @@ class SenderDeviceAsyncTask extends AsyncTask { if(fileSendSuccessful) { transferProgressFragment.changeStatus(fileItemIndex, FileItem.SENT); } 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); } 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(); } } diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/WifiDirectBroadcastReceiver.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/WifiDirectBroadcastReceiver.java index 536f75987..44582d964 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/WifiDirectBroadcastReceiver.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/WifiDirectBroadcastReceiver.java @@ -11,6 +11,8 @@ import android.widget.Toast; 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. * @@ -42,7 +44,7 @@ public class WifiDirectBroadcastReceiver extends BroadcastReceiver { wifiActivity.setWifiP2pEnabled(true); } else { 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(); } Log.d(LocalFileTransferActivity.TAG, "WiFi P2P state changed - " + wifiP2pState);