Messaging: Language cleanup

No unnecessary boxing, enhanced for loops, redundant checks and throws,
imports (removal, reordering), possible void returns

Change-Id: I7a8e1b2007e3b0906e01b41785c518d02c2f3fab
This commit is contained in:
Michael W
2024-12-17 19:04:38 +01:00
parent e335f6bec8
commit e128bff457
77 changed files with 202 additions and 334 deletions

View File

@@ -35,7 +35,6 @@ import android.webkit.MimeTypeMap;
import com.android.messaging.Factory;
import com.android.messaging.datamodel.data.MessageData;
import com.android.messaging.datamodel.media.VideoThumbnailRequest;
import com.android.messaging.mmslib.pdu.CharacterSets;
import com.android.messaging.util.ContentType;
import com.android.messaging.util.LogUtil;
@@ -65,7 +64,7 @@ public class DatabaseMessages {
@Override
public boolean equals(final Object other) {
if (other == null || !(other instanceof DatabaseMessage)) {
if (!(other instanceof DatabaseMessage)) {
return false;
}
final DatabaseMessage otherDbMsg = (DatabaseMessage) other;
@@ -155,8 +154,8 @@ public class DatabaseMessages {
mType = cursor.getInt(INDEX_TYPE);
mThreadId = cursor.getLong(INDEX_THREAD_ID);
mStatus = cursor.getInt(INDEX_STATUS);
mRead = cursor.getInt(INDEX_READ) == 0 ? false : true;
mSeen = cursor.getInt(INDEX_SEEN) == 0 ? false : true;
mRead = cursor.getInt(INDEX_READ) != 0;
mSeen = cursor.getInt(INDEX_SEEN) != 0;
mUri = ContentUris.withAppendedId(Sms.CONTENT_URI, mRowId).toString();
mSubId = PhoneUtils.getDefault().getSubIdFromTelephony(cursor, INDEX_SUB_ID);
}
@@ -351,8 +350,8 @@ public class DatabaseMessages {
mThreadId = cursor.getLong(INDEX_THREAD_ID);
mPriority = cursor.getInt(INDEX_PRIORITY);
mStatus = cursor.getInt(INDEX_STATUS);
mRead = cursor.getInt(INDEX_READ) == 0 ? false : true;
mSeen = cursor.getInt(INDEX_SEEN) == 0 ? false : true;
mRead = cursor.getInt(INDEX_READ) != 0;
mSeen = cursor.getInt(INDEX_SEEN) != 0;
mContentLocation = cursor.getString(INDEX_CONTENT_LOCATION);
mTransactionId = cursor.getString(INDEX_TRANSACTION_ID);
mMmsMessageType = cursor.getInt(INDEX_MESSAGE_TYPE);
@@ -731,6 +730,7 @@ public class DatabaseMessages {
/**
* Get an instance of the MMS part from the part table cursor
*
* @param loadMedia Whether to load the media file of the part
*/
public static MmsPart get(final Cursor cursor, final boolean loadMedia) {
final MmsPart part = new MmsPart();