Update StorageUtils.java

Electric1447 · Feb 25, 2021 · 8b54db8 · 8b54db8
1 parent 0e6a2dc
commit 8b54db8
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/app/src/main/java/eparon/vhbb_android/Utils/StorageUtils.java b/app/src/main/java/eparon/vhbb_android/Utils/StorageUtils.java
@@ -8,6 +8,8 @@
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
 
+import java.util.Objects;
+
 public class StorageUtils {
 
     public static String getPath (final Context context, final Uri uri) {
@@ -58,7 +60,7 @@ else if (isMediaDocument(uri)) {
             }
         }
         // MediaStore (and general)
-        else if (uri.getScheme().equalsIgnoreCase("content")) {
+        else if (Objects.requireNonNull(uri.getScheme()).equalsIgnoreCase("content")) {
 
             // Return the remote address
             if (isGooglePhotosUri(uri))
@@ -98,31 +100,31 @@ public static String getDataColumn (Context context, Uri uri, String selection,
      * @return Whether the Uri authority is ExternalStorageProvider.
      */
     public static boolean isExternalStorageDocument (Uri uri) {
-        return uri.getAuthority().equals("com.android.externalstorage.documents");
+        return Objects.equals(uri.getAuthority(), "com.android.externalstorage.documents");
     }
 
     /**
      * @param uri The Uri to check.
      * @return Whether the Uri authority is DownloadsProvider.
      */
     public static boolean isDownloadsDocument (Uri uri) {
-        return uri.getAuthority().equals("com.android.providers.downloads.documents");
+        return Objects.equals(uri.getAuthority(), "com.android.providers.downloads.documents");
     }
 
     /**
      * @param uri The Uri to check.
      * @return Whether the Uri authority is MediaProvider.
      */
     public static boolean isMediaDocument (Uri uri) {
-        return uri.getAuthority().equals("com.android.providers.media.documents");
+        return Objects.equals(uri.getAuthority(), "com.android.providers.media.documents");
     }
 
     /**
      * @param uri The Uri to check.
      * @return Whether the Uri authority is Google Photos.
      */
     public static boolean isGooglePhotosUri (Uri uri) {
-        return uri.getAuthority().equals("com.google.android.apps.photos.content");
+        return Objects.equals(uri.getAuthority(), "com.google.android.apps.photos.content");
     }
 
 }