mirror/Anki-Android
0
0
Fork 0
mirror of https://github.com/ankidroid/Anki-Android.git synced 2024-09-20 03:52:15 +02:00
Code

lint: minor de-lint of ContentResolverUtil

Browse Source 
just null checking / annotation
This commit is contained in:
Mike Hardy 2021-05-25 10:15:37 -05:00
parent a6cc6e1d6f
commit f9153d7e85
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
AnkiDroid/src/main/java/com/ichi2/utils/ContentResolverUtil.java
View File

@ -26,6 +26,7 @@ import java.io.File;
import java.util.Locale;
import androidx.annotation.CheckResult;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import timber.log.Timber;
@ -53,9 +54,9 @@ public class ContentResolverUtil {
@CheckResult
@Nullable
private static String getFilenameViaMimeType(ContentResolver contentResolver, Uri uri) {
private static String getFilenameViaMimeType(ContentResolver contentResolver, @NonNull Uri uri) {
// value: "png" when testing
String extension;
String extension = null;
//Check uri format to avoid null
if (uri.getScheme() != null && uri.getScheme().equals(ContentResolver.SCHEME_CONTENT)) {
@ -65,7 +66,9 @@ public class ContentResolverUtil {
} else {
// If scheme is a File
// This will replace white spaces with %20 and also other special characters. This will avoid returning null values on file name with spaces and special characters.
extension = MimeTypeMap.getFileExtensionFromUrl(Uri.fromFile(new File(uri.getPath())).toString().toLowerCase(Locale.ROOT));
if (uri.getPath() != null) {
extension = MimeTypeMap.getFileExtensionFromUrl(Uri.fromFile(new File(uri.getPath())).toString().toLowerCase(Locale.ROOT));
}
}
if (extension == null) {
return null;