Extract getFileOverlayIcon function from getFileIcon

Signed-off-by: Alper Ozturk <alperozturk@lions-macbook.local>
Signed-off-by: alperozturk <alper_ozturk@proton.me>

app/src/androidTest/java/com/owncloud/android/datamodel/OCFileIconTests.kt

@@ -0,0 +1,4 @@
+package com.owncloud.android.datamodel
+
+class OCFileIconTests {
+}

app/src/main/java/com/owncloud/android/datamodel/OCFile.java

@@ -646,29 +646,42 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
         return permissions != null && permissions.contains(PERMISSION_GROUPFOLDER);
     }
 
-    public LayerDrawable getFileIcon(boolean isAutoUploadFolder, Context context) {
-        Drawable folderDrawable = ContextCompat.getDrawable(context, R.drawable.folder);
-
-        int overlayIconId;
+    public Integer getFileOverlayIcon(boolean isAutoUploadFolder) {
         if (WebdavEntry.MountType.GROUP == mountType || isGroupFolder()) {
-            overlayIconId = R.drawable.ic_folder_overlay_account_group;
+            return R.drawable.ic_folder_overlay_account_group;
         } else if (sharedViaLink && !encrypted) {
-            overlayIconId = R.drawable.ic_folder_overlay_link;
+            return R.drawable.ic_folder_overlay_link;
         } else if (isSharedWithMe() || sharedWithSharee) {
-            overlayIconId = R.drawable.ic_folder_overlay_share;
+            return R.drawable.ic_folder_overlay_share;
         } else if (encrypted) {
-            overlayIconId = R.drawable.ic_folder_overlay_key;
+            return R.drawable.ic_folder_overlay_key;
         } else if (WebdavEntry.MountType.EXTERNAL == mountType) {
-            overlayIconId = R.drawable.ic_folder_overlay_external;
+            return R.drawable.ic_folder_overlay_external;
         } else if (locked) {
-            overlayIconId = R.drawable.ic_folder_overlay_lock;
+            return R.drawable.ic_folder_overlay_lock;
         } else if (isAutoUploadFolder) {
-            overlayIconId = R.drawable.ic_folder_overlay_upload;
+            return R.drawable.ic_folder_overlay_upload;
         } else {
-            return new LayerDrawable(new Drawable[] { folderDrawable } );
+            return null;
+        }
+    }
+
+    public LayerDrawable getFileIcon(boolean isAutoUploadFolder, Context context) {
+        Drawable folderDrawable = ContextCompat.getDrawable(context, R.drawable.folder);
+        LayerDrawable folderLayerDrawable = new LayerDrawable(new Drawable[] { folderDrawable } );
+
+        Integer overlayIconId = getFileOverlayIcon(isAutoUploadFolder);
+
+        if (overlayIconId == null || folderDrawable == null) {
+            return folderLayerDrawable;
         }
 
         Drawable overlayDrawable = ContextCompat.getDrawable(context, overlayIconId);
+
+        if (overlayDrawable == null) {
+            return folderLayerDrawable;
+        }
+
         DrawableUtil drawableUtil = new DrawableUtil();
         return drawableUtil.addDrawableAsOverlay(folderDrawable, overlayDrawable, 6);
     }