Mms: Scrub debug logging for identifiable information, fix codestyle.kitkat

Change-Id: I07e865c9f0b47a9841e7fa2c6a232a1b51d6ad48

1 files changed, 58 insertions, 33 deletions

diff --git a/src/com/android/mms/quickmessage/QuickMessagePopup.java b/src/com/android/mms/quickmessage/QuickMessagePopup.java
index 03210427..ec59d52e 100644
--- a/src/com/android/mms/quickmessage/QuickMessagePopup.java
+++ b/src/com/android/mms/quickmessage/QuickMessagePopup.java
@@ -277,7 +277,8 @@ public class QuickMessagePopup extends Activity implements
             }
         } else {
             // Parse the intent and ensure we have a notification object to work with
-            NotificationInfo nm = (NotificationInfo) extras.getParcelable(SMS_NOTIFICATION_OBJECT_EXTRA);
+            NotificationInfo nm = (NotificationInfo) extras
+                    .getParcelable(SMS_NOTIFICATION_OBJECT_EXTRA);
             if (nm != null) {
                 QuickMessage qm = new QuickMessage(extras.getString(SMS_FROM_NAME_EXTRA),
                         extras.getString(SMS_FROM_NUMBER_EXTRA), nm);
@@ -286,7 +287,8 @@ public class QuickMessagePopup extends Activity implements
 
                 // If triggered from Quick Reply the keyboard should be visible immediately
                 if (extras.getBoolean(QR_SHOW_KEYBOARD_EXTRA, false)) {
-                    getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+                    getWindow().setSoftInputMode(WindowManager
+                            .LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
                 }
 
                 if (newMessage && mCurrentPage != -1) {
@@ -299,10 +301,11 @@ public class QuickMessagePopup extends Activity implements
                     mMessagePager.setCurrentItem(mCurrentPage);
                 }
 
-                if (DEBUG)
-                    Log.d(LOG_TAG, "parseIntent(): New message from " + qm.getFromName().toString()
+                if (DEBUG) {
+                    Log.d(LOG_TAG, "parseIntent(): New message from " + qm.getThreadId()
                             + " added. Number of messages = " + mMessageList.size()
-                            + ". Displaying page #" + (mCurrentPage+1));
+                            + ". Displaying page #" + (mCurrentPage + 1));
+                }
 
                 // Make sure the counter is accurate
                 updateMessageCounter();
@@ -313,8 +316,9 @@ public class QuickMessagePopup extends Activity implements
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-        if (DEBUG)
+        if (DEBUG) {
             Log.d(LOG_TAG, "onNewIntent() called");
+        }
 
         // Set new intent
         setIntent(intent);
@@ -433,7 +437,8 @@ public class QuickMessagePopup extends Activity implements
         if (qm != null) {
             EditText editView = qm.getEditText();
             if (editView != null) {
-                InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
+                InputMethodManager imm = (InputMethodManager)
+                        getSystemService(Context.INPUT_METHOD_SERVICE);
                 imm.hideSoftInputFromWindow(editView.getApplicationWindowToken(), 0);
             }
         }
@@ -477,8 +482,9 @@ public class QuickMessagePopup extends Activity implements
      */
     public void showPreviousMessageWithRemove(QuickMessage qm) {
         if (qm != null) {
-            if (DEBUG)
+            if (DEBUG) {
                 Log.d(LOG_TAG, "showPreviousMessageWithRemove()");
+            }
 
             markCurrentMessageRead(qm);
             if (mCurrentPage > 0) {
@@ -494,8 +500,9 @@ public class QuickMessagePopup extends Activity implements
      */
     public void showNextMessageWithRemove(QuickMessage qm) {
         if (qm != null) {
-            if (DEBUG)
+            if (DEBUG) {
                 Log.d(LOG_TAG, "showNextMessageWithRemove()");
+            }
 
             markCurrentMessageRead(qm);
             if (mCurrentPage < (mMessageList.size() - 1)) {
@@ -516,10 +523,11 @@ public class QuickMessagePopup extends Activity implements
         mMessagePager.setCurrentItem(gotoPage);
         updateMessageCounter();
 
-        if (DEBUG)
+        if (DEBUG) {
             Log.d(LOG_TAG, "updatePages(): Removed message " + removeMsg.getThreadId()
-                    + " and changed to page #" + (gotoPage+1) + ". Remaining messages = "
+                    + " and changed to page #" + (gotoPage + 1) + ". Remaining messages = "
                     + mMessageList.size());
+        }
     }
 
     /**
@@ -528,8 +536,10 @@ public class QuickMessagePopup extends Activity implements
      * @param threadId
      */
     public void removeMatchingMessages(long threadId) {
-        if (DEBUG)
-            Log.d(LOG_TAG, "removeMatchingMessages() looking for match with threadID = " + threadId);
+        if (DEBUG) {
+            Log.d(LOG_TAG, "removeMatchingMessages() looking for match with threadID = "
+                    + threadId);
+        }
 
         Iterator<QuickMessage> itr = mMessageList.iterator();
         QuickMessage qmElement = null;
@@ -563,9 +573,10 @@ public class QuickMessagePopup extends Activity implements
             Conversation con = Conversation.get(mContext, qm.getThreadId(), true);
             if (con != null) {
                 con.markAsRead(false);
-                if (DEBUG)
+                if (DEBUG) {
                     Log.d(LOG_TAG, "markCurrentMessageRead(): Marked message " + qm.getThreadId()
                             + " as read");
+                }
             }
         }
     }
@@ -579,9 +590,10 @@ public class QuickMessagePopup extends Activity implements
             Conversation con = Conversation.get(mContext, qm.getThreadId(), true);
             if (con != null) {
                 con.markAsRead(false);
-                if (DEBUG)
+                if (DEBUG) {
                     Log.d(LOG_TAG, "markAllMessagesRead(): Marked message " + qm.getThreadId()
                             + " as read");
+                }
             }
         }
     }
@@ -626,14 +638,16 @@ public class QuickMessagePopup extends Activity implements
             SmsMessageSender sender = new SmsMessageSender(getBaseContext(),
                     qm.getFromNumber(), message, threadId);
             try {
-                if (DEBUG)
-                    Log.d(LOG_TAG, "sendQuickMessage(): Sending message to " + qm.getFromName()
-                            + ", with threadID = " + threadId + ". Current page is #" + (mCurrentPage+1));
+                if (DEBUG) {
+                    Log.d(LOG_TAG, "sendQuickMessage(): Sending message to " + qm.getThreadId()
+                            + ", with threadID = " + threadId
+                            + ". Current page is #" + (mCurrentPage + 1));
+                }
 
                 sender.sendMessage(threadId);
                 Toast.makeText(mContext, R.string.toast_sending_message, Toast.LENGTH_SHORT).show();
             } catch (MmsException e) {
-                Log.e(LOG_TAG, "Error sending message to " + qm.getFromName());
+                Log.e(LOG_TAG, "Error sending message in " + qm.getThreadId());
             }
         }
     }
@@ -659,8 +673,10 @@ public class QuickMessagePopup extends Activity implements
         mMessageList.clear();
         mPagerAdapter.notifyDataSetChanged();
 
-        if (DEBUG)
-            Log.d(LOG_TAG, "clearNotification(): Message list cleared. Size = " + mMessageList.size());
+        if (DEBUG) {
+            Log.d(LOG_TAG, "clearNotification(): Message list cleared. Size = "
+                    + mMessageList.size());
+        }
     }
 
     /**
@@ -762,7 +778,8 @@ public class QuickMessagePopup extends Activity implements
         public Object instantiateItem(View collection, int position) {
 
             // Load the layout to be used
-            LayoutInflater inflater = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            LayoutInflater inflater = (LayoutInflater)mContext
+                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             View layout;
             if (mDarkTheme) {
                 layout = inflater.inflate(R.layout.quickmessage_content_dark, null);
@@ -778,14 +795,17 @@ public class QuickMessagePopup extends Activity implements
             TextView qmMessageText = (TextView) layout.findViewById(R.id.messageTextView);
             TextView qmFromName = (TextView) layout.findViewById(R.id.fromTextView);
             TextView qmTimestamp = (TextView) layout.findViewById(R.id.timestampTextView);
-            QuickContactBadge qmContactBadge = (QuickContactBadge) layout.findViewById(R.id.contactBadge);
+            QuickContactBadge qmContactBadge = (QuickContactBadge)
+                    layout.findViewById(R.id.contactBadge);
 
             // Retrieve the current message
             QuickMessage qm = mMessageList.get(position);
             if (qm != null) {
-                if (DEBUG)
-                    Log.d(LOG_TAG, "instantiateItem(): Creating page #" + (position + 1) + " for message from "
-                            + qm.getFromName() + ". Number of pages to create = " + getCount());
+                if (DEBUG) {
+                    Log.d(LOG_TAG, "instantiateItem(): Creating page #" + (position + 1)
+                            + " for message in " + qm.getThreadId()
+                            + ". Number of pages to create = " + getCount());
+                }
 
                 if (mCurrentQm == null) {
                     mCurrentQm = qm;
@@ -793,7 +813,8 @@ public class QuickMessagePopup extends Activity implements
 
                 // Set the general fields
                 qmFromName.setText(qm.getFromName());
-                qmTimestamp.setText(MessageUtils.formatTimeStampString(mContext, qm.getTimestamp(), mFullTimestamp));
+                qmTimestamp.setText(MessageUtils
+                        .formatTimeStampString(mContext, qm.getTimestamp(), mFullTimestamp));
                 updateContactBadge(qmContactBadge, qm.getFromNumber()[0], false);
                 SmileyParser parser = SmileyParser.getInstance();
                 qmMessageText.setText(parser.addSmileySpans(qm.getMessageBody()));
@@ -812,13 +833,16 @@ public class QuickMessagePopup extends Activity implements
                 qmReplyText.setText(qm.getReplyText());
                 qmReplyText.setSelection(qm.getReplyText().length());
 
-                if (mUnicodeStripping != MessagingPreferenceActivity.UNICODE_STRIPPING_LEAVE_INTACT) {
+                if (mUnicodeStripping !=
+                        MessagingPreferenceActivity.UNICODE_STRIPPING_LEAVE_INTACT) {
                     boolean stripNonDecodableOnly =
-                            mUnicodeStripping == MessagingPreferenceActivity.UNICODE_STRIPPING_NON_DECODABLE;
+                            (MessagingPreferenceActivity.UNICODE_STRIPPING_NON_DECODABLE
+                                    == mUnicodeStripping);
                     mUnicodeFilter = new UnicodeFilter(stripNonDecodableOnly);
                 }
 
-                qmReplyText.addTextChangedListener(new QmTextWatcher(mContext, qmTextCounter, qmSendButton,
+                qmReplyText.addTextChangedListener(
+                        new QmTextWatcher(mContext, qmTextCounter, qmSendButton,
                         qmTemplatesButton, mNumTemplates, mUnicodeFilter));
                 qmReplyText.setOnEditorActionListener(new OnEditorActionListener() {
                     @Override
@@ -940,10 +964,11 @@ public class QuickMessagePopup extends Activity implements
             mCurrentPage = position;
             mCurrentQm = mMessageList.get(position);
 
-            if (DEBUG)
-                Log.d(LOG_TAG, "onPageSelected(): Current page is #" + (position+1)
+            if (DEBUG) {
+                Log.d(LOG_TAG, "onPageSelected(): Current page is #" + (position + 1)
                         + " of " + getCount() + " pages. Currenty visible message is from "
-                        + mCurrentQm.getFromName());
+                        + mCurrentQm.getThreadId());
+            }
 
             updateMessageCounter();
         }