Revert "[SMS] Replace message content can't be replaced"

This reverts commit 88b174ec24c702fe82b41bed285eb9d9d3e7bc60.

Change-Id: I0ddbb917ccc82ff2b548745c9395ae93a97a92de

3 files changed, 6 insertions, 57 deletions

diff --git a/src/com/android/messaging/datamodel/action/ReceiveSmsMessageAction.java b/src/com/android/messaging/datamodel/action/ReceiveSmsMessageAction.java
index ea70250..b8c97b9 100644
--- a/src/com/android/messaging/datamodel/action/ReceiveSmsMessageAction.java
+++ b/src/com/android/messaging/datamodel/action/ReceiveSmsMessageAction.java
@@ -17,9 +17,7 @@
 package com.android.messaging.datamodel.action;
 
 import android.content.ContentValues;
-import android.content.ContentUris;
 import android.content.Context;
-import android.database.Cursor;
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -46,21 +44,18 @@ public class ReceiveSmsMessageAction extends Action implements Parcelable {
     private static final String TAG = LogUtil.BUGLE_DATAMODEL_TAG;
 
     private static final String KEY_MESSAGE_VALUES = "message_values";
-    private static final String KEY_MESSAGE_REPLACEABLE = "message_replaceable";
 
     /**
      * Create a message received from a particular number in a particular conversation
      */
-    public ReceiveSmsMessageAction(final ContentValues messageValues, final boolean isReplaceable) {
+    public ReceiveSmsMessageAction(final ContentValues messageValues) {
         actionParameters.putParcelable(KEY_MESSAGE_VALUES, messageValues);
-        actionParameters.putBoolean(KEY_MESSAGE_REPLACEABLE, isReplaceable);
     }
 
     @Override
     protected Object executeAction() {
         final Context context = Factory.get().getApplicationContext();
         final ContentValues messageValues = actionParameters.getParcelable(KEY_MESSAGE_VALUES);
-        final boolean mReplaceable = actionParameters.getBoolean(KEY_MESSAGE_REPLACEABLE);
         final DatabaseWrapper db = DataModel.get().getDatabase();
 
         // Get the SIM subscription ID
@@ -114,47 +109,9 @@ public class ReceiveSmsMessageAction extends Action implements Parcelable {
             messageValues.put(Sms.Inbox.SEEN, 1);
 
             // Insert into telephony
-            Uri messageUri = null;
-            LogUtil.d("MessageReplaceFeature", "SMS Message Replaceable : " + mReplaceable);
-            if (mReplaceable) {
-                // This must match the column IDs below.
-                String[] REPLACE_PROJECTION = new String[]{
-                        Sms._ID,
-                        Sms.ADDRESS,
-                        Sms.PROTOCOL
-                };
-                int REPLACE_COLUMN_ID = 0;
-                String selection;
-                String[] selectionArgs;
-                selection = Sms.ADDRESS + " = ? AND " +
-                        Sms.PROTOCOL + " = ? AND " +
-                        Sms.SUBSCRIPTION_ID + " = ? ";
-                selectionArgs = new String[]{
-                        messageValues.getAsString(Sms.ADDRESS),
-                        messageValues.getAsString(Sms.PROTOCOL),
-                        messageValues.getAsString(Sms.SUBSCRIPTION_ID)
-                };
-                Cursor cursor = context.getContentResolver().query(Sms.Inbox.CONTENT_URI,
-                        REPLACE_PROJECTION, selection, selectionArgs, null);
-                LogUtil.d("MessageReplaceFeature", "cursor != null " + cursor.getCount());
-                if (cursor != null) {
-                    try {
-                        if (cursor.moveToFirst()) {
-                            long messageId = cursor.getLong(REPLACE_COLUMN_ID);
-                            messageUri = ContentUris.withAppendedId(
-                                    Sms.CONTENT_URI, messageId);
-                            LogUtil.d("MessageReplaceFeature", "sms messageUri : " + messageUri.toString());
-                            context.getContentResolver().update(messageUri,
-                                    messageValues, null, null);
-                        }
-                    } finally {
-                        cursor.close();
-                    }
-                }
-            } else {
-                messageUri = context.getContentResolver().insert(Sms.Inbox.CONTENT_URI,
-                        messageValues);
-            }
+            final Uri messageUri = context.getContentResolver().insert(Sms.Inbox.CONTENT_URI,
+                    messageValues);
+
             if (messageUri != null) {
                 if (LogUtil.isLoggable(TAG, LogUtil.DEBUG)) {
                     LogUtil.d(TAG, "ReceiveSmsMessageAction: Inserted SMS message into telephony, "
diff --git a/src/com/android/messaging/receiver/SmsReceiver.java b/src/com/android/messaging/receiver/SmsReceiver.java
index a8f25b7..db9b4bb 100644
--- a/src/com/android/messaging/receiver/SmsReceiver.java
+++ b/src/com/android/messaging/receiver/SmsReceiver.java
@@ -199,14 +199,6 @@ public final class SmsReceiver extends BroadcastReceiver {
 
     public static void deliverSmsMessages(final Context context, final int subId,
             final int errorCode, final android.telephony.SmsMessage[] messages) {
-        final android.telephony.SmsMessage sms = messages[0];
-        boolean isReplaceable = false;
-        LogUtil.d("MessageReplaceFeature", "Is SMS Message Replaceable : " + sms.isReplace());
-        if(sms.isReplace()) {
-            isReplaceable = true;
-        } else {
-            isReplaceable = false;
-        }
         final ContentValues messageValues =
                 MmsUtils.parseReceivedSmsMessage(context, messages, errorCode);
 
@@ -228,7 +220,7 @@ public final class SmsReceiver extends BroadcastReceiver {
                 DebugUtils.debugClassZeroSmsEnabled()) {
             Factory.get().getUIIntents().launchClassZeroActivity(context, messageValues);
         } else {
-            final ReceiveSmsMessageAction action = new ReceiveSmsMessageAction(messageValues, isReplaceable);
+            final ReceiveSmsMessageAction action = new ReceiveSmsMessageAction(messageValues);
             action.start();
         }
     }
diff --git a/src/com/android/messaging/ui/ClassZeroActivity.java b/src/com/android/messaging/ui/ClassZeroActivity.java
index 7698ce6..ccb15a0 100644
--- a/src/com/android/messaging/ui/ClassZeroActivity.java
+++ b/src/com/android/messaging/ui/ClassZeroActivity.java
@@ -107,7 +107,7 @@ public class ClassZeroActivity extends Activity {
 
     private void saveMessage() {
         mMessageValues.put(Sms.Inbox.READ, mRead ? Integer.valueOf(1) : Integer.valueOf(0));
-        final ReceiveSmsMessageAction action = new ReceiveSmsMessageAction(mMessageValues, false);
+        final ReceiveSmsMessageAction action = new ReceiveSmsMessageAction(mMessageValues);
         action.start();
     }