Merge branch 'develop' into feature/new_home

2024-10-23 03:06:33 +03:00 · 2020-07-01 20:31:55 +02:00 · 2020-07-01 20:31:55 +02:00 · a98bd0940f
commit a98bd0940f
parent fb1c01c37c ba8ec97f6a
9 changed files with 34 additions and 4 deletions
--- a/CHANGES.md
+++ b/CHANGES.md
@ -14,6 +14,7 @@ Improvements 🙌:
 - Allow self-signed certificate (#1564)
 - Improve file download and open in timeline
 - Catchup tab is removed temporarily (#1565)
+ - Render room avatar change (#1319)

 Bugfix 🐛:
 - Fix dark theme issue on login screen (#1097)
@ -22,6 +23,7 @@ Bugfix 🐛:
 - Use vendor prefix for non merged MSC (#1537)
 - Compress images before sending (#1333)
 - Searching by displayname is case sensitive (#1468)
+ - Fix layout overlap issue (#1407)

 Translations 🗣:
 -
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/CertUtil.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/CertUtil.kt
@ -252,7 +252,8 @@ internal object CertUtil {
        builder.supportsTlsExtensions(hsConfig.shouldAcceptTlsExtensions)
        val list = ArrayList<ConnectionSpec>()
        list.add(builder.build())
-        if (hsConfig.allowHttpExtension) {
+        // TODO: we should display a warning if user enter an http url
+        if (hsConfig.allowHttpExtension || hsConfig.homeServerUri.toString().startsWith("http://")) {
            list.add(ConnectionSpec.CLEARTEXT)
        }
        return list
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/summary/RoomSummaryUpdater.kt
@ -65,6 +65,7 @@ internal class RoomSummaryUpdater @Inject constructor(
                EventType.MESSAGE,
                EventType.STATE_ROOM_NAME,
                EventType.STATE_ROOM_TOPIC,
+                EventType.STATE_ROOM_AVATAR,
                EventType.STATE_ROOM_MEMBER,
                EventType.STATE_ROOM_HISTORY_VISIBILITY,
                EventType.CALL_INVITE,
--- a/matrix-sdk-android/src/main/res/values/strings.xml
+++ b/matrix-sdk-android/src/main/res/values/strings.xml
@ -37,6 +37,8 @@
    <string name="notice_display_name_removed_by_you">You removed your display name (it was %1$s)</string>
    <string name="notice_room_topic_changed">%1$s changed the topic to: %2$s</string>
    <string name="notice_room_topic_changed_by_you">You changed the topic to: %1$s</string>
+    <string name="notice_room_avatar_changed">%1$s changed the room avatar</string>
+    <string name="notice_room_avatar_changed_by_you">You changed the room avatar</string>
    <string name="notice_room_name_changed">%1$s changed the room name to: %2$s</string>
    <string name="notice_room_name_changed_by_you">You changed the room name to: %1$s</string>
    <string name="notice_placed_video_call">%s placed a video call.</string>
@ -71,6 +73,8 @@
    <string name="notice_room_name_removed_by_you">You removed the room name</string>
    <string name="notice_room_topic_removed">%1$s removed the room topic</string>
    <string name="notice_room_topic_removed_by_you">You removed the room topic</string>
+    <string name="notice_room_avatar_removed">%1$s removed the room avatar</string>
+    <string name="notice_room_avatar_removed_by_you">You removed the room avatar</string>
    <string name="notice_event_redacted">Message removed</string>
    <string name="notice_event_redacted_by">Message removed by %1$s</string>
    <string name="notice_event_redacted_with_reason">Message removed [reason: %1$s]</string>
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@ -179,6 +179,7 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
            }
            EventType.STATE_ROOM_NAME,
            EventType.STATE_ROOM_TOPIC,
+            EventType.STATE_ROOM_AVATAR,
            EventType.STATE_ROOM_MEMBER,
            EventType.STATE_ROOM_ALIASES,
            EventType.STATE_ROOM_CANONICAL_ALIAS,
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
@ -48,6 +48,7 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
                EventType.STATE_ROOM_TOMBSTONE,
                EventType.STATE_ROOM_NAME,
                EventType.STATE_ROOM_TOPIC,
+                EventType.STATE_ROOM_AVATAR,
                EventType.STATE_ROOM_MEMBER,
                EventType.STATE_ROOM_ALIASES,
                EventType.STATE_ROOM_CANONICAL_ALIAS,
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
@ -24,6 +24,7 @@ import im.vector.matrix.android.api.session.room.model.GuestAccess
 import im.vector.matrix.android.api.session.room.model.Membership
 import im.vector.matrix.android.api.session.room.model.PowerLevelsContent
 import im.vector.matrix.android.api.session.room.model.RoomAliasesContent
+import im.vector.matrix.android.api.session.room.model.RoomAvatarContent
 import im.vector.matrix.android.api.session.room.model.RoomCanonicalAliasContent
 import im.vector.matrix.android.api.session.room.model.RoomGuestAccessContent
 import im.vector.matrix.android.api.session.room.model.RoomHistoryVisibilityContent
@ -57,6 +58,7 @@ class NoticeEventFormatter @Inject constructor(private val sessionHolder: Active
            EventType.STATE_ROOM_CREATE             -> formatRoomCreateEvent(timelineEvent.root)
            EventType.STATE_ROOM_NAME               -> formatRoomNameEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
            EventType.STATE_ROOM_TOPIC              -> formatRoomTopicEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
+            EventType.STATE_ROOM_AVATAR             -> formatRoomAvatarEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
            EventType.STATE_ROOM_MEMBER             -> formatRoomMemberEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
            EventType.STATE_ROOM_ALIASES            -> formatRoomAliasesEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
            EventType.STATE_ROOM_CANONICAL_ALIAS    -> formatRoomCanonicalAliasEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
@ -149,6 +151,7 @@ class NoticeEventFormatter @Inject constructor(private val sessionHolder: Active
            EventType.STATE_ROOM_JOIN_RULES         -> formatJoinRulesEvent(event, senderName)
            EventType.STATE_ROOM_NAME               -> formatRoomNameEvent(event, senderName)
            EventType.STATE_ROOM_TOPIC              -> formatRoomTopicEvent(event, senderName)
+            EventType.STATE_ROOM_AVATAR             -> formatRoomAvatarEvent(event, senderName)
            EventType.STATE_ROOM_MEMBER             -> formatRoomMemberEvent(event, senderName)
            EventType.STATE_ROOM_HISTORY_VISIBILITY -> formatRoomHistoryVisibilityEvent(event, senderName)
            EventType.CALL_INVITE,
@ -220,6 +223,23 @@ class NoticeEventFormatter @Inject constructor(private val sessionHolder: Active
        }
    }

+    private fun formatRoomAvatarEvent(event: Event, senderName: String?): CharSequence? {
+        val content = event.getClearContent().toModel<RoomAvatarContent>() ?: return null
+        return if (content.avatarUrl.isNullOrEmpty()) {
+            if (event.isSentByCurrentUser()) {
+                sp.getString(R.string.notice_room_avatar_removed_by_you)
+            } else {
+                sp.getString(R.string.notice_room_avatar_removed, senderName)
+            }
+        } else {
+            if (event.isSentByCurrentUser()) {
+                sp.getString(R.string.notice_room_avatar_changed_by_you)
+            } else {
+                sp.getString(R.string.notice_room_avatar_changed, senderName)
+            }
+        }
+    }
+
    private fun formatRoomHistoryVisibilityEvent(event: Event, senderName: String?): CharSequence? {
        val historyVisibility = event.getClearContent().toModel<RoomHistoryVisibilityContent>()?.historyVisibility ?: return null

--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt
@ -28,6 +28,7 @@ object TimelineDisplayableEvents {
            EventType.STATE_ROOM_WIDGET,
            EventType.STATE_ROOM_NAME,
            EventType.STATE_ROOM_TOPIC,
+            EventType.STATE_ROOM_AVATAR,
            EventType.STATE_ROOM_MEMBER,
            EventType.STATE_ROOM_ALIASES,
            EventType.STATE_ROOM_CANONICAL_ALIAS,
--- a/vector/src/main/res/layout/item_form_switch.xml
+++ b/vector/src/main/res/layout/item_form_switch.xml
@ -30,13 +30,13 @@

    <TextView
        android:id="@+id/formSwitchSummary"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
        android:textColor="?riotx_text_secondary"
        android:textSize="14sp"
        app:layout_constraintBottom_toTopOf="@+id/formSwitchDivider"
+        app:layout_constraintEnd_toStartOf="@+id/formSwitchSwitch"
        app:layout_constraintStart_toStartOf="@+id/formSwitchTitle"
        app:layout_constraintTop_toBottomOf="@+id/formSwitchTitle"
        tools:text="@string/create_room_public_description" />
@ -46,7 +46,6 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginEnd="19dp"
-        android:layout_marginRight="19dp"
        app:layout_constraintBottom_toTopOf="@+id/formSwitchDivider"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintTop_toTopOf="parent" />