From fce4a4267a56c462e015a5da3cb5f85ff5ee4994 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Wed, 28 Nov 2018 01:32:14 +0100 Subject: [PATCH] allow chat-specific ringtones and vibrations --- .../RecipientPreferenceActivity.java | 27 ++---- .../securesms/database/RecipientDatabase.java | 85 +------------------ .../database/helpers/SQLCipherOpenHelper.java | 2 +- .../AbstractNotificationBuilder.java | 6 +- .../FailedNotificationBuilder.java | 30 ------- .../notifications/MessageNotifier.java | 7 +- .../notifications/NotificationState.java | 15 ++-- .../PendingMessageNotificationBuilder.java | 35 -------- .../NotificationsPreferenceFragment.java | 2 +- .../securesms/recipients/Recipient.java | 45 ---------- .../recipients/RecipientProvider.java | 9 -- .../securesms/util/TextSecurePreferences.java | 51 ++++++++++- 12 files changed, 75 insertions(+), 239 deletions(-) delete mode 100644 src/org/thoughtcrime/securesms/notifications/FailedNotificationBuilder.java delete mode 100644 src/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java diff --git a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java index 8bb620f5f..7d45f99cf 100644 --- a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java +++ b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java @@ -46,7 +46,6 @@ import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.RecipientDatabase; -import org.thoughtcrime.securesms.database.RecipientDatabase.VibrateState; import org.thoughtcrime.securesms.database.loaders.ThreadMediaLoader; import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.mms.GlideRequests; @@ -62,6 +61,7 @@ import org.thoughtcrime.securesms.util.DynamicLanguage; import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme; import org.thoughtcrime.securesms.util.DynamicTheme; import org.thoughtcrime.securesms.util.TextSecurePreferences; +import org.thoughtcrime.securesms.util.TextSecurePreferences.VibrateState; import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.ViewUtil; @@ -335,8 +335,9 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi ringtoneMessagePreference.setSummary(getRingtoneSummary(getContext(), recipient.getMessageRingtone())); ringtoneCallPreference.setSummary(getRingtoneSummary(getContext(), recipient.getCallRingtone())); - Pair vibrateMessageSummary = getVibrateSummary(getContext(), recipient.getMessageVibrate()); - Pair vibrateCallSummary = getVibrateSummary(getContext(), recipient.getCallVibrate()); + VibrateState vibrateState = TextSecurePreferences.getChatVibrate(getContext(), chatId); + Pair vibrateMessageSummary = getVibrateSummary(getContext(), vibrateState); + Pair vibrateCallSummary = getVibrateSummary(getContext(), vibrateState); vibrateMessagePreference.setSummary(vibrateMessageSummary.first); vibrateMessagePreference.setValueIndex(vibrateMessageSummary.second); @@ -440,14 +441,8 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi if (defaultValue.equals(value)) value = null; else if (value == null) value = Uri.EMPTY; - new AsyncTask() { - @Override - protected Void doInBackground(Uri... params) { - if (calls) DatabaseFactory.getRecipientDatabase(getActivity()).setCallRingtone(recipient, params[0]); - else DatabaseFactory.getRecipientDatabase(getActivity()).setMessageRingtone(recipient, params[0]); - return null; - } - }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, value); + int chatId = recipient.getAddress().isDcChat()? recipient.getAddress().getDcChatId() : 0; + TextSecurePreferences.setChatRingtone(getContext(), chatId, value); return false; } @@ -495,14 +490,8 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi int value = Integer.parseInt((String) newValue); final VibrateState vibrateState = VibrateState.fromId(value); - new AsyncTask() { - @Override - protected Void doInBackground(Void... params) { - if (call) DatabaseFactory.getRecipientDatabase(getActivity()).setCallVibrate(recipient, vibrateState); - else DatabaseFactory.getRecipientDatabase(getActivity()).setMessageVibrate(recipient, vibrateState); - return null; - } - }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + int chatId = recipient.getAddress().isDcChat()? recipient.getAddress().getDcChatId() : 0; + TextSecurePreferences.setChatVibrate(getContext(), chatId, vibrateState); return false; } diff --git a/src/org/thoughtcrime/securesms/database/RecipientDatabase.java b/src/org/thoughtcrime/securesms/database/RecipientDatabase.java index 1a9decc68..a5aada6af 100644 --- a/src/org/thoughtcrime/securesms/database/RecipientDatabase.java +++ b/src/org/thoughtcrime/securesms/database/RecipientDatabase.java @@ -64,24 +64,6 @@ public class RecipientDatabase extends Database { .map(columnName -> TABLE_NAME + "." + columnName) .toList(); - public enum VibrateState { - DEFAULT(0), ENABLED(1), DISABLED(2); - - private final int id; - - VibrateState(int id) { - this.id = id; - } - - public int getId() { - return id; - } - - public static VibrateState fromId(int id) { - return values()[id]; - } - } - public enum RegisteredState { UNKNOWN(0), REGISTERED(1), NOT_REGISTERED(2); @@ -106,7 +88,7 @@ public class RecipientDatabase extends Database { ADDRESS + " TEXT UNIQUE, " + BLOCK + " INTEGER DEFAULT 0," + NOTIFICATION + " TEXT DEFAULT NULL, " + - VIBRATE + " INTEGER DEFAULT " + VibrateState.DEFAULT.getId() + ", " + + VIBRATE + " INTEGER DEFAULT 0, " + MUTE_UNTIL + " INTEGER DEFAULT 0, " + COLOR + " TEXT DEFAULT NULL, " + SEEN_INVITE_REMINDER + " INTEGER DEFAULT 0, " + @@ -122,7 +104,7 @@ public class RecipientDatabase extends Database { SIGNAL_PROFILE_AVATAR + " TEXT DEFAULT NULL, " + PROFILE_SHARING + " INTEGER DEFAULT 0, " + CALL_RINGTONE + " TEXT DEFAULT NULL, " + - CALL_VIBRATE + " INTEGER DEFAULT " + VibrateState.DEFAULT.getId() + ");"; + CALL_VIBRATE + " INTEGER DEFAULT 0);"; public RecipientDatabase(Context context, SQLCipherOpenHelper databaseHelper) { super(context, databaseHelper); @@ -159,10 +141,6 @@ public class RecipientDatabase extends Database { Optional getRecipientSettings(@NonNull Cursor cursor) { boolean blocked = cursor.getInt(cursor.getColumnIndexOrThrow(BLOCK)) == 1; - String messageRingtone = cursor.getString(cursor.getColumnIndexOrThrow(NOTIFICATION)); - String callRingtone = cursor.getString(cursor.getColumnIndexOrThrow(CALL_RINGTONE)); - int messageVibrateState = cursor.getInt(cursor.getColumnIndexOrThrow(VIBRATE)); - int callVibrateState = cursor.getInt(cursor.getColumnIndexOrThrow(CALL_VIBRATE)); long muteUntil = cursor.getLong(cursor.getColumnIndexOrThrow(MUTE_UNTIL)); String serializedColor = cursor.getString(cursor.getColumnIndexOrThrow(COLOR)); boolean seenInviteReminder = cursor.getInt(cursor.getColumnIndexOrThrow(SEEN_INVITE_REMINDER)) == 1; @@ -198,9 +176,6 @@ public class RecipientDatabase extends Database { } return Optional.of(new RecipientSettings(blocked, muteUntil, - VibrateState.fromId(messageVibrateState), - VibrateState.fromId(callVibrateState), - Util.uri(messageRingtone), Util.uri(callRingtone), color, seenInviteReminder, defaultSubscriptionId, expireMessages, RegisteredState.fromId(registeredState), @@ -245,34 +220,6 @@ public class RecipientDatabase extends Database { recipient.resolve().setBlocked(blocked); } - public void setMessageRingtone(@NonNull Recipient recipient, @Nullable Uri notification) { - ContentValues values = new ContentValues(); - values.put(NOTIFICATION, notification == null ? null : notification.toString()); - updateOrInsert(recipient.getAddress(), values); - recipient.resolve().setMessageRingtone(notification); - } - - public void setCallRingtone(@NonNull Recipient recipient, @Nullable Uri ringtone) { - ContentValues values = new ContentValues(); - values.put(CALL_RINGTONE, ringtone == null ? null : ringtone.toString()); - updateOrInsert(recipient.getAddress(), values); - recipient.resolve().setCallRingtone(ringtone); - } - - public void setMessageVibrate(@NonNull Recipient recipient, @NonNull VibrateState enabled) { - ContentValues values = new ContentValues(); - values.put(VIBRATE, enabled.getId()); - updateOrInsert(recipient.getAddress(), values); - recipient.resolve().setMessageVibrate(enabled); - } - - public void setCallVibrate(@NonNull Recipient recipient, @NonNull VibrateState enabled) { - ContentValues values = new ContentValues(); - values.put(CALL_VIBRATE, enabled.getId()); - updateOrInsert(recipient.getAddress(), values); - recipient.resolve().setCallVibrate(enabled); - } - public void setSeenInviteReminder(@NonNull Recipient recipient, @SuppressWarnings("SameParameterValue") boolean seen) { ContentValues values = new ContentValues(1); values.put(SEEN_INVITE_REMINDER, seen ? 1 : 0); @@ -448,10 +395,6 @@ public class RecipientDatabase extends Database { public static class RecipientSettings { private final boolean blocked; private final long muteUntil; - private final VibrateState messageVibrateState; - private final VibrateState callVibrateState; - private final Uri messageRingtone; - private final Uri callRingtone; private final MaterialColor color; private final boolean seenInviteReminder; private final int defaultSubscriptionId; @@ -467,10 +410,6 @@ public class RecipientDatabase extends Database { private final boolean profileSharing; RecipientSettings(boolean blocked, long muteUntil, - @NonNull VibrateState messageVibrateState, - @NonNull VibrateState callVibrateState, - @Nullable Uri messageRingtone, - @Nullable Uri callRingtone, @Nullable MaterialColor color, boolean seenInviteReminder, int defaultSubscriptionId, @@ -487,10 +426,6 @@ public class RecipientDatabase extends Database { { this.blocked = blocked; this.muteUntil = muteUntil; - this.messageVibrateState = messageVibrateState; - this.callVibrateState = callVibrateState; - this.messageRingtone = messageRingtone; - this.callRingtone = callRingtone; this.color = color; this.seenInviteReminder = seenInviteReminder; this.defaultSubscriptionId = defaultSubscriptionId; @@ -518,22 +453,6 @@ public class RecipientDatabase extends Database { return muteUntil; } - public @NonNull VibrateState getMessageVibrateState() { - return messageVibrateState; - } - - public @NonNull VibrateState getCallVibrateState() { - return callVibrateState; - } - - public @Nullable Uri getMessageRingtone() { - return messageRingtone; - } - - public @Nullable Uri getCallRingtone() { - return callRingtone; - } - public boolean hasSeenInviteReminder() { return seenInviteReminder; } diff --git a/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java b/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java index a4cabba02..03ab61735 100644 --- a/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java +++ b/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java @@ -101,7 +101,7 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper { if (oldVersion < RECIPIENT_CALL_RINGTONE_VERSION) { db.execSQL("ALTER TABLE recipient_preferences ADD COLUMN call_ringtone TEXT DEFAULT NULL"); - db.execSQL("ALTER TABLE recipient_preferences ADD COLUMN call_vibrate INTEGER DEFAULT " + RecipientDatabase.VibrateState.DEFAULT.getId()); + db.execSQL("ALTER TABLE recipient_preferences ADD COLUMN call_vibrate INTEGER DEFAULT 0"); } if (oldVersion < MIGRATE_PREKEYS_VERSION) { diff --git a/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java b/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java index 8b75342da..bcb1a82d9 100644 --- a/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java +++ b/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java @@ -44,15 +44,15 @@ public abstract class AbstractNotificationBuilder extends NotificationCompat.Bui return builder; } - public void setAlarms(@Nullable Uri ringtone, RecipientDatabase.VibrateState vibrate) { + public void setAlarms(@Nullable Uri ringtone, TextSecurePreferences.VibrateState vibrate) { Uri defaultRingtone = TextSecurePreferences.getNotificationRingtone(context); boolean defaultVibrate = TextSecurePreferences.isNotificationVibrateEnabled(context); if (ringtone == null && !TextUtils.isEmpty(defaultRingtone.toString())) setSound(defaultRingtone); else if (ringtone != null && !ringtone.toString().isEmpty()) setSound(ringtone); - if (vibrate == RecipientDatabase.VibrateState.ENABLED || - (vibrate == RecipientDatabase.VibrateState.DEFAULT && defaultVibrate)) + if (vibrate == TextSecurePreferences.VibrateState.ENABLED || + (vibrate == TextSecurePreferences.VibrateState.DEFAULT && defaultVibrate)) { setDefaults(Notification.DEFAULT_VIBRATE); } diff --git a/src/org/thoughtcrime/securesms/notifications/FailedNotificationBuilder.java b/src/org/thoughtcrime/securesms/notifications/FailedNotificationBuilder.java deleted file mode 100644 index b7fc29b17..000000000 --- a/src/org/thoughtcrime/securesms/notifications/FailedNotificationBuilder.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.thoughtcrime.securesms.notifications; - -import android.app.PendingIntent; -import android.content.Context; -import android.content.Intent; -import android.graphics.BitmapFactory; - -import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.database.RecipientDatabase; -import org.thoughtcrime.securesms.preferences.widgets.NotificationPrivacyPreference; - -public class FailedNotificationBuilder extends AbstractNotificationBuilder { - - public FailedNotificationBuilder(Context context, NotificationPrivacyPreference privacy, Intent intent) { - super(context, privacy); - - setSmallIcon(R.drawable.icon_notification); - setLargeIcon(BitmapFactory.decodeResource(context.getResources(), - R.drawable.ic_action_warning_red)); - setContentTitle(context.getString(R.string.MessageNotifier_message_delivery_failed)); - setContentText(context.getString(R.string.MessageNotifier_failed_to_deliver_message)); - setTicker(context.getString(R.string.MessageNotifier_error_delivering_message)); - setContentIntent(PendingIntent.getActivity(context, 0, intent, 0)); - setAutoCancel(true); - setAlarms(null, RecipientDatabase.VibrateState.DEFAULT); - } - - - -} diff --git a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java index e06f7961d..e8e3c1b60 100644 --- a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java +++ b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java @@ -291,7 +291,7 @@ public class MessageNotifier { } if (signal) { - builder.setAlarms(notificationState.getRingtone(), notificationState.getVibrate()); + builder.setAlarms(notificationState.getRingtone(context), notificationState.getVibrate(context)); builder.setTicker(notifications.get(0).getIndividualRecipient(), notifications.get(0).getText()); } @@ -328,7 +328,7 @@ public class MessageNotifier { } if (signal) { - builder.setAlarms(notificationState.getRingtone(), notificationState.getVibrate()); + builder.setAlarms(notificationState.getRingtone(context), notificationState.getVibrate(context)); builder.setTicker(notifications.get(0).getIndividualRecipient(), notifications.get(0).getText()); } @@ -348,8 +348,7 @@ public class MessageNotifier { return; } - Uri uri = null; // TODO: init with chat-specific ringtone; was: recipient.resolve().getMessageRingtone() - + Uri uri = TextSecurePreferences.getChatRingtone(context, chatId); if (uri == null) { uri = TextSecurePreferences.getNotificationRingtone(context); } diff --git a/src/org/thoughtcrime/securesms/notifications/NotificationState.java b/src/org/thoughtcrime/securesms/notifications/NotificationState.java index 960d6c949..32f110636 100644 --- a/src/org/thoughtcrime/securesms/notifications/NotificationState.java +++ b/src/org/thoughtcrime/securesms/notifications/NotificationState.java @@ -10,7 +10,8 @@ import android.util.Log; import org.thoughtcrime.securesms.ConversationActivity; import org.thoughtcrime.securesms.ConversationPopupActivity; -import org.thoughtcrime.securesms.database.RecipientDatabase.VibrateState; +import org.thoughtcrime.securesms.util.TextSecurePreferences; +import org.thoughtcrime.securesms.util.TextSecurePreferences.VibrateState; import org.thoughtcrime.securesms.recipients.Recipient; import java.util.LinkedHashSet; @@ -43,24 +44,24 @@ public class NotificationState { notificationCount++; } - public @Nullable Uri getRingtone() { + public @Nullable Uri getRingtone(Context context) { if (!notifications.isEmpty()) { Recipient recipient = notifications.getFirst().getRecipient(); - if (recipient != null) { - return recipient.resolve().getMessageRingtone(); + if (recipient != null && recipient.getAddress().isDcChat()) { + return TextSecurePreferences.getChatRingtone(context, recipient.getAddress().getDcChatId()); } } return null; } - public VibrateState getVibrate() { + public VibrateState getVibrate(Context context) { if (!notifications.isEmpty()) { Recipient recipient = notifications.getFirst().getRecipient(); - if (recipient != null) { - return recipient.resolve().getMessageVibrate(); + if (recipient != null && recipient.getAddress().isDcChat()) { + return TextSecurePreferences.getChatVibrate(context, recipient.getAddress().getDcChatId()); } } diff --git a/src/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java b/src/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java deleted file mode 100644 index 9784cc6ba..000000000 --- a/src/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.thoughtcrime.securesms.notifications; - - -import android.app.PendingIntent; -import android.content.Context; -import android.content.Intent; -import android.support.v4.app.NotificationCompat; - -import org.thoughtcrime.securesms.ConversationListActivity; -import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.database.RecipientDatabase; -import org.thoughtcrime.securesms.preferences.widgets.NotificationPrivacyPreference; -import org.thoughtcrime.securesms.util.TextSecurePreferences; - -public class PendingMessageNotificationBuilder extends AbstractNotificationBuilder { - - public PendingMessageNotificationBuilder(Context context, NotificationPrivacyPreference privacy) { - super(context, privacy); - - Intent intent = new Intent(context, ConversationListActivity.class); - - setSmallIcon(R.drawable.icon_notification); - setColor(context.getResources().getColor(R.color.textsecure_primary)); - setPriority(TextSecurePreferences.getNotificationPriority(context)); - setCategory(NotificationCompat.CATEGORY_MESSAGE); - - setContentTitle(context.getString(R.string.MessageNotifier_pending_signal_messages)); - setContentText(context.getString(R.string.MessageNotifier_you_have_pending_signal_messages)); - setTicker(context.getString(R.string.MessageNotifier_you_have_pending_signal_messages)); - - setContentIntent(PendingIntent.getActivity(context, 0, intent, 0)); - setAutoCancel(true); - setAlarms(null, RecipientDatabase.VibrateState.DEFAULT); - } -} diff --git a/src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java index 0299a69b4..a9700a826 100644 --- a/src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java @@ -88,7 +88,7 @@ public class NotificationsPreferenceFragment extends ListSummaryPreferenceFragme if (Settings.System.DEFAULT_NOTIFICATION_URI.equals(uri)) { TextSecurePreferences.removeNotificationRingtone(getContext()); } else { - TextSecurePreferences.setNotificationRingtone(getContext(), uri != null ? uri.toString() : Uri.EMPTY.toString()); + TextSecurePreferences.setNotificationRingtone(getContext(), uri != null ? uri : Uri.EMPTY); } initializeRingtoneSummary(findPreference(TextSecurePreferences.RINGTONE_PREF)); diff --git a/src/org/thoughtcrime/securesms/recipients/Recipient.java b/src/org/thoughtcrime/securesms/recipients/Recipient.java index c59b5e479..9cb9640ae 100644 --- a/src/org/thoughtcrime/securesms/recipients/Recipient.java +++ b/src/org/thoughtcrime/securesms/recipients/Recipient.java @@ -42,7 +42,6 @@ import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.database.GroupDatabase; import org.thoughtcrime.securesms.database.RecipientDatabase.RecipientSettings; import org.thoughtcrime.securesms.database.RecipientDatabase.RegisteredState; -import org.thoughtcrime.securesms.database.RecipientDatabase.VibrateState; import org.thoughtcrime.securesms.recipients.RecipientProvider.RecipientDetails; import org.thoughtcrime.securesms.util.FutureTaskListener; import org.thoughtcrime.securesms.util.ListenableFutureTask; @@ -77,8 +76,6 @@ public class Recipient implements RecipientModifiedListener { private @Nullable Uri messageRingtone = null; private @Nullable Uri callRingtone = null; private boolean blocked = false; - private VibrateState messageVibrate = VibrateState.DEFAULT; - private VibrateState callVibrate = VibrateState.DEFAULT; private int expireMessages = 0; private Optional defaultSubscriptionId = Optional.absent(); private @NonNull RegisteredState registered = RegisteredState.UNKNOWN; @@ -150,8 +147,6 @@ public class Recipient implements RecipientModifiedListener { this.messageRingtone = stale.messageRingtone; this.callRingtone = stale.callRingtone; this.blocked = stale.blocked; - this.messageVibrate = stale.messageVibrate; - this.callVibrate = stale.callVibrate; this.expireMessages = stale.expireMessages; this.seenInviteReminder = stale.seenInviteReminder; this.defaultSubscriptionId = stale.defaultSubscriptionId; @@ -168,11 +163,7 @@ public class Recipient implements RecipientModifiedListener { this.name = details.get().name; this.systemContactPhoto = details.get().systemContactPhoto; this.color = details.get().color; - this.messageRingtone = details.get().messageRingtone; - this.callRingtone = details.get().callRingtone; this.blocked = details.get().blocked; - this.messageVibrate = details.get().messageVibrateState; - this.callVibrate = details.get().callVibrateState; this.expireMessages = details.get().expireMessages; this.seenInviteReminder = details.get().seenInviteReminder; this.defaultSubscriptionId = details.get().defaultSubscriptionId; @@ -195,11 +186,7 @@ public class Recipient implements RecipientModifiedListener { Recipient.this.systemContactPhoto = result.systemContactPhoto; Recipient.this.color = result.color; Recipient.this.customLabel = result.customLabel; - Recipient.this.messageRingtone = result.messageRingtone; - Recipient.this.callRingtone = result.callRingtone; Recipient.this.blocked = result.blocked; - Recipient.this.messageVibrate = result.messageVibrateState; - Recipient.this.callVibrate = result.callVibrateState; Recipient.this.expireMessages = result.expireMessages; Recipient.this.seenInviteReminder = result.seenInviteReminder; Recipient.this.defaultSubscriptionId = result.defaultSubscriptionId; @@ -239,11 +226,7 @@ public class Recipient implements RecipientModifiedListener { this.systemContactPhoto = details.systemContactPhoto; this.color = details.color; this.customLabel = details.customLabel; - this.messageRingtone = details.messageRingtone; - this.callRingtone = details.callRingtone; this.blocked = details.blocked; - this.messageVibrate = details.messageVibrateState; - this.callVibrate = details.callVibrateState; this.expireMessages = details.expireMessages; this.seenInviteReminder = details.seenInviteReminder; this.defaultSubscriptionId = details.defaultSubscriptionId; @@ -501,30 +484,6 @@ public class Recipient implements RecipientModifiedListener { notifyListeners(); } - public synchronized VibrateState getMessageVibrate() { - return messageVibrate; - } - - public void setMessageVibrate(VibrateState vibrate) { - synchronized (this) { - this.messageVibrate = vibrate; - } - - notifyListeners(); - } - - public synchronized VibrateState getCallVibrate() { - return callVibrate; - } - - public void setCallVibrate(VibrateState vibrate) { - synchronized (this) { - this.callVibrate = vibrate; - } - - notifyListeners(); - } - public synchronized int getExpireMessages() { return expireMessages; } @@ -628,11 +587,7 @@ public class Recipient implements RecipientModifiedListener { ", resolving=" + resolving + ", systemContactPhoto=" + systemContactPhoto + ", contactUri=" + contactUri + - ", messageRingtone=" + messageRingtone + - ", callRingtone=" + callRingtone + ", blocked=" + blocked + - ", messageVibrate=" + messageVibrate + - ", callVibrate=" + callVibrate + ", expireMessages=" + expireMessages + ", defaultSubscriptionId=" + defaultSubscriptionId + ", registered=" + registered + diff --git a/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java b/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java index 64fd5a063..c687c16fb 100644 --- a/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java +++ b/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java @@ -29,7 +29,6 @@ import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.GroupDatabase.GroupRecord; import org.thoughtcrime.securesms.database.RecipientDatabase.RecipientSettings; import org.thoughtcrime.securesms.database.RecipientDatabase.RegisteredState; -import org.thoughtcrime.securesms.database.RecipientDatabase.VibrateState; import org.thoughtcrime.securesms.util.ListenableFutureTask; import org.thoughtcrime.securesms.util.SoftHashMap; import org.thoughtcrime.securesms.util.Util; @@ -158,10 +157,6 @@ public class RecipientProvider { @Nullable final Uri contactUri; @Nullable final Long groupAvatarId; @Nullable final MaterialColor color; - @Nullable final Uri messageRingtone; - @Nullable final Uri callRingtone; - @Nullable final VibrateState messageVibrateState; - @Nullable final VibrateState callVibrateState; final boolean blocked; final int expireMessages; @NonNull final List participants; @@ -183,10 +178,6 @@ public class RecipientProvider { this.customLabel = settings != null ? settings.getSystemPhoneLabel() : null; this.contactUri = settings != null ? Util.uri(settings.getSystemContactUri()) : null; this.color = settings != null ? settings.getColor() : null; - this.messageRingtone = settings != null ? settings.getMessageRingtone() : null; - this.callRingtone = settings != null ? settings.getCallRingtone() : null; - this.messageVibrateState = settings != null ? settings.getMessageVibrateState() : null; - this.callVibrateState = settings != null ? settings.getCallVibrateState() : null; this.blocked = settings != null && settings.isBlocked(); this.expireMessages = settings != null ? settings.getExpireMessages() : 0; this.participants = participants == null ? new LinkedList<>() : participants; diff --git a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java index dccc022eb..21c7701c4 100644 --- a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java +++ b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java @@ -36,11 +36,13 @@ public class TextSecurePreferences { private static final String LAST_VERSION_CODE_PREF = "last_version_code"; public static final String RINGTONE_PREF = "pref_key_ringtone"; private static final String VIBRATE_PREF = "pref_key_vibrate"; + private static final String CHAT_VIBRATE = "pref_chat_vibrate_"; // followed by chat-id private static final String NOTIFICATION_PREF = "pref_key_enable_notifications"; public static final String LED_COLOR_PREF = "pref_led_color"; public static final String LED_BLINK_PREF = "pref_led_blink"; private static final String LED_BLINK_PREF_CUSTOM = "pref_led_blink_custom"; private static final String CHAT_MUTED_UNTIL = "pref_chat_muted_until_"; // followed by chat-id + private static final String CHAT_RINGTONE = "pref_chat_ringtone_"; // followed by chat-id public static final String ALL_SMS_PREF = "pref_all_sms"; public static final String SCREEN_LOCK_TIMEOUT_INTERVAL_PREF = "pref_timeout_interval"; public static final String SCREEN_LOCK_TIMEOUT_PREF = "pref_timeout_passphrase"; @@ -77,6 +79,14 @@ public class TextSecurePreferences { private static final String PREF_CONTACT_PHOTO_IDENTIFIERS = "pref_contact_photo_identifiers"; + public enum VibrateState { + DEFAULT(0), ENABLED(1), DISABLED(2); + private final int id; + VibrateState(int id) { this.id = id; } + public int getId() { return id; } + public static VibrateState fromId(int id) { return values()[id]; } + } + public static boolean isScreenLockEnabled(@NonNull Context context) { return getBooleanPreference(context, SCREEN_LOCK, false); } @@ -301,6 +311,8 @@ public class TextSecurePreferences { return getBooleanPreference(context, NOTIFICATION_PREF, true); } + // ringtone + public static @NonNull Uri getNotificationRingtone(Context context) { String result = getStringPreference(context, RINGTONE_PREF, Settings.System.DEFAULT_NOTIFICATION_URI.toString()); @@ -315,14 +327,45 @@ public class TextSecurePreferences { removePreference(context, RINGTONE_PREF); } - public static void setNotificationRingtone(Context context, String ringtone) { - setStringPreference(context, RINGTONE_PREF, ringtone); + public static void setNotificationRingtone(Context context, Uri ringtone) { + setStringPreference(context, RINGTONE_PREF, ringtone.toString()); } + public static void setChatRingtone(Context context, int chatId, Uri ringtone) { + if(ringtone!=null) { + setStringPreference(context, CHAT_RINGTONE+chatId, ringtone.toString()); + } + else { + removePreference(context, CHAT_RINGTONE+chatId); + } + } + + public static @Nullable Uri getChatRingtone(Context context, int chatId) { + String result = getStringPreference(context, CHAT_RINGTONE+chatId, null); + return result==null? null : Uri.parse(result); + } + + // vibrate + public static boolean isNotificationVibrateEnabled(Context context) { return getBooleanPreference(context, VIBRATE_PREF, true); } + public static void setChatVibrate(Context context, int chatId, VibrateState vibrateState) { + if(vibrateState!=VibrateState.DEFAULT) { + setIntegerPrefrence(context, CHAT_VIBRATE+chatId, vibrateState.getId()); + } + else { + removePreference(context, CHAT_VIBRATE+chatId); + } + } + + public static VibrateState getChatVibrate(Context context, int chatId) { + return VibrateState.fromId(getIntegerPreference(context, CHAT_VIBRATE+chatId, VibrateState.DEFAULT.getId())); + } + + // led + public static String getNotificationLedColor(Context context) { return getStringPreference(context, LED_COLOR_PREF, "blue"); } @@ -335,6 +378,8 @@ public class TextSecurePreferences { return getStringPreference(context, LED_BLINK_PREF_CUSTOM, "500,2000"); } + // mute + public static void setChatMutedUntil(Context context, int chatId, long until) { setLongPreference(context, CHAT_MUTED_UNTIL+chatId, until); } @@ -347,6 +392,8 @@ public class TextSecurePreferences { return System.currentTimeMillis() <= getChatMutedUntil(context, chatId); } + // misc. + public static String getBackgroundImagePath(Context context) { return getStringPreference(context, BACKGROUND_PREF, ""); }