Merge "CrespoMMS appears after delay in the thread" (429cf48e) · Commits · e / os / android_frameworks_base

core/java/com/google/android/mms/pdu/PduPersister.java

+127 −53

Original line number	Diff line number	Diff line
		@@ -510,10 +510,23 @@ public class PduPersister {
		* @throws MmsException Failed to load some fields of a PDU.
		*/
		public GenericPdu load(Uri uri) throws MmsException {
		PduCacheEntry cacheEntry = PDU_CACHE_INSTANCE.get(uri);
		PduCacheEntry cacheEntry;
		synchronized(PDU_CACHE_INSTANCE) {
		if (PDU_CACHE_INSTANCE.isUpdating(uri)) {
		try {
		PDU_CACHE_INSTANCE.wait();
		} catch (InterruptedException e) {
		Log.e(TAG, "load: ", e);
		}
		cacheEntry = PDU_CACHE_INSTANCE.get(uri);
		if (cacheEntry != null) {
		return cacheEntry.getPdu();
		}
		}
		// Tell the cache to indicate to other callers that this item
		// is currently being updated.
		PDU_CACHE_INSTANCE.setUpdating(uri, true);
		}

		Cursor c = SqliteWrapper.query(mContext, mContentResolver, uri,
		PDU_PROJECTION, null, null, null);
		@@ -634,10 +647,15 @@ public class PduPersister {
		"Unrecognized PDU type: " + Integer.toHexString(msgType));
		}

		synchronized(PDU_CACHE_INSTANCE ) {
		assert(PDU_CACHE_INSTANCE.get(uri) == null);
		// Update the cache entry with the real info
		cacheEntry = new PduCacheEntry(pdu, msgBox, threadId);
		PDU_CACHE_INSTANCE.put(uri, cacheEntry);
		PDU_CACHE_INSTANCE.notifyAll(); // tell anybody waiting on this entry to go ahead
		return pdu;
		}
		}

		private void persistAddress(
		long msgId, int type, EncodedStringValue[] array) {
		@@ -818,6 +836,17 @@ public class PduPersister {
		* @throws MmsException Bad URI or updating failed.
		*/
		public void updateHeaders(Uri uri, SendReq sendReq) {
		synchronized(PDU_CACHE_INSTANCE) {
		// If the cache item is getting updated, wait until it's done updating before
		// purging it.
		if (PDU_CACHE_INSTANCE.isUpdating(uri)) {
		try {
		PDU_CACHE_INSTANCE.wait();
		} catch (InterruptedException e) {
		Log.e(TAG, "updateHeaders: ", e);
		}
		}
		}
		PDU_CACHE_INSTANCE.purge(uri);

		ContentValues values = new ContentValues(10);
		@@ -969,10 +998,24 @@ public class PduPersister {
		*/
		public void updateParts(Uri uri, PduBody body)
		throws MmsException {
		PduCacheEntry cacheEntry = PDU_CACHE_INSTANCE.get(uri);
		try {
		PduCacheEntry cacheEntry;
		synchronized(PDU_CACHE_INSTANCE) {
		if (PDU_CACHE_INSTANCE.isUpdating(uri)) {
		try {
		PDU_CACHE_INSTANCE.wait();
		} catch (InterruptedException e) {
		Log.e(TAG, "updateParts: ", e);
		}
		cacheEntry = PDU_CACHE_INSTANCE.get(uri);
		if (cacheEntry != null) {
		((MultimediaMessagePdu) cacheEntry.getPdu()).setBody(body);
		}
		}
		// Tell the cache to indicate to other callers that this item
		// is currently being updated.
		PDU_CACHE_INSTANCE.setUpdating(uri, true);
		}

		ArrayList<PduPart> toBeCreated = new ArrayList<PduPart>();
		HashMap<Uri, PduPart> toBeUpdated = new HashMap<Uri, PduPart>();
		@@ -1016,6 +1059,12 @@ public class PduPersister {
		for (Map.Entry<Uri, PduPart> e : toBeUpdated.entrySet()) {
		updatePart(e.getKey(), e.getValue());
		}
		} finally {
		synchronized(PDU_CACHE_INSTANCE) {
		PDU_CACHE_INSTANCE.setUpdating(uri, false);
		PDU_CACHE_INSTANCE.notifyAll();
		}
		}
		}

		/**
		@@ -1029,15 +1078,32 @@ public class PduPersister {
		if (uri == null) {
		throw new MmsException("Uri may not be null.");
		}
		long msgId = -1;
		try {
		msgId = ContentUris.parseId(uri);
		} catch (NumberFormatException e) {
		// the uri ends with "inbox" or something else like that
		}
		boolean existingUri = msgId != -1;

		Integer msgBox = MESSAGE_BOX_MAP.get(uri);
		if (msgBox == null) {
		if (!existingUri && MESSAGE_BOX_MAP.get(uri) == null) {
		throw new MmsException(
		"Bad destination, must be one of "
		+ "content://mms/inbox, content://mms/sent, "
		+ "content://mms/drafts, content://mms/outbox, "
		+ "content://mms/temp.");
		}
		synchronized(PDU_CACHE_INSTANCE) {
		// If the cache item is getting updated, wait until it's done updating before
		// purging it.
		if (PDU_CACHE_INSTANCE.isUpdating(uri)) {
		try {
		PDU_CACHE_INSTANCE.wait();
		} catch (InterruptedException e) {
		Log.e(TAG, "persist1: ", e);
		}
		}
		}
		PDU_CACHE_INSTANCE.purge(uri);

		PduHeaders header = pdu.getPduHeaders();
		@@ -1145,14 +1211,20 @@ public class PduPersister {
		}
		}

		Uri res = SqliteWrapper.insert(mContext, mContentResolver, uri, values);
		Uri res = null;
		if (existingUri) {
		res = uri;
		SqliteWrapper.update(mContext, mContentResolver, res, values, null, null);
		} else {
		res = SqliteWrapper.insert(mContext, mContentResolver, uri, values);
		if (res == null) {
		throw new MmsException("persist() failed: return null.");
		}

		// Get the real ID of the PDU and update all parts which were
		// saved with the dummy ID.
		long msgId = ContentUris.parseId(res);
		msgId = ContentUris.parseId(res);
		}

		values = new ContentValues(1);
		values.put(Part.MSG_ID, msgId);
		SqliteWrapper.update(mContext, mContentResolver,
		@@ -1163,7 +1235,9 @@ public class PduPersister {
		// persisted PDU is '8', we should return "content://mms/inbox/8"
		// instead of "content://mms/8".
		// FIXME: Should the MmsProvider be responsible for this???
		if (!existingUri) {
		res = Uri.parse(uri + "/" + msgId);
		}

		// Save address information.
		for (int addrType : ADDRESS_FIELDS) {

core/java/com/google/android/mms/util/PduCache.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -73,10 +73,12 @@ public final class PduCache extends AbstractCache<Uri, PduCacheEntry> {

		private final HashMap<Integer, HashSet<Uri>> mMessageBoxes;
		private final HashMap<Long, HashSet<Uri>> mThreads;
		private final HashSet<Uri> mUpdating;

		private PduCache() {
		mMessageBoxes = new HashMap<Integer, HashSet<Uri>>();
		mThreads = new HashMap<Long, HashSet<Uri>>();
		mUpdating = new HashSet<Uri>();
		}

		synchronized public static final PduCache getInstance() {
		@@ -111,9 +113,22 @@ public final class PduCache extends AbstractCache<Uri, PduCacheEntry> {
		msgBox.add(finalKey);
		thread.add(finalKey);
		}
		setUpdating(uri, false);
		return result;
		}

		synchronized public void setUpdating(Uri uri, boolean updating) {
		if (updating) {
		mUpdating.add(uri);
		} else {
		mUpdating.remove(uri);
		}
		}

		synchronized public boolean isUpdating(Uri uri) {
		return mUpdating.contains(uri);
		}

		@Override
		synchronized public PduCacheEntry purge(Uri uri) {
		int match = URI_MATCHER.match(uri);