filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Messaging: Remove unnecessary toString() and String.valueOf() calls

Browse Source 
Change-Id: I5d5624386ba72b9e7074a7da909f78baaee73f75
This commit is contained in:
Michael W
2024-12-26 14:55:12 +01:00
parent 21cb2b6289
commit e35d385149
18 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/messaging/datamodel/BugleDatabaseOperations.java
+2 -1
View File
@@ -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) {
src/com/android/messaging/datamodel/DatabaseWrapper.java
+1 -1
View File
@@ -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);
src/com/android/messaging/datamodel/action/InsertNewMessageAction.java
+2 -1
View File
@@ -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;
}
src/com/android/messaging/datamodel/data/MessageData.java
+1 -1
View File
@@ -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)";
}
}
src/com/android/messaging/datamodel/media/ImageRequestDescriptor.java
+5 -4
View File
@@ -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<Imag
return new StringBuilder()
.append(desiredWidth).append(KEY_PART_DELIMITER)
.append(desiredHeight).append(KEY_PART_DELIMITER)
.append(String.valueOf(cropToCircle)).append(KEY_PART_DELIMITER)
.append(String.valueOf(circleBackgroundColor)).append(KEY_PART_DELIMITER)
.append(String.valueOf(isStatic)).toString();
.append(cropToCircle).append(KEY_PART_DELIMITER)
.append(circleBackgroundColor).append(KEY_PART_DELIMITER)
.append(isStatic).toString();
}
public boolean isStatic() {
@@ -110,4 +111,4 @@ public abstract class ImageRequestDescriptor extends MediaRequestDescriptor<Imag
// Called once source dimensions finally determined upon loading the image
public void updateSourceDimensions(final int sourceWidth, final int sourceHeight) {
}
}
}
src/com/android/messaging/datamodel/media/NetworkUriImageRequest.java
+5 -5
View File
@@ -66,11 +66,11 @@ public class NetworkUriImageRequest<D extends UriImageRequestDescriptor> 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<D extends UriImageRequestDescriptor> 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();
src/com/android/messaging/datamodel/media/UriImageRequestDescriptor.java
+2 -1
View File
@@ -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();
}
}
src/com/android/messaging/mmslib/pdu/PduPersister.java
+2 -1
View File
@@ -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 {
src/com/android/messaging/sms/MmsUtils.java
+1 -1
View File
@@ -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)";
}
}
src/com/android/messaging/ui/ClassZeroActivity.java
+4 -6
View File
@@ -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);
}
}
src/com/android/messaging/ui/conversation/MessageDetailsDialog.java
+2 -1
View File
@@ -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());
src/com/android/messaging/util/Assert.java
+1 -1
View File
@@ -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);
}
}
}
src/com/android/messaging/util/BugleSubscriptionPrefs.java
+2 -1
View File
@@ -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
src/com/android/messaging/util/DebugUtils.java
+1 -1
View File
@@ -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);
src/com/android/messaging/util/exif/ExifOutputStream.java
+2 -1
View File
@@ -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());
src/com/android/messaging/util/exif/ExifParser.java
+5 -5
View File
@@ -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<Integer, Object> 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);
}
}
src/com/android/messaging/widget/WidgetConversationService.java
+1 -1
View File
@@ -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(),