Merge branch 'stable'

apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt

@@ -496,6 +496,14 @@ data class Chat (
       else -> false
     }
 
+  val userIsObserver: Boolean get() = when(chatInfo) {
+    is ChatInfo.Group -> {
+      val m = chatInfo.groupInfo.membership
+      m.memberActive && m.memberRole == GroupMemberRole.Observer
+    }
+    else -> false
+  }
+
   val id: String get() = chatInfo.id
 
   @Serializable
@@ -942,7 +950,7 @@ data class GroupMember (
   fun canChangeRoleTo(groupInfo: GroupInfo): List<GroupMemberRole>? =
     if (!canBeRemoved(groupInfo)) null
     else groupInfo.membership.memberRole.let { userRole ->
-      GroupMemberRole.values().filter { it <= userRole }
+      GroupMemberRole.values().filter { it <= userRole && it != GroupMemberRole.Observer }
     }
 
   val memberIncognito = memberProfile.profileId != memberContactProfileId

apps/android/app/src/main/java/chat/simplex/app/views/TerminalView.kt

@@ -83,6 +83,7 @@ fun TerminalLayout(
             liveMessageAlertShown = SharedPreference(get = { false }, set = {}),
             needToAllowVoiceToContact = false,
             allowedVoiceByPrefs = false,
+            userIsObserver = false,
             userCanSend = true,
             allowVoiceToContact = {},
             sendMessage = sendCommand,

apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeView.kt

@@ -648,6 +648,7 @@ fun ComposeView(
   }
 
   val userCanSend = rememberUpdatedState(chat.userCanSend)
+  val userIsObserver = rememberUpdatedState(chat.userIsObserver)
 
   Column {
     contextItemView()
@@ -744,6 +745,7 @@ fun ComposeView(
         needToAllowVoiceToContact,
         allowedVoiceByPrefs,
         allowVoiceToContact = ::allowVoiceToContact,
+        userIsObserver = userIsObserver.value,
         userCanSend = userCanSend.value,
         sendMessage = {
           sendMessage()

apps/android/app/src/main/java/chat/simplex/app/views/chat/SendMsgView.kt

@@ -60,6 +60,7 @@ fun SendMsgView(
   liveMessageAlertShown: SharedPreference<Boolean>,
   needToAllowVoiceToContact: Boolean,
   allowedVoiceByPrefs: Boolean,
+  userIsObserver: Boolean,
   userCanSend: Boolean,
   allowVoiceToContact: () -> Unit,
   sendMessage: () -> Unit,
@@ -75,7 +76,7 @@ fun SendMsgView(
     val showVoiceButton = cs.message.isEmpty() && showVoiceRecordIcon && !composeState.value.editing &&
         cs.liveMessage == null && (cs.preview is ComposePreview.NoPreview || recState.value is RecordingState.Started)
     val showDeleteTextButton = rememberSaveable { mutableStateOf(false) }
-    NativeKeyboard(composeState, textStyle, showDeleteTextButton, userCanSend, onMessageChange)
+    NativeKeyboard(composeState, textStyle, showDeleteTextButton, userIsObserver, onMessageChange)
     // Disable clicks on text field
     if (cs.preview is ComposePreview.VoicePreview || !userCanSend) {
       Box(Modifier
@@ -182,7 +183,7 @@ private fun NativeKeyboard(
   composeState: MutableState<ComposeState>,
   textStyle: MutableState<TextStyle>,
   showDeleteTextButton: MutableState<Boolean>,
-  userCanSend: Boolean,
+  userIsObserver: Boolean,
   onMessageChange: (String) -> Unit
 ) {
   val cs = composeState.value
@@ -262,16 +263,23 @@ private fun NativeKeyboard(
     }
     showDeleteTextButton.value = it.lineCount >= 4
   }
-  if (composeState.value.preview is ComposePreview.VoicePreview || !userCanSend) {
-    Text(
-      if (composeState.value.preview is ComposePreview.VoicePreview) generalGetString(R.string.voice_message_send_text) else generalGetString(R.string.you_are_observer),
-      Modifier.padding(padding),
-      color = HighOrLowlight,
-      style = textStyle.value.copy(fontStyle = FontStyle.Italic)
-    )
+  if (composeState.value.preview is ComposePreview.VoicePreview) {
+    ComposeOverlay(R.string.voice_message_send_text, textStyle, padding)
+  } else if (userIsObserver) {
+    ComposeOverlay(R.string.you_are_observer, textStyle, padding)
   }
 }
 
+@Composable
+private fun ComposeOverlay(textId: Int, textStyle: MutableState<TextStyle>, padding: PaddingValues) {
+  Text(
+    generalGetString(textId),
+    Modifier.padding(padding),
+    color = HighOrLowlight,
+    style = textStyle.value.copy(fontStyle = FontStyle.Italic)
+  )
+}
+
 @Composable
 private fun BoxScope.DeleteTextButton(composeState: MutableState<ComposeState>) {
   IconButton(
@@ -581,6 +589,7 @@ fun PreviewSendMsgView() {
       liveMessageAlertShown = SharedPreference(get = { true }, set = { }),
       needToAllowVoiceToContact = false,
       allowedVoiceByPrefs = true,
+      userIsObserver = false,
       userCanSend = true,
       allowVoiceToContact = {},
       sendMessage = {},
@@ -610,6 +619,7 @@ fun PreviewSendMsgViewEditing() {
       liveMessageAlertShown = SharedPreference(get = { true }, set = { }),
       needToAllowVoiceToContact = false,
       allowedVoiceByPrefs = true,
+      userIsObserver = false,
       userCanSend = true,
       allowVoiceToContact = {},
       sendMessage = {},
@@ -639,6 +649,7 @@ fun PreviewSendMsgViewInProgress() {
       liveMessageAlertShown = SharedPreference(get = { true }, set = { }),
       needToAllowVoiceToContact = false,
       allowedVoiceByPrefs = true,
+      userIsObserver = false,
       userCanSend = true,
       allowVoiceToContact = {},
       sendMessage = {},

apps/android/app/src/main/java/chat/simplex/app/views/chat/group/AddGroupMembersView.kt

@@ -166,7 +166,7 @@ private fun RoleSelectionRow(groupInfo: GroupInfo, selectedRole: MutableState<Gr
     verticalAlignment = Alignment.CenterVertically,
     horizontalArrangement = Arrangement.SpaceBetween
   ) {
-    val values = GroupMemberRole.values().filter { it <= groupInfo.membership.memberRole }.map { it to it.text }
+    val values = GroupMemberRole.values().filter { it <= groupInfo.membership.memberRole && it != GroupMemberRole.Observer }.map { it to it.text }
     ExposedDropDownSettingRow(
       generalGetString(R.string.new_member_role),
       values,

apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupLinkView.kt

@@ -120,9 +120,9 @@ fun GroupLinkLayout(
       if (groupLink == null) {
         SimpleButton(stringResource(R.string.button_create_group_link), icon = Icons.Outlined.AddLink, disabled = creatingLink, click = createLink)
       } else {
-        SectionItemView(padding = PaddingValues(bottom = DEFAULT_PADDING)) {
-          RoleSelectionRow(groupInfo, groupLinkMemberRole)
-        }
+//        SectionItemView(padding = PaddingValues(bottom = DEFAULT_PADDING)) {
+//          RoleSelectionRow(groupInfo, groupLinkMemberRole)
+//        }
         var initialLaunch by remember { mutableStateOf(true) }
         LaunchedEffect(groupLinkMemberRole.value) {
           if (!initialLaunch) {