diff options
author | Christian Schneppe <christian.schneppe@pix-art.de> | 2020-03-16 19:32:02 +0100 |
---|---|---|
committer | Christian Schneppe <christian.schneppe@pix-art.de> | 2020-03-16 19:32:02 +0100 |
commit | 755625eec548db50654ca6eebb0feb3ce44225aa (patch) | |
tree | cde452e1b41e4ee61a808dbf7853fd4d89e4d9bf /src/main/java | |
parent | dfdf8014d8fc7ab2c433d6e6fbd91fe62aa9a68c (diff) |
show invidious links in notifications too
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/de/pixart/messenger/services/NotificationService.java | 7 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/SetSettingsActivity.java | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/main/java/de/pixart/messenger/services/NotificationService.java b/src/main/java/de/pixart/messenger/services/NotificationService.java index 826b5172d..fe97344c0 100644 --- a/src/main/java/de/pixart/messenger/services/NotificationService.java +++ b/src/main/java/de/pixart/messenger/services/NotificationService.java @@ -59,10 +59,13 @@ import de.pixart.messenger.ui.EditAccountActivity; import de.pixart.messenger.ui.TimePreference; import de.pixart.messenger.utils.AccountUtils; import de.pixart.messenger.utils.Compatibility; +import de.pixart.messenger.utils.EmojiWrapper; import de.pixart.messenger.utils.GeoHelper; import de.pixart.messenger.utils.UIHelper; import de.pixart.messenger.xmpp.XmppConnection; +import static de.pixart.messenger.ui.util.MyLinkify.replaceYoutube; + public class NotificationService { public static final Object CATCHUP_LOCK = new Object(); @@ -705,14 +708,14 @@ public class NotificationService { SpannableString styledString; for (Message message : messages) { final SpannableString name = UIHelper.getColoredUsername(mXmppConnectionService, message); - styledString = new SpannableString(name + ": " + message.getBody()); + styledString = new SpannableString(name + ": " + EmojiWrapper.transform(replaceYoutube(mXmppConnectionService, message.getBody()))); style.addLine(styledString); } builder.setStyle(style); int count = messages.size(); if (count == 1) { final SpannableString name = UIHelper.getColoredUsername(mXmppConnectionService, messages.get(0)); - styledString = new SpannableString(name + ": " + messages.get(0).getBody()); + styledString = new SpannableString(name + ": " + EmojiWrapper.transform(replaceYoutube(mXmppConnectionService, messages.get(0).getBody()))); builder.setContentText(styledString); builder.setTicker(styledString); } else { diff --git a/src/main/java/de/pixart/messenger/ui/SetSettingsActivity.java b/src/main/java/de/pixart/messenger/ui/SetSettingsActivity.java index 5c4ce2622..27119f5fd 100644 --- a/src/main/java/de/pixart/messenger/ui/SetSettingsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/SetSettingsActivity.java @@ -36,7 +36,7 @@ public class SetSettingsActivity extends XmppActivity implements XmppConnectionS static final int CHATSTATES = 4; static final int CONFIRMMESSAGES = 5; static final int LASTSEEN = 6; - static final int INVIDEOUS = 7; + static final int INVIDIOUS = 7; @Override protected void refreshUiReal() { @@ -66,7 +66,7 @@ public class SetSettingsActivity extends XmppActivity implements XmppConnectionS this.binding.actionInfoChatStates.setOnClickListener(string -> showInfo(CHATSTATES)); this.binding.actionInfoConfirmMessages.setOnClickListener(string -> showInfo(CONFIRMMESSAGES)); this.binding.actionInfoLastSeen.setOnClickListener(string -> showInfo(LASTSEEN)); - this.binding.actionInfoInvideous.setOnClickListener(string -> showInfo(INVIDEOUS)); + this.binding.actionInfoInvidious.setOnClickListener(string -> showInfo(INVIDIOUS)); } private void getDefaults() { @@ -76,7 +76,7 @@ public class SetSettingsActivity extends XmppActivity implements XmppConnectionS this.binding.chatStates.setChecked(getResources().getBoolean(R.bool.chat_states)); this.binding.confirmMessages.setChecked(getResources().getBoolean(R.bool.confirm_messages)); this.binding.lastSeen.setChecked(getResources().getBoolean(R.bool.last_activity)); - this.binding.invideous.setChecked(getResources().getBoolean(R.bool.use_invidious)); + this.binding.invidious.setChecked(getResources().getBoolean(R.bool.use_invidious)); } private void next(View view) { @@ -122,7 +122,7 @@ public class SetSettingsActivity extends XmppActivity implements XmppConnectionS title = getString(R.string.pref_broadcast_last_activity); message = getString(R.string.pref_broadcast_last_activity_summary); break; - case INVIDEOUS: + case INVIDIOUS: title = getString(R.string.pref_use_invidious); message = getString(R.string.pref_use_invidious_summary); break; @@ -171,7 +171,7 @@ public class SetSettingsActivity extends XmppActivity implements XmppConnectionS } else { preferences.edit().putBoolean(BROADCAST_LAST_ACTIVITY, false).apply(); } - if (this.binding.invideous.isChecked()) { + if (this.binding.invidious.isChecked()) { preferences.edit().putBoolean(USE_INVIDIOUS, true).apply(); } else { preferences.edit().putBoolean(USE_INVIDIOUS, false).apply(); |