Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12e2eb10 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Send group mail from Contacts Label cause app to crash" am: 8df75ccc... 

Merge "Send group mail from Contacts Label cause app to crash" am: 8df75ccc am: 0d771e06 am: c614b258

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Contacts/+/1341595



Change-Id: I559cedfcf55f4e2a87c0fd6ffb55abc0f982b8fe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0353528d c614b258

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

+3 −4
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ public class GroupMembersFragment extends MultiSelectContactsListFragment<GroupM 


    private static final int LOADER_GROUP_METADATA = 100;

    private static final int MSG_FAIL_TO_LOAD = 1;

    private static final int RESULT_GROUP_ADD_MEMBER = 100;



    /** Filters out duplicate contacts. */

    private class FilterCursorWrapper extends CursorWrapper {
@@ -448,7 +447,7 @@ public class GroupMembersFragment extends MultiSelectContactsListFragment<GroupM 


    private void startGroupAddMemberActivity() {

        startActivityForResult(GroupUtil.createPickMemberIntent(getContext(), mGroupMetaData,

                getMemberContactIds()), RESULT_GROUP_ADD_MEMBER);

                getMemberContactIds()), GroupUtil.RESULT_GROUP_ADD_MEMBER);

    }



    @Override
@@ -504,7 +503,7 @@ public class GroupMembersFragment extends MultiSelectContactsListFragment<GroupM 
    @Override

    public void onActivityResult(int requestCode, int resultCode, Intent data) {

        if (resultCode != Activity.RESULT_OK || data == null

                || requestCode != RESULT_GROUP_ADD_MEMBER) {

                || requestCode != GroupUtil.RESULT_GROUP_ADD_MEMBER) {

            return;

        }
@@ -776,7 +775,7 @@ public class GroupMembersFragment extends MultiSelectContactsListFragment<GroupM 
            @Override

            public void onClick(View v) {

                startActivityForResult(GroupUtil.createPickMemberIntent(getContext(),

                        mGroupMetaData, getMemberContactIds()), RESULT_GROUP_ADD_MEMBER);

                        mGroupMetaData, getMemberContactIds()), GroupUtil.RESULT_GROUP_ADD_MEMBER);

            }

        });

        return view;

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

+2 −1
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ public final class GroupUtil { 
    public static final String ACTION_SWITCH_GROUP = "switchGroup";

    public static final String ACTION_UPDATE_GROUP = "updateGroup";



    public static final int RESULT_SEND_TO_SELECTION = 100;

    public static final int RESULT_GROUP_ADD_MEMBER = 100;

    public static final int RESULT_SEND_TO_SELECTION = 200;



    // System IDs of FFC groups in Google accounts

    private static final Set<String> FFC_GROUPS =