Merge pull request #6414 from nextcloud/ezaquarii/migrate-upload-list-adapter-to-user-model

Migrate UploadListAdapter to User model

src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java

@@ -340,10 +340,8 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
                 itemViewHolder.button.setImageResource(R.drawable.ic_dots_vertical);
                 itemViewHolder.button.setOnClickListener(view -> {
                     if (optionalUser.isPresent()) {
-                        Account account = optionalUser.get().toPlatformAccount();
-                        showItemConflictPopup(
-                            itemViewHolder, item, account, status, view
-                        );
+                        User user = optionalUser.get();
+                        showItemConflictPopup(user, itemViewHolder, item, status, view);
                     }
                 });
             } else {
@@ -366,8 +364,8 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
                     parentActivity.getFileOperationsHelper().checkCurrentCredentials(item.getAccount(accountManager));
                     return;
                 } else if (uploadResult == UploadResult.SYNC_CONFLICT && optionalUser.isPresent()) {
-                    Account account = optionalUser.get().toPlatformAccount();
-                    if (checkAndOpenConflictResolutionDialog(itemViewHolder, item, account, status)) {
+                    User user = optionalUser.get();
+                    if (checkAndOpenConflictResolutionDialog(user, itemViewHolder, item, status)) {
                         return;
                     }
                 }
@@ -483,21 +481,24 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
                 final User user = optionalUser.get();
                 final Drawable icon = MimeTypeUtil.getFileTypeIcon(item.getMimeType(),
                                                                    fileName,
-                                                                   user.toPlatformAccount(),
+                                                                   user,
                                                                    parentActivity);
                 itemViewHolder.thumbnail.setImageDrawable(icon);
             }
         }
     }
 
-    private boolean checkAndOpenConflictResolutionDialog(ItemViewHolder itemViewHolder, OCUpload item, Account account, String status) {
+    private boolean checkAndOpenConflictResolutionDialog(User user,
+                                                         ItemViewHolder itemViewHolder,
+                                                         OCUpload item,
+                                                         String status) {
         String remotePath = item.getRemotePath();
         OCFile ocFile = storageManager.getFileByPath(remotePath);
 
         if (ocFile == null) { // Remote file doesn't exist, try to refresh folder
             OCFile folder = storageManager.getFileByPath(new File(remotePath).getParent() + "/");
             if (folder != null && folder.isFolder()) {
-                this.refreshFolder(itemViewHolder, account, folder, (caller, result) -> {
+                this.refreshFolder(itemViewHolder, user.toPlatformAccount(), folder, (caller, result) -> {
                     itemViewHolder.status.setText(status);
                     if (result.isSuccess()) {
                         OCFile file = storageManager.getFileByPath(remotePath);
@@ -521,13 +522,17 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
         return false;
     }
 
-    private void showItemConflictPopup(ItemViewHolder itemViewHolder, OCUpload item, Account account, String status, View view) {
+    private void showItemConflictPopup(User user,
+                                       ItemViewHolder itemViewHolder,
+                                       OCUpload item,
+                                       String status,
+                                       View view) {
         PopupMenu popup = new PopupMenu(MainApp.getAppContext(), view);
         popup.inflate(R.menu.upload_list_item_file_conflict);
         popup.setOnMenuItemClickListener(i -> {
             switch (i.getItemId()) {
                 case R.id.action_upload_list_resolve_conflict:
-                    checkAndOpenConflictResolutionDialog(itemViewHolder, item, account, status);
+                    checkAndOpenConflictResolutionDialog(user, itemViewHolder, item, status);
                     break;
                 case R.id.action_upload_list_delete:
                 default:

src/main/java/com/owncloud/android/utils/MimeTypeUtil.java

@@ -24,6 +24,7 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.webkit.MimeTypeMap;
 
+import com.nextcloud.client.account.User;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.network.WebdavEntry;
@@ -92,7 +93,8 @@ public final class MimeTypeUtil {
      * @return Drawable of an image resource.
      */
     public static Drawable getFileTypeIcon(String mimetype, String filename, Context context) {
-        return getFileTypeIcon(mimetype, filename, null, context);
+        final Account nullAccount = null;
+        return getFileTypeIcon(mimetype, filename, nullAccount, context);
     }
 
     /**
@@ -104,6 +106,7 @@ public final class MimeTypeUtil {
      * @return Drawable of an image resource.
      */
     @Nullable
+    @Deprecated
     public static Drawable getFileTypeIcon(String mimetype, String filename, Account account, Context context) {
         if (context != null) {
             int iconId = MimeTypeUtil.getFileTypeIconId(mimetype, filename);
@@ -119,6 +122,11 @@ public final class MimeTypeUtil {
         }
     }
 
+    @Nullable
+    public static Drawable getFileTypeIcon(String mimetype, String filename, User user, Context context) {
+        return getFileTypeIcon(mimetype, filename, user.toPlatformAccount(), context);
+    }
+
     /**
      * Returns the resource identifier of an image to use as icon associated to a known MIME type.
      *