import android.annotation.SuppressLint;
import android.app.Dialog;
-import android.app.DialogFragment;
import android.content.Context;
import android.content.DialogInterface;
import android.net.Uri;
import android.os.Bundle;
+import android.support.annotation.NonNull;
// `android.support.v7.app.AlertDialog` uses more of the horizontal screen real estate versus `android.app.AlertDialog's` smaller width.
import android.support.v7.app.AlertDialog;
+// We have to use `AppCompatDialogFragment` instead of `DialogFragment` or an error is produced on API <=22.
+import android.support.v7.app.AppCompatDialogFragment;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
import java.util.Locale;
-public class DownloadFile extends DialogFragment {
+public class DownloadFile extends AppCompatDialogFragment {
private String downloadUrl;
private String downloadFileName;
Bundle argumentsBundle = new Bundle();
String fileNameString;
- if (!contentDisposition.isEmpty()) { // Extract `fileNameString` from `contentDisposition` using the substring beginning after `filename="` and ending one character before the end of `contentDisposition`.
- fileNameString = contentDisposition.substring(contentDisposition.indexOf("filename=\"") + 10, contentDisposition.length() - 1);
- } else { // `contentDisposition` is empty, so use the last path segment of the URL as the file name.
+
+ // Parse `filename` from `contentDisposition`.
+ if (contentDisposition.contains("filename=\"")) { // The file name is contained in a string surrounded by `""`.
+ fileNameString = contentDisposition.substring(contentDisposition.indexOf("filename=\"") + 10, contentDisposition.indexOf("\"", contentDisposition.indexOf("filename=\"") + 10));
+ } else if (contentDisposition.contains("filename=") && ((contentDisposition.indexOf(";", contentDisposition.indexOf("filename=") + 9)) > 0 )) { // The file name is contained in a string beginning with `filename=` and ending with `;`.
+ fileNameString = contentDisposition.substring(contentDisposition.indexOf("filename=") + 9, contentDisposition.indexOf(";", contentDisposition.indexOf("filename=") + 9));
+ } else if (contentDisposition.contains("filename=")) { // The file name is contained in a string beginning with `filename=` and proceeding to the end of `contentDisposition`.
+ fileNameString = contentDisposition.substring(contentDisposition.indexOf("filename=") + 9, contentDisposition.length());
+ } else { // `contentDisposition` does not contain the filename, so use the last path segment of the URL.
Uri downloadUri = Uri.parse(urlString);
fileNameString = downloadUri.getLastPathSegment();
}
- // Convert `contentLength` to MB and store it in `fileSizeString`. `%.3g` displays the three most significant digits.
- String fileSizeString = String.format(Locale.getDefault(), "%.3g", (float) contentLength / 1048576) + " MB";
-
// Store the variables in the `Bundle`.
argumentsBundle.putString("URL", urlString);
argumentsBundle.putString("File_Name", fileNameString);
- argumentsBundle.putString("File_Size", fileSizeString);
+ argumentsBundle.putLong("File_Size", contentLength);
// Add `argumentsBundle` to this instance of `DownloadFile`.
DownloadFile thisDownloadFileDialog = new DownloadFile();
// Store the strings in the local class variables.
downloadUrl = getArguments().getString("URL");
downloadFileName = getArguments().getString("File_Name");
- fileSize = getArguments().getString("File_Size");
+
+ // Get the `File_Size`.
+ long fileSizeLong = getArguments().getLong("File_Size");
+
+ // Convert `fileSizeLong` to a String.
+ if (fileSizeLong == -1) { // We don't know the file size.
+ fileSize = getString(R.string.unknown_size);
+ } else { // Convert `fileSize` to MB and store it in `fileSizeString`. `%.3g` displays the three most significant digits.
+ fileSize = String.format(Locale.getDefault(), "%.3g", (float) fileSizeLong / 1048576) + " MB";
+ }
}
// The public interface is used to send information back to the parent activity.
public interface DownloadFileListener {
- void onDownloadFile(DialogFragment dialogFragment, String downloadUrl);
+ void onDownloadFile(AppCompatDialogFragment dialogFragment, String downloadUrl);
}
// `downloadFileListener` is used in `onAttach()` and `onCreateDialog()`.
private DownloadFileListener downloadFileListener;
- // Check to make sure tha the parent activity implements the listener.
@Override
public void onAttach(Context context) {
super.onAttach(context);
+
+ // Check to make sure the parent activity implements the listener.
try {
downloadFileListener = (DownloadFileListener) context;
} catch (ClassCastException exception) {
}
}
+ @Override
+ @NonNull
// `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the `AlertDialog`.
@SuppressLint("InflateParams")
- @Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
// Get the activity's layout inflater.
LayoutInflater layoutInflater = getActivity().getLayoutInflater();
// Use `AlertDialog.Builder` to create the `AlertDialog`. `R.style.lightAlertDialog` formats the color of the button text.
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.LightAlertDialog);
+
+ // Set the title.
dialogBuilder.setTitle(R.string.save_as);
- // The parent view is `null` because it will be assigned by `AlertDialog`.
+
+ // Set the view. The parent view is `null` because it will be assigned by `AlertDialog`.
dialogBuilder.setView(layoutInflater.inflate(R.layout.download_file_dialog, null));
// Set an `onClick()` listener on the negative button.
dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
- // Do nothing if `Cancel` is clicked.
+ // Do nothing if `Cancel` is clicked. The `Dialog` will automatically close.
}
});
}
});
-
// Create an `AlertDialog` from the `AlertDialog.Builder`.
final AlertDialog alertDialog = dialogBuilder.create();
}
});
-
// `onCreateDialog` requires the return of an `AlertDialog`.
return alertDialog;
}
projects / PrivacyBrowserAndroid.git / blobdiff