diff --git a/src/cheogram/res/drawable/ring_volume_24dp.xml b/src/cheogram/res/drawable/ring_volume_24dp.xml new file mode 100644 index 0000000000000000000000000000000000000000..684f429b2addf0bea94b6fb1e791777d7ba7567b --- /dev/null +++ b/src/cheogram/res/drawable/ring_volume_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/src/cheogram/res/values/strings.xml b/src/cheogram/res/values/strings.xml index efeeb2a0d5486e9e3795aa40911b2296a77285b4..4c065754b0aded0f569794937a1cb0cbb6334bcf 100644 --- a/src/cheogram/res/values/strings.xml +++ b/src/cheogram/res/values/strings.xml @@ -54,4 +54,6 @@ Export Data (experimental) Export data useful for importing into another app. Not a full backup. Full backups are meant for restore after a device loss, or for migrating to a new device. You cannot restore a backup to another app while still being connected with this one! + Ring calls from strangers + A stranger is someone not in your contacts to whom you have never sent a message diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java index 068c4654976135942eb7e8a090c44658adbebd5b..be090dab273131bc6e79a01d1941c76f9109505b 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java @@ -256,9 +256,10 @@ public class JingleConnectionManager extends AbstractConnectionManager { } private boolean isWithStrangerAndStrangerNotificationsAreOff(final Account account, Jid with) { - final var chatRequestsPref = mXmppConnectionService.getStringPreference("chat_requests", R.string.default_chat_requests); + final var ringFromStrangers = mXmppConnectionService.getBooleanPreference("ring_from_strangers", R.bool.notifications_from_strangers); + if (ringFromStrangers) return false; final var conversation = mXmppConnectionService.findOrCreateConversation(account, with, false, true); - return conversation.isChatRequest(chatRequestsPref); + return conversation.isWithStranger(); } ScheduledFuture schedule( diff --git a/src/main/res/xml/preferences_notifications.xml b/src/main/res/xml/preferences_notifications.xml index 8088a85491d9d4d78f33a8bbbfce6f948ef5980e..01d714ed0761e7d2d1e2942044567ce5f006dc66 100644 --- a/src/main/res/xml/preferences_notifications.xml +++ b/src/main/res/xml/preferences_notifications.xml @@ -74,6 +74,12 @@ android:key="chat_requests" android:title="@string/pref_chat_requests" app:useSimpleSummaryProvider="true" /> +