Merge "Fix FC when add group as reciepients" (b4551733) · Commits · e / os / android_packages_apps_Contacts

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

+16 −2

Original line number	Diff line number	Diff line
		@@ -220,6 +220,12 @@ public class GroupsFragment extends ExpandableListFragment implements OnGroupCli
		mContext = null;
		}

		@Override
		public void onResume() {
		super.onResume();
		fillAllContactsCursorMap();
		}

		@Override
		public void onDestroy() {
		mAdapter.getQueryHandler().removeCallbacksAndMessages(QUERY_TOKEN);
		@@ -228,6 +234,9 @@ public class GroupsFragment extends ExpandableListFragment implements OnGroupCli
		mAdapter.getCursor().close();
		}

		if(allContactsInGroups!=null)
		allContactsInGroups.close();

		if (mAllContactsCurosrMap != null) {
		mAllContactsCurosrMap.clear();
		}
		@@ -776,7 +785,10 @@ public class GroupsFragment extends ExpandableListFragment implements OnGroupCli
		@Override
		protected Cursor getChildrenCursor(Cursor groupCursor) {
		long groupId = groupCursor.getLong(GROUP_ID);
		return getContactsDetailCursor(groupId);
		Cursor c = getContactsDetailCursor(groupId);
		if (c != null)
		getActivity().startManagingCursor(c);
		return c;
		}

		@Override
		@@ -787,6 +799,7 @@ public class GroupsFragment extends ExpandableListFragment implements OnGroupCli
		super.changeCursor(cursor);
		}
		}
		}

		/**
		* all contacts cursor fill to map
		@@ -794,6 +807,8 @@ public class GroupsFragment extends ExpandableListFragment implements OnGroupCli
		private void fillAllContactsCursorMap() {
		mAllContactsCurosrMap.clear();
		Cursor cursor = null;
		if (mGroupsCursor == null)
		return;
		for (int groupPosition = 0; groupPosition < mGroupsCursor.getCount(); groupPosition++) {
		mGroupsCursor.moveToPosition(groupPosition);
		long groupCacheId = mGroupsCursor.getLong(GROUP_ID);
		@@ -817,7 +832,6 @@ public class GroupsFragment extends ExpandableListFragment implements OnGroupCli
		cursor.close();
		}
		}
		}

		@Override
		public void setUserVisibleHint(boolean isVisibleToUser) {