diff options
Diffstat (limited to 'src/com/android/messaging/datamodel/data/ConversationListItemData.java')
| -rw-r--r-- | src/com/android/messaging/datamodel/data/ConversationListItemData.java | 61 |
1 files changed, 14 insertions, 47 deletions
diff --git a/src/com/android/messaging/datamodel/data/ConversationListItemData.java b/src/com/android/messaging/datamodel/data/ConversationListItemData.java index f627a09..46d4b64 100644 --- a/src/com/android/messaging/datamodel/data/ConversationListItemData.java +++ b/src/com/android/messaging/datamodel/data/ConversationListItemData.java @@ -52,9 +52,6 @@ public class ConversationListItemData { private String mOtherParticipantNormalizedDestination; private String mSelfId; private int mParticipantCount; - private boolean mNotificationEnabled; - private String mNotificationSoundUri; - private boolean mNotificationVibrate; private boolean mIncludeEmailAddress; private int mMessageStatus; private int mMessageRawTelephonyStatus; @@ -92,9 +89,6 @@ public class ConversationListItemData { INDEX_OTHER_PARTICIPANT_NORMALIZED_DESTINATION); mSelfId = cursor.getString(INDEX_SELF_ID); mParticipantCount = cursor.getInt(INDEX_PARTICIPANT_COUNT); - mNotificationEnabled = cursor.getInt(INDEX_NOTIFICATION_ENABLED) == 1; - mNotificationSoundUri = cursor.getString(INDEX_NOTIFICATION_SOUND_URI); - mNotificationVibrate = cursor.getInt(INDEX_NOTIFICATION_VIBRATION) == 1; mIncludeEmailAddress = cursor.getInt(INDEX_INCLUDE_EMAIL_ADDRESS) == 1; mMessageStatus = cursor.getInt(INDEX_MESSAGE_STATUS); mMessageRawTelephonyStatus = cursor.getInt(INDEX_MESSAGE_RAW_TELEPHONY_STATUS); @@ -199,18 +193,6 @@ public class ConversationListItemData { return mIncludeEmailAddress; } - public boolean getNotificationEnabled() { - return mNotificationEnabled; - } - - public String getNotificationSoundUri() { - return mNotificationSoundUri; - } - - public boolean getNotifiationVibrate() { - return mNotificationVibrate; - } - public final boolean getIsFailedStatus() { return (mMessageStatus == MessageData.BUGLE_STATUS_OUTGOING_FAILED || mMessageStatus == MessageData.BUGLE_STATUS_OUTGOING_FAILED_EMERGENCY_NUMBER || @@ -328,12 +310,6 @@ public class ConversationListItemData { + " as " + ConversationListViewColumns.PREVIEW_CONTENT_TYPE + ", " + DatabaseHelper.CONVERSATIONS_TABLE + '.' + ConversationColumns.PARTICIPANT_COUNT + " as " + ConversationListViewColumns.PARTICIPANT_COUNT + ", " - + DatabaseHelper.CONVERSATIONS_TABLE + '.' + ConversationColumns.NOTIFICATION_ENABLED - + " as " + ConversationListViewColumns.NOTIFICATION_ENABLED + ", " - + DatabaseHelper.CONVERSATIONS_TABLE + '.' + ConversationColumns.NOTIFICATION_SOUND_URI - + " as " + ConversationListViewColumns.NOTIFICATION_SOUND_URI + ", " - + DatabaseHelper.CONVERSATIONS_TABLE + '.' + ConversationColumns.NOTIFICATION_VIBRATION - + " as " + ConversationListViewColumns.NOTIFICATION_VIBRATION + ", " + DatabaseHelper.CONVERSATIONS_TABLE + '.' + ConversationColumns.INCLUDE_EMAIL_ADDRESS + " as " + ConversationListViewColumns.INCLUDE_EMAIL_ADDRESS + ", " @@ -396,9 +372,6 @@ public class ConversationListItemData { ConversationColumns.OTHER_PARTICIPANT_NORMALIZED_DESTINATION; static final String CURRENT_SELF_ID = ConversationColumns.CURRENT_SELF_ID; static final String PARTICIPANT_COUNT = ConversationColumns.PARTICIPANT_COUNT; - static final String NOTIFICATION_ENABLED = ConversationColumns.NOTIFICATION_ENABLED; - static final String NOTIFICATION_SOUND_URI = ConversationColumns.NOTIFICATION_SOUND_URI; - static final String NOTIFICATION_VIBRATION = ConversationColumns.NOTIFICATION_VIBRATION; static final String INCLUDE_EMAIL_ADDRESS = ConversationColumns.INCLUDE_EMAIL_ADDRESS; static final String MESSAGE_STATUS = MessageColumns.STATUS; @@ -424,9 +397,6 @@ public class ConversationListItemData { ConversationListViewColumns.OTHER_PARTICIPANT_NORMALIZED_DESTINATION, ConversationListViewColumns.PARTICIPANT_COUNT, ConversationListViewColumns.CURRENT_SELF_ID, - ConversationListViewColumns.NOTIFICATION_ENABLED, - ConversationListViewColumns.NOTIFICATION_SOUND_URI, - ConversationListViewColumns.NOTIFICATION_VIBRATION, ConversationListViewColumns.INCLUDE_EMAIL_ADDRESS, ConversationListViewColumns.MESSAGE_STATUS, ConversationListViewColumns.SHOW_DRAFT, @@ -456,23 +426,20 @@ public class ConversationListItemData { private static final int INDEX_OTHER_PARTICIPANT_NORMALIZED_DESTINATION = 10; private static final int INDEX_PARTICIPANT_COUNT = 11; private static final int INDEX_SELF_ID = 12; - private static final int INDEX_NOTIFICATION_ENABLED = 13; - private static final int INDEX_NOTIFICATION_SOUND_URI = 14; - private static final int INDEX_NOTIFICATION_VIBRATION = 15; - private static final int INDEX_INCLUDE_EMAIL_ADDRESS = 16; - private static final int INDEX_MESSAGE_STATUS = 17; - private static final int INDEX_SHOW_DRAFT = 18; - private static final int INDEX_DRAFT_PREVIEW_URI = 19; - private static final int INDEX_DRAFT_PREVIEW_CONTENT_TYPE = 20; - private static final int INDEX_DRAFT_SNIPPET_TEXT = 21; - private static final int INDEX_ARCHIVE_STATUS = 22; - private static final int INDEX_MESSAGE_ID = 23; - private static final int INDEX_SUBJECT_TEXT = 24; - private static final int INDEX_DRAFT_SUBJECT_TEXT = 25; - private static final int INDEX_MESSAGE_RAW_TELEPHONY_STATUS = 26; - private static final int INDEX_SNIPPET_SENDER_FIRST_NAME = 27; - private static final int INDEX_SNIPPET_SENDER_DISPLAY_DESTINATION = 28; - private static final int INDEX_IS_ENTERPRISE = 29; + private static final int INDEX_INCLUDE_EMAIL_ADDRESS = 13; + private static final int INDEX_MESSAGE_STATUS = 14; + private static final int INDEX_SHOW_DRAFT = 15; + private static final int INDEX_DRAFT_PREVIEW_URI = 16; + private static final int INDEX_DRAFT_PREVIEW_CONTENT_TYPE = 17; + private static final int INDEX_DRAFT_SNIPPET_TEXT = 18; + private static final int INDEX_ARCHIVE_STATUS = 19; + private static final int INDEX_MESSAGE_ID = 20; + private static final int INDEX_SUBJECT_TEXT = 21; + private static final int INDEX_DRAFT_SUBJECT_TEXT = 22; + private static final int INDEX_MESSAGE_RAW_TELEPHONY_STATUS = 23; + private static final int INDEX_SNIPPET_SENDER_FIRST_NAME = 24; + private static final int INDEX_SNIPPET_SENDER_DISPLAY_DESTINATION = 25; + private static final int INDEX_IS_ENTERPRISE = 26; private static final String DIVIDER_TEXT = ", "; |