Merge "Loosen up type requirements for contexts"

This commit is contained in:
Ben Komalo 2011-04-22 14:11:06 -07:00 committed by Android (Google) Code Review
commit 23b441a5c8
1 changed files with 10 additions and 9 deletions

View File

@ -25,6 +25,7 @@ import com.android.emailcommon.utility.Utility;
import android.app.Activity; import android.app.Activity;
import android.content.ActivityNotFoundException; import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.provider.Browser; import android.provider.Browser;
@ -99,26 +100,26 @@ public final class ActivityHelper {
activity.startActivity(intent); activity.startActivity(intent);
} }
public static void deleteMessage(Activity activity, long messageId) { public static void deleteMessage(Context context, long messageId) {
Controller.getInstance(activity).deleteMessage(messageId, -1); Controller.getInstance(context).deleteMessage(messageId, -1);
Utility.showToast(activity, Utility.showToast(context,
activity.getResources().getQuantityString(R.plurals.message_deleted_toast, 1)); context.getResources().getQuantityString(R.plurals.message_deleted_toast, 1));
} }
public static void moveMessages(final Activity activity, final long newMailboxId, public static void moveMessages(final Context context, final long newMailboxId,
final long[] messageIds) { final long[] messageIds) {
Controller.getInstance(activity).moveMessage(messageIds, newMailboxId); Controller.getInstance(context).moveMessage(messageIds, newMailboxId);
EmailAsyncTask.runAsyncSerial(new Runnable() { EmailAsyncTask.runAsyncSerial(new Runnable() {
@Override @Override
public void run() { public void run() {
String mailboxName = Mailbox.getDisplayName(activity, newMailboxId); String mailboxName = Mailbox.getDisplayName(context, newMailboxId);
if (mailboxName == null) { if (mailboxName == null) {
return; // Mailbox gone?? return; // Mailbox gone??
} }
String message = activity.getResources().getQuantityString( String message = context.getResources().getQuantityString(
R.plurals.message_moved_toast, messageIds.length, messageIds.length , R.plurals.message_moved_toast, messageIds.length, messageIds.length ,
mailboxName); mailboxName);
Utility.showToast(activity, message); Utility.showToast(context, message);
} }
}); });
} }