fixed wrong number of elements in alert dialog (d6af4b65) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/activities/MultiPickContactActivity.java

+24 −6

Original line number	Original line	Diff line number	Diff line
	@@ -499,9 +499,7 @@ public class MultiPickContactActivity extends ListActivity implements
	case R.id.dialog_delete_contact_confirmation:		case R.id.dialog_delete_contact_confirmation:
	return new AlertDialog.Builder(this)		return new AlertDialog.Builder(this)
	.setTitle(R.string.deleteConfirmation_title)		.setTitle(R.string.deleteConfirmation_title)
	.setMessage(getResources().getQuantityString(		.setMessage("")
	R.plurals.ContactMultiDeleteConfirmation,
	mChoiceSet.size(), mChoiceSet.size()))
	.setNegativeButton(android.R.string.cancel, null)		.setNegativeButton(android.R.string.cancel, null)
	.setPositiveButton(android.R.string.ok, this)		.setPositiveButton(android.R.string.ok, this)
	.create();		.create();
	@@ -515,9 +513,7 @@ public class MultiPickContactActivity extends ListActivity implements
	case R.id.dialog_import_sim_contact_confirmation:		case R.id.dialog_import_sim_contact_confirmation:
	return new AlertDialog.Builder(this)		return new AlertDialog.Builder(this)
	.setTitle(R.string.importConfirmation_title)		.setTitle(R.string.importConfirmation_title)
	.setMessage(getResources().getQuantityString(		.setMessage("")
	R.plurals.ContactMultiImportConfirmation,
	mChoiceSet.size(), mChoiceSet.size()))
	.setNegativeButton(android.R.string.cancel, null)		.setNegativeButton(android.R.string.cancel, null)
	.setPositiveButton(android.R.string.ok, this)		.setPositiveButton(android.R.string.ok, this)
	.create();		.create();
	@@ -526,6 +522,28 @@ public class MultiPickContactActivity extends ListActivity implements
	return super.onCreateDialog(id, bundle);		return super.onCreateDialog(id, bundle);
	}		}

			@Override
			protected void onPrepareDialog(int id, Dialog dialog, Bundle bundle) {
			CharSequence message = null;
			int size = mChoiceSet.size();

			switch (id) {
			case R.id.dialog_delete_contact_confirmation:
			message = getResources().getQuantityString(
			R.plurals.ContactMultiDeleteConfirmation, size, size);
			break;
			case R.id.dialog_import_sim_contact_confirmation:
			message = getResources().getQuantityString(
			R.plurals.ContactMultiImportConfirmation, size, size);
			break;
			default:
			super.onPrepareDialog(id, dialog);
			return;
			}

			((AlertDialog)dialog).setMessage(message);
			}

	private class DeleteContactsThread extends Thread implements		private class DeleteContactsThread extends Thread implements
	DialogInterface.OnCancelListener, DialogInterface.OnClickListener {		DialogInterface.OnCancelListener, DialogInterface.OnClickListener {
	boolean mCanceled = false;		boolean mCanceled = false;