1 files changed, 2 insertions, 45 deletions
diff --git a/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java b/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
index e56e25d..c01f63d 100644
--- a/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
+++ b/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
@@ -607,7 +607,6 @@ public class MmsSmsDatabaseHelper extends SQLiteOpenHelper {
                    Mms.PHONE_ID + " INTEGER DEFAULT -1, " +
                    Mms.SEEN + " INTEGER DEFAULT 0," +
                    Mms.CREATOR + " TEXT," +
-                   "favourite INTEGER DEFAULT 0," +
                    Mms.TEXT_ONLY + " INTEGER DEFAULT 0" +
                    ");");
 
@@ -835,39 +834,7 @@ public class MmsSmsDatabaseHelper extends SQLiteOpenHelper {
                    "error_code INTEGER DEFAULT 0," +
                    "creator TEXT," +
                    "seen INTEGER DEFAULT 0," +
-                   "priority INTEGER DEFAULT -1," +
-                   "favourite INTEGER DEFAULT 0," +
-                   "rcs_message_id    TEXT,  " +
-                   "rcs_data     TEXT,   " +
-                   "rcs_filename   TEXT,      " +
-                   "rcs_filesize   LONG,  " +
-                   "rcs_mime_type   TEXT,      " +
-                   "rcs_msg_type   INTEGER DEFAULT -1,   " +
-                   "rcs_send_receive   INTEGER, " +
-                   "rcs_is_read   INTEGER, " +
-                   "rcs_msg_state   INTEGER,     " +
-                   "rcs_chat_type   INTEGER,    " +
-                   "rcs_thread_id   TEXT,       " +
-                   "rcs_conversation_id     TEXT,   " +
-                   "rcs_contribution_id   TEXT, " +
-                   "rcs_file_selector   TEXT,   " +
-                   "rcs_file_transfer_ext   TEXT," +
-                   "rcs_file_transfer_id   TEXT, " +
-                   "rcs_file_icon   TEXT,       " +
-                   "rcs_burn_flag   INTEGER  DEFAULT -1, " +
-                   "rcs_barcycle   INTEGER,    " +
-                   "rcs_header   TEXT,    " +
-                   "is_rcs   INTEGER DEFAULT -1," +
-                   "rcs_have_attach INTEGER DEFAULT -1," +
-                   "rcs_path TEXT," +
-                   "rcs_is_burn INTEGER,  "+
-                   "rcs_is_download INTEGER DEFAULT 0 ,  "+
-                   "rcs_play_time INTEGER DEFAULT 0 ,  "+
-                   "rcs_file_size INTEGER DEFAULT 0 ,  "+
-                   "rcs_id INTEGER DEFAULT -1, "+
-                   "rcs_thumb_path TEXT, " +
-                   "rcs_burn_body TEXT, " +
-                   "rcs_nmsg_state TEXT " +
+                   "priority INTEGER DEFAULT -1" +
                    ");");
 
         /**
@@ -936,10 +903,7 @@ public class MmsSmsDatabaseHelper extends SQLiteOpenHelper {
                    Threads.ARCHIVED + " INTEGER DEFAULT 0," +
                    Threads.TYPE + " INTEGER DEFAULT 0," +
                    Threads.ERROR + " INTEGER DEFAULT 0," +
-                   Threads.HAS_ATTACHMENT + " INTEGER DEFAULT 0," +
-                   "top" + " INTEGER DEFAULT 0," +
-                   "top_time" + " INTEGER DEFAULT 0," +
-                   "is_group_chat" + " INTEGER DEFAULT 0);");
+                   Threads.HAS_ATTACHMENT + " INTEGER DEFAULT 0);");
 
         /**
          * This table stores the queue of messages to be sent/downloaded.
@@ -1623,13 +1587,6 @@ public class MmsSmsDatabaseHelper extends SQLiteOpenHelper {
 
     private void upgradeDatabaseToVersion61(SQLiteDatabase db) {
         try {
-           db.execSQL("ALTER TABLE " + MmsSmsProvider.TABLE_THREADS +" ADD COLUMN "
-                    + "is_group_chat" + " INTEGER DEFAULT 0");
-
-            db.execSQL("ALTER TABLE " + SmsProvider.TABLE_RAW +" ADD COLUMN "
-                    + "favorited" + " INTEGER DEFAULT 0");
-            db.execSQL("ALTER TABLE " + SmsProvider.TABLE_RAW +" ADD COLUMN "
-            + "rcs_message_id" + " INTEGER DEFAULT -1");
             db.execSQL("ALTER TABLE " + SmsProvider.TABLE_SMS + " ADD COLUMN "
                     + "priority INTEGER DEFAULT -1");
             // Try to update the "priority" column with existing "pri" column.