diff options
author | Artem Shvadskiy <ashvadskiy@cyngn.com> | 2016-07-25 14:38:33 -0700 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2016-12-30 21:04:51 +0200 |
commit | 360f4e57bc40ccd84d50030409c3740ed569cf13 (patch) | |
tree | ac71d8e254ee76d7f3d8dbdc6924279b601bbd59 /src/com/android/messaging/datamodel/data | |
parent | 3bc02835132384830f545cad82201aa5766c615f (diff) | |
download | android_packages_apps_Messaging-360f4e57bc40ccd84d50030409c3740ed569cf13.tar.gz android_packages_apps_Messaging-360f4e57bc40ccd84d50030409c3740ed569cf13.tar.bz2 android_packages_apps_Messaging-360f4e57bc40ccd84d50030409c3740ed569cf13.zip |
Use app settings for conversation settings if no custom set
Change-Id: I07adfd75c465ae40e477470d66587df21d560c4d
issue-id: FEIJ-1291
Diffstat (limited to 'src/com/android/messaging/datamodel/data')
-rw-r--r-- | src/com/android/messaging/datamodel/data/ConversationListItemData.java | 7 | ||||
-rw-r--r-- | src/com/android/messaging/datamodel/data/PeopleOptionsItemData.java | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/com/android/messaging/datamodel/data/ConversationListItemData.java b/src/com/android/messaging/datamodel/data/ConversationListItemData.java index f627a09..13cfc74 100644 --- a/src/com/android/messaging/datamodel/data/ConversationListItemData.java +++ b/src/com/android/messaging/datamodel/data/ConversationListItemData.java @@ -30,6 +30,7 @@ import com.android.messaging.datamodel.action.DeleteConversationAction; import com.android.messaging.util.Assert; import com.android.messaging.util.ContactUtil; import com.android.messaging.util.Dates; +import com.android.messaging.util.NotificationUtil; import com.google.common.base.Joiner; import java.util.ArrayList; @@ -92,9 +93,11 @@ 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; + mNotificationEnabled = NotificationUtil.getConversationNotificationEnabled + (cursor.getInt(INDEX_NOTIFICATION_ENABLED)); mNotificationSoundUri = cursor.getString(INDEX_NOTIFICATION_SOUND_URI); - mNotificationVibrate = cursor.getInt(INDEX_NOTIFICATION_VIBRATION) == 1; + mNotificationVibrate = NotificationUtil.getConversationNotificationVibrateEnabled( + cursor.getInt(INDEX_NOTIFICATION_VIBRATION)); mIncludeEmailAddress = cursor.getInt(INDEX_INCLUDE_EMAIL_ADDRESS) == 1; mMessageStatus = cursor.getInt(INDEX_MESSAGE_STATUS); mMessageRawTelephonyStatus = cursor.getInt(INDEX_MESSAGE_RAW_TELEPHONY_STATUS); diff --git a/src/com/android/messaging/datamodel/data/PeopleOptionsItemData.java b/src/com/android/messaging/datamodel/data/PeopleOptionsItemData.java index 5af6a30..b24ca55 100644 --- a/src/com/android/messaging/datamodel/data/PeopleOptionsItemData.java +++ b/src/com/android/messaging/datamodel/data/PeopleOptionsItemData.java @@ -24,6 +24,7 @@ import android.net.Uri; import com.android.messaging.R; import com.android.messaging.datamodel.data.ConversationListItemData.ConversationListViewColumns; import com.android.messaging.util.Assert; +import com.android.messaging.util.NotificationUtil; import com.android.messaging.util.RingtoneUtil; public class PeopleOptionsItemData { @@ -78,7 +79,8 @@ public class PeopleOptionsItemData { mItemId = settingType; mOtherParticipant = otherParticipant; - final boolean notificationEnabled = cursor.getInt(INDEX_NOTIFICATION_ENABLED) == 1; + final boolean notificationEnabled = NotificationUtil + .getConversationNotificationEnabled(cursor.getInt(INDEX_NOTIFICATION_ENABLED)); switch (settingType) { case SETTING_NOTIFICATION_ENABLED: mTitle = mContext.getString(R.string.notifications_enabled_conversation_pref_title); @@ -104,7 +106,8 @@ public class PeopleOptionsItemData { case SETTING_NOTIFICATION_VIBRATION: mTitle = mContext.getString(R.string.notification_vibrate_pref_title); - mChecked = cursor.getInt(INDEX_NOTIFICATION_VIBRATION) == 1; + mChecked = NotificationUtil.getConversationNotificationVibrateEnabled( + cursor.getInt(INDEX_NOTIFICATION_VIBRATION)); mEnabled = notificationEnabled; break; |