X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FDownloadFile.java;h=1a3b76dae267abaaf7b1deb034e18c4c19aeca66;hb=afe89bbfe094100ef11ead2e615c1df1bab1ec7d;hp=627335df711dc8c5528999c01b6091c5d7d10e01;hpb=bc6574b86391ed9c731835c18de7bd0a10de19f8;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 627335df..1a3b76da 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/DownloadFile.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/DownloadFile.java
@@ -21,13 +21,15 @@ package com.stoutner.privacybrowser;
 
 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;
@@ -37,7 +39,7 @@ import android.widget.TextView;
 
 import java.util.Locale;
 
-public class DownloadFile extends DialogFragment {
+public class DownloadFile extends AppCompatDialogFragment {
 
     private String downloadUrl;
     private String downloadFileName;
@@ -48,20 +50,17 @@ public class DownloadFile extends DialogFragment {
         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);
+        if (!contentDisposition.isEmpty()) {  // Extract `fileNameString` from `contentDisposition` using the substring beginning after `filename="` and ending with the next `"`.
+            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.
             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();
@@ -76,12 +75,21 @@ public class DownloadFile extends DialogFragment {
         // 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()`.
@@ -101,6 +109,7 @@ public class DownloadFile extends DialogFragment {
     // `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the `AlertDialog`.
     @SuppressLint("InflateParams")
     @Override
+    @NonNull
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         // Get the activity's layout inflater.
         LayoutInflater layoutInflater = getActivity().getLayoutInflater();