mirror/fdroidclient
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidclient.git synced 2026-02-15 09:33:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

use READ_EXTERNAL_STORAGE perm since only reading is needed

Browse Source 
READ_EXTERNAL_STORAGE was added in SDK 16, this code predates that, so it
still used WRITE_EXTERNAL_STORAGE.  The minSdkVersion is 23 now, so the
correct permission is preferred.  This code does not do any writing, only
reading.

#1440
This commit is contained in:
Hans-Christoph Steiner
2023-06-12 10:20:02 +02:00
committed by Torsten Grote
parent 22635cd525
commit 703a1c10a7
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java
View File

@@ -152,8 +152,8 @@ public class MainActivityEspressoTest {
Manifest.permission.ACCESS_COARSE_LOCATION);
@Rule
public GrantPermissionRule writeExternalStoragePermissionRule = GrantPermissionRule.grant(
Manifest.permission.WRITE_EXTERNAL_STORAGE);
public GrantPermissionRule readExternalStoragePermissionRule = GrantPermissionRule.grant(
Manifest.permission.READ_EXTERNAL_STORAGE);
@Test
public void bottomNavFlavorCheck() {

13
app/src/full/java/org/fdroid/fdroid/views/main/NearbyViewBinder.java
View File

@@ -49,16 +49,11 @@ import java.util.concurrent.Executor;
* that have a removable SD Card that is currently mounted, this will request
* permission to read it, so that F-Droid can look for repos on the SD Card.
* <p>
* Once {@link Manifest.permission#READ_EXTERNAL_STORAGE} or
* {@link Manifest.permission#WRITE_EXTERNAL_STORAGE} is granted for F-Droid,
* Once {@link Manifest.permission#READ_EXTERNAL_STORAGE} is granted to F-Droid,
* then it can read any file on an SD Card and no more prompts are needed. For
* USB OTG drives, the only way to get read permissions is to prompt the user
* via {@link Intent#ACTION_OPEN_DOCUMENT_TREE}.
* <p>
* For write permissions, {@code android-19} and {@code android-20} devices are
* basically screwed here. {@link Intent#ACTION_OPEN_DOCUMENT_TREE} was added
* in {@code android-21}, and there does not seem to be any other way to get
* write access to the the removable storage.
*
* @see TreeUriScannerIntentService
* @see org.fdroid.fdroid.nearby.SDCardScannerService
@@ -106,7 +101,7 @@ public class NearbyViewBinder {
}
}
final String writeExternalStorage = Manifest.permission.WRITE_EXTERNAL_STORAGE;
final String readExternalStorage = Manifest.permission.READ_EXTERNAL_STORAGE;
if (externalStorage != null) {
nearbySplash.setVisibility(View.GONE);
TextView readExternalStorageText = swapView.findViewById(R.id.read_external_storage_text);
@@ -116,8 +111,8 @@ public class NearbyViewBinder {
requestReadExternalStorage.setOnClickListener(v -> {
if ((externalStorage == null || !externalStorage.canRead())
&& PackageManager.PERMISSION_GRANTED != ContextCompat.checkSelfPermission(activity,
writeExternalStorage)) {
ActivityCompat.requestPermissions(activity, new String[]{writeExternalStorage},
readExternalStorage)) {
ActivityCompat.requestPermissions(activity, new String[]{readExternalStorage},
MainActivity.REQUEST_STORAGE_PERMISSIONS);
} else {
Toast.makeText(activity,