diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3db1204e..f0383876b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@
* fix Direct Share shortcuts
* fix: don't show error message when cancelling profile creation
* enable permanent notification by default if push notifications are not available
+* hide "clone chat" and member list for incoming channels
+* show warning if background notifications will be unreliable
## v2.11.0
2025-08
diff --git a/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java b/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java
index 42a419143..8f36b35c0 100644
--- a/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java
@@ -109,7 +109,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
if (chatId != 0) {
DcChat dcChat = dcContext.getChat(chatId);
- menu.findItem(R.id.menu_clone).setVisible(chatIsMultiUser && !chatIsMailingList);
+ menu.findItem(R.id.menu_clone).setVisible(chatIsMultiUser && !chatIsInBroadcast && !chatIsMailingList);
if (chatIsDeviceTalk) {
menu.findItem(R.id.edit_name).setVisible(false);
menu.findItem(R.id.show_encr_info).setVisible(false);
diff --git a/src/main/java/org/thoughtcrime/securesms/ProfileAdapter.java b/src/main/java/org/thoughtcrime/securesms/ProfileAdapter.java
index fc9946eae..9aac1f71b 100644
--- a/src/main/java/org/thoughtcrime/securesms/ProfileAdapter.java
+++ b/src/main/java/org/thoughtcrime/securesms/ProfileAdapter.java
@@ -278,6 +278,7 @@ public class ProfileAdapter extends RecyclerView.Adapter
itemDataStatusText = "";
isOutBroadcast = dcChat != null && dcChat.isOutBroadcast();
boolean isMailingList = dcChat != null && dcChat.isMailingList();
+ boolean isInBroadcast = dcChat != null && dcChat.isInBroadcast();
boolean isSelfTalk = dcChat != null && dcChat.isSelfTalk();
boolean isDeviceTalk = dcChat != null && dcChat.isDeviceTalk();
memberCount = memberList!=null ? memberList.length : 0;
@@ -309,7 +310,7 @@ public class ProfileAdapter extends RecyclerView.Adapter
itemData.add(new ItemData(ITEM_LAST_SEEN, lastSeenTxt, 0));
}
- if (memberList!=null && !isMailingList) {
+ if (memberList!=null && !isInBroadcast && !isMailingList) {
itemData.add(new ItemData(ITEM_DIVIDER, null, 0));
if (dcChat != null) {
if (dcChat.canSend() && dcChat.isEncrypted()) {
diff --git a/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java b/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java
index 47f663f48..e6e282cd7 100644
--- a/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java
@@ -28,6 +28,7 @@ import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.connect.DcHelper;
import org.thoughtcrime.securesms.connect.KeepAliveService;
+import org.thoughtcrime.securesms.notifications.FcmReceiveService;
import org.thoughtcrime.securesms.util.Prefs;
public class NotificationsPreferenceFragment extends ListSummaryPreferenceFragment implements Preference.OnPreferenceChangeListener {
@@ -99,6 +100,7 @@ public class NotificationsPreferenceFragment extends ListSummaryPreferenceFragme
notificationsEnabled.setOnPreferenceChangeListener((preference, newValue) -> {
boolean enabled = (Boolean) newValue;
dcContext.setMuted(!enabled);
+ notificationsEnabled.setSummary(getSummary(getContext(), false));
return true;
});
}
@@ -126,6 +128,7 @@ public class NotificationsPreferenceFragment extends ListSummaryPreferenceFragme
// update ignoreBattery in onResume() to reflects changes done in the system settings
ignoreBattery.setChecked(isIgnoringBatteryOptimizations());
notificationsEnabled.setChecked(!dcContext.isMuted());
+ notificationsEnabled.setSummary(getSummary(getContext(), false));
mentionNotifEnabled.setChecked(dcContext.isMentionsEnabled());
// set without altering "unset" state of the preference
@@ -160,6 +163,7 @@ public class NotificationsPreferenceFragment extends ListSummaryPreferenceFragme
} else {
context.stopService(new Intent(context, KeepAliveService.class));
}
+ notificationsEnabled.setSummary(getSummary(context, false));
return true;
}
@@ -239,11 +243,21 @@ public class NotificationsPreferenceFragment extends ListSummaryPreferenceFragme
}
public static CharSequence getSummary(Context context) {
+ return getSummary(context, true);
+ }
+
+ public static CharSequence getSummary(Context context, boolean detailed) {
NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU || notificationManager.areNotificationsEnabled()) {
- return context.getString(DcHelper.getContext(context).isMuted() ? R.string.off : R.string.on);
+ if (DcHelper.getContext(context).isMuted()) {
+ return detailed? context.getString(R.string.off) : "";
+ }
+ if (FcmReceiveService.getToken() == null && !Prefs.reliableService(context)) {
+ return "⚠️ " + context.getString(R.string.unreliable_bg_notifications);
+ }
+ return detailed? context.getString(R.string.on) : "";
} else {
- return context.getString(R.string.disabled_in_system_settings);
+ return "⚠️ " + context.getString(R.string.disabled_in_system_settings);
}
}
}
diff --git a/src/main/java/org/thoughtcrime/securesms/util/Prefs.java b/src/main/java/org/thoughtcrime/securesms/util/Prefs.java
index b7a3ee0c4..355b56d63 100644
--- a/src/main/java/org/thoughtcrime/securesms/util/Prefs.java
+++ b/src/main/java/org/thoughtcrime/securesms/util/Prefs.java
@@ -228,7 +228,7 @@ public class Prefs {
}
// if the key was unset, then calculate default value
- return isPushEnabled(context) || !DcHelper.getAccounts(context).isAllChatmail();
+ return !isPushEnabled(context) || !DcHelper.getAccounts(context).isAllChatmail();
}
// vibrate
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 8914a2144..dd8a9cade 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -368,20 +368,33 @@
File saved to \"%1$s\".
+
Video Chat
+
Invite %1$s to a video chat?
+
This requires a compatible app or browser on both ends.
+
%1$s invited to a video chat.
+
You sent a video chat invitation.
+
Tap to Join
+
Tap to Open
+
Video Chat Instance
+
Your Video Chat Instance
-
+
Example: https://your-server.org/$ROOM
+
If enabled, you can start a video chat from each chat. Requires a compatible app or a browser on both ends.
+
Use \"%1$s\" to invite others to video chats?\n\nOnce set, you can start a video chat from each chat. This replaces any previous setting for video chats.
+
Video chat invitation
+
You are invited to a video chat, click %1$s to join.
@@ -868,8 +881,10 @@
At once after Download
After 30 seconds
+
After 1 minute
After 5 minutes
+
After 30 minutes
After 1 hour
After 1 day
@@ -923,8 +938,9 @@
You set disappearing messages timer to %1$s seconds
Disappearing messages timer set to %1$s seconds by %2$s.
+
You set disappearing messages timer to 1 minute.
-
+
Disappearing messages timer set to 1 minute by %1$s.
You set disappearing messages timer to 1 hour.
@@ -1035,6 +1051,7 @@
Name only
No name or message
Notifications disabled
+ Enable \"Force Background Connection\" for reliable notifications
New messages
You have new messages
@@ -1148,7 +1165,7 @@
Disabled in Delta Chat
Disabled in system settings
\"Background App Refresh\" disabled in system settings
-
+
Delayed
On average every %1$d minutes
On average every %1$d hours