/*
- * Copyright © 2020-2021 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2020-2022 Soren Stoutner <soren@stoutner.com>.
*
- * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+ * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
*
- * Privacy Browser is free software: you can redistribute it and/or modify
+ * Privacy Browser Android is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * Privacy Browser is distributed in the hope that it will be useful,
+ * Privacy Browser Android is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Privacy Browser. If not, see <http://www.gnu.org/licenses/>.
+ * along with Privacy Browser Android. If not, see <http://www.gnu.org/licenses/>.
*/
package com.stoutner.privacybrowser.asynctasks;
import android.app.Activity;
+import android.database.Cursor;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.net.Uri;
import android.os.AsyncTask;
+import android.os.Build;
+import android.provider.OpenableColumns;
import android.widget.LinearLayout;
import com.google.android.material.snackbar.Snackbar;
import java.lang.ref.WeakReference;
public class SaveAboutVersionImage extends AsyncTask<Void, Void, String> {
+ // Declare the class constants.
+ private final String SUCCESS = "Success";
+
// Declare the weak references.
private final WeakReference<Activity> activityWeakReference;
private final WeakReference<LinearLayout> aboutVersionLinearLayoutWeakReference;
- // Declare the class constants.
- private final String SUCCESS = "Success";
-
// Declare the class variables.
private Snackbar savingImageSnackbar;
private Bitmap aboutVersionBitmap;
+ private final Uri fileUri;
private final String fileNameString;
// The public constructor.
- public SaveAboutVersionImage(Activity activity, String fileNameString, LinearLayout aboutVersionLinearLayout) {
+ public SaveAboutVersionImage(Activity activity, Uri fileUri, LinearLayout aboutVersionLinearLayout) {
// Populate the weak references.
activityWeakReference = new WeakReference<>(activity);
aboutVersionLinearLayoutWeakReference = new WeakReference<>(aboutVersionLinearLayout);
// Store the class variables.
- this.fileNameString = fileNameString;
+ this.fileUri = fileUri;
+
+ // Query the exact file name if the API >= 26.
+ if (Build.VERSION.SDK_INT >= 26) {
+ // Get a cursor from the content resolver.
+ Cursor contentResolverCursor = activity.getContentResolver().query(fileUri, null, null, null);
+
+ // Move to the first row.
+ contentResolverCursor.moveToFirst();
+
+ // Get the file name from the cursor.
+ fileNameString = contentResolverCursor.getString(contentResolverCursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME));
+
+ // Close the cursor.
+ contentResolverCursor.close();
+ } else {
+ // Use the URI last path segment as the file name string.
+ fileNameString = fileUri.getLastPathSegment();
+ }
}
// `onPreExecute()` operates on the UI thread.
try {
// Open an output stream.
- OutputStream outputStream = activity.getContentResolver().openOutputStream(Uri.parse(fileNameString));
+ OutputStream outputStream = activity.getContentResolver().openOutputStream(fileUri);
// Write the webpage image to the image file.
aboutVersionByteArrayOutputStream.writeTo(outputStream);
// Display a file creation disposition snackbar.
if (fileCreationDisposition.equals(SUCCESS)) {
// Create a file saved snackbar.
- Snackbar.make(aboutVersionLinearLayout, activity.getString(R.string.file_saved) + " " + fileNameString, Snackbar.LENGTH_SHORT).show();
+ Snackbar.make(aboutVersionLinearLayout, activity.getString(R.string.saved, fileNameString), Snackbar.LENGTH_SHORT).show();
} else {
- Snackbar.make(aboutVersionLinearLayout, activity.getString(R.string.error_saving_file) + " " + fileCreationDisposition, Snackbar.LENGTH_INDEFINITE).show();
+ Snackbar.make(aboutVersionLinearLayout, activity.getString(R.string.error_saving_file, fileNameString, fileCreationDisposition), Snackbar.LENGTH_INDEFINITE).show();
}
}
-}
\ No newline at end of file
+}