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

Commit 77b4ea8d authored by Walter Jang's avatar Walter Jang Committed by android-build-merger
Browse files

Exit edit mode when the last group member is removed

am: 550c3e0f

Change-Id: Ie9a6dca7c608393824134d2cb6eb9dac200a4a99
parents 13a22ec1 550c3e0f
Loading
Loading
Loading
Loading
+13 −3
Original line number Diff line number Diff line
@@ -255,9 +255,14 @@ public class GroupMembersActivity extends ContactsDrawerActivity implements

            toast(getToastMessageForSaveAction(newIntent.getAction()));

            // If we're editing the group, don't reload the fragment so the user can
            // continue to remove group members one by one
            if (!mIsEditMode && !ACTION_REMOVE_FROM_GROUP.equals(newIntent.getAction())) {
            if (mIsEditMode) {
                // If we're removing group members one at a time, don't reload the fragment so
                // the user can continue to remove group members one by one
                if (getGroupCount() == 1) {
                    // If we're deleting the last group member, exit edit mode
                    onBackPressed();
                }
            } else if (!ACTION_REMOVE_FROM_GROUP.equals(newIntent.getAction())) {
                replaceGroupMembersFragment();
                invalidateOptionsMenu();
            }
@@ -281,6 +286,11 @@ public class GroupMembersActivity extends ContactsDrawerActivity implements
        throw new IllegalArgumentException("Unhanded contact save action " + action);
    }

    private int getGroupCount() {
        return mMembersFragment != null && mMembersFragment.getAdapter() != null
                ? mMembersFragment.getAdapter().getCount() : -1;
    }

    private void replaceGroupMembersFragment() {
        mMembersFragment = GroupMembersFragment.newInstance(mGroupUri);
        mMembersFragment.setListener(this);