X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;ds=sidebyside;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fasynctasks%2FSaveAboutVersionImage.java;h=2fa4f99ae761bef59228e7a089eca3121bf03f15;hb=8142ac5fc2489de735de4b6fa21a1eae733ccfce;hp=1c15bc9c56c9dea22c4097509818d5eb1e2ec7e8;hpb=d53f0640263cf0799e7304fa459864c542ab0d2a;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveAboutVersionImage.java b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveAboutVersionImage.java index 1c15bc9c..2fa4f99a 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveAboutVersionImage.java +++ b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveAboutVersionImage.java @@ -1,20 +1,20 @@ /* - * Copyright © 2020-2021 Soren Stoutner . + * Copyright © 2020-2022 Soren Stoutner . * - * This file is part of Privacy Browser . + * This file is part of 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 . + * along with Privacy Browser Android. If not, see . */ package com.stoutner.privacybrowser.asynctasks; @@ -48,34 +48,34 @@ public class SaveAboutVersionImage extends AsyncTask { // Declare the class variables. private Snackbar savingImageSnackbar; private Bitmap aboutVersionBitmap; - private final Uri fileNameUri; + private final Uri fileUri; private final String fileNameString; // The public constructor. - public SaveAboutVersionImage(Activity activity, Uri fileNameUri, 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.fileNameUri = fileNameUri; + 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(fileNameUri, null, null, null); + 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.getColumnIndex(OpenableColumns.DISPLAY_NAME)); + 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 = fileNameUri.getLastPathSegment(); + fileNameString = fileUri.getLastPathSegment(); } } @@ -129,7 +129,7 @@ public class SaveAboutVersionImage extends AsyncTask { try { // Open an output stream. - OutputStream outputStream = activity.getContentResolver().openOutputStream(fileNameUri); + OutputStream outputStream = activity.getContentResolver().openOutputStream(fileUri); // Write the webpage image to the image file. aboutVersionByteArrayOutputStream.writeTo(outputStream);