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

Merge "Fix bug with meeting responses"

Browse Source
This commit is contained in:
Marc Blank 2010-02-17 09:44:36 -08:00 committed by Android (Google) Code Review
commit 0055f37a82
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/exchange/EasSyncService.java
View File

@ -38,11 +38,11 @@ import com.android.exchange.adapter.ContactsSyncAdapter;
import com.android.exchange.adapter.EmailSyncAdapter; import com.android.exchange.adapter.EmailSyncAdapter;
import com.android.exchange.adapter.FolderSyncParser; import com.android.exchange.adapter.FolderSyncParser;
import com.android.exchange.adapter.MeetingResponseParser; import com.android.exchange.adapter.MeetingResponseParser;
import com.android.exchange.adapter.Parser.EasParserException;
import com.android.exchange.adapter.PingParser; import com.android.exchange.adapter.PingParser;
import com.android.exchange.adapter.ProvisionParser; import com.android.exchange.adapter.ProvisionParser;
import com.android.exchange.adapter.Serializer; import com.android.exchange.adapter.Serializer;
import com.android.exchange.adapter.Tags; import com.android.exchange.adapter.Tags;
import com.android.exchange.adapter.Parser.EasParserException;
import org.apache.http.Header; import org.apache.http.Header;
import org.apache.http.HttpEntity; import org.apache.http.HttpEntity;
@ -765,11 +765,15 @@ public class EasSyncService extends AbstractSyncService {
* @throws IOException * @throws IOException
*/ */
protected void sendMeetingResponse(MeetingResponseRequest req) throws IOException { protected void sendMeetingResponse(MeetingResponseRequest req) throws IOException {
// Retrieve the message and mailbox; punt if either are null
Message msg = Message.restoreMessageWithId(mContext, req.mMessageId); Message msg = Message.restoreMessageWithId(mContext, req.mMessageId);
if (msg == null) return;
Mailbox mailbox = Mailbox.restoreMailboxWithId(mContext, msg.mMailboxKey);
if (mailbox == null) return;
Serializer s = new Serializer(); Serializer s = new Serializer();
s.start(Tags.MREQ_MEETING_RESPONSE).start(Tags.MREQ_REQUEST); s.start(Tags.MREQ_MEETING_RESPONSE).start(Tags.MREQ_REQUEST);
s.data(Tags.MREQ_USER_RESPONSE, Integer.toString(req.mResponse)); s.data(Tags.MREQ_USER_RESPONSE, Integer.toString(req.mResponse));
s.data(Tags.MREQ_COLLECTION_ID, Long.toString(msg.mMailboxKey)); s.data(Tags.MREQ_COLLECTION_ID, mailbox.mServerId);
s.data(Tags.MREQ_REQ_ID, msg.mServerId); s.data(Tags.MREQ_REQ_ID, msg.mServerId);
s.end().end().done(); s.end().end().done();
HttpResponse res = sendHttpClientPost("MeetingResponse", s.toByteArray()); HttpResponse res = sendHttpClientPost("MeetingResponse", s.toByteArray());