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

Auto-refresh message view 

Now MessageViewFragment detects changes made to the current message,
and update the UI.
(Although it doesn't really know if the message is really changed, or just
something else was changed in the DB.  It updates the header regardless.)

Change-Id: I35627c7aff129723b83605fc84521da907078571
This commit is contained in:
Makoto Onuki 2010-10-01 18:04:12 -07:00
parent 591e8fa0c9
commit d058f8abcd
2 changed files with 111 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -349,17 +349,12 @@ public class MessageViewFragment extends MessageViewFragmentBase {
onMarkMessageAsRead(true);
}
/**
* {@inheritDoc}
*
* - Update the favorite star icon.
* - Show the invite section if necessary.
*/
@Override
protected void reloadUiFromMessage(Message message, boolean okToFetch) {
super.reloadUiFromMessage(message, okToFetch);
protected void updateHeaderView(Message message) {
super.updateHeaderView(message);
mFavoriteIcon.setImageDrawable(message.mFlagFavorite ? mFavoriteIconOn : mFavoriteIconOff);
// Show the message invite section if we're an incoming meeting invitation only
mInviteSection.setVisibility((message.mFlags & Message.FLAG_INCOMING_MEETING_INVITE) != 0 ?
View.VISIBLE : View.GONE);

127
src/com/android/email/activity/MessageViewFragmentBase.java
View File

@ -20,6 +20,7 @@ import com.android.email.Controller;
import com.android.email.ControllerResultUiThreadWrapper;
import com.android.email.Email;
import com.android.email.R;
import com.android.email.Throttle;
import com.android.email.Utility;
import com.android.email.mail.Address;
import com.android.email.mail.MessagingException;
@ -37,9 +38,12 @@ import org.apache.commons.io.IOUtils;
import android.app.Fragment;
import android.app.LoaderManager.LoaderCallbacks;
import android.content.ActivityNotFoundException;
import android.content.ContentResolver;
import android.content.ContentUris;
import android.content.Context;
import android.content.Intent;
import android.content.Loader;
import android.database.ContentObserver;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.net.Uri;
@ -74,18 +78,11 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
// TODO Restore "Show pictures" state and scroll position on rotation.
// TODO Interaction with MessageListFragment
// Messages can now be moved, deleted, starred, and makred as unread at anytime, without this
// fragment knowing it. Update (or close or whatever) the fragment as necessary.
/**
* Base class for {@link MessageViewFragment} and {@link MessageFileViewFragment}.
*
* See {@link MessageViewBase} for the class relation diagram.
*
* NOTE "Move to mailbox" and "delete message" are asynchronous operations, which means message'
* mailbox can change any time. Don't use {@link Message#mMailboxKey} of {@link #mMessage}
* directly. If you need, always load the latest value.
*/
public abstract class MessageViewFragmentBase extends Fragment implements View.OnClickListener {
private static final int PHOTO_LOADER_ID = 1;
@ -119,6 +116,7 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
private Message mMessage;
private LoadMessageTask mLoadMessageTask;
private ReloadMessageTask mReloadMessageTask;
private LoadBodyTask mLoadBodyTask;
private LoadAttachmentsTask mLoadAttachmentsTask;
@ -139,6 +137,8 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
private boolean mIsMessageLoadedForTest;
private MessageObserver mMessageObserver;
private static final int CONTACT_STATUS_STATE_UNLOADED = 0;
private static final int CONTACT_STATUS_STATE_UNLOADED_TRIGGERED = 1;
private static final int CONTACT_STATUS_STATE_LOADED = 2;
@ -177,7 +177,9 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
*/
public boolean onUrlInMessageClicked(String url);
/** Called when the message specified doesn't exist. */
/**
* Called when the message specified doesn't exist, or is deleted/moved.
*/
public void onMessageNotExists();
/** Called when it starts loading a message. */
@ -222,6 +224,7 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
mTimeFormat = android.text.format.DateFormat.getTimeFormat(mContext); // 12/24 date format
mController = Controller.getInstance(mContext);
mMessageObserver = new MessageObserver(new Handler(), mContext);
}
@Override
@ -331,8 +334,11 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
}
private void cancelAllTasks() {
mMessageObserver.unregister();
Utility.cancelTaskInterrupt(mLoadMessageTask);
mLoadMessageTask = null;
Utility.cancelTaskInterrupt(mReloadMessageTask);
mReloadMessageTask = null;
Utility.cancelTaskInterrupt(mLoadBodyTask);
mLoadBodyTask = null;
Utility.cancelTaskInterrupt(mLoadAttachmentsTask);
@ -691,6 +697,30 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
}
}
/**
* Kicked by {@link MessageObserver}. Reload the message and update the views.
*/
private class ReloadMessageTask extends AsyncTask<Void, Void, Message> {
@Override
protected Message doInBackground(Void... params) {
return openMessageSync();
}
@Override
protected void onPostExecute(Message message) {
if (isCancelled()) {
return;
}
if (message == null || message.mMailboxKey != mMessage.mMailboxKey) {
// Message deleted or moved.
mCallback.onMessageNotExists();
return;
}
mMessage = message;
updateHeaderView(mMessage);
}
}
/**
* Called when a message is shown to the user.
*/
@ -921,7 +951,9 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
}
/**
* Reload the UI from a provider cursor. This must only be called from the UI thread.
* Reload the UI from a provider cursor. {@link LoadMessageTask#onPostExecute} calls it.
*
* Update the header views, and start loading the body.
*
* @param message A copy of the message loaded from the database
* @param okToFetch If true, and message is not fully loaded, it's OK to fetch from
@ -931,16 +963,9 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
mMessage = message;
mAccountId = message.mAccountKey;
mSubjectView.setText(message.mSubject);
mFromView.setText(Address.toFriendly(Address.unpack(message.mFrom)));
Date date = new Date(message.mTimeStamp);
mTimeView.setText(mTimeFormat.format(date));
mDateView.setText(Utility.isDateToday(date) ? null : mDateFormat.format(date));
mToView.setText(Address.toFriendly(Address.unpack(message.mTo)));
String friendlyCc = Address.toFriendly(Address.unpack(message.mCc));
mCcView.setText(friendlyCc);
mCcContainerView.setVisibility((friendlyCc != null) ? View.VISIBLE : View.GONE);
mAttachmentIcon.setVisibility(message.mAttachments != null ? View.VISIBLE : View.GONE);
mMessageObserver.register(ContentUris.withAppendedId(Message.CONTENT_URI, mMessage.mId));
updateHeaderView(mMessage);
// Handle partially-loaded email, as follows:
// 1. Check value of message.mFlagLoaded
@ -958,6 +983,19 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
}
}
protected void updateHeaderView(Message message) {
mSubjectView.setText(message.mSubject);
mFromView.setText(Address.toFriendly(Address.unpack(message.mFrom)));
Date date = new Date(message.mTimeStamp);
mTimeView.setText(mTimeFormat.format(date));
mDateView.setText(Utility.isDateToday(date) ? null : mDateFormat.format(date));
mToView.setText(Address.toFriendly(Address.unpack(message.mTo)));
String friendlyCc = Address.toFriendly(Address.unpack(message.mCc));
mCcView.setText(friendlyCc);
mCcContainerView.setVisibility((friendlyCc != null) ? View.VISIBLE : View.GONE);
mAttachmentIcon.setVisibility(message.mAttachments != null ? View.VISIBLE : View.GONE);
}
/**
* Reload the body from the provider cursor. This must only be called from the UI thread.
*
@ -1163,6 +1201,57 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
}
}
/**
* Class to detect update on the current message (e.g. toggle star). When it gets content
* change notifications, it kicks {@link ReloadMessageTask}.
*
* TODO Use the new Throttle class.
*/
private class MessageObserver extends ContentObserver implements Runnable {
private final Throttle mThrottle;
private final ContentResolver mContentResolver;
private boolean mRegistered;
public MessageObserver(Handler handler, Context context) {
super(handler);
mContentResolver = context.getContentResolver();
mThrottle = new Throttle("MessageObserver", this, handler);
}
public void unregister() {
if (!mRegistered) {
return;
}
mThrottle.cancelScheduledCallback();
mContentResolver.unregisterContentObserver(this);
mRegistered = false;
}
public void register(Uri notifyUri) {
unregister();
mContentResolver.registerContentObserver(notifyUri, true, this);
mRegistered = true;
}
@Override
public boolean deliverSelfNotifications() {
return true;
}
@Override
public void onChange(boolean selfChange) {
mThrottle.onEvent();
}
@Override
public void run() {
Utility.cancelTaskInterrupt(mReloadMessageTask);
mReloadMessageTask = new ReloadMessageTask();
mReloadMessageTask.execute();
}
}
public boolean isMessageLoadedForTest() {
return mIsMessageLoadedForTest;
}