From cc36a18d2c1695f95738ee691abc50e0aecd0849 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 24 May 2022 17:07:58 +0200
Subject: [PATCH] Mute/unmute chat room notifications, using 3-dots menu even
 for basic chat rooms, updated icons

---
 CHANGELOG.md                                  |  21 ++++++
 app/build.gradle                              |   2 +-
 .../chat/fragments/DetailChatRoomFragment.kt  |  64 ++++++++++++------
 .../main/chat/viewmodels/ChatRoomViewModel.kt |  21 ++++--
 .../java/org/linphone/core/CorePreferences.kt |  12 ++++
 .../notifications/NotificationsManager.kt     |   9 ++-
 .../drawable-xhdpi/menu_notifications_off.png | Bin 0 -> 1678 bytes
 .../drawable-xhdpi/menu_notifications_on.png  | Bin 0 -> 1363 bytes
 .../drawable-xhdpi/voip_call_list_menu.png    | Bin 750 -> 1895 bytes
 .../res/drawable-xhdpi/voip_menu_more.png     | Bin 1772 -> 1540 bytes
 .../res/layout/chat_room_detail_fragment.xml  |  15 ----
 .../main/res/layout/chat_room_list_cell.xml   |  43 ++++++++----
 app/src/main/res/layout/chat_room_menu.xml    |  32 +++++++++
 app/src/main/res/values-fr/strings.xml        |   3 +
 app/src/main/res/values/strings.xml           |   3 +
 build.gradle                                  |   2 +-
 16 files changed, 171 insertions(+), 56 deletions(-)
 create mode 100644 app/src/main/res/drawable-xhdpi/menu_notifications_off.png
 create mode 100644 app/src/main/res/drawable-xhdpi/menu_notifications_on.png

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54e3e139c..7127a8aa1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,11 +14,13 @@ Group changes to describe their impact on the project, as follows:
 
 ### Added
 - Conference creation with scheduling, video, different layouts, showing who is speaking and who is muted, etc...
+- Chat rooms can be individually muted (no notification when receiving a chat message)
 
 ### Changed
 - In-call views have been re-designed
 - Improved how call logs are handled to improve performances
 - Improved how contact avatars are generated
+- 3-dots menu even for basic chat rooms
 
 ### Fixed
 - Multiple file download attempt from the same chat bubble at the same time needed app restart to properly download each file
@@ -27,6 +29,25 @@ Group changes to describe their impact on the project, as follows:
 - Show service notification sooner to prevent crash if Core creation takes too long
 - Trying to keep the preferred driver (OpenSLES / AAudio) when switching device
 
+## [4.6.9] - 2022-05-30
+
+### Fixed
+- ANR when screen turns OFF/ON while app is in foreground
+- Crash due to missing CoreContext instance in TelecomManager service
+- One-to-One encrypted chat room creation if it already exists
+- Crash if ConnectionService feature isn't supported by the device
+
+### Changed
+- Updated translations from Weblate
+- Improved audio devices logs
+
+## [4.6.8] - 2022-05-23
+
+### Fixed
+- Crash due to missing CoreContext in CoreService
+- Crash in BootReceiver if auto start is disabled
+- Other crashes
+
 ## [4.6.7] - 2022-05-04
 
 ### Changed
diff --git a/app/build.gradle b/app/build.gradle
index a9b27ae9a..4a0a56fff 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -216,7 +216,7 @@ dependencies {
     implementation "androidx.slidingpanelayout:slidingpanelayout:1.2.0"
     implementation "androidx.window:window:1.0.0"
 
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation "androidx.gridlayout:gridlayout:1.0.0"
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
index cb340badc..d0d658ec9 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
@@ -561,10 +561,6 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
             showPopupMenu(chatRoom)
         }
 
-        binding.setEditClickListener {
-            enterEditionMode()
-        }
-
         binding.setSecurityIconClickListener {
             showParticipantsDevices()
         }
@@ -853,32 +849,50 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
         )
 
         val itemSize = AppUtils.getDimension(R.dimen.chat_room_popup_item_height).toInt()
-        var totalSize = itemSize * 4
+        var totalSize = itemSize * 6
 
-        if (!viewModel.encryptedChatRoom) {
+        val notificationsTurnedOff = viewModel.areNotificationsMuted()
+        if (notificationsTurnedOff) {
+            popupView.muteHidden = true
+            totalSize -= itemSize
+        } else {
+            popupView.unmuteHidden = true
+            totalSize -= itemSize
+        }
+
+        if (viewModel.basicChatRoom) {
+            popupView.groupInfoHidden = true
+            totalSize -= itemSize
             popupView.devicesHidden = true
             totalSize -= itemSize
             popupView.ephemeralHidden = true
             totalSize -= itemSize
         } else {
-            if (viewModel.oneToOneChatRoom) {
-                popupView.groupInfoHidden = true
-                totalSize -= itemSize
-            }
-
-            // If one participant one device, a click on security badge
-            // will directly start a call or show the dialog, so don't show this menu
-            if (viewModel.oneParticipantOneDevice) {
+            if (!viewModel.encryptedChatRoom) {
                 popupView.devicesHidden = true
                 totalSize -= itemSize
-            }
+                popupView.ephemeralHidden = true
+                totalSize -= itemSize
+            } else {
+                if (viewModel.oneToOneChatRoom) {
+                    popupView.groupInfoHidden = true
+                    totalSize -= itemSize
+                }
 
-            if (viewModel.ephemeralChatRoom) {
-                if (chatRoom.currentParams.ephemeralMode == ChatRoomEphemeralMode.AdminManaged) {
-                    if (chatRoom.me?.isAdmin == false) {
-                        Log.w("[Chat Room] Hiding ephemeral menu as mode is admin managed and we aren't admin")
-                        popupView.ephemeralHidden = true
-                        totalSize -= itemSize
+                // If one participant one device, a click on security badge
+                // will directly start a call or show the dialog, so don't show this menu
+                if (viewModel.oneParticipantOneDevice) {
+                    popupView.devicesHidden = true
+                    totalSize -= itemSize
+                }
+
+                if (viewModel.ephemeralChatRoom) {
+                    if (chatRoom.currentParams.ephemeralMode == ChatRoomEphemeralMode.AdminManaged) {
+                        if (chatRoom.me?.isAdmin == false) {
+                            Log.w("[Chat Room] Hiding ephemeral menu as mode is admin managed and we aren't admin")
+                            popupView.ephemeralHidden = true
+                            totalSize -= itemSize
+                        }
                     }
                 }
             }
@@ -911,6 +925,14 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
             enterEditionMode()
             popupWindow.dismiss()
         }
+        popupView.setMuteListener {
+            viewModel.muteNotifications(true)
+            popupWindow.dismiss()
+        }
+        popupView.setUnmuteListener {
+            viewModel.muteNotifications(false)
+            popupWindow.dismiss()
+        }
 
         popupWindow.showAsDropDown(binding.menu, 0, 0, Gravity.BOTTOM)
     }
diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt
index c2c0f12e3..fc8f7dd17 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt
@@ -78,6 +78,8 @@ class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactDataInterf
 
     val ephemeralEnabled = MutableLiveData<Boolean>()
 
+    val basicChatRoom: Boolean = chatRoom.hasCapability(ChatRoomCapabilities.Basic.toInt())
+
     val oneToOneChatRoom: Boolean = chatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())
 
     val encryptedChatRoom: Boolean = chatRoom.hasCapability(ChatRoomCapabilities.Encrypted.toInt())
@@ -99,6 +101,8 @@ class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactDataInterf
     val groupCallAvailable: Boolean
         get() = LinphoneUtils.isRemoteConferencingAvailable()
 
+    val notificationsMuted = MutableLiveData<Boolean>()
+
     private var addressToCall: Address? = null
 
     private val bounceAnimator: ValueAnimator by lazy {
@@ -235,6 +239,8 @@ class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactDataInterf
         callInProgress.value = chatRoom.core.callsNb > 0
         updateRemotesComposing()
 
+        notificationsMuted.value = areNotificationsMuted()
+
         if (corePreferences.enableAnimations) bounceAnimator.start()
     }
 
@@ -250,10 +256,6 @@ class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactDataInterf
         if (corePreferences.enableAnimations) bounceAnimator.end()
     }
 
-    fun hideMenu(): Boolean {
-        return chatRoom.hasCapability(ChatRoomCapabilities.Basic.toInt()) || (oneToOneChatRoom && !encryptedChatRoom)
-    }
-
     fun contactLookup() {
         displayName.value = when {
             chatRoom.hasCapability(ChatRoomCapabilities.Basic.toInt()) -> LinphoneUtils.getDisplayName(
@@ -307,6 +309,17 @@ class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactDataInterf
         formatLastMessage(chatRoom.lastMessageInHistory)
     }
 
+    fun areNotificationsMuted(): Boolean {
+        val id = LinphoneUtils.getChatRoomId(chatRoom.localAddress, chatRoom.peerAddress)
+        return corePreferences.chatRoomMuted(id)
+    }
+
+    fun muteNotifications(mute: Boolean) {
+        val id = LinphoneUtils.getChatRoomId(chatRoom.localAddress, chatRoom.peerAddress)
+        corePreferences.muteChatRoom(id, mute)
+        notificationsMuted.value = mute
+    }
+
     private fun formatLastMessage(msg: ChatMessage?) {
         val builder = SpannableStringBuilder()
         if (msg == null) {
diff --git a/app/src/main/java/org/linphone/core/CorePreferences.kt b/app/src/main/java/org/linphone/core/CorePreferences.kt
index cfdf8bcdc..cdf1b6e8d 100644
--- a/app/src/main/java/org/linphone/core/CorePreferences.kt
+++ b/app/src/main/java/org/linphone/core/CorePreferences.kt
@@ -84,6 +84,18 @@ class CorePreferences constructor(private val context: Context) {
             // logcatLogsOutput = false
         }
 
+    fun chatRoomMuted(id: String): Boolean {
+        val sharedPreferences: SharedPreferences = coreContext.context.getSharedPreferences("notifications", Context.MODE_PRIVATE)
+        return sharedPreferences.getBoolean(id, false)
+    }
+
+    fun muteChatRoom(id: String, mute: Boolean) {
+        val sharedPreferences: SharedPreferences = coreContext.context.getSharedPreferences("notifications", Context.MODE_PRIVATE)
+        val editor = sharedPreferences.edit()
+        editor.putBoolean(id, mute)
+        editor.apply()
+    }
+
     /* App settings */
 
     var debugLogs: Boolean
diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
index 67fd007f2..f60740622 100644
--- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
+++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
@@ -167,7 +167,14 @@ class NotificationsManager(private val context: Context) {
                     ShortcutsHelper.createShortcutsToChatRooms(context)
                 }
             }
-            displayIncomingChatNotification(room, message)
+
+            val id = LinphoneUtils.getChatRoomId(room.localAddress, room.peerAddress)
+            val mute = corePreferences.chatRoomMuted(id)
+            if (mute) {
+                Log.i("[Notifications Manager] Chat room $id has been muted")
+            } else {
+                displayIncomingChatNotification(room, message)
+            }
         }
 
         override fun onChatRoomRead(core: Core, chatRoom: ChatRoom) {
diff --git a/app/src/main/res/drawable-xhdpi/menu_notifications_off.png b/app/src/main/res/drawable-xhdpi/menu_notifications_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..e014eced1f4f5c1fb213e9256c19a0f19b2db3a5
GIT binary patch
literal 1678
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
Y0J}h0pUtmu&;S4c07*qoM6N<$f<WaBwg3PC

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/menu_notifications_on.png b/app/src/main/res/drawable-xhdpi/menu_notifications_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..f48062e060f8170ad011b9d98bd0837b0a2e83ad
GIT binary patch
literal 1363
zcmV-Z1+4msP)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ;Q-k4i-@n$xxjvh>AFB6^c-y)C#RSm|Xe=O&XFE
z7e~Rh;NZt%)xpJCR|i)?5c~jfbaGO3krMxx6k5c1aNLh~_a1le0HI!Hs@X9PsG4P@
z;xRFkT@^cD5x_7)=)-`-OnokyOu%z|-NVP%yC~1{KKJJcDLIn?K9P8q>4rtTK|H-_
z>74h8!>lMN#OK6g23?T&k?XR{Z=4Gb3p_Jyq*L?6VPdh+#&R38qM;H`5l0kNqkJLb
zvch?bvs$jQ<~{ifgE?(wnd>x%5XT~xkc0>sRg_SMg($5WDJD|1AM@}JI{qZNWO9|j
z$gzM5R7j2={11M2Yvv~>+@xR(2)x+##|Y553p8rB{e5iPjT6BC3|wg~f29u0e3D*k
zX^|tKXB)V<ZfWu!aJd8YKk1SoIg+2Ikk13}XY@^3p!XK&UUPeE?&I_UNK;pd8{ps&
z7%foty2rb_+I#!=OtZfqT+DKw$WE3100006VoOIv0A~P|0J)nqVG#fT010qNS#tmY
z4c7nw4c7reD4Tcy000McNliru<^>)N7Bw~;A4C8E15imsK~!ko?V3$URY4TTe?C7U
zQ`78;ftxZiFcpk8LP50XyG6T7XcIv~;ihG+BZ6qrs)!(pHtvF`MGIR*nUb3fL(LGC
zGC#`FUcMH0r15y4&z^JV-ut?L7<lvU+&SkzALpJkb09*52oXYr9E-B@fLdS^Pz@x3
z5nvqX2NKyZphZ9{@CcYxB;Cpc@DMl&6oipz0dN)=UV&t)@)5WI6o!RtEzpwzQCZ#q
zTY|oaj{*095|?LFz%$^T+PA3vTnFp}N?qQWRLlHv5NGxPFz+%`FM-3#Xr)3va74A0
z@BdT-5-98jz6(WXfYTZD)vDgr`<e!tf<m?s=o1PKtEHML>Rb$7uUZMd<BCx1GqA&u
z@f#C;U-Fx51@J>Cb=0sC)cgLH!nj$(MWIlK2QoT@jB|bx?iI>3dmy7($av)!*|<=o
z+e2C1nw$loEYpr+Yfz$5)Sq}r_^EJ~8vP)=Q`FyjNVrGT8~h+#BkJ!xB;1!qwiUuv
zqCV;&;V~Ec;Va>!77%!WaU~<wU|S)qkMdU)ICzD5CBxSlj<2xfyk6GU2^Wc&*EZpe
znFbOu1N+x&gXKmzN0GKhIG)Ce+OX7B{~O_WMA+gUwn2C_NHaW|?K8Yh)IV7uJS^(l
zZN<S&IQKw{@#&z&7<@>R`^zO_Gmhh$U%ObYS|of;$R5Kv_cD$=;4aG#$-e-V7714>
znNpA2K(0waH(i9x0xj4_3(HSRlfZRT0vcR8?*i)a5B0!nq0<6p&cnGSI=(|NZUFL?
zF1l_vOmy7I(u=JUf`d|EPSfwXiSKZ=`1nr;i13tfdN!LNte<2Q6D;Ha>$Uov3Bn(=
z-{nAifC#q(8?<`=YDOp>&M4!cV*=-P-cOXN3D9v0xNpMgaJ!igTIn?Dd{hOT^o!Mc
zeE*WvlB<@?31BO$%crX0Z*E5dCnaeu?GOg4A14Rw0q{ErMrA;og#iQY){L0PglC0?
zkEPI|JjFYqBRr)2E&=wqwAm}Xw*f+oHep-_S(+uVOZ}&}IUi=i#me=QQB9vJ3*y-b
zu#S*pzdDXd_i0JsWb<VO4k_<!rS##0WEm=OlGwU%QVVBP5P#XlMT`(3LWBqae*n?~
Vgt$aA3OoP+002ovPDHLkV1k!vYEu9J

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/voip_call_list_menu.png b/app/src/main/res/drawable-xhdpi/voip_call_list_menu.png
index fdd82bea690184cd11af45f15cdccb4bf2a5e7b2..b4e2ff3bfe4c743a755296729ce33507ca0e58b6 100644
GIT binary patch
delta 1808
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

delta 656
zcmV;B0&o524(<hzJ%3OXg-=tZDisAgh&W`Z;$T5k#8InIgbJZnXw|{wr9VQGh9t$s
zQE)9d__J7baB<ev!Br3he?Z*aoD^N8#QTy$ix?kV-p6_G9PYah5Nai+S#4v0rrTyJ
z5f?Mr6*2URPV`cZAS5%(n3bd?eAm}K0(`%V@hty)f39vdXMZsuAQI0o!?cOliKjMg
zgY!OdgcW6#_?&puqy~u}xvqHp#<}3Kz%wIeIyFZeAr=cQth6vIni}yWaa7fG$`>*o
ztDLtuYo!Wn^vPcs&gsibT&EgD0t;A#1Q7}<*gy$3Vzld|SV+-%+{ZuQ`XzEH<k|ou
z$2`i=AiI9>KY#c=TPr^??j?oeK>Lg1d<+4hU7%idobO}Dsh<GBXW&Y2`pY$7`jhl(
zQ;Qw}J=?&=byHLJfXf}A|H+U|*_DD+LOu_?pV2pEfxcUyYt@@u;~b|CK$>Qiya5gl
zf#CvWulc;Yqjhfo-f7J52RBc0kFr2gD*ylh24YJ`L}vg100000`9r&Z00009a7bBm
z000fw000fw0YWI7cmMzZ2XskIMF-^x5D6$2aSSyJ0002$Nkl<Zc-rmTyA1*{5CqWi
z(FG9&Au6B%bPe%|sepubhzKYGQv|`;zV|9vYscDX5|c3p9Di7oGSXwt_s71LdQGzJ
zWaL+Bndjr-Im!;Ekpfkxdg&-kNwO=Y-bUKNP=V_56C@jfYW049%PGmbqme%;)9hOT
z0000000000001xoy}V`V<+V&NPoP#$FR$hMt(OM?0000000000004{8%UhOSUd#0I
q1Zws4@>;&%dI5QpF$WqK@P{A6mNrt|4XD}x0000<MNUMnLSTX%)E(OZ

diff --git a/app/src/main/res/drawable-xhdpi/voip_menu_more.png b/app/src/main/res/drawable-xhdpi/voip_menu_more.png
index 7f7f7d8fd31b8bf96b81cf24fe2a50303142acbb..64abbbba8257152a04d9bb141463d71208b77796 100644
GIT binary patch
literal 1540
zcmV+f2K)JmP)<h;3K|Lk000e1NJLTq000sI002e^1^@s6!O_IF0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ%gmv4t6NwkfAzR@e6U(DionYs1;guFuC+YXws0h
zxHt-~1qVMCs}3&Cx;nTDg5U>;qmz@Oi<J1kq|hS9gX4a@yZ5+z2MF~N)2xnBK+`K`
zDiIem*%dMPiU1<$!3f4=W*M`Rl!WK_x`&UicQKyjeeTcEt>!ES_(b9vW|$S?b>gYb
ziotoGILwN&N_<W{Y|;gZAGxl${KmQ9u)s6JW;!)T93~bEZLG90E1DYdBym*LbjlYp
zE~}ikIBTUUYu=N;FqG4mm$*)I00}H$5fVfwsA2;pR1l+8C&faF_TwJ@e#bA7OCi?=
z7&+!qh6dU3ga5(rZms;pxSJG;1A!OY{ul&;yFjC6+uz5w-8cdK&%l-5@|Wwt^e5@H
zmKHq%dbfd#>z1bM0hc>K<jIgt*^&G-g?t`(KcjET0)4kY*Q(oFb04P<K$^Nr-T()O
zz)*p**F4_c+1}f~XPW)}0LR;M$rw<L%>V!Z24YJ`L;z<1l>oV$G+_|{000SaNLh0L
z01ejw01ejxLMWSf00007bV*G`2j&GB4lx1hK)4YA00aO@L_t(o!|j+&Ok7nI$A9O}
zP$+3B_>ma2%A%#l*oBb*w!i{Rnkq4EFj`|9cOncD7sfIVj7igZL#i8<L3H6lO{}CQ
zt=1|=Pz!DO5Tn))6c)6Ys?=0kszPSw9v7Vw5GV|fg(m!WFE{sh-@Esm|2g*w|59~b
zI8%(~0Xu+F;FiSD&nO)#au~}O&5gma>GNdzL%<0Yfb0i~fmG(!Bye1j=bGK%sac@v
z`f#bJ9t3V=aT-P06$v|^PJsf>{=31v2V|3+eno6~B-GF^0Vk9W@;2}QOVj&m<q-q2
z2`FLdDi));1|=WJ^Z?2P%{Pc_#It0B0rhzY;WxmrXN)pz5W0cCJYfD*q1z~C0O<7q
z>Qm)MUti}ZlljGEzX9byT9S~9C{Hzqo$n05=;hUIKrJwl1mtf~p3GSH`^Nx2fbV<S
z$S*4U7Q+Cr8MqEG^8n(&fFQLgt0r5Yf3{I)Wj{cT<KCvoeW2w)VFC(p0XPL51w9sV
z>(9<>BU5%#7dD8d0Dfal8h|x+LPcU?iAEZOmKCk&zbu(=U~A<|a@X~jvn{d?z@Qhu
zy0GS4S4*uf3RL+_bE@Az_89PRqFi6KmI+`4cqbamdgHYNRg-gqsu~)7K8+WtN)vGB
z0$*}kL~Fp;)fB3;Ot%UXw>wnj&>|oJn^omqH2&a>H>wG`MJjv%WF)!A<0#uBVdsPd
zf}spVT7hj#Jg_#g@{mz68-cAJPJW9T-CzVQ1lD)}tpy4U=*DG;##{rUo(rv_24Qd+
z(qqt|bOYlaIO8Ba#;6$rPIv&F6qTVXJ!H_`g7D!I0`gKKAW!-L`nuXj3QF!BO!U?1
zi-ep<sEWAGM>BFw<9ZmhLWOS@++5*npu)yEG{22J-JI%QHMR%Xm9UZ3SDOZ41m$2X
zn)TMJFU(^jvw$tTCFSfL*%rx27~7@Ttv{S=dE!lFMJxJWmh3=X*obI~g5UaV8i3E5
z35A%A`J%5J*lQOARXc8u%xsUdrnSdCs2mm1V@<9zJSQj+bPa|Ilzl+%0uB2h%09nn
z>x*uEe5&&g>~#gh9^iH0rfVg0Vu2eF?zd{r+*4e7x~Ho{udM20JMeOnmzp$0n=G;o
zKx!JonQHZjhYRv&h}mgSy&cH&aPs-8c9T)1FbSWYOX(<u1|(-0;xWg7#+D(fqXu1u
zl5H3=2tB}<2hNyUdJX7Lz;O?tPE{H7^>ubc3rflc6SwTONkV=RsEmZ2GX|h3<n#;d
z2F@n|83i6~a-IIETm$IsY#+`qF8v&2J#aISa;;xuB0L^(ozD4fq`oo3Seu8)PDM+B
q^@*Voly-z8D)!6fP{SY7=luiAFmM*GXF>}A0000<MNUMnLSTX%<h?fl

literal 1772
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
O0000<MNUMnLSTZ~Un|1^

diff --git a/app/src/main/res/layout/chat_room_detail_fragment.xml b/app/src/main/res/layout/chat_room_detail_fragment.xml
index c22659ad2..f69bb7e5c 100644
--- a/app/src/main/res/layout/chat_room_detail_fragment.xml
+++ b/app/src/main/res/layout/chat_room_detail_fragment.xml
@@ -11,9 +11,6 @@
         <variable
             name="titleClickListener"
             type="android.view.View.OnClickListener"/>
-        <variable
-            name="editClickListener"
-            type="android.view.View.OnClickListener"/>
         <variable
             name="menuClickListener"
             type="android.view.View.OnClickListener"/>
@@ -131,7 +128,6 @@
 
             <ImageView
                 android:id="@+id/menu"
-                android:visibility="@{viewModel.hideMenu() || chatSendingViewModel.isReadOnly ? View.GONE : View.VISIBLE}"
                 android:onClick="@{menuClickListener}"
                 android:contentDescription="@string/content_description_show_chat_room_menu"
                 android:layout_width="0dp"
@@ -141,17 +137,6 @@
                 android:padding="15dp"
                 android:src="@drawable/icon_menu_more"/>
 
-            <ImageView
-                android:onClick="@{editClickListener}"
-                android:visibility="@{menu.visibility == View.GONE ? View.VISIBLE : View.GONE}"
-                android:contentDescription="@string/content_description_enter_edition_mode"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="?attr/button_background_drawable"
-                android:padding="15dp"
-                android:src="@drawable/delete" />
-
         </LinearLayout>
 
         <androidx.fragment.app.FragmentContainerView
diff --git a/app/src/main/res/layout/chat_room_list_cell.xml b/app/src/main/res/layout/chat_room_list_cell.xml
index 05835b673..cfa8f99a3 100644
--- a/app/src/main/res/layout/chat_room_list_cell.xml
+++ b/app/src/main/res/layout/chat_room_list_cell.xml
@@ -87,7 +87,7 @@
             <TextView
                 android:id="@+id/title"
                 style="@style/contact_name_list_cell_font"
-                android:text="@{viewModel.oneToOneChatRoom ? (viewModel.contact.name ?? viewModel.displayName) : viewModel.subject}"
+                android:text="@{viewModel.oneToOneChatRoom ? (viewModel.contact.name ?? viewModel.displayName) : viewModel.subject, default=`Lorem Ipsum`}"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginRight="30dp"
@@ -101,7 +101,6 @@
                 android:layout_above="@+id/lastMessage"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="5dp"
-                android:layout_marginLeft="5dp"
                 android:gravity="center"
                 android:orientation="horizontal">
 
@@ -131,24 +130,42 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/title"
-                android:layout_toLeftOf="@id/ephemeral"
+                android:layout_toLeftOf="@id/icons"
                 android:ellipsize="end"
                 android:maxLines="2"
-                android:text="@{viewModel.lastMessageText}" />
+                android:text="@{viewModel.lastMessageText, default=`Lorem ipsum dolor sit amet`}" />
 
-            <ImageView
-                android:visibility="@{viewModel.ephemeralEnabled ? View.VISIBLE : View.GONE, default=gone}"
-                android:id="@+id/ephemeral"
-                android:contentDescription="@string/content_description_ephemeral_chat_room"
-                android:layout_width="20dp"
+            <LinearLayout
+                android:id="@+id/icons"
+                android:layout_width="wrap_content"
                 android:layout_height="20dp"
-                android:adjustViewBounds="true"
+                android:orientation="horizontal"
                 android:layout_alignParentBottom="true"
                 android:layout_alignParentRight="true"
-                android:layout_marginRight="5dp"
-                android:layout_marginLeft="5dp"
                 android:layout_marginBottom="10dp"
-                android:src="@drawable/ephemeral_messages"/>
+                android:gravity="right">
+
+                <ImageView
+                    android:visibility="@{viewModel.notificationsMuted ? View.VISIBLE : View.GONE, default=gone}"
+                    android:id="@+id/muted"
+                    android:contentDescription="@string/content_description_muted_chat_room"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:adjustViewBounds="true"
+                    android:layout_marginRight="5dp"
+                    android:src="@drawable/menu_notifications_off"/>
+
+                <ImageView
+                    android:visibility="@{viewModel.ephemeralEnabled ? View.VISIBLE : View.GONE, default=gone}"
+                    android:id="@+id/ephemeral"
+                    android:contentDescription="@string/content_description_ephemeral_chat_room"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:adjustViewBounds="true"
+                    android:layout_marginRight="5dp"
+                    android:src="@drawable/ephemeral_messages"/>
+
+            </LinearLayout>
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/chat_room_menu.xml b/app/src/main/res/layout/chat_room_menu.xml
index a5d1d778d..6c7550a2a 100644
--- a/app/src/main/res/layout/chat_room_menu.xml
+++ b/app/src/main/res/layout/chat_room_menu.xml
@@ -16,6 +16,12 @@
         <variable
             name="editionModeListener"
             type="View.OnClickListener" />
+        <variable
+            name="muteListener"
+            type="View.OnClickListener" />
+        <variable
+            name="unmuteListener"
+            type="View.OnClickListener" />
         <variable
             name="groupInfoHidden"
             type="Boolean" />
@@ -25,6 +31,12 @@
         <variable
             name="ephemeralHidden"
             type="Boolean" />
+        <variable
+            name="muteHidden"
+            type="Boolean" />
+        <variable
+            name="unmuteHidden"
+            type="Boolean" />
     </data>
 
     <LinearLayout
@@ -63,6 +75,26 @@
             android:text="@string/chat_message_context_menu_ephemeral_messages"
             app:drawableRightCompat="@drawable/chat_room_menu_ephemeral" />
 
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/chat_room_popup_item_height"
+            android:background="@drawable/menu_background"
+            android:visibility="@{muteHidden ? View.GONE : View.VISIBLE}"
+            android:onClick="@{muteListener}"
+            style="@style/popup_item_font"
+            android:text="@string/chat_message_context_menu_turn_off_notifications"
+            app:drawableRightCompat="@drawable/menu_notifications_off" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/chat_room_popup_item_height"
+            android:background="@drawable/menu_background"
+            android:visibility="@{unmuteHidden ? View.GONE : View.VISIBLE}"
+            android:onClick="@{unmuteListener}"
+            style="@style/popup_item_font"
+            android:text="@string/chat_message_context_menu_turn_on_notifications"
+            app:drawableRightCompat="@drawable/menu_notifications_on" />
+
         <TextView
             android:layout_width="match_parent"
             android:layout_height="@dimen/chat_room_popup_item_height"
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index d91f5a62c..3094bf385 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -727,4 +727,7 @@
     <string name="conference_start_group_call_dialog_title">Appel de groupe</string>
     <string name="conference_start_group_call_dialog_message">Voulez-vous démarrer un appel de groupe ?\nToutes les personnes dans cette conversation vont recevoir un appel.</string>
     <string name="conference_start_group_call_dialog_ok_button">Démarrer</string>
+    <string name="chat_message_context_menu_turn_off_notifications">Désactiver les notifications</string>
+    <string name="chat_message_context_menu_turn_on_notifications">Activer les notifications</string>
+    <string name="content_description_muted_chat_room">Les notifications sont désactivées pour cette conversation</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8fea766ed..34da62b26 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -190,6 +190,8 @@
     <string name="chat_room_context_menu_participants_devices">Conversation\'s devices</string>
     <string name="chat_message_context_menu_ephemeral_messages">Ephemeral messages</string>
     <string name="chat_message_context_menu_delete_messages">Delete messages</string>
+    <string name="chat_message_context_menu_turn_off_notifications">Disable notifications</string>
+    <string name="chat_message_context_menu_turn_on_notifications">Enable notifications</string>
     <string name="chat_room_ephemeral_fragment_title">Ephemeral messages</string>
     <string name="chat_room_ephemeral_messages_desc">This message will be deleted on both ends once it has been read and after the selected timeout.</string>
     <string name="chat_room_ephemeral_message_disabled">Disabled</string>
@@ -773,6 +775,7 @@
     <string name="content_description_contact_is_admin">Contact is an admin in this conversation</string>
     <string name="content_description_contact_is_not_admin">Contact isn\'t an admin in this conversation</string>
     <string name="content_description_ephemeral_chat_room">Messages are ephemeral in this conversation</string>
+    <string name="content_description_muted_chat_room">Notifications are disabled for this conversation</string>
     <string name="content_description_contact_can_do_encryption">Contact can be invited in encrypted conversations</string>
     <string name="content_description_start_chat">Go into conversation</string>
     <string name="content_description_start_encrypted_chat">Go into encrypted conversation</string>
diff --git a/build.gradle b/build.gradle
index bf3a0c8ea..83d1f7501 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         } // for com.github.chrisbanes:PhotoView
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath 'com.android.tools.build:gradle:7.2.1'
         classpath 'com.google.gms:google-services:4.3.10'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
         classpath "org.jlleitschuh.gradle:ktlint-gradle:10.1.0"