Skip to content

Fix NPE on some Android 16 devices #3646

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ewpatton wants to merge 1 commit into
base: ucr
Choose a base branch
from
Open

Fix NPE on some Android 16 devices #3646

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion appinventor/components/src/com/google/appinventor/components/runtime/util/QUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,14 @@ public static File getExternalStorageDir(Context context, boolean forcePrivate,
}
if ((!legacy && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) || forcePrivate) {
// Q no longer allows using getExternalStorageDirectory()
return context.getExternalFilesDir(null);
File externalStorage = context.getExternalFilesDir(null);
if (externalStorage == null) {
// This can happen if the external storage is not currently mounted, but we need some
// place to put assets, etc. Fall back to internal storage in this case.
return context.getFilesDir();
} else {
return externalStorage;
}
} else {
return Environment.getExternalStorageDirectory();
}
Expand Down