From e35d385149502dbe3389b842277f9166d21ac764 Mon Sep 17 00:00:00 2001 From: Michael W Date: Fri, 13 Dec 2024 20:57:50 +0100 Subject: [PATCH] Messaging: Remove unnecessary toString() and String.valueOf() calls Change-Id: I5d5624386ba72b9e7074a7da909f78baaee73f75 --- src/android/support/v7/mms/MmsHttpClient.java | 2 +- .../messaging/datamodel/BugleDatabaseOperations.java | 3 ++- .../android/messaging/datamodel/DatabaseWrapper.java | 2 +- .../datamodel/action/InsertNewMessageAction.java | 3 ++- .../android/messaging/datamodel/data/MessageData.java | 2 +- .../datamodel/media/ImageRequestDescriptor.java | 9 +++++---- .../datamodel/media/NetworkUriImageRequest.java | 10 +++++----- .../datamodel/media/UriImageRequestDescriptor.java | 3 ++- src/com/android/messaging/mmslib/pdu/PduPersister.java | 3 ++- src/com/android/messaging/sms/MmsUtils.java | 2 +- src/com/android/messaging/ui/ClassZeroActivity.java | 10 ++++------ .../ui/conversation/MessageDetailsDialog.java | 3 ++- src/com/android/messaging/util/Assert.java | 2 +- .../android/messaging/util/BugleSubscriptionPrefs.java | 3 ++- src/com/android/messaging/util/DebugUtils.java | 2 +- .../android/messaging/util/exif/ExifOutputStream.java | 3 ++- src/com/android/messaging/util/exif/ExifParser.java | 10 +++++----- .../messaging/widget/WidgetConversationService.java | 2 +- 18 files changed, 40 insertions(+), 34 deletions(-) diff --git a/src/android/support/v7/mms/MmsHttpClient.java b/src/android/support/v7/mms/MmsHttpClient.java index 20fe08f..0202b7a 100644 --- a/src/android/support/v7/mms/MmsHttpClient.java +++ b/src/android/support/v7/mms/MmsHttpClient.java @@ -234,7 +234,7 @@ public class MmsHttpClient { } } } - Log.v(MmsService.TAG, "HTTP: headers\n" + sb.toString()); + Log.v(MmsService.TAG, "HTTP: headers\n" + sb); } } diff --git a/src/com/android/messaging/datamodel/BugleDatabaseOperations.java b/src/com/android/messaging/datamodel/BugleDatabaseOperations.java index 1bf9f9c..2474bb1 100644 --- a/src/com/android/messaging/datamodel/BugleDatabaseOperations.java +++ b/src/com/android/messaging/datamodel/BugleDatabaseOperations.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1891,7 +1892,7 @@ public class BugleDatabaseOperations { } } - final String whereClause = rowKey + "=?" + " AND (" + sb.toString() + ")"; + final String whereClause = rowKey + "=?" + " AND (" + sb + ")"; final String [] whereValuesArray = whereValues.toArray(new String[whereValues.size()]); final int count = db.update(table, values, whereClause, whereValuesArray); if (count > 1) { diff --git a/src/com/android/messaging/datamodel/DatabaseWrapper.java b/src/com/android/messaging/datamodel/DatabaseWrapper.java index be5de94..4fce3a0 100644 --- a/src/com/android/messaging/datamodel/DatabaseWrapper.java +++ b/src/com/android/messaging/datamodel/DatabaseWrapper.java @@ -231,7 +231,7 @@ public class DatabaseWrapper { sb.setLength(sb.length() - 1); } LogUtil.v(TAG, "for query " + sql + "\nplan is: " - + sb.toString()); + + sb); } } catch (final Exception e) { LogUtil.w(TAG, "Query plan failed ", e); diff --git a/src/com/android/messaging/datamodel/action/InsertNewMessageAction.java b/src/com/android/messaging/datamodel/action/InsertNewMessageAction.java index b5406e4..98aa1f4 100644 --- a/src/com/android/messaging/datamodel/action/InsertNewMessageAction.java +++ b/src/com/android/messaging/datamodel/action/InsertNewMessageAction.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -266,7 +267,7 @@ public class InsertNewMessageAction extends Action implements Parcelable { if (threadId < 0) { Assert.fail("InsertNewMessage: Couldn't get threadId in SMS db for these recipients: " - + recipients.toString()); + + recipients); // TODO: How do we fail the action? return null; } diff --git a/src/com/android/messaging/datamodel/data/MessageData.java b/src/com/android/messaging/datamodel/data/MessageData.java index 9bed507..1d865c4 100644 --- a/src/com/android/messaging/datamodel/data/MessageData.java +++ b/src/com/android/messaging/datamodel/data/MessageData.java @@ -181,7 +181,7 @@ public class MessageData implements Parcelable { case BUGLE_STATUS_INCOMING_EXPIRED_OR_NOT_AVAILABLE: return "INCOMING_EXPIRED_OR_NOT_AVAILABLE"; default: - return String.valueOf(status) + " (check MessageData)"; + return status + " (check MessageData)"; } } diff --git a/src/com/android/messaging/datamodel/media/ImageRequestDescriptor.java b/src/com/android/messaging/datamodel/media/ImageRequestDescriptor.java index 20cb9af..8264be1 100644 --- a/src/com/android/messaging/datamodel/media/ImageRequestDescriptor.java +++ b/src/com/android/messaging/datamodel/media/ImageRequestDescriptor.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -95,9 +96,9 @@ public abstract class ImageRequestDescriptor extends MediaRequestDescriptor extends } catch (MalformedURLException e) { LogUtil.e(LogUtil.BUGLE_TAG, "MalformedUrl for image with url: " - + mDescriptor.uri.toString(), e); + + mDescriptor.uri, e); } catch (IOException e) { LogUtil.e(LogUtil.BUGLE_TAG, "IOException trying to get inputStream for image with url: " - + mDescriptor.uri.toString(), e); + + mDescriptor.uri, e); } finally { if (connection != null) { connection.disconnect(); @@ -98,16 +98,16 @@ public class NetworkUriImageRequest extends } catch (MalformedURLException e) { LogUtil.e(LogUtil.BUGLE_TAG, "MalformedUrl for image with url: " - + mDescriptor.uri.toString(), e); + + mDescriptor.uri, e); } catch (final OutOfMemoryError e) { LogUtil.e(LogUtil.BUGLE_TAG, "OutOfMemoryError for image with url: " - + mDescriptor.uri.toString(), e); + + mDescriptor.uri, e); Factory.get().reclaimMemory(); } catch (IOException e) { LogUtil.e(LogUtil.BUGLE_TAG, "IOException trying to get inputStream for image with url: " - + mDescriptor.uri.toString(), e); + + mDescriptor.uri, e); } finally { if (inputStream != null) { inputStream.close(); diff --git a/src/com/android/messaging/datamodel/media/UriImageRequestDescriptor.java b/src/com/android/messaging/datamodel/media/UriImageRequestDescriptor.java index dae293a..ccc99b2 100644 --- a/src/com/android/messaging/datamodel/media/UriImageRequestDescriptor.java +++ b/src/com/android/messaging/datamodel/media/UriImageRequestDescriptor.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -72,7 +73,7 @@ public class UriImageRequestDescriptor extends ImageRequestDescriptor { if (key != null) { return new StringBuilder() .append(uri).append(KEY_PART_DELIMITER) - .append(String.valueOf(allowCompression)).append(KEY_PART_DELIMITER) + .append(allowCompression).append(KEY_PART_DELIMITER) .append(key).toString(); } } diff --git a/src/com/android/messaging/mmslib/pdu/PduPersister.java b/src/com/android/messaging/mmslib/pdu/PduPersister.java index 9b2dc12..52c94a2 100644 --- a/src/com/android/messaging/mmslib/pdu/PduPersister.java +++ b/src/com/android/messaging/mmslib/pdu/PduPersister.java @@ -1,6 +1,7 @@ /* * Copyright (C) 2007-2008 Esmertec AG. * Copyright (C) 2007-2008 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -876,7 +877,7 @@ public class PduPersister { final ContentValues cv = new ContentValues(); cv.put(Mms.Part.TEXT, new EncodedStringValue(charset, data).getString()); if (mContentResolver.update(uri, cv, null, null) != 1) { - throw new MmsException("unable to update " + uri.toString()); + throw new MmsException("unable to update " + uri); } } } else { diff --git a/src/com/android/messaging/sms/MmsUtils.java b/src/com/android/messaging/sms/MmsUtils.java index ae7aad2..3e2047c 100644 --- a/src/com/android/messaging/sms/MmsUtils.java +++ b/src/com/android/messaging/sms/MmsUtils.java @@ -137,7 +137,7 @@ public class MmsUtils { case MMS_REQUEST_NO_RETRY: return "NO_RETRY"; default: - return String.valueOf(status) + " (check MmsUtils)"; + return status + " (check MmsUtils)"; } } diff --git a/src/com/android/messaging/ui/ClassZeroActivity.java b/src/com/android/messaging/ui/ClassZeroActivity.java index ccb15a0..6b952a7 100644 --- a/src/com/android/messaging/ui/ClassZeroActivity.java +++ b/src/com/android/messaging/ui/ClassZeroActivity.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -162,8 +163,7 @@ public class ClassZeroActivity extends Activity { } else { mHandler.sendEmptyMessageAtTime(ON_AUTO_SAVE, mTimerSet); if (VERBOSE) { - Log.d(TAG, "onRestart time = " + Long.toString(mTimerSet) + " " - + this.toString()); + Log.d(TAG, "onRestart time = " + mTimerSet + " " + this); } } } @@ -173,8 +173,7 @@ public class ClassZeroActivity extends Activity { super.onSaveInstanceState(outState); outState.putLong(TIMER_FIRE, mTimerSet); if (VERBOSE) { - Log.d(TAG, "onSaveInstanceState time = " + Long.toString(mTimerSet) - + " " + this.toString()); + Log.d(TAG, "onSaveInstanceState time = " + mTimerSet + " " + this); } } @@ -183,8 +182,7 @@ public class ClassZeroActivity extends Activity { super.onStop(); mHandler.removeMessages(ON_AUTO_SAVE); if (VERBOSE) { - Log.d(TAG, "onStop time = " + Long.toString(mTimerSet) - + " " + this.toString()); + Log.d(TAG, "onStop time = " + mTimerSet + " " + this); } } diff --git a/src/com/android/messaging/ui/conversation/MessageDetailsDialog.java b/src/com/android/messaging/ui/conversation/MessageDetailsDialog.java index 30bb628..0091b7d 100644 --- a/src/com/android/messaging/ui/conversation/MessageDetailsDialog.java +++ b/src/com/android/messaging/ui/conversation/MessageDetailsDialog.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -296,7 +297,7 @@ public class MessageDetailsDialog { if (recipients != null) { details.append('\n'); details.append("Thread recipients: "); - details.append(recipients.toString()); + details.append(recipients); if (mms != null) { final String from = MmsUtils.getMmsSender(recipients, mms.getUri()); diff --git a/src/com/android/messaging/util/Assert.java b/src/com/android/messaging/util/Assert.java index 9440771..d284b0f 100644 --- a/src/com/android/messaging/util/Assert.java +++ b/src/com/android/messaging/util/Assert.java @@ -208,7 +208,7 @@ public final class Assert { if (caller != null) { // This log message can be de-obfuscated by the Proguard retrace tool, just like a // full stack trace from a crash. - LogUtil.e(LogUtil.BUGLE_TAG, "\tat " + caller.toString()); + LogUtil.e(LogUtil.BUGLE_TAG, "\tat " + caller); } } } diff --git a/src/com/android/messaging/util/BugleSubscriptionPrefs.java b/src/com/android/messaging/util/BugleSubscriptionPrefs.java index 039712a..f7f0c31 100644 --- a/src/com/android/messaging/util/BugleSubscriptionPrefs.java +++ b/src/com/android/messaging/util/BugleSubscriptionPrefs.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +37,7 @@ public class BugleSubscriptionPrefs extends BuglePrefsImpl { @Override public String getSharedPreferencesName() { - return SHARED_PREFERENCES_PER_SUBSCRIPTION_PREFIX + String.valueOf(mSubId); + return SHARED_PREFERENCES_PER_SUBSCRIPTION_PREFIX + mSubId; } @Override diff --git a/src/com/android/messaging/util/DebugUtils.java b/src/com/android/messaging/util/DebugUtils.java index aa516bd..cb9b578 100644 --- a/src/com/android/messaging/util/DebugUtils.java +++ b/src/com/android/messaging/util/DebugUtils.java @@ -250,7 +250,7 @@ public class DebugUtils { public static void dumpSms(final long id, final android.telephony.SmsMessage[] messages, final String format) { try { - final String dumpFileName = MmsUtils.SMS_DUMP_PREFIX + Long.toString(id); + final String dumpFileName = MmsUtils.SMS_DUMP_PREFIX + id; final File dumpFile = DebugUtils.getDebugFile(dumpFileName, true); if (dumpFile != null) { final FileOutputStream fos = new FileOutputStream(dumpFile); diff --git a/src/com/android/messaging/util/exif/ExifOutputStream.java b/src/com/android/messaging/util/exif/ExifOutputStream.java index 2016da4..48c995f 100644 --- a/src/com/android/messaging/util/exif/ExifOutputStream.java +++ b/src/com/android/messaging/util/exif/ExifOutputStream.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -291,7 +292,7 @@ class ExifOutputStream extends FilterOutputStream { dataOutputStream.writeShort(tag.getDataType()); dataOutputStream.writeInt(tag.getComponentCount()); if (DEBUG) { - Log.v(TAG, "\n" + tag.toString()); + Log.v(TAG, "\n" + tag); } if (tag.getDataSize() > 4) { dataOutputStream.writeInt(tag.getOffset()); diff --git a/src/com/android/messaging/util/exif/ExifParser.java b/src/com/android/messaging/util/exif/ExifParser.java index 8b9dc86..ef62f7d 100644 --- a/src/com/android/messaging/util/exif/ExifParser.java +++ b/src/com/android/messaging/util/exif/ExifParser.java @@ -659,22 +659,22 @@ public class ExifParser { Object event = mCorrespondingEvent.firstEntry().getValue(); if (event instanceof ImageEvent) { // Tag value overlaps thumbnail, ignore thumbnail. - Log.w(TAG, "Thumbnail overlaps value for tag: \n" + tag.toString()); + Log.w(TAG, "Thumbnail overlaps value for tag: \n" + tag); Entry entry = mCorrespondingEvent.pollFirstEntry(); Log.w(TAG, "Invalid thumbnail offset: " + entry.getKey()); } else { // Tag value overlaps another tag, shorten count if (event instanceof IfdEvent) { Log.w(TAG, "Ifd " + ((IfdEvent) event).ifd - + " overlaps value for tag: \n" + tag.toString()); + + " overlaps value for tag: \n" + tag); } else if (event instanceof ExifTagEvent) { Log.w(TAG, "Tag value for tag: \n" + ((ExifTagEvent) event).tag.toString() - + " overlaps value for tag: \n" + tag.toString()); + + " overlaps value for tag: \n" + tag); } size = mCorrespondingEvent.firstEntry().getKey() - mTiffStream.getReadByteCount(); - Log.w(TAG, "Invalid size of tag: \n" + tag.toString() + Log.w(TAG, "Invalid size of tag: \n" + tag + " setting count to: " + size); tag.forceSetComponentCount(size); } @@ -734,7 +734,7 @@ public class ExifParser { break; } if (LOGV) { - Log.v(TAG, "\n" + tag.toString()); + Log.v(TAG, "\n" + tag); } } diff --git a/src/com/android/messaging/widget/WidgetConversationService.java b/src/com/android/messaging/widget/WidgetConversationService.java index 243d11e..eee073c 100644 --- a/src/com/android/messaging/widget/WidgetConversationService.java +++ b/src/com/android/messaging/widget/WidgetConversationService.java @@ -108,7 +108,7 @@ public class WidgetConversationService extends RemoteViewsService { } final Uri uri = MessagingContentProvider.buildConversationMessagesUri(mConversationId); if (uri != null) { - LogUtil.w(TAG, "doQuery uri: " + uri.toString()); + LogUtil.w(TAG, "doQuery uri: " + uri); } return mContext.getContentResolver().query(uri, ConversationMessageData.getProjection(),