X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FDownloadFile.java;h=1a68f71fd82dd479365d7a91c82b2ba11434c5fa;hb=7d632afdd10cad5b4d62fce37707eaceebe260cb;hp=1a3b76dae267abaaf7b1deb034e18c4c19aeca66;hpb=1bd5ba3b9f91e69517fa8a39665256f0badc408b;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/java/com/stoutner/privacybrowser/DownloadFile.java b/app/src/main/java/com/stoutner/privacybrowser/DownloadFile.java
index 1a3b76da..1a68f71f 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/DownloadFile.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/DownloadFile.java
@@ -50,9 +50,15 @@ public class DownloadFile extends AppCompatDialogFragment {
         Bundle argumentsBundle = new Bundle();
 
         String fileNameString;
-        if (!contentDisposition.isEmpty()) {  // Extract `fileNameString` from `contentDisposition` using the substring beginning after `filename="` and ending with the next `"`.
+
+        // 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 {  // `contentDisposition` is empty, so use the last path segment of the URL as the file name.
+        } 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();
         }
@@ -95,10 +101,11 @@ public class DownloadFile extends AppCompatDialogFragment {
     // `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) {
@@ -106,25 +113,28 @@ public class DownloadFile extends AppCompatDialogFragment {
         }
     }
 
-    // `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the `AlertDialog`.
-    @SuppressLint("InflateParams")
     @Override
     @NonNull
+    // `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the `AlertDialog`.
+    @SuppressLint("InflateParams")
     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.
             }
         });
 
@@ -137,7 +147,6 @@ public class DownloadFile extends AppCompatDialogFragment {
             }
         });
 
-
         // Create an `AlertDialog` from the `AlertDialog.Builder`.
         final AlertDialog alertDialog = dialogBuilder.create();
 
@@ -178,7 +187,6 @@ public class DownloadFile extends AppCompatDialogFragment {
             }
         });
 
-
         // `onCreateDialog` requires the return of an `AlertDialog`.
         return alertDialog;
     }