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

Merge "Handle clearing notifications via respond()" into jb-dev

Browse Source
This commit is contained in:
Marc Blank 2012-04-26 15:27:21 -07:00 committed by Android (Google) Code Review
commit a4d8ff2293
1 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
email2/src/com/android/email/provider/EmailProvider.java
View File

@ -28,6 +28,7 @@ import android.content.OperationApplicationException;
import android.content.UriMatcher; import android.content.UriMatcher;
import android.database.ContentObserver; import android.database.ContentObserver;
import android.database.Cursor; import android.database.Cursor;
import android.database.CursorWrapper;
import android.database.MatrixCursor; import android.database.MatrixCursor;
import android.database.MergeCursor; import android.database.MergeCursor;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
@ -2815,6 +2816,39 @@ outer:
} }
} }
/**
* Wrapper that handles the visibility feature (i.e. the conversation list is visible, so
* any pending notifications for the corresponding mailbox should be canceled)
*/
static class VisibilityCursor extends CursorWrapper {
private final long mMailboxId;
private final Context mContext;
public VisibilityCursor(Context context, Cursor cursor, long mailboxId) {
super(cursor);
mMailboxId = mailboxId;
mContext = context;
}
@Override
public Bundle respond(Bundle params) {
final String setVisibilityKey =
UIProvider.ConversationCursorCommand.COMMAND_KEY_SET_VISIBILITY;
if (params.containsKey(setVisibilityKey)) {
final boolean visible = params.getBoolean(setVisibilityKey);
if (visible) {
NotificationController.getInstance(mContext).cancelNewMessageNotification(
mMailboxId);
}
}
// Return success
Bundle response = new Bundle();
response.putString(setVisibilityKey,
UIProvider.ConversationCursorCommand.COMMAND_RESPONSE_OK);
return response;
}
}
/** /**
* Handle UnifiedEmail queries here (dispatched from query()) * Handle UnifiedEmail queries here (dispatched from query())
* *
@ -2846,6 +2880,7 @@ outer:
c = db.rawQuery(genQueryMailboxMessages(uiProjection), new String[] {id}); c = db.rawQuery(genQueryMailboxMessages(uiProjection), new String[] {id});
} }
notifyUri = UIPROVIDER_CONVERSATION_NOTIFIER.buildUpon().appendPath(id).build(); notifyUri = UIPROVIDER_CONVERSATION_NOTIFIER.buildUpon().appendPath(id).build();
c = new VisibilityCursor(context, c, mailboxId);
break; break;
case UI_MESSAGE: case UI_MESSAGE:
c = db.rawQuery(genQueryViewMessage(uiProjection, id), new String[] {id}); c = db.rawQuery(genQueryViewMessage(uiProjection, id), new String[] {id});