Merge branch 'develop' into feature/fix_draw_large_bitmap

* develop: (1406 commits)
  Version++
  Prepare release 1.0.13
  Typo in comment
  Improve redirect url, which can be visible to the user: "element://element" -> "element://connect"
  Fix compilation issue
  Add changelog
  Make MSC2858 implementation match the unstable policy of the spec
  Version++
  Prepare release 1.0.12
  /confetti /snow commands: send emote if text is blank (iso Element Web)
  Import SAS strings
  Ensure the message is understood as a debug indication (#2509)
  Add /snow command
  PR Review
  Chat Effects
  Remove bad translation
  Translated using Weblate (French)
  Translated using Weblate (Albanian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Albanian)
  ...

# Conflicts:
#	CHANGES.md

CHANGES.md

@@ -8,6 +8,8 @@ Improvements 🙌:
   - Add System theme option and set as default (#904) (#2387)
 
 Bugfix 🐛:
+ - Fix Canvas: trying to draw too large bitmap (#1951)
+ - Url previews sometimes attached to wrong message (#2561)
  - Unspecced msgType field in m.sticker (#2580)
  - Wait for all room members to be known before sending a message to a e2e room (#2518)
  - Url previews sometimes attached to wrong message (#2561)

vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt

@@ -30,6 +30,7 @@ import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.target.CustomViewTarget
 import com.bumptech.glide.request.target.Target
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView.ORIENTATION_USE_EXIF
+import com.github.chrisbanes.photoview.PhotoView
 import com.github.piasy.biv.view.BigImageView
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
@@ -152,7 +153,11 @@ class ImageContentRenderer @Inject constructor(private val activeSessionHolder:
                     .load(resolvedUrl)
         }
 
-        req.override(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)
+        val maximumScale = (contextView as? PhotoView)?.maximumScale?.toInt() ?: 1
+        val width = min(contextView.resources.displayMetrics.widthPixels, data.width ?: 0).times(maximumScale)
+        val height = min(contextView.resources.displayMetrics.heightPixels, data.height ?: 0).times(maximumScale)
+
+        req.override(width, height)
                 .fitCenter()
                 .into(target)
     }

vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt

@@ -52,8 +52,8 @@ class RoomEventsAttachmentProvider(
                         elementToDecrypt = content.encryptedFileInfo?.toElementToDecrypt(),
                         maxHeight = -1,
                         maxWidth = -1,
-                        width = null,
+                        width = content.info?.width,
-                        height = null,
+                        height = content.info?.height,
                         allowNonMxcUrls = it.root.sendState.isSending()
 
                 )