commit 5b9215ab2b8456d52453ad61107446e72293283c
author Wenyi Wang <wenyiw@google.com> Thu Aug 04 00:18:29 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 04 00:18:29 2016 +0000
tree b1b0906ce47da57a629627254c9ef0dd0c61039f
parent 91c8356aac12ffe215869fe50a8a31541d2e09ba
parent c1c8baae33a0268f4b5123dcb79cedf874d02c21

Merge "Revert "Avoid selecting group item every time when groups are loaded"" into ub-contactsdialer-f-dev

src/com/android/contacts/group/GroupListItem.java

diff --git a/src/com/android/contacts/group/GroupListItem.java b/src/com/android/contacts/group/GroupListItem.java
index 3bfcdd3..f2359b6 100644
--- a/src/com/android/contacts/group/GroupListItem.java
+++ b/src/com/android/contacts/group/GroupListItem.java
@@ -15,8 +15,6 @@
  */
 package com.android.contacts.group;
 
-import java.util.Objects;
-
 /**
  * Meta-data for a contact group.  We load all groups associated with the contact's
  * constituent accounts.
@@ -85,36 +83,4 @@
     public String getSystemId() {
         return mSystemId;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(mAccountName, mAccountType, mDataSet, mGroupId, mTitle,
-                mIsFirstGroupInAccount, mMemberCount, mIsReadOnly, mSystemId);
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (this == other) {
-            return true;
-        }
-
-        if (!(other instanceof GroupListItem)) {
-            return false;
-        }
-
-        final GroupListItem otherGroup = (GroupListItem) other;
-        if (!Objects.equals(mAccountName, otherGroup.getAccountName())
-                || !Objects.equals(mAccountType, otherGroup.getAccountType())
-                || !Objects.equals(mDataSet, otherGroup.getDataSet())
-                || !(mGroupId == otherGroup.getGroupId())
-                || !Objects.equals(mTitle, otherGroup.getTitle())
-                || !(mIsFirstGroupInAccount == otherGroup.isFirstGroupInAccount())
-                || !(mMemberCount == otherGroup.getMemberCount())
-                || !(mIsReadOnly == otherGroup.isReadOnly())
-                || !Objects.equals(mSystemId, otherGroup.getSystemId())) {
-            return false;
-        }
-
-        return true;
-    }
 }
\ No newline at end of file

src/com/android/contacts/group/GroupsFragment.java

diff --git a/src/com/android/contacts/group/GroupsFragment.java b/src/com/android/contacts/group/GroupsFragment.java
index 4c9e251..be1b44a 100644
--- a/src/com/android/contacts/group/GroupsFragment.java
+++ b/src/com/android/contacts/group/GroupsFragment.java
@@ -18,11 +18,11 @@
 
 import android.app.Fragment;
 import android.app.LoaderManager;
+import android.content.Context;
 import android.content.CursorLoader;
 import android.content.Loader;
 import android.database.Cursor;
 import android.os.Bundle;
-import android.util.Log;
 
 import com.android.contacts.GroupListLoader;
 
@@ -34,8 +34,6 @@
  */
 public final class GroupsFragment extends Fragment {
 
-    private static final String TAG = GroupsFragment.class.getSimpleName();
-
     private static final int LOADER_GROUPS = 1;
 
     /**
@@ -59,26 +57,12 @@
 
                 @Override
                 public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
-                    final List<GroupListItem> newGroupListItems = new ArrayList<>();
+                    mGroupListItems.clear();
                     for (int i = 0; i < data.getCount(); i++) {
                         if (data.moveToNext()) {
-                            newGroupListItems.add(GroupUtil.getGroupListItem(data, i));
+                            mGroupListItems.add(GroupUtil.getGroupListItem(data, i));
                         }
                     }
-
-                    if (mGroupListItems.equals(newGroupListItems)) {
-                        if (Log.isLoggable(TAG, Log.VERBOSE)) {
-                            Log.v(TAG, "The same groups loaded, returning.");
-                        }
-                        return;
-                    }
-
-                    if (Log.isLoggable(TAG, Log.VERBOSE)) {
-                        Log.v(TAG, "New group(s) loaded.");
-                    }
-
-                    mGroupListItems.clear();
-                    mGroupListItems.addAll(newGroupListItems);
                     if (mListener != null) {
                         mListener.onGroupsLoaded(mGroupListItems);
                     }