Merge pull request #8027 from nextcloud/federatedUser

Try to fetch avatar only if sharee type is "federated"

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

@@ -442,20 +442,20 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
                                     ThemeUtils.createAvatar(sharee.getShareType(), avatar, activity);
                                     break;
 
+                                case FEDERATED:
+                                    showFederatedShareAvatar(sharee.getUserId(), avatarRadius, resources, avatar);
+                                    break;
                                 default:
-                                    if (sharee.getUserId().contains("@")) {
-                                        showFederatedShareAvatar(sharee.getUserId(), avatarRadius, resources, avatar);
-                                    } else {
-                                        avatar.setTag(sharee);
-                                        DisplayUtils.setAvatar(user,
-                                                               sharee.getUserId(),
-                                                               sharee.getDisplayName(),
-                                                               this,
-                                                               avatarRadius,
-                                                               resources,
-                                                               avatar,
-                                                               activity);
-                                    }
+                                    avatar.setTag(sharee);
+                                    DisplayUtils.setAvatar(user,
+                                                           sharee.getUserId(),
+                                                           sharee.getDisplayName(),
+                                                           this,
+                                                           avatarRadius,
+                                                           resources,
+                                                           avatar,
+                                                           activity);
+                                    break;
                             }
                         }