Browse Source

Merge pull request #5750 from nextcloud/ezaquarii/migrate-user-list-adapter-to-new-user-model

Migrate UserListAdapter to new User model
Andy Scherzinger 5 years ago
parent
commit
2391561755

+ 2 - 3
src/main/java/com/owncloud/android/ui/adapter/UserListAdapter.java

@@ -26,7 +26,6 @@
 
 package com.owncloud.android.ui.adapter;
 
-import android.accounts.Account;
 import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
 import android.view.LayoutInflater;
@@ -183,8 +182,8 @@ public class UserListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
      * @param user the account
      */
     private void setCurrentlyActiveState(AccountViewHolderItem viewHolder, User user) {
-        Account currentAccount = accountManager.getCurrentAccount();
-        if (currentAccount != null && currentAccount.name.equals(user.getAccountName())) {
+        User currentUser = accountManager.getUser();
+        if (currentUser.nameEquals(user)) {
             viewHolder.checkViewItem.setVisibility(View.VISIBLE);
         } else {
             viewHolder.checkViewItem.setVisibility(View.INVISIBLE);