From 9784c9d93022ece334c912e9394c0b6104b6bf4d Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Tue, 18 May 2021 17:36:43 +1000 Subject: [PATCH] Android: Only use scoped storage for scanning on 11+ --- .../github/stenzek/duckstation/GameDirectoriesActivity.java | 4 ++-- .../java/com/github/stenzek/duckstation/MainActivity.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/app/src/main/java/com/github/stenzek/duckstation/GameDirectoriesActivity.java b/android/app/src/main/java/com/github/stenzek/duckstation/GameDirectoriesActivity.java index 0bba77450..3361ed6f5 100644 --- a/android/app/src/main/java/com/github/stenzek/duckstation/GameDirectoriesActivity.java +++ b/android/app/src/main/java/com/github/stenzek/duckstation/GameDirectoriesActivity.java @@ -292,9 +292,9 @@ public class GameDirectoriesActivity extends AppCompatActivity { if (resultCode != RESULT_OK || data.getData() == null) return; - // Use legacy storage on devices older than Android 9... apparently some of them + // Use legacy storage on devices older than Android 11... apparently some of them // have broken storage access framework.... - if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.P) { + if (android.os.Build.VERSION.SDK_INT < 30) { final String path = FileHelper.getFullPathFromTreeUri(data.getData(), this); if (path != null) { addSearchDirectory(this, path, true); diff --git a/android/app/src/main/java/com/github/stenzek/duckstation/MainActivity.java b/android/app/src/main/java/com/github/stenzek/duckstation/MainActivity.java index b6a7e44ad..48abc89d7 100644 --- a/android/app/src/main/java/com/github/stenzek/duckstation/MainActivity.java +++ b/android/app/src/main/java/com/github/stenzek/duckstation/MainActivity.java @@ -272,9 +272,9 @@ public class MainActivity extends AppCompatActivity { if (resultCode != RESULT_OK || data.getData() == null) return; - // Use legacy storage on devices older than Android 9... apparently some of them + // Use legacy storage on devices older than Android 11... apparently some of them // have broken storage access framework.... - if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.P) { + if (android.os.Build.VERSION.SDK_INT < 30) { final String path = FileHelper.getFullPathFromTreeUri(data.getData(), this); if (path != null) { GameDirectoriesActivity.addSearchDirectory(this, path, true);