ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

basic code cleanup of the notification controller 

* javadoc methods
* rename some methods
* remove duplicate code; now new message and other account notifications
  are created with the same code

Change-Id: Iecf70494b6407a9a73380de103390a59d006191b
This commit is contained in:
Todd Kennedy 2011-04-28 11:09:41 -07:00
parent 8112732376
commit 958b15e8f3
3 changed files with 193 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

259
src/com/android/email/NotificationController.java
View File

@ -25,7 +25,9 @@ import com.android.emailcommon.provider.EmailContent;
import com.android.emailcommon.provider.EmailContent.Account; import com.android.emailcommon.provider.EmailContent.Account;
import com.android.emailcommon.provider.EmailContent.Attachment; import com.android.emailcommon.provider.EmailContent.Attachment;
import com.android.emailcommon.provider.EmailContent.Message; import com.android.emailcommon.provider.EmailContent.Message;
import com.android.emailcommon.utility.EmailAsyncTask;
import com.android.emailcommon.utility.Utility; import com.android.emailcommon.utility.Utility;
import com.google.common.annotations.VisibleForTesting;
import android.app.Notification; import android.app.Notification;
import android.app.NotificationManager; import android.app.NotificationManager;
@ -40,16 +42,14 @@ import android.text.SpannableString;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.style.TextAppearanceSpan; import android.text.style.TextAppearanceSpan;
import java.util.concurrent.atomic.AtomicInteger;
/** /**
* Class that manages notifications. * Class that manages notifications.
*/ */
public class NotificationController { public class NotificationController {
private static final int NOTIFICATION_ID_SECURITY_NEEDED = 1; private static final int NOTIFICATION_ID_SECURITY_NEEDED = 1;
/** Reserved for {@link com.android.exchange.CalendarSyncEnabler} */
// ID reserved for CalendarSyncEnabler @SuppressWarnings("unused")
private static final int PLACEHOLDER_NOTIFICATION_ID_EXCHANGE_CALENDAR_ADDED = 2; private static final int NOTIFICATION_ID_EXCHANGE_CALENDAR_ADDED = 2;
private static final int NOTIFICATION_ID_ATTACHMENT_WARNING = 3; private static final int NOTIFICATION_ID_ATTACHMENT_WARNING = 3;
private static final int NOTIFICATION_ID_PASSWORD_EXPIRING = 4; private static final int NOTIFICATION_ID_PASSWORD_EXPIRING = 4;
private static final int NOTIFICATION_ID_PASSWORD_EXPIRED = 5; private static final int NOTIFICATION_ID_PASSWORD_EXPIRED = 5;
@ -65,7 +65,8 @@ public class NotificationController {
private final Clock mClock; private final Clock mClock;
/** Constructor */ /** Constructor */
/* package */ NotificationController(Context context, Clock clock) { @VisibleForTesting
NotificationController(Context context, Clock clock) {
mContext = context.getApplicationContext(); mContext = context.getApplicationContext();
mNotificationManager = (NotificationManager) context.getSystemService( mNotificationManager = (NotificationManager) context.getSystemService(
Context.NOTIFICATION_SERVICE); Context.NOTIFICATION_SERVICE);
@ -84,75 +85,85 @@ public class NotificationController {
} }
/** /**
* Generic notifier for any account. Uses notification rules from account. * Returns a {@link Notification} for an event with the given account. The account contains
* NOTE: Ticker is not shown in Holo XL notifications. * specific rules on ring tone usage and these will be used to modify the notification
* behaviour.
* *
* @param account The account for which the notification is posted * @param account The account this notification is being built for.
* @param ticker String for ticker * @param ticker Text displayed when the notification is first shown. May be {@code null}.
* @param contentTitle String for notification content title * @param title The first line of text. May NOT be {@code null}.
* @param contentText String for notification content text * @param contentText The second line of text. May NOT be {@code null}.
* @param intent The intent to launch from the notification * @param intent The intent to start if the user clicks on the notification.
* @param notificationId The notification id * @param largeIcon A large icon. May be {@code null}
* @param number A number to display using {@link Notification.Builder#setNumber(int)}. May
* be {@code null}.
* @return A {@link Notification} that can be sent to the notification service.
*/ */
private void showAccountNotification(Account account, String ticker, String contentTitle, private Notification createAccountNotification(Account account, String ticker,
String contentText, Intent intent, int notificationId) { CharSequence title, String contentText, Intent intent, Bitmap largeIcon,
Integer number) {
// Pending Intent // Pending Intent
PendingIntent pending = null; PendingIntent pending = null;
if (intent != null) { if (intent != null) {
pending = pending = PendingIntent.getActivity(
PendingIntent.getActivity(mContext, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT); mContext, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
} }
// Ringtone & Vibration // NOTE: the ticker is not shown for notifications in the Holo UX
String ringtoneString = account.getRingtone(); Notification.Builder builder = new Notification.Builder(mContext)
Uri ringTone = (ringtoneString == null) ? null : Uri.parse(ringtoneString); .setContentTitle(title)
boolean vibrate = 0 != (account.mFlags & Account.FLAGS_VIBRATE_ALWAYS); .setContentText(contentText)
boolean vibrateWhenSilent = 0 != (account.mFlags & Account.FLAGS_VIBRATE_WHEN_SILENT); .setContentIntent(pending)
.setLargeIcon(largeIcon)
.setNumber(number == null ? 0 : number)
.setSmallIcon(R.drawable.stat_notify_email_generic)
.setWhen(mClock.getTime())
.setTicker(ticker);
setupSoundAndVibration(builder, account);
// Use the account's notification rules for sound & vibrate (but always notify) Notification notification = builder.getNotification();
boolean nowSilent = return notification;
mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_VIBRATE; }
int defaults = Notification.DEFAULT_LIGHTS;
if (vibrate || (vibrateWhenSilent && nowSilent)) {
defaults |= Notification.DEFAULT_VIBRATE;
}
// Notification
Notification.Builder nb = new Notification.Builder(mContext);
nb.setSmallIcon(R.drawable.stat_notify_email_generic);
nb.setTicker(ticker);
nb.setContentTitle(contentTitle);
nb.setContentText(contentText);
nb.setContentIntent(pending);
nb.setSound(ringTone);
nb.setDefaults(defaults);
Notification notification = nb.getNotification();
/**
* Generic notifier for any account. Uses notification rules from account.
*
* @param account The account this notification is being built for.
* @param ticker Text displayed when the notification is first shown. May be {@code null}.
* @param title The first line of text. May NOT be {@code null}.
* @param contentText The second line of text. May NOT be {@code null}.
* @param intent The intent to start if the user clicks on the notification.
* @param notificationId The ID of the notification to register with the service.
*/
private void showAccountNotification(Account account, String ticker, String title,
String contentText, Intent intent, int notificationId) {
Notification notification = //nb.getNotification();
createAccountNotification(account, ticker, title, contentText, intent, null, null);
mNotificationManager.notify(notificationId, notification); mNotificationManager.notify(notificationId, notification);
} }
/** /**
* Generic notification canceler. * Cancels the specified notification.
* @param notificationId The notification id *
* @param notificationId The ID of the notification to register with the service.
*/ */
private void cancelNotification(int notificationId) { private void cancelNotification(int notificationId) {
mNotificationManager.cancel(notificationId); mNotificationManager.cancel(notificationId);
} }
/** /**
* @return the "new message" notification ID for an account. It just assumes * Returns a notification ID for new message notifications for the given account.
* accountID won't be too huge. Any other smarter/cleaner way?
*/ */
private int getNewMessageNotificationId(long accountId) { private int getNewMessageNotificationId(long accountId) {
// We assume accountId will always be less than 0x0FFFFFFF; is there a better way?
return (int) (NOTIFICATION_ID_BASE_NEW_MESSAGES + accountId); return (int) (NOTIFICATION_ID_BASE_NEW_MESSAGES + accountId);
} }
/** /**
* Dismiss new message notification * Cancels a "new message" notification for the specified account.
* *
* @param accountId ID of the target account, or -1 for all accounts. * @param accountId The ID of the account to cancel for. If {@code -1}, "new message"
* notifications for all accounts will be canceled.
*/ */
public void cancelNewMessageNotification(long accountId) { public void cancelNewMessageNotification(long accountId) {
if (accountId == -1) { if (accountId == -1) {
@ -168,11 +179,14 @@ public class NotificationController {
} }
/** /**
* Show (or update) the "new message" notification. * Show (or update) a "new message" notification for the given account.
*
* @param accountId The ID of the account to display a notification for.
* @param unseenMessageCount The number of messages in the account that are unseen.
*/ */
public void showNewMessageNotification(final long accountId, final int unseenMessageCount, public void showNewMessageNotification(final long accountId, final int unseenMessageCount,
final int justFetchedCount) { final int justFetchedCount) {
Utility.runAsync(new Runnable() { EmailAsyncTask.runAsyncParallel(new Runnable() {
@Override @Override
public void run() { public void run() {
Notification n = createNewMessageNotification(accountId, unseenMessageCount); Notification n = createNewMessageNotification(accountId, unseenMessageCount);
@ -185,9 +199,10 @@ public class NotificationController {
} }
/** /**
* @return The sender's photo, if available, or null. * Returns a picture of the sender of the given message. If no picture is available, returns
* {@code null}.
* *
* Don't call it on the UI thread. * NOTE: DO NOT CALL THIS METHOD FROM THE UI THREAD (DATABASE ACCESS)
*/ */
private Bitmap getSenderPhoto(Message message) { private Bitmap getSenderPhoto(Message message) {
Address sender = Address.unpackFirst(message.mFrom); Address sender = Address.unpackFirst(message.mFrom);
@ -198,18 +213,16 @@ public class NotificationController {
if (TextUtils.isEmpty(email)) { if (TextUtils.isEmpty(email)) {
return null; return null;
} }
return ContactStatusLoader.load(mContext, email).mPhoto; return ContactStatusLoader.getContactInfo(mContext, email).mPhoto;
} }
private static final AtomicInteger sSequenceNumber = new AtomicInteger();
/** /**
* Create a notification * Returns a "new message" notification for the given account.
* *
* Don't call it on the UI thread. * NOTE: DO NOT CALL THIS METHOD FROM THE UI THREAD (DATABASE ACCESS)
*/ */
/* package */ Notification createNewMessageNotification(long accountId, @VisibleForTesting
int unseenMessageCount) { Notification createNewMessageNotification(long accountId, int unseenMessageCount) {
final Account account = Account.restoreAccountWithId(mContext, accountId); final Account account = Account.restoreAccountWithId(mContext, accountId);
if (account == null) { if (account == null) {
return null; return null;
@ -226,37 +239,23 @@ public class NotificationController {
} }
final String subject = message.mSubject; final String subject = message.mSubject;
final Bitmap senderPhoto = getSenderPhoto(message); final Bitmap senderPhoto = getSenderPhoto(message);
final SpannableString title = getNewMessageTitle(senderName, account.mDisplayName);
final Intent intent = Welcome.createOpenAccountInboxIntent(mContext, accountId);
final Bitmap largeIcon = senderPhoto != null ? senderPhoto : mGenericSenderIcon;
final Integer number = unseenMessageCount > 1 ? unseenMessageCount : null;
// Intent to open inbox Notification notification =
PendingIntent contentIntent = PendingIntent.getActivity(mContext, 0, createAccountNotification(account, null, title, subject, intent, largeIcon, number);
Welcome.createOpenAccountInboxIntent(mContext, accountId),
0);
Notification.Builder builder = new Notification.Builder(mContext)
.setSmallIcon(R.drawable.stat_notify_email_generic)
.setWhen(mClock.getTime())
.setLargeIcon(senderPhoto != null ? senderPhoto : mGenericSenderIcon)
.setContentTitle(getNotificationTitle(senderName, account.mDisplayName))
.setContentText(subject)
.setContentIntent(contentIntent);
if (unseenMessageCount > 1) {
builder.setNumber(unseenMessageCount);
}
Notification notification = builder.getNotification();
setupNotificationSoundAndVibrationFromAccount(notification, account);
return notification; return notification;
} }
/** /**
* Creates the notification title. * Creates a notification title for a new message. If there is only 1 email account, just
* * show the sender name. Otherwise, show both the sender and the account name, but, grey
* If only 1 account, just show the sender name. * out the account name.
* If 2+ accounts, make it "SENDER_NAME to RECEIVER_NAME", and gray out the "to RECEIVER_NAME"
* part.
*/ */
/* package */ SpannableString getNotificationTitle(String sender, String receiverDisplayName) { @VisibleForTesting
SpannableString getNewMessageTitle(String sender, String receiverDisplayName) {
final int numAccounts = EmailContent.count(mContext, Account.CONTENT_URI); final int numAccounts = EmailContent.count(mContext, Account.CONTENT_URI);
if (numAccounts == 1) { if (numAccounts == 1) {
return new SpannableString(sender); return new SpannableString(sender);
@ -277,36 +276,35 @@ public class NotificationController {
} }
} }
// Overridden for testing (AudioManager can't be mocked out.) /** Returns the system's current ringer mode */
/* package */ int getRingerMode() { @VisibleForTesting
int getRingerMode() {
return mAudioManager.getRingerMode(); return mAudioManager.getRingerMode();
} }
/* package */ boolean isRingerModeSilent() { /** Sets up the notification's sound and vibration based upon account details. */
return getRingerMode() != AudioManager.RINGER_MODE_NORMAL; @VisibleForTesting
} void setupSoundAndVibration(Notification.Builder builder, Account account) {
/* package */ void setupNotificationSoundAndVibrationFromAccount(Notification notification,
Account account) {
final int flags = account.mFlags; final int flags = account.mFlags;
final String ringtoneUri = account.mRingtoneUri; final String ringtoneUri = account.mRingtoneUri;
final boolean vibrate = (flags & Account.FLAGS_VIBRATE_ALWAYS) != 0; final boolean vibrate = (flags & Account.FLAGS_VIBRATE_ALWAYS) != 0;
final boolean vibrateWhenSilent = (flags & Account.FLAGS_VIBRATE_WHEN_SILENT) != 0; final boolean vibrateWhenSilent = (flags & Account.FLAGS_VIBRATE_WHEN_SILENT) != 0;
final boolean isRingerSilent = getRingerMode() != AudioManager.RINGER_MODE_NORMAL;
notification.sound = (ringtoneUri == null) ? null : Uri.parse(ringtoneUri); int defaults = Notification.DEFAULT_LIGHTS;
if (vibrate || (vibrateWhenSilent && isRingerSilent)) {
if (vibrate || (vibrateWhenSilent && isRingerModeSilent())) { defaults |= Notification.DEFAULT_VIBRATE;
notification.defaults |= Notification.DEFAULT_VIBRATE;
} }
// This code is identical to that used by Gmail and GTalk for notifications builder.setSound((ringtoneUri == null) ? null : Uri.parse(ringtoneUri))
notification.flags |= Notification.FLAG_SHOW_LIGHTS; .setDefaults(defaults);
notification.defaults |= Notification.DEFAULT_LIGHTS;
} }
/** /**
* Alert the user that an attachment couldn't be forwarded. This is a very unusual case, and * Show (or update) a notification that the given attachment could not be forwarded. This
* perhaps we shouldn't even send a notification. For now, it's helpful for debugging. * is a very unusual case, and perhaps we shouldn't even send a notification. For now,
* it's helpful for debugging.
*
* NOTE: DO NOT CALL THIS METHOD FROM THE UI THREAD (DATABASE ACCESS) * NOTE: DO NOT CALL THIS METHOD FROM THE UI THREAD (DATABASE ACCESS)
*/ */
public void showDownloadForwardFailedNotification(Attachment attachment) { public void showDownloadForwardFailedNotification(Attachment attachment) {
@ -321,14 +319,15 @@ public class NotificationController {
} }
/** /**
* Alert the user that login failed for the specified account * Returns a notification ID for login failed notifications for the given account account.
*/ */
private int getLoginFailedNotificationId(long accountId) { private int getLoginFailedNotificationId(long accountId) {
return NOTIFICATION_ID_BASE_LOGIN_WARNING + (int)accountId; return NOTIFICATION_ID_BASE_LOGIN_WARNING + (int)accountId;
} }
/** /**
* Alert the user that login failed on a particular account. * Show (or update) a notification that there was a login failure for the given account.
*
* NOTE: DO NOT CALL THIS METHOD FROM THE UI THREAD (DATABASE ACCESS) * NOTE: DO NOT CALL THIS METHOD FROM THE UI THREAD (DATABASE ACCESS)
*/ */
public void showLoginFailedNotification(long accountId) { public void showLoginFailedNotification(long accountId) {
@ -343,48 +342,54 @@ public class NotificationController {
getLoginFailedNotificationId(accountId)); getLoginFailedNotificationId(accountId));
} }
/**
* Cancels the login failed notification for the given account.
*/
public void cancelLoginFailedNotification(long accountId) { public void cancelLoginFailedNotification(long accountId) {
mNotificationManager.cancel(getLoginFailedNotificationId(accountId)); mNotificationManager.cancel(getLoginFailedNotificationId(accountId));
} }
/** /**
* Show "password expiring" notification. * Show (or update) a notification that the user's password is expiring. The given account
* is used to update the display text, but, all accounts share the same notification ID.
* *
* Note all accounts share the same notification ID. * NOTE: DO NOT CALL THIS METHOD FROM THE UI THREAD (DATABASE ACCESS)
*/ */
public void showPasswordExpiringNotification(long accountId) { public void showPasswordExpiringNotification(long accountId) {
Account account = Account.restoreAccountWithId(mContext, accountId); Account account = Account.restoreAccountWithId(mContext, accountId);
if (account == null) return; if (account == null) return;
Intent intent = AccountSecurity.actionDevicePasswordExpirationIntent(mContext, Intent intent = AccountSecurity.actionDevicePasswordExpirationIntent(mContext,
accountId, false); accountId, false);
String ticker = mContext.getString( String accountName = account.getDisplayName();
R.string.password_expire_warning_ticker_fmt, account.getDisplayName()); String ticker =
String contentTitle = mContext.getString( mContext.getString(R.string.password_expire_warning_ticker_fmt, accountName);
R.string.password_expire_warning_content_title); String title = mContext.getString(R.string.password_expire_warning_content_title);
String contentText = account.getDisplayName(); showAccountNotification(account, ticker, title, accountName, intent,
showAccountNotification(account, ticker, contentTitle, contentText, intent,
NOTIFICATION_ID_PASSWORD_EXPIRING); NOTIFICATION_ID_PASSWORD_EXPIRING);
} }
/** /**
* Show "password expired" notification. * Show (or update) a notification that the user's password has expired. The given account
* is used to update the display text, but, all accounts share the same notification ID.
* *
* Note all accounts share the same notification ID. * NOTE: DO NOT CALL THIS METHOD FROM THE UI THREAD (DATABASE ACCESS)
*/ */
public void showPasswordExpiredNotification(long accountId) { public void showPasswordExpiredNotification(long accountId) {
Account account = Account.restoreAccountWithId(mContext, accountId); Account account = Account.restoreAccountWithId(mContext, accountId);
if (account == null) return; if (account == null) return;
Intent intent = AccountSecurity.actionDevicePasswordExpirationIntent(mContext, Intent intent = AccountSecurity.actionDevicePasswordExpirationIntent(mContext,
accountId, true); accountId, true);
String accountName = account.getDisplayName();
String ticker = mContext.getString(R.string.password_expired_ticker); String ticker = mContext.getString(R.string.password_expired_ticker);
String contentTitle = mContext.getString(R.string.password_expired_content_title); String title = mContext.getString(R.string.password_expired_content_title);
String contentText = account.getDisplayName(); showAccountNotification(account, ticker, title, accountName, intent,
showAccountNotification(account, ticker, contentTitle, NOTIFICATION_ID_PASSWORD_EXPIRED);
contentText, intent, NOTIFICATION_ID_PASSWORD_EXPIRED);
} }
/** /**
* Cancel both "password expired/expiring" notifications. * Cancels any password expire notifications [both expired & expiring].
*/ */
public void cancelPasswordExpirationNotifications() { public void cancelPasswordExpirationNotifications() {
cancelNotification(NOTIFICATION_ID_PASSWORD_EXPIRING); cancelNotification(NOTIFICATION_ID_PASSWORD_EXPIRING);
@ -392,21 +397,21 @@ public class NotificationController {
} }
/** /**
* Show "security needed" notification. * Show (or update) a security needed notification. The given account is used to update
* the display text, but, all accounts share the same notification ID.
*/ */
public void showSecurityNeededNotification(Account account) { public void showSecurityNeededNotification(Account account) {
String tickerText = mContext.getString(R.string.security_notification_ticker_fmt,
account.getDisplayName());
String contentTitle = mContext.getString(R.string.security_notification_content_title);
String contentText = account.getDisplayName();
Intent intent = AccountSecurity.actionUpdateSecurityIntent(mContext, account.mId, true); Intent intent = AccountSecurity.actionUpdateSecurityIntent(mContext, account.mId, true);
showAccountNotification( String accountName = account.getDisplayName();
account, tickerText, contentTitle, contentText, intent, String ticker =
mContext.getString(R.string.security_notification_ticker_fmt, accountName);
String title = mContext.getString(R.string.security_notification_content_title);
showAccountNotification(account, ticker, title, accountName, intent,
NOTIFICATION_ID_SECURITY_NEEDED); NOTIFICATION_ID_SECURITY_NEEDED);
} }
/** /**
* Cancel "security needed" notification. * Cancels the security needed notification.
*/ */
public void cancelSecurityNeededNotification() { public void cancelSecurityNeededNotification() {
cancelNotification(NOTIFICATION_ID_SECURITY_NEEDED); cancelNotification(NOTIFICATION_ID_SECURITY_NEEDED);

11
src/com/android/email/activity/ContactStatusLoader.java
View File

@ -34,7 +34,7 @@ import android.provider.ContactsContract.StatusUpdates;
import android.util.Log; import android.util.Log;
/** /**
* Loader to load presence statuses and the contact photoes. * Loader to load presence statuses and the contact photo.
*/ */
public class ContactStatusLoader extends AsyncTaskLoader<ContactStatusLoader.Result> { public class ContactStatusLoader extends AsyncTaskLoader<ContactStatusLoader.Result> {
public static final int PRESENCE_UNKNOWN_RESOURCE_ID = android.R.drawable.presence_offline; public static final int PRESENCE_UNKNOWN_RESOURCE_ID = android.R.drawable.presence_offline;
@ -86,16 +86,15 @@ public class ContactStatusLoader extends AsyncTaskLoader<ContactStatusLoader.Res
@Override @Override
public Result loadInBackground() { public Result loadInBackground() {
return load(mContext, mEmailAddress); return getContactInfo(mContext, mEmailAddress);
} }
/** /**
* Load synchronously. * Synchronously loads contact data.
* *
* Used to fetch a photo for notification, in which calls the callsite is already on a worker * NOTE: DO NOT CALL THIS METHOD FROM THE UI THREAD (DATABASE ACCESS)
* thread.
*/ */
public static Result load(Context context, String emailAddress) { public static Result getContactInfo(Context context, String emailAddress) {
// Load photo-id and presence status. // Load photo-id and presence status.
Uri uri = Uri.withAppendedPath(Email.CONTENT_LOOKUP_URI, Uri.encode(emailAddress)); Uri uri = Uri.withAppendedPath(Email.CONTENT_LOOKUP_URI, Uri.encode(emailAddress));
Cursor c = context.getContentResolver().query( Cursor c = context.getContentResolver().query(

101
tests/src/com/android/email/NotificationControllerTest.java
View File

@ -60,11 +60,12 @@ public class NotificationControllerTest extends AndroidTestCase {
mTarget = new NotificationControllerForTest(mProviderContext); mTarget = new NotificationControllerForTest(mProviderContext);
} }
public void testSetupNotificationSoundAndVibrationFromAccount() { public void testSetupSoundAndVibration() {
final Notification n = new Notification();
final Context c = mProviderContext; final Context c = mProviderContext;
final Account a1 = ProviderTestUtils.setupAccount("a1", true, c); final Account a1 = ProviderTestUtils.setupAccount("a1", true, c);
final Notification.Builder nb = new Notification.Builder(c);
final Uri expectedRingtone = Uri.parse(a1.mRingtoneUri);
Notification n;
// === Ringer mode change === // === Ringer mode change ===
mRingerMode = AudioManager.RINGER_MODE_NORMAL; mRingerMode = AudioManager.RINGER_MODE_NORMAL;
@ -72,11 +73,12 @@ public class NotificationControllerTest extends AndroidTestCase {
// VIBRATE_ALWAYS, with a ringer tone // VIBRATE_ALWAYS, with a ringer tone
a1.mFlags = Account.FLAGS_VIBRATE_ALWAYS; a1.mFlags = Account.FLAGS_VIBRATE_ALWAYS;
n.defaults = 0; nb.setDefaults(0);
n.flags = 0; nb.setSound(null);
mTarget.setupNotificationSoundAndVibrationFromAccount(n, a1); mTarget.setupSoundAndVibration(nb, a1);
n = nb.getNotification();
assertEquals(Uri.parse(a1.mRingtoneUri), n.sound); assertEquals(expectedRingtone, n.sound);
assertTrue((n.defaults & Notification.DEFAULT_VIBRATE) != 0); assertTrue((n.defaults & Notification.DEFAULT_VIBRATE) != 0);
assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set
assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set
@ -84,11 +86,12 @@ public class NotificationControllerTest extends AndroidTestCase {
// FLAGS_VIBRATE_WHEN_SILENT, with a ringer tone // FLAGS_VIBRATE_WHEN_SILENT, with a ringer tone
a1.mFlags = Account.FLAGS_VIBRATE_WHEN_SILENT; a1.mFlags = Account.FLAGS_VIBRATE_WHEN_SILENT;
n.defaults = 0; nb.setDefaults(0);
n.flags = 0; nb.setSound(null);
mTarget.setupNotificationSoundAndVibrationFromAccount(n, a1); mTarget.setupSoundAndVibration(nb, a1);
n = nb.getNotification();
assertEquals(Uri.parse(a1.mRingtoneUri), n.sound); assertEquals(expectedRingtone, n.sound);
assertFalse((n.defaults & Notification.DEFAULT_VIBRATE) != 0); // no vibe assertFalse((n.defaults & Notification.DEFAULT_VIBRATE) != 0); // no vibe
assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set
assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set
@ -96,11 +99,12 @@ public class NotificationControllerTest extends AndroidTestCase {
// No VIBRATE flags, with a ringer tone // No VIBRATE flags, with a ringer tone
a1.mFlags = 0; a1.mFlags = 0;
n.defaults = 0; nb.setDefaults(0);
n.flags = 0; nb.setSound(null);
mTarget.setupNotificationSoundAndVibrationFromAccount(n, a1); mTarget.setupSoundAndVibration(nb, a1);
n = nb.getNotification();
assertEquals(Uri.parse(a1.mRingtoneUri), n.sound); assertEquals(expectedRingtone, n.sound);
assertFalse((n.defaults & Notification.DEFAULT_VIBRATE) != 0); // no vibe assertFalse((n.defaults & Notification.DEFAULT_VIBRATE) != 0); // no vibe
assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set
assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set
@ -111,11 +115,12 @@ public class NotificationControllerTest extends AndroidTestCase {
// VIBRATE_ALWAYS, with a ringer tone // VIBRATE_ALWAYS, with a ringer tone
a1.mFlags = Account.FLAGS_VIBRATE_ALWAYS; a1.mFlags = Account.FLAGS_VIBRATE_ALWAYS;
n.defaults = 0; nb.setDefaults(0);
n.flags = 0; nb.setSound(null);
mTarget.setupNotificationSoundAndVibrationFromAccount(n, a1); mTarget.setupSoundAndVibration(nb, a1);
n = nb.getNotification();
assertEquals(Uri.parse(a1.mRingtoneUri), n.sound); assertEquals(expectedRingtone, n.sound);
assertTrue((n.defaults & Notification.DEFAULT_VIBRATE) != 0); assertTrue((n.defaults & Notification.DEFAULT_VIBRATE) != 0);
assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set
assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set
@ -123,11 +128,12 @@ public class NotificationControllerTest extends AndroidTestCase {
// FLAGS_VIBRATE_WHEN_SILENT, with a ringer tone // FLAGS_VIBRATE_WHEN_SILENT, with a ringer tone
a1.mFlags = Account.FLAGS_VIBRATE_WHEN_SILENT; a1.mFlags = Account.FLAGS_VIBRATE_WHEN_SILENT;
n.defaults = 0; nb.setDefaults(0);
n.flags = 0; nb.setSound(null);
mTarget.setupNotificationSoundAndVibrationFromAccount(n, a1); mTarget.setupSoundAndVibration(nb, a1);
n = nb.getNotification();
assertEquals(Uri.parse(a1.mRingtoneUri), n.sound); assertEquals(expectedRingtone, n.sound);
assertTrue((n.defaults & Notification.DEFAULT_VIBRATE) != 0); assertTrue((n.defaults & Notification.DEFAULT_VIBRATE) != 0);
assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set
assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set
@ -135,11 +141,12 @@ public class NotificationControllerTest extends AndroidTestCase {
// No VIBRATE flags, with a ringer tone // No VIBRATE flags, with a ringer tone
a1.mFlags = 0; a1.mFlags = 0;
n.defaults = 0; nb.setDefaults(0);
n.flags = 0; nb.setSound(null);
mTarget.setupNotificationSoundAndVibrationFromAccount(n, a1); mTarget.setupSoundAndVibration(nb, a1);
n = nb.getNotification();
assertEquals(Uri.parse(a1.mRingtoneUri), n.sound); assertEquals(expectedRingtone, n.sound);
assertFalse((n.defaults & Notification.DEFAULT_VIBRATE) != 0); // no vibe assertFalse((n.defaults & Notification.DEFAULT_VIBRATE) != 0); // no vibe
assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set
assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set
@ -150,11 +157,12 @@ public class NotificationControllerTest extends AndroidTestCase {
// VIBRATE_ALWAYS, with a ringer tone // VIBRATE_ALWAYS, with a ringer tone
a1.mFlags = Account.FLAGS_VIBRATE_ALWAYS; a1.mFlags = Account.FLAGS_VIBRATE_ALWAYS;
n.defaults = 0; nb.setDefaults(0);
n.flags = 0; nb.setSound(null);
mTarget.setupNotificationSoundAndVibrationFromAccount(n, a1); mTarget.setupSoundAndVibration(nb, a1);
n = nb.getNotification();
assertEquals(Uri.parse(a1.mRingtoneUri), n.sound); assertEquals(expectedRingtone, n.sound);
assertTrue((n.defaults & Notification.DEFAULT_VIBRATE) != 0); assertTrue((n.defaults & Notification.DEFAULT_VIBRATE) != 0);
assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set
assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set
@ -162,11 +170,12 @@ public class NotificationControllerTest extends AndroidTestCase {
// FLAGS_VIBRATE_WHEN_SILENT, with a ringer tone // FLAGS_VIBRATE_WHEN_SILENT, with a ringer tone
a1.mFlags = Account.FLAGS_VIBRATE_WHEN_SILENT; a1.mFlags = Account.FLAGS_VIBRATE_WHEN_SILENT;
n.defaults = 0; nb.setDefaults(0);
n.flags = 0; nb.setSound(null);
mTarget.setupNotificationSoundAndVibrationFromAccount(n, a1); mTarget.setupSoundAndVibration(nb, a1);
n = nb.getNotification();
assertEquals(Uri.parse(a1.mRingtoneUri), n.sound); assertEquals(expectedRingtone, n.sound);
assertTrue((n.defaults & Notification.DEFAULT_VIBRATE) != 0); assertTrue((n.defaults & Notification.DEFAULT_VIBRATE) != 0);
assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set
assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set
@ -174,11 +183,12 @@ public class NotificationControllerTest extends AndroidTestCase {
// No VIBRATE flags, with a ringer tone // No VIBRATE flags, with a ringer tone
a1.mFlags = 0; a1.mFlags = 0;
n.defaults = 0; nb.setDefaults(0);
n.flags = 0; nb.setSound(null);
mTarget.setupNotificationSoundAndVibrationFromAccount(n, a1); mTarget.setupSoundAndVibration(nb, a1);
n = nb.getNotification();
assertEquals(Uri.parse(a1.mRingtoneUri), n.sound); assertEquals(expectedRingtone, n.sound);
assertFalse((n.defaults & Notification.DEFAULT_VIBRATE) != 0); // no vibe assertFalse((n.defaults & Notification.DEFAULT_VIBRATE) != 0); // no vibe
assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set
assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set
@ -186,9 +196,10 @@ public class NotificationControllerTest extends AndroidTestCase {
// No ringer tone // No ringer tone
a1.mRingtoneUri = null; a1.mRingtoneUri = null;
n.defaults = 0; nb.setDefaults(0);
n.flags = 0; nb.setSound(null);
mTarget.setupNotificationSoundAndVibrationFromAccount(n, a1); mTarget.setupSoundAndVibration(nb, a1);
n = nb.getNotification();
assertNull(n.sound); assertNull(n.sound);
} }
@ -242,21 +253,21 @@ public class NotificationControllerTest extends AndroidTestCase {
assertEquals(R.drawable.stat_notify_email_generic, n.icon); assertEquals(R.drawable.stat_notify_email_generic, n.icon);
} }
public void testGetNotificationTitle() { public void testGetNewMessageTitle() {
final Context c = mProviderContext; final Context c = mProviderContext;
// Case 1: 1 account // Case 1: 1 account
Account a1 = ProviderTestUtils.setupAccount("a1", true, c); Account a1 = ProviderTestUtils.setupAccount("a1", true, c);
// Just check the content. Ignore the spans. // Just check the content. Ignore the spans.
String title = mTarget.getNotificationTitle("*sender*", "*receiver*").toString(); String title = mTarget.getNewMessageTitle("*sender*", "*receiver*").toString();
assertEquals("*sender*", title); assertEquals("*sender*", title);
// Case 1: 2 account // Case 1: 2 account
Account a2 = ProviderTestUtils.setupAccount("a1", true, c); Account a2 = ProviderTestUtils.setupAccount("a1", true, c);
// Just check the content. Ignore the spans. // Just check the content. Ignore the spans.
title = mTarget.getNotificationTitle("*sender*", "*receiver*").toString(); title = mTarget.getNewMessageTitle("*sender*", "*receiver*").toString();
assertEquals("*sender* to *receiver*", title); assertEquals("*sender* to *receiver*", title);
} }
} }