Merge branch 'develop' into feature/fix_draw_large_bitmap

Typo in the set-up instructions for the test homeserver

.idea/dictionaries/bmarty.xml

@@ -24,6 +24,8 @@
       <w>pbkdf</w>
       <w>pids</w>
       <w>pkcs</w>
+      <w>previewable</w>
+      <w>previewables</w>
       <w>riotx</w>
       <w>signin</w>
       <w>signout</w>
@@ -31,6 +33,7 @@
       <w>ssss</w>
       <w>sygnal</w>
       <w>threepid</w>
+      <w>unpublish</w>
       <w>unwedging</w>
     </words>
   </dictionary>

CHANGES.md

@@ -1,3 +1,83 @@
+Changes in Element 1.0.14 (2020-XX-XX)
+===================================================
+
+Features ✨:
+ - Enable url previews for notices (#2562)
+
+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)
+ - Hiding membership events works the exact opposite (#2603)
+ - Tapping drawer having more than 1 room in notifications gives "malformed link" error (#2605)
+
+Translations 🗣:
+ -
+
+SDK API changes ⚠️:
+ -
+
+Build 🧱:
+ -
+
+Test:
+ -
+
+Other changes:
+ - Migrate to ViewBindings (#1072)
+
+Changes in Element 1.0.13 (2020-12-18)
+===================================================
+
+Bugfix 🐛:
+ - Fix MSC2858 implementation details (#2540)
+
+Changes in Element 1.0.12 (2020-12-15)
+===================================================
+
+Features ✨:
+ - Add room aliases management, and room directory visibility management in a dedicated screen (#1579, #2428)
+ - Room setting: update join rules and guest access (#2442)
+ - Url preview (#481)
+ - Store encrypted file in cache and cleanup decrypted file at each app start (#2512)
+ - Emoji Keyboard (#2520)
+ - Social login (#2452)
+ - Support for chat effects in timeline (confetti, snow) (#2535)
+
+Improvements 🙌:
+ - Add Setting Item to Change PIN (#2462)
+ - Improve room history visibility setting UX (#1579)
+ - Matrix.to deeplink custom scheme support
+ - Homeserver history (#1933)
+
+Bugfix 🐛:
+ - Fix cancellation of sending event (#2438)
+ - Double bottomsheet effect after verify with passphrase
+ - EditText cursor jumps to the start while typing fast (#2469)
+ - UTD for events before invitation if member state events are hidden (#2486)
+ - No known servers error is given when joining rooms on new Gitter bridge (#2516)
+ - Show preview when sending attachment from the keyboard (#2440)
+ - Do not compress GIFs (#1616, #1254)
+
+SDK API changes ⚠️:
+ - StateService now exposes suspendable function instead of using MatrixCallback.
+ - RawCacheStrategy has been moved and renamed to CacheStrategy
+ - FileService: remove useless FileService.DownloadMode
+
+Build 🧱:
+ - Upgrade some dependencies and Kotlin version
+ - Use fragment-ktx and preference-ktx dependencies (fix lint issue KtxExtensionAvailable)
+ - Upgrade Realm dependency to 10.1.2
+
+Other changes:
+ - Remove "Status.im" theme #2424
+ - Log HTTP requests and responses in production (level BASIC, i.e. without any private data)
+
 Changes in Element 1.0.11 (2020-11-27)
 ===================================================
 

attachment-viewer/build.gradle

@@ -16,7 +16,6 @@
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 buildscript {
     repositories {
@@ -55,6 +54,10 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 dependencies {
@@ -66,7 +69,6 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation "androidx.fragment:fragment:1.3.0-beta01"
     implementation "androidx.recyclerview:recyclerview:1.1.0"
 
     implementation 'com.google.android.material:material:1.2.1'

attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt

@@ -17,19 +17,17 @@
 package im.vector.lib.attachmentviewer
 
 import android.view.View
-import android.widget.ImageView
-import android.widget.ProgressBar
+import im.vector.lib.attachmentviewer.databinding.ItemAnimatedImageAttachmentBinding
 
 class AnimatedImageViewHolder constructor(itemView: View) :
         BaseViewHolder(itemView) {
 
-    val touchImageView: ImageView = itemView.findViewById(R.id.imageView)
-    val imageLoaderProgress: ProgressBar = itemView.findViewById(R.id.imageLoaderProgress)
+    val views = ItemAnimatedImageAttachmentBinding.bind(itemView)
 
-    internal val target = DefaultImageLoaderTarget(this, this.touchImageView)
+    internal val target = DefaultImageLoaderTarget(this, views.imageView)
 
     override fun onRecycled() {
         super.onRecycled()
-        touchImageView.setImageDrawable(null)
+        views.imageView.setImageDrawable(null)
     }
 }

attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt

@@ -33,43 +33,51 @@ import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import androidx.transition.TransitionManager
 import androidx.viewpager2.widget.ViewPager2
-import kotlinx.android.synthetic.main.activity_attachment_viewer.*
+import im.vector.lib.attachmentviewer.databinding.ActivityAttachmentViewerBinding
+
 import java.lang.ref.WeakReference
 import kotlin.math.abs
 
 abstract class AttachmentViewerActivity : AppCompatActivity(), AttachmentEventListener {
 
-    lateinit var pager2: ViewPager2
-    lateinit var imageTransitionView: ImageView
-    lateinit var transitionImageContainer: ViewGroup
+    protected val pager2: ViewPager2
+        get() = views.attachmentPager
+    protected val imageTransitionView: ImageView
+        get() = views.transitionImageView
+    protected val transitionImageContainer: ViewGroup
+        get() = views.transitionImageContainer
 
-    var topInset = 0
-    var bottomInset = 0
-    var systemUiVisibility = true
+    private var topInset = 0
+    private var bottomInset = 0
+    private var systemUiVisibility = true
 
     private var overlayView: View? = null
         set(value) {
             if (value == overlayView) return
-            overlayView?.let { rootContainer.removeView(it) }
-            rootContainer.addView(value)
+            overlayView?.let { views.rootContainer.removeView(it) }
+            views.rootContainer.addView(value)
             value?.updatePadding(top = topInset, bottom = bottomInset)
             field = value
         }
 
+    private lateinit var views: ActivityAttachmentViewerBinding
+
     private lateinit var swipeDismissHandler: SwipeToDismissHandler
     private lateinit var directionDetector: SwipeDirectionDetector
     private lateinit var scaleDetector: ScaleGestureDetector
     private lateinit var gestureDetector: GestureDetectorCompat
 
     var currentPosition = 0
+        private set
 
     private var swipeDirection: SwipeDirection? = null
 
     private fun isScaled() = attachmentsAdapter.isScaled(currentPosition)
 
+    private val attachmentsAdapter = AttachmentsAdapter()
+
     private var wasScaled: Boolean = false
     private var isSwipeToDismissAllowed: Boolean = true
-    private lateinit var attachmentsAdapter: AttachmentsAdapter
     private var isOverlayWasClicked = false
 
 //    private val shouldDismissToBottom: Boolean
@@ -95,17 +103,14 @@ abstract class AttachmentViewerActivity : AppCompatActivity(), AttachmentEventLi
         window.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS, WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
         window.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION)
 
-        setContentView(R.layout.activity_attachment_viewer)
-        attachmentPager.orientation = ViewPager2.ORIENTATION_HORIZONTAL
-        attachmentsAdapter = AttachmentsAdapter()
-        attachmentPager.adapter = attachmentsAdapter
-        imageTransitionView = transitionImageView
-        transitionImageContainer = findViewById(R.id.transitionImageContainer)
-        pager2 = attachmentPager
+        views = ActivityAttachmentViewerBinding.inflate(layoutInflater)
+        setContentView(views.root)
+        views.attachmentPager.orientation = ViewPager2.ORIENTATION_HORIZONTAL
+        views.attachmentPager.adapter = attachmentsAdapter
         directionDetector = createSwipeDirectionDetector()
         gestureDetector = createGestureDetector()
 
-        attachmentPager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
+        views.attachmentPager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
             override fun onPageScrollStateChanged(state: Int) {
                 isImagePagerIdle = state == ViewPager2.SCROLL_STATE_IDLE
             }
@@ -116,12 +121,12 @@ abstract class AttachmentViewerActivity : AppCompatActivity(), AttachmentEventLi
         })
 
         swipeDismissHandler = createSwipeToDismissHandler()
-        rootContainer.setOnTouchListener(swipeDismissHandler)
-        rootContainer.viewTreeObserver.addOnGlobalLayoutListener { swipeDismissHandler.translationLimit = dismissContainer.height / 4 }
+        views.rootContainer.setOnTouchListener(swipeDismissHandler)
+        views.rootContainer.viewTreeObserver.addOnGlobalLayoutListener { swipeDismissHandler.translationLimit = views.dismissContainer.height / 4 }
 
         scaleDetector = createScaleGestureDetector()
 
-        ViewCompat.setOnApplyWindowInsetsListener(rootContainer) { _, insets ->
+        ViewCompat.setOnApplyWindowInsetsListener(views.rootContainer) { _, insets ->
             overlayView?.updatePadding(top = insets.systemWindowInsetTop, bottom = insets.systemWindowInsetBottom)
             topInset = insets.systemWindowInsetTop
             bottomInset = insets.systemWindowInsetBottom
@@ -170,7 +175,7 @@ abstract class AttachmentViewerActivity : AppCompatActivity(), AttachmentEventLi
         if (swipeDirection == null && (scaleDetector.isInProgress || ev.pointerCount > 1 || wasScaled)) {
             wasScaled = true
 //            Log.v("ATTACHEMENTS", "dispatch to pager")
-            return attachmentPager.dispatchTouchEvent(ev)
+            return views.attachmentPager.dispatchTouchEvent(ev)
         }
 
         // Log.v("ATTACHEMENTS", "is current item scaled ${isScaled()}")
@@ -196,16 +201,16 @@ abstract class AttachmentViewerActivity : AppCompatActivity(), AttachmentEventLi
     private fun handleEventActionDown(event: MotionEvent) {
         swipeDirection = null
         wasScaled = false
-        attachmentPager.dispatchTouchEvent(event)
+        views.attachmentPager.dispatchTouchEvent(event)
 
-        swipeDismissHandler.onTouch(rootContainer, event)
+        swipeDismissHandler.onTouch(views.rootContainer, event)
         isOverlayWasClicked = dispatchOverlayTouch(event)
     }
 
     private fun handleEventActionUp(event: MotionEvent) {
 //        wasDoubleTapped = false
-        swipeDismissHandler.onTouch(rootContainer, event)
-        attachmentPager.dispatchTouchEvent(event)
+        swipeDismissHandler.onTouch(views.rootContainer, event)
+        views.attachmentPager.dispatchTouchEvent(event)
         isOverlayWasClicked = dispatchOverlayTouch(event)
     }
 
@@ -220,12 +225,12 @@ abstract class AttachmentViewerActivity : AppCompatActivity(), AttachmentEventLi
     private fun toggleOverlayViewVisibility() {
         if (systemUiVisibility) {
             // we hide
-            TransitionManager.beginDelayedTransition(rootContainer)
+            TransitionManager.beginDelayedTransition(views.rootContainer)
             hideSystemUI()
             overlayView?.isVisible = false
         } else {
             // we show
-            TransitionManager.beginDelayedTransition(rootContainer)
+            TransitionManager.beginDelayedTransition(views.rootContainer)
             showSystemUI()
             overlayView?.isVisible = true
         }
@@ -238,11 +243,11 @@ abstract class AttachmentViewerActivity : AppCompatActivity(), AttachmentEventLi
         return when (swipeDirection) {
             SwipeDirection.Up, SwipeDirection.Down    -> {
                 if (isSwipeToDismissAllowed && !wasScaled && isImagePagerIdle) {
-                    swipeDismissHandler.onTouch(rootContainer, event)
+                    swipeDismissHandler.onTouch(views.rootContainer, event)
                 } else true
             }
             SwipeDirection.Left, SwipeDirection.Right -> {
-                attachmentPager.dispatchTouchEvent(event)
+                views.attachmentPager.dispatchTouchEvent(event)
             }
             else                                      -> true
         }
@@ -250,8 +255,8 @@ abstract class AttachmentViewerActivity : AppCompatActivity(), AttachmentEventLi
 
     private fun handleSwipeViewMove(translationY: Float, translationLimit: Int) {
         val alpha = calculateTranslationAlpha(translationY, translationLimit)
-        backgroundView.alpha = alpha
-        dismissContainer.alpha = alpha
+        views.backgroundView.alpha = alpha
+        views.dismissContainer.alpha = alpha
         overlayView?.alpha = alpha
     }
 
@@ -265,7 +270,7 @@ abstract class AttachmentViewerActivity : AppCompatActivity(), AttachmentEventLi
 
     private fun createSwipeToDismissHandler()
             : SwipeToDismissHandler = SwipeToDismissHandler(
-            swipeView = dismissContainer,
+            swipeView = views.dismissContainer,
             shouldAnimateDismiss = { shouldAnimateDismiss() },
             onDismiss = { animateClose() },
             onSwipeViewMove = ::handleSwipeViewMove)

attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt

@@ -98,7 +98,7 @@ class AttachmentsAdapter : RecyclerView.Adapter<BaseViewHolder>() {
     fun isScaled(position: Int): Boolean {
         val holder = recyclerView?.findViewHolderForAdapterPosition(position)
         if (holder is ZoomableImageViewHolder) {
-            return holder.touchImageView.attacher.scale > 1f
+            return holder.views.touchImageView.attacher.scale > 1f
         }
         return false
     }

attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt

@@ -44,29 +44,29 @@ internal class DefaultImageLoaderTarget(val holder: AnimatedImageViewHolder, pri
 
     override fun onResourceLoading(uid: String, placeholder: Drawable?) {
         if (holder.boundResourceUid != uid) return
-        holder.imageLoaderProgress.isVisible = true
+        holder.views.imageLoaderProgress.isVisible = true
     }
 
     override fun onLoadFailed(uid: String, errorDrawable: Drawable?) {
         if (holder.boundResourceUid != uid) return
-        holder.imageLoaderProgress.isVisible = false
-        holder.touchImageView.setImageDrawable(errorDrawable)
+        holder.views.imageLoaderProgress.isVisible = false
+        holder.views.imageView.setImageDrawable(errorDrawable)
     }
 
     override fun onResourceCleared(uid: String, placeholder: Drawable?) {
         if (holder.boundResourceUid != uid) return
-        holder.touchImageView.setImageDrawable(placeholder)
+        holder.views.imageView.setImageDrawable(placeholder)
     }
 
     override fun onResourceReady(uid: String, resource: Drawable) {
         if (holder.boundResourceUid != uid) return
-        holder.imageLoaderProgress.isVisible = false
+        holder.views.imageLoaderProgress.isVisible = false
         // Glide mess up the view size :/
-        holder.touchImageView.updateLayoutParams {
+        holder.views.imageView.updateLayoutParams {
             width = LinearLayout.LayoutParams.MATCH_PARENT
             height = LinearLayout.LayoutParams.MATCH_PARENT
         }
-        holder.touchImageView.setImageDrawable(resource)
+        holder.views.imageView.setImageDrawable(resource)
         if (resource is Animatable) {
             resource.start()
         }
@@ -77,30 +77,30 @@ internal class DefaultImageLoaderTarget(val holder: AnimatedImageViewHolder, pri
 
         override fun onResourceLoading(uid: String, placeholder: Drawable?) {
             if (holder.boundResourceUid != uid) return
-            holder.imageLoaderProgress.isVisible = true
-            holder.touchImageView.setImageDrawable(placeholder)
+            holder.views.imageLoaderProgress.isVisible = true
+            holder.views.touchImageView.setImageDrawable(placeholder)
         }
 
         override fun onLoadFailed(uid: String, errorDrawable: Drawable?) {
             if (holder.boundResourceUid != uid) return
-            holder.imageLoaderProgress.isVisible = false
-            holder.touchImageView.setImageDrawable(errorDrawable)
+            holder.views.imageLoaderProgress.isVisible = false
+            holder.views.touchImageView.setImageDrawable(errorDrawable)
         }
 
         override fun onResourceCleared(uid: String, placeholder: Drawable?) {
             if (holder.boundResourceUid != uid) return
-            holder.touchImageView.setImageDrawable(placeholder)
+            holder.views.touchImageView.setImageDrawable(placeholder)
         }
 
         override fun onResourceReady(uid: String, resource: Drawable) {
             if (holder.boundResourceUid != uid) return
-            holder.imageLoaderProgress.isVisible = false
+            holder.views.imageLoaderProgress.isVisible = false
             // Glide mess up the view size :/
-            holder.touchImageView.updateLayoutParams {
+            holder.views.touchImageView.updateLayoutParams {
                 width = LinearLayout.LayoutParams.MATCH_PARENT
                 height = LinearLayout.LayoutParams.MATCH_PARENT
             }
-            holder.touchImageView.setImageDrawable(resource)
+            holder.views.touchImageView.setImageDrawable(resource)
         }
     }
 }

attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt

@@ -49,19 +49,19 @@ internal class DefaultVideoLoaderTarget(val holder: VideoViewHolder, private val
 
     override fun onThumbnailResourceCleared(uid: String, placeholder: Drawable?) {
         if (holder.boundResourceUid != uid) return
-        holder.thumbnailImage.setImageDrawable(placeholder)
+        holder.views.videoThumbnailImage.setImageDrawable(placeholder)
     }
 
     override fun onThumbnailResourceReady(uid: String, resource: Drawable) {
         if (holder.boundResourceUid != uid) return
-        holder.thumbnailImage.setImageDrawable(resource)
+        holder.views.videoThumbnailImage.setImageDrawable(resource)
     }
 
     override fun onVideoFileLoading(uid: String) {
         if (holder.boundResourceUid != uid) return
-        holder.thumbnailImage.isVisible = true
-        holder.loaderProgressBar.isVisible = true
-        holder.videoView.isVisible = false
+        holder.views.videoThumbnailImage.isVisible = true
+        holder.views.videoLoaderProgress.isVisible = true
+        holder.views.videoView.isVisible = false
     }
 
     override fun onVideoFileLoadFailed(uid: String) {
@@ -82,8 +82,8 @@ internal class DefaultVideoLoaderTarget(val holder: VideoViewHolder, private val
     }
 
     private fun arrangeForVideoReady() {
-        holder.thumbnailImage.isVisible = false
-        holder.loaderProgressBar.isVisible = false
-        holder.videoView.isVisible = true
+        holder.views.videoThumbnailImage.isVisible = false
+        holder.views.videoLoaderProgress.isVisible = false
+        holder.views.videoView.isVisible = true
     }
 }

attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt

@@ -18,11 +18,8 @@ package im.vector.lib.attachmentviewer
 
 import android.util.Log
 import android.view.View
-import android.widget.ImageView
-import android.widget.ProgressBar
-import android.widget.TextView
-import android.widget.VideoView
 import androidx.core.view.isVisible
+import im.vector.lib.attachmentviewer.databinding.ItemVideoAttachmentBinding
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
@@ -44,13 +41,9 @@ class VideoViewHolder constructor(itemView: View) :
 
     var eventListener: WeakReference<AttachmentEventListener>? = null
 
-    val thumbnailImage: ImageView = itemView.findViewById(R.id.videoThumbnailImage)
-    val videoView: VideoView = itemView.findViewById(R.id.videoView)
-    val loaderProgressBar: ProgressBar = itemView.findViewById(R.id.videoLoaderProgress)
-    val videoControlIcon: ImageView = itemView.findViewById(R.id.videoControlIcon)
-    val errorTextView: TextView = itemView.findViewById(R.id.videoMediaViewerErrorView)
+    val views = ItemVideoAttachmentBinding.bind(itemView)
 
-    internal val target = DefaultVideoLoaderTarget(this, thumbnailImage)
+    internal val target = DefaultVideoLoaderTarget(this, views.videoThumbnailImage)
 
     override fun onRecycled() {
         super.onRecycled()
@@ -77,12 +70,12 @@ class VideoViewHolder constructor(itemView: View) :
     }
 
     override fun entersBackground() {
-        if (videoView.isPlaying) {
-            progress = videoView.currentPosition
+        if (views.videoView.isPlaying) {
+            progress = views.videoView.currentPosition
             progressDisposable?.dispose()
             progressDisposable = null
-            videoView.stopPlayback()
-            videoView.pause()
+            views.videoView.stopPlayback()
+            views.videoView.pause()
         }
     }
 
@@ -92,9 +85,9 @@ class VideoViewHolder constructor(itemView: View) :
 
     override fun onSelected(selected: Boolean) {
         if (!selected) {
-            if (videoView.isPlaying) {
-                progress = videoView.currentPosition
-                videoView.stopPlayback()
+            if (views.videoView.isPlaying) {
+                progress = views.videoView.currentPosition
+                views.videoView.stopPlayback()
             } else {
                 progress = 0
             }
@@ -109,34 +102,34 @@ class VideoViewHolder constructor(itemView: View) :
     }
 
     private fun startPlaying() {
-        thumbnailImage.isVisible = false
-        loaderProgressBar.isVisible = false
-        videoView.isVisible = true
+        views.videoThumbnailImage.isVisible = false
+        views.videoLoaderProgress.isVisible = false
+        views.videoView.isVisible = true
 
-        videoView.setOnPreparedListener {
+        views.videoView.setOnPreparedListener {
             progressDisposable?.dispose()
             progressDisposable = Observable.interval(100, TimeUnit.MILLISECONDS)
                     .timeInterval()
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe {
-                        val duration = videoView.duration
-                        val progress = videoView.currentPosition
-                        val isPlaying = videoView.isPlaying
+                        val duration = views.videoView.duration
+                        val progress = views.videoView.currentPosition
+                        val isPlaying = views.videoView.isPlaying
 //                        Log.v("FOO", "isPlaying $isPlaying $progress/$duration")
                         eventListener?.get()?.onEvent(AttachmentEvents.VideoEvent(isPlaying, progress, duration))
                     }
         }
         try {
-            videoView.setVideoPath(mVideoPath)
+            views.videoView.setVideoPath(mVideoPath)
         } catch (failure: Throwable) {
             // Couldn't open
             Log.v(VideoViewHolder::class.java.name, "Failed to start video")
         }
 
         if (!wasPaused) {
-            videoView.start()
+            views.videoView.start()
             if (progress > 0) {
-                videoView.seekTo(progress)
+                views.videoView.seekTo(progress)
             }
         }
     }
@@ -146,17 +139,17 @@ class VideoViewHolder constructor(itemView: View) :
         when (commands) {
             AttachmentCommands.StartVideo -> {
                 wasPaused = false
-                videoView.start()
+                views.videoView.start()
             }
             AttachmentCommands.PauseVideo -> {
                 wasPaused = true
-                videoView.pause()
+                views.videoView.pause()
             }
             is AttachmentCommands.SeekTo  -> {
-                val duration = videoView.duration
+                val duration = views.videoView.duration
                 if (duration > 0) {
                     val seekDuration = duration * (commands.percentProgress / 100f)
-                    videoView.seekTo(seekDuration.toInt())
+                    views.videoView.seekTo(seekDuration.toInt())
                 }
             }
         }

attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt

@@ -17,31 +17,29 @@
 package im.vector.lib.attachmentviewer
 
 import android.view.View
-import android.widget.ProgressBar
-import com.github.chrisbanes.photoview.PhotoView
+import im.vector.lib.attachmentviewer.databinding.ItemImageAttachmentBinding
 
 class ZoomableImageViewHolder constructor(itemView: View) :
         BaseViewHolder(itemView) {
 
-    val touchImageView: PhotoView = itemView.findViewById(R.id.touchImageView)
-    val imageLoaderProgress: ProgressBar = itemView.findViewById(R.id.imageLoaderProgress)
+    val views = ItemImageAttachmentBinding.bind(itemView)
 
     init {
-        touchImageView.setAllowParentInterceptOnEdge(false)
-        touchImageView.setOnScaleChangeListener { scaleFactor, _, _ ->
+        views.touchImageView.setAllowParentInterceptOnEdge(false)
+        views.touchImageView.setOnScaleChangeListener { scaleFactor, _, _ ->
             // Log.v("ATTACHEMENTS", "scaleFactor $scaleFactor")
             // It's a bit annoying but when you pitch down the scaling
             // is not exactly one :/
-            touchImageView.setAllowParentInterceptOnEdge(scaleFactor <= 1.0008f)
+            views.touchImageView.setAllowParentInterceptOnEdge(scaleFactor <= 1.0008f)
         }
-        touchImageView.setScale(1.0f, true)
-        touchImageView.setAllowParentInterceptOnEdge(true)
+        views.touchImageView.setScale(1.0f, true)
+        views.touchImageView.setAllowParentInterceptOnEdge(true)
     }
 
-    internal val target = DefaultImageLoaderTarget.ZoomableImageTarget(this, touchImageView)
+    internal val target = DefaultImageLoaderTarget.ZoomableImageTarget(this, views.touchImageView)
 
     override fun onRecycled() {
         super.onRecycled()
-        touchImageView.setImageDrawable(null)
+        views.touchImageView.setImageDrawable(null)
     }
 }

build.gradle

@@ -2,8 +2,8 @@
 
 buildscript {
     // Ref: https://kotlinlang.org/releases.html
-    ext.kotlin_version = '1.4.10'
-    ext.kotlin_coroutines_version = "1.3.9"
+    ext.kotlin_version = '1.4.20'
+    ext.kotlin_coroutines_version = "1.4.1"
     repositories {
         google()
         jcenter()
@@ -12,7 +12,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath 'com.google.gms:google-services:4.3.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1'
@@ -43,6 +43,10 @@ allprojects {
                 includeGroupByRegex 'com\\.github\\.chrisbanes'
                 // PFLockScreen-Android
                 includeGroupByRegex 'com\\.github\\.vector-im'
+
+                //Chat effects
+                includeGroupByRegex 'com\\.github\\.jetradarmobile'
+                includeGroupByRegex 'nl\\.dionsegijn'
             }
         }
         maven {

docs/signin.md

@@ -165,7 +165,7 @@ In this case, the user can click on "Sign in with SSO" and the native web browse
 
 > https://homeserver.with.sso/_matrix/client/r0/login/sso/redirect?redirectUrl=element%3A%2F%element
 
-The parameter `redirectUrl` is set to `element://element`.
+The parameter `redirectUrl` is set to `element://connect`.
 
 ChromeCustomTabs are an intermediate way to display a WebPage, between a WebView and using the external browser. More info can be found [here](https://developer.chrome.com/multidevice/android/customtabs)
 
@@ -175,7 +175,7 @@ During the process, user may be asked to validate an email by clicking on a link
 
 Once the process is finished, the web page will call the `redirectUrl` with an extra parameter `loginToken`
 
-> element://element?loginToken=MDAxOWxvY2F0aW9uIG1vemlsbGEub3JnCjAwMTNpZGVudGlmaWVy
+> element://connect?loginToken=MDAxOWxvY2F0aW9uIG1vemlsbGEub3JnCjAwMTNpZGVudGlmaWVy
 
 This navigation is intercepted by Element by the `LoginActivity`, which will then ask the homeserver to convert this `loginToken` to an access token
 

docs/ui-tests.md

@@ -27,7 +27,6 @@ $ source env/bin/activate
 Every time you want to launch these test homeservers, type:
 
 ```shell script
-$ virtualenv -p python3 env
 $ source env/bin/activate
 (env) $ demo/start.sh --no-rate-limit
 ```

fastlane/metadata/android/en-US/changelogs/40100120.txt

@@ -0,0 +1,2 @@
+Main changes in this version: URL Preview, new Emoji keyboard, new room settings capabilities, and snow for Christmas!
+Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.0.12

fastlane/metadata/android/en-US/changelogs/40100130.txt

@@ -0,0 +1,2 @@
+Main changes in this version: URL Preview, new Emoji keyboard, new room settings capabilities, and snow for Christmas!
+Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.0.12

fastlane/metadata/android/fi/changelogs/40100100.txt

@@ -0,0 +1,2 @@
+Tämä versio sisältää virheenkorjauksia ja muita parannuksia. Viestien lähettäminen on nyt paljon nopeampaa.
+Täysi muutosloki: https://github.com/vector-im/element-android/releases/tag/v1.0.10

fastlane/metadata/android/fi/full_description.txt

@@ -0,0 +1,30 @@
+Element on uudenlainen viestinsovellus, joka:
+
+1. Antaa sinun päättää yksityisyydestäsi.
+2. Antaa sinun kommunikoida kenen tahansa kanssa Matrix-verkossa ja jopa sen ulkopuolella siltaamalla sovelluksiin, kuten Slack
+3. Suojaa sinua mainonnalta, tietojen keräämiseltä ja suljetuilta alustoilta
+4. Suojaa sinut päästä päähän -salauksella sekä ristiin varmentamisella muiden todentamiseksi
+
+Element eroaa täysin muista viestintäsovelluksista, koska se on hajautettu ja avointa lähdekoodia.
+
+Element antaa sinun isännöidä itse - valita isännän - jotta sinulla on yksityisyys ja voit hallita tietojasi sekä keskustelujasi. Se antaa sinulle pääsyn avoimeen verkkoon; joten et ole jumissa Elementin käyttäjissä.
+
+Element pystyy tekemään kaiken tämän, koska se toimii Matrixilla - avoimella, hajautetun viestinnän standardilla.
+
+Element antaa sinulle hallinnan antamalla sinun valita, kuka isännöi keskustelujasi. Element-sovelluksessa voit valita isännän eri tavoin:
+
+1. Hanki ilmainen tili Matrix-kehittäjien ylläpitämällä matrix.org-palvelimella tai valitse tuhansista vapaaehtoisten ylläpitämistä julkisista palvelimista.
+2. Isännöi tiliäsi itse suorittamalla palvelinta omalla laitteellasi
+3. Luo tili mukautetulla palvelimella yksinkertaisesti tilaamalla Element Matrix Services -palvelu
+
+<b>Miksi valita Element?</b>
+
+<b>OMAT TIEDOT</b>: Sinä päätät, missä tietosi ja viestisi säilytetään. Hallitset sitä itse, eikä jokin MEGAYHTIÖ, joka tutkii tietojasi tai antaa niitä kolmansille osapuolille.
+
+<b>AVOIN KOMMUNIKOINYI JA YHTEISTYÖ</b>: Voit keskustella kaikkien muiden Matrix-verkon käyttäjien kanssa, riippumatta siitä käyttävätkö he Elementiä tai muuta Matrix-sovellusta, ja vaikka he käyttäisivät eri viestijärjestelmiä, kuten Slack, IRC tai XMPP.
+
+<b>ERITTÄIN TURVALLINEN</b>: Vahva päästä päähän -salaus (vain keskustelussa olevat voivat purkaa viestien salauksen), ja ristiin varmentaminen keskustelun osallistujien laitteiden tarkistamiseksi.
+
+<b>TÄYDELLISTÄ VIESTINTÄÄ</b>: Viestit, ääni- ja videopuhelut, tiedostojen jakaminen, näytön jakaminen ja koko joukko integraatioita, botteja ja widgettejä. Rakenna huoneita, yhteisöjä, pidä yhteyttä ja tee asioita.
+
+<b>MISSÄ TAHANSA OLETKIN</b>: Pidä yhteyttä missä tahansa, täysin synkronoidun viestihistorian kautta kaikilla laitteillasi ja verkossa osoitteessa https://app.element.io.

fastlane/metadata/android/fi/short_description.txt

@@ -1 +1 @@
-Turvallista, hajautettua keskustelua ja VoIP-puheluita. Pidä tietosi turvassa.
+Turvallista, hajautettua, keskusteluja ja VoIP-puheluita. Pidä tietosi turvassa.

fastlane/metadata/android/it/changelogs/40100100.txt

@@ -1 +1,2 @@
-// DA FARE
+Questa nuova versione contiene soprattutto correzioni di errori e miglioramenti. L'invio di messaggi ora è molto più veloce.
+Cronologia completa: https://github.com/vector-im/element-android/releases/tag/v1.0.10

fastlane/metadata/android/pt_BR/changelogs/40100100.txt

@@ -1 +1,2 @@
-// A FAZER
+Esta nova versão contém principalmente correções de erros e melhorias. Enviar mensagens agora é muito mais rápido.
+Registro de todas as alterações: https://github.com/vector-im/element-android/releases/tag/v1.0.10

fastlane/metadata/android/sv/changelogs/40100100.txt

@@ -1 +1,2 @@
-// ATT GÖRA
+Den här nya versionen innehåller mest buggfixar och förbättringar. Det går nu mycket snabbare att skicka meddelanden.
+Full ändringslogg: https://github.com/vector-im/element-android/releases/tag/v1.0.10

fastlane/metadata/android/uk/changelogs/40100100.txt

@@ -0,0 +1,2 @@
+Ця версія містить переважно виправлення помилок та деякі покращення. Відправлення повідомлень стало тепер ще швидшим.
+Повний перелік змін: https://github.com/vector-im/element-android/releases/tag/v1.0.10

fastlane/metadata/android/uk/full_description.txt

@@ -7,7 +7,7 @@ Element — це застосунок для спілкування та спі
 
 Element ґрунтовно відрізняється від інших застосунків для спілкування та співпраці тому що він є децентралізованим та відкритоджерельним.
 
-Element дозволяє вам розміщувати сервер в себе або обирати будь-якого з надавачів послуг, таким чином забезпечуючи вам конфіденційність і  можливість володіти власними даними й бесідами та контролювати їх. Він надає вам доступ до відкритої мережі, тож ви не є обмеженими спілкуванням виключно з користувачами Element. І він є дуже надійним та безпечним.
+Element дозволяє вам розміщувати сервер в себе або обирати будь-якого з надавачів послуг, таким чином забезпечуючи вам конфіденційність і можливість володіти власними даними й бесідами та контролювати їх. Він надає вам доступ до відкритої мережі, тож ви не є обмеженими спілкуванням виключно з користувачами Element. І він є дуже надійним та безпечним.
 
 Element здатен забезпечити усе це завдяки тому, що він заснований на протоколі Matrix — стандарті для відкритого та децентралізованого спілкування.
 

fastlane/metadata/android/zh_Hant/changelogs/40100100.txt

@@ -1 +1,2 @@
-// 待辦事項
+這個新版本主要包含錯誤修復與改善。傳送訊息更快了。
+完整的變更紀錄請見：https://github.com/vector-im/element-android/releases/tag/v1.0.10

gradle.properties

@@ -18,7 +18,7 @@ org.gradle.jvmargs=-Xmx2048m
 org.gradle.vfs.watch=true
 
 vector.debugPrivateData=false
-vector.httpLogLevel=NONE
+vector.httpLogLevel=BASIC
 
 # Note: to debug, you can put and uncomment the following lines in the file ~/.gradle/gradle.properties to override the value above
 #vector.debugPrivateData=true

matrix-sdk-android-rx/build.gradle

@@ -36,9 +36,10 @@ android {
 dependencies {
     implementation project(":matrix-sdk-android")
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation "androidx.fragment:fragment:1.3.0-beta01"
     implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$kotlin_coroutines_version"
+
     // Paging
     implementation "androidx.paging:paging-runtime-ktx:2.1.2"
 

matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxCallbackBuilders.kt

@@ -21,34 +21,36 @@ import org.matrix.android.sdk.api.util.Cancelable
 import io.reactivex.Completable
 import io.reactivex.Single
 
-fun <T> singleBuilder(builder: (callback: MatrixCallback<T>) -> Cancelable): Single<T> = Single.create {
-    val callback: MatrixCallback<T> = object : MatrixCallback<T> {
+fun <T> singleBuilder(builder: (MatrixCallback<T>) -> Cancelable): Single<T> = Single.create { emitter ->
+    val callback = object : MatrixCallback<T> {
         override fun onSuccess(data: T) {
-            it.onSuccess(data)
+            // Add `!!` to fix the warning:
+            // "Type mismatch: type parameter with nullable bounds is used T is used where T was expected. This warning will become an error soon"
+            emitter.onSuccess(data!!)
         }
 
         override fun onFailure(failure: Throwable) {
-            it.tryOnError(failure)
+            emitter.tryOnError(failure)
         }
     }
     val cancelable = builder(callback)
-    it.setCancellable {
+    emitter.setCancellable {
         cancelable.cancel()
     }
 }
 
-fun <T> completableBuilder(builder: (callback: MatrixCallback<T>) -> Cancelable): Completable = Completable.create {
-    val callback: MatrixCallback<T> = object : MatrixCallback<T> {
+fun <T> completableBuilder(builder: (MatrixCallback<T>) -> Cancelable): Completable = Completable.create { emitter ->
+    val callback = object : MatrixCallback<T> {
         override fun onSuccess(data: T) {
-            it.onComplete()
+            emitter.onComplete()
         }
 
         override fun onFailure(failure: Throwable) {
-            it.tryOnError(failure)
+            emitter.tryOnError(failure)
         }
     }
     val cancelable = builder(callback)
-    it.setCancellable {
+    emitter.setCancellable {
         cancelable.cancel()
     }
 }

matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt

@@ -17,14 +17,20 @@
 package org.matrix.android.sdk.rx
 
 import android.net.Uri
+import io.reactivex.Completable
+import io.reactivex.Observable
+import io.reactivex.Single
+import kotlinx.coroutines.rx2.rxCompletable
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.members.RoomMemberQueryParams
 import org.matrix.android.sdk.api.session.room.model.EventAnnotationsSummary
+import org.matrix.android.sdk.api.session.room.model.GuestAccess
 import org.matrix.android.sdk.api.session.room.model.ReadReceipt
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
@@ -32,9 +38,6 @@ import org.matrix.android.sdk.api.session.room.send.UserDraft
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.toOptional
-import io.reactivex.Completable
-import io.reactivex.Observable
-import io.reactivex.Single
 
 class RxRoom(private val room: Room) {
 
@@ -119,32 +122,28 @@ class RxRoom(private val room: Room) {
         room.invite3pid(threePid, it)
     }
 
-    fun updateTopic(topic: String): Completable = completableBuilder<Unit> {
-        room.updateTopic(topic, it)
+    fun updateTopic(topic: String): Completable = rxCompletable {
+        room.updateTopic(topic)
     }
 
-    fun updateName(name: String): Completable = completableBuilder<Unit> {
-        room.updateName(name, it)
+    fun updateName(name: String): Completable = rxCompletable {
+        room.updateName(name)
     }
 
-    fun addRoomAlias(alias: String): Completable = completableBuilder<Unit> {
-        room.addRoomAlias(alias, it)
+    fun updateHistoryReadability(readability: RoomHistoryVisibility): Completable = rxCompletable {
+        room.updateHistoryReadability(readability)
     }
 
-    fun updateCanonicalAlias(alias: String): Completable = completableBuilder<Unit> {
-        room.updateCanonicalAlias(alias, it)
+    fun updateJoinRule(joinRules: RoomJoinRules?, guestAccess: GuestAccess?): Completable = rxCompletable {
+        room.updateJoinRule(joinRules, guestAccess)
     }
 
-    fun updateHistoryReadability(readability: RoomHistoryVisibility): Completable = completableBuilder<Unit> {
-        room.updateHistoryReadability(readability, it)
+    fun updateAvatar(avatarUri: Uri, fileName: String): Completable = rxCompletable {
+        room.updateAvatar(avatarUri, fileName)
     }
 
-    fun updateAvatar(avatarUri: Uri, fileName: String): Completable = completableBuilder<Unit> {
-        room.updateAvatar(avatarUri, fileName, it)
-    }
-
-    fun deleteAvatar(): Completable = completableBuilder<Unit> {
-        room.deleteAvatar(it)
+    fun deleteAvatar(): Completable = rxCompletable {
+        room.deleteAvatar()
     }
 }
 

matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt

@@ -47,6 +47,7 @@ import org.matrix.android.sdk.api.util.toOptional
 import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
 import org.matrix.android.sdk.internal.crypto.store.PrivateKeysInfo
+import org.matrix.android.sdk.internal.session.room.alias.RoomAliasDescription
 
 class RxSession(private val session: Session) {
 
@@ -139,7 +140,7 @@ class RxSession(private val session: Session) {
     }
 
     fun getRoomIdByAlias(roomAlias: String,
-                         searchOnServer: Boolean): Single<Optional<String>> = singleBuilder {
+                         searchOnServer: Boolean): Single<Optional<RoomAliasDescription>> = singleBuilder {
         session.getRoomIdByAlias(roomAlias, searchOnServer, it)
     }
 

matrix-sdk-android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-parcelize'
 apply plugin: 'realm-android'
 
 buildscript {
@@ -9,14 +9,10 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "io.realm:realm-gradle-plugin:10.0.0"
+        classpath "io.realm:realm-gradle-plugin:10.1.2"
     }
 }
 
-androidExtensions {
-    experimental = true
-}
-
 android {
     compileSdkVersion 29
     testOptions.unitTests.includeAndroidResources = true
@@ -63,7 +59,7 @@ android {
 
         release {
             buildConfigField "boolean", "LOG_PRIVATE_DATA", "false"
-            buildConfigField "okhttp3.logging.HttpLoggingInterceptor.Level", "OKHTTP_LOGGING_LEVEL", "okhttp3.logging.HttpLoggingInterceptor.Level.NONE"
+            buildConfigField "okhttp3.logging.HttpLoggingInterceptor.Level", "OKHTTP_LOGGING_LEVEL", "okhttp3.logging.HttpLoggingInterceptor.Level.BASIC"
         }
     }
 
@@ -125,7 +121,6 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
 
     implementation "androidx.appcompat:appcompat:1.2.0"
-    implementation "androidx.fragment:fragment:1.3.0-beta01"
     implementation "androidx.core:core-ktx:1.3.2"
 
     implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
@@ -146,7 +141,7 @@ dependencies {
     implementation "ru.noties.markwon:core:$markwon_version"
 
     // Image
-    implementation 'androidx.exifinterface:exifinterface:1.3.0'
+    implementation 'androidx.exifinterface:exifinterface:1.3.1'
 
     // Database
     implementation 'com.github.Zhuinden:realm-monarchy:0.7.1'

matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt

@@ -25,6 +25,7 @@ import androidx.work.WorkManager
 import com.zhuinden.monarchy.Monarchy
 import org.matrix.android.sdk.BuildConfig
 import org.matrix.android.sdk.api.auth.AuthenticationService
+import org.matrix.android.sdk.api.auth.HomeServerHistoryService
 import org.matrix.android.sdk.api.legacy.LegacySessionImporter
 import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.common.DaggerTestMatrixComponent
@@ -49,6 +50,7 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
     @Inject internal lateinit var backgroundDetectionObserver: BackgroundDetectionObserver
     @Inject internal lateinit var olmManager: OlmManager
     @Inject internal lateinit var sessionManager: SessionManager
+    @Inject internal lateinit var homeServerHistoryService: HomeServerHistoryService
 
     private val uiHandler = Handler(Looper.getMainLooper())
 
@@ -71,6 +73,8 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
 
     fun rawService() = rawService
 
+    fun homeServerHistoryService() = homeServerHistoryService
+
     fun legacySessionImporter(): LegacySessionImporter {
         return legacySessionImporter
     }

matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt

@@ -86,7 +86,7 @@ class CommonTestHelper(context: Context) {
      *
      * @param session    the session to sync
      */
-    fun syncSession(session: Session) {
+    fun syncSession(session: Session, timeout: Long = TestConstants.timeOutMillis) {
         val lock = CountDownLatch(1)
 
         val job = GlobalScope.launch(Dispatchers.Main) {
@@ -109,7 +109,7 @@ class CommonTestHelper(context: Context) {
         }
         GlobalScope.launch(Dispatchers.Main) { syncLiveData.observeForever(syncObserver) }
 
-        await(lock)
+        await(lock, timeout)
     }
 
     /**
@@ -119,7 +119,7 @@ class CommonTestHelper(context: Context) {
      * @param message      the message to send
      * @param nbOfMessages the number of time the message will be sent
      */
-    fun sendTextMessage(room: Room, message: String, nbOfMessages: Int): List<TimelineEvent> {
+    fun sendTextMessage(room: Room, message: String, nbOfMessages: Int, timeout: Long = TestConstants.timeOutMillis): List<TimelineEvent> {
         val timeline = room.createTimeline(null, TimelineSettings(10))
         val sentEvents = ArrayList<TimelineEvent>(nbOfMessages)
         val latch = CountDownLatch(1)
@@ -151,7 +151,7 @@ class CommonTestHelper(context: Context) {
             room.sendTextMessage(message + " #" + (i + 1))
         }
         // Wait 3 second more per message
-        await(latch, timeout = TestConstants.timeOutMillis + 3_000L * nbOfMessages)
+        await(latch, timeout = timeout + 3_000L * nbOfMessages)
         timeline.dispose()
 
         // Check that all events has been created
@@ -215,14 +215,14 @@ class CommonTestHelper(context: Context) {
                     .getLoginFlow(hs, it)
         }
 
-        doSync<RegistrationResult> {
+        doSync<RegistrationResult>(timeout = 60_000) {
             matrix.authenticationService
                     .getRegistrationWizard()
                     .createAccount(userName, password, null, it)
         }
 
         // Perform dummy step
-        val registrationResult = doSync<RegistrationResult> {
+        val registrationResult = doSync<RegistrationResult>(timeout = 60_000) {
             matrix.authenticationService
                     .getRegistrationWizard()
                     .dummy(it)
@@ -231,7 +231,7 @@ class CommonTestHelper(context: Context) {
         assertTrue(registrationResult is RegistrationResult.Success)
         val session = (registrationResult as RegistrationResult.Success).session
         if (sessionTestParams.withInitialSync) {
-            syncSession(session)
+            syncSession(session, 60_000)
         }
 
         return session

matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestData.kt

@@ -18,14 +18,21 @@ package org.matrix.android.sdk.common
 
 import org.matrix.android.sdk.api.session.Session
 
-data class CryptoTestData(val firstSession: Session,
-                          val roomId: String,
-                          val secondSession: Session? = null,
-                          val thirdSession: Session? = null) {
+data class CryptoTestData(val roomId: String,
+                          val sessions: List<Session>) {
+
+    val firstSession: Session
+        get() = sessions.first()
+
+    val secondSession: Session?
+        get() = sessions.getOrNull(1)
+
+    val thirdSession: Session?
+        get() = sessions.getOrNull(2)
 
     fun cleanUp(testHelper: CommonTestHelper) {
-        testHelper.signOutAndClose(firstSession)
-        secondSession?.let { testHelper.signOutAndClose(it) }
-        thirdSession?.let { testHelper.signOutAndClose(it) }
+        sessions.forEach {
+            testHelper.signOutAndClose(it)
+        }
     }
 }

matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt

@@ -73,7 +73,7 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) {
             }
         }
 
-        return CryptoTestData(aliceSession, roomId)
+        return CryptoTestData(roomId, listOf(aliceSession))
     }
 
     /**
@@ -139,7 +139,7 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) {
 //        assertNotNull(roomFromBobPOV.powerLevels)
 //        assertTrue(roomFromBobPOV.powerLevels.maySendMessage(bobSession.myUserId))
 
-        return CryptoTestData(aliceSession, aliceRoomId, bobSession)
+        return CryptoTestData(aliceRoomId, listOf(aliceSession, bobSession))
     }
 
     /**
@@ -157,7 +157,7 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) {
         // wait the initial sync
         SystemClock.sleep(1000)
 
-        return CryptoTestData(aliceSession, aliceRoomId, cryptoTestData.secondSession, samSession)
+        return CryptoTestData(aliceRoomId, listOf(aliceSession, cryptoTestData.secondSession!!, samSession))
     }
 
     /**
@@ -381,4 +381,30 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) {
             }
         }
     }
+
+    fun doE2ETestWithManyMembers(numberOfMembers: Int): CryptoTestData {
+        val aliceSession = mTestHelper.createAccount(TestConstants.USER_ALICE, defaultSessionParams)
+        aliceSession.cryptoService().setWarnOnUnknownDevices(false)
+
+        val roomId = mTestHelper.doSync<String> {
+            aliceSession.createRoom(CreateRoomParams().apply { name = "MyRoom" }, it)
+        }
+        val room = aliceSession.getRoom(roomId)!!
+
+        mTestHelper.runBlockingTest {
+            room.enableEncryption()
+        }
+
+        val sessions = mutableListOf(aliceSession)
+        for (index in 1 until numberOfMembers) {
+            val session = mTestHelper.createAccount("User_$index", defaultSessionParams)
+            mTestHelper.doSync<Unit>(timeout = 600_000) { room.invite(session.myUserId, null, it) }
+            println("TEST -> " + session.myUserId + " invited")
+            mTestHelper.doSync<Unit> { session.joinRoom(room.roomId, null, emptyList(), it) }
+            println("TEST -> " + session.myUserId + " joined")
+            sessions.add(session)
+        }
+
+        return CryptoTestData(roomId, sessions)
+    }
 }

matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt

@@ -17,13 +17,13 @@
 package org.matrix.android.sdk.internal.crypto.encryption
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import kotlinx.coroutines.runBlocking
 import org.amshove.kluent.shouldBe
 import org.junit.FixMethodOrder
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
 import org.matrix.android.sdk.InstrumentedTest
-import org.matrix.android.sdk.api.NoOpMatrixCallback
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.room.Room
@@ -57,13 +57,14 @@ class EncryptionTest : InstrumentedTest {
     @Test
     fun test_EncryptionStateEvent() {
         performTest(roomShouldBeEncrypted = true) { room ->
-            // Send an encryption Event as a State Event
-            room.sendStateEvent(
-                    eventType = EventType.STATE_ROOM_ENCRYPTION,
-                    stateKey = null,
-                    body = EncryptionEventContent(algorithm = MXCRYPTO_ALGORITHM_MEGOLM).toContent(),
-                    callback = NoOpMatrixCallback()
-            )
+            runBlocking {
+                // Send an encryption Event as a State Event
+                room.sendStateEvent(
+                        eventType = EventType.STATE_ROOM_ENCRYPTION,
+                        stateKey = null,
+                        body = EncryptionEventContent(algorithm = MXCRYPTO_ALGORITHM_MEGOLM).toContent()
+                )
+            }
         }
     }
 

matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt

@@ -264,7 +264,7 @@ class KeysBackupTest : InstrumentedTest {
         assertNotNull(decryption)
         // - Check decryptKeyBackupData() returns stg
         val sessionData = keysBackup
-                .decryptKeyBackupData(keyBackupData!!,
+                .decryptKeyBackupData(keyBackupData,
                         session.olmInboundGroupSession!!.sessionIdentifier(),
                         cryptoTestData.roomId,
                         decryption!!)

matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt

@@ -111,7 +111,7 @@ class KeysBackupTestHelper(
         Assert.assertTrue(keysBackup.isEnabled)
 
         stateObserver.stopAndCheckStates(null)
-        return PrepareKeysBackupDataResult(megolmBackupCreationInfo, keysVersion.version!!)
+        return PrepareKeysBackupDataResult(megolmBackupCreationInfo, keysVersion.version)
     }
 
     /**

matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/media/UrlsExtractorTest.kt

@@ -0,0 +1,108 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.media
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageTextContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
+
+@RunWith(AndroidJUnit4::class)
+internal class UrlsExtractorTest : InstrumentedTest {
+
+    private val urlsExtractor = UrlsExtractor()
+
+    @Test
+    fun wrongEventTypeTest() {
+        createEvent(body = "https://matrix.org")
+                .copy(type = EventType.STATE_ROOM_GUEST_ACCESS)
+                .let { urlsExtractor.extract(it) }
+                .size shouldBeEqualTo 0
+    }
+
+    @Test
+    fun oneUrlTest() {
+        createEvent(body = "https://matrix.org")
+                .let { urlsExtractor.extract(it) }
+                .let { result ->
+                    result.size shouldBeEqualTo 1
+                    result[0] shouldBeEqualTo "https://matrix.org"
+                }
+    }
+
+    @Test
+    fun withoutProtocolTest() {
+        createEvent(body = "www.matrix.org")
+                .let { urlsExtractor.extract(it) }
+                .size shouldBeEqualTo 0
+    }
+
+    @Test
+    fun oneUrlWithParamTest() {
+        createEvent(body = "https://matrix.org?foo=bar")
+                .let { urlsExtractor.extract(it) }
+                .let { result ->
+                    result.size shouldBeEqualTo 1
+                    result[0] shouldBeEqualTo "https://matrix.org?foo=bar"
+                }
+    }
+
+    @Test
+    fun oneUrlWithParamsTest() {
+        createEvent(body = "https://matrix.org?foo=bar&bar=foo")
+                .let { urlsExtractor.extract(it) }
+                .let { result ->
+                    result.size shouldBeEqualTo 1
+                    result[0] shouldBeEqualTo "https://matrix.org?foo=bar&bar=foo"
+                }
+    }
+
+    @Test
+    fun oneUrlInlinedTest() {
+        createEvent(body = "Hello https://matrix.org, how are you?")
+                .let { urlsExtractor.extract(it) }
+                .let { result ->
+                    result.size shouldBeEqualTo 1
+                    result[0] shouldBeEqualTo  "https://matrix.org"
+                }
+    }
+
+    @Test
+    fun twoUrlsTest() {
+        createEvent(body = "https://matrix.org https://example.org")
+                .let { urlsExtractor.extract(it) }
+                .let { result ->
+                    result.size shouldBeEqualTo 2
+                    result[0] shouldBeEqualTo "https://matrix.org"
+                    result[1] shouldBeEqualTo "https://example.org"
+                }
+    }
+
+    private fun createEvent(body: String): Event = Event(
+            type = EventType.MESSAGE,
+            content = MessageTextContent(
+                    msgType = MessageType.MSGTYPE_TEXT,
+                    body = body
+            ).toContent()
+    )
+}

matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineWithManyMembersTest.kt

@@ -0,0 +1,92 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.session.room.timeline
+
+import org.junit.FixMethodOrder
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import org.junit.runners.MethodSorters
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
+import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CryptoTestHelper
+import java.util.concurrent.CountDownLatch
+import kotlin.test.fail
+
+@RunWith(JUnit4::class)
+@FixMethodOrder(MethodSorters.JVM)
+class TimelineWithManyMembersTest : InstrumentedTest {
+
+    companion object {
+        private const val NUMBER_OF_MEMBERS = 6
+    }
+
+    private val commonTestHelper = CommonTestHelper(context())
+    private val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
+
+    /**
+     * Ensures when someone sends a message to a crowded room, everyone can decrypt the message.
+     */
+    @Test
+    fun everyone_should_decrypt_message_in_a_crowded_room() {
+        val cryptoTestData = cryptoTestHelper.doE2ETestWithManyMembers(NUMBER_OF_MEMBERS)
+
+        val sessionForFirstMember = cryptoTestData.firstSession
+        val roomForFirstMember = sessionForFirstMember.getRoom(cryptoTestData.roomId)!!
+
+        val firstMessage = "First messages from Alice"
+        commonTestHelper.sendTextMessage(
+                roomForFirstMember,
+                firstMessage,
+                1,
+                600_000
+        )
+
+        for (index in 1 until cryptoTestData.sessions.size) {
+            val session = cryptoTestData.sessions[index]
+            val roomForCurrentMember = session.getRoom(cryptoTestData.roomId)!!
+            val timelineForCurrentMember = roomForCurrentMember.createTimeline(null, TimelineSettings(30))
+            timelineForCurrentMember.start()
+
+            session.startSync(true)
+
+            run {
+                val lock = CountDownLatch(1)
+                val eventsListener = commonTestHelper.createEventListener(lock) { snapshot ->
+                    snapshot
+                            .find { it.isEncrypted() }
+                            ?.let {
+                                val body = it.root.getClearContent()?.toModel<MessageContent>()?.body
+                                if (body?.startsWith(firstMessage).orFalse()) {
+                                    println("User " + session.myUserId + " decrypted as " + body)
+                                    return@createEventListener true
+                                } else {
+                                    fail("User " + session.myUserId + " decrypted as " + body + " CryptoError: " + it.root.mCryptoError)
+                                }
+                            } ?: return@createEventListener false
+                }
+                timelineForCurrentMember.addListener(eventsListener)
+                commonTestHelper.await(lock, 600_000)
+            }
+            session.stopSync()
+        }
+    }
+}

matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt

@@ -17,7 +17,6 @@
 package org.matrix.android.sdk.internal.network.interceptors
 
 import androidx.annotation.NonNull
-import org.matrix.android.sdk.BuildConfig
 import okhttp3.logging.HttpLoggingInterceptor
 import org.json.JSONArray
 import org.json.JSONException
@@ -38,31 +37,28 @@ class FormattedJsonHttpLogger : HttpLoggingInterceptor.Logger {
      */
     @Synchronized
     override fun log(@NonNull message: String) {
-        // In RELEASE there is no log, but for sure, test again BuildConfig.DEBUG
-        if (BuildConfig.DEBUG) {
-            Timber.v(message)
+        Timber.v(message)
 
-            if (message.startsWith("{")) {
-                // JSON Detected
-                try {
-                    val o = JSONObject(message)
-                    logJson(o.toString(INDENT_SPACE))
-                } catch (e: JSONException) {
-                    // Finally this is not a JSON string...
-                    Timber.e(e)
-                }
-            } else if (message.startsWith("[")) {
-                // JSON Array detected
-                try {
-                    val o = JSONArray(message)
-                    logJson(o.toString(INDENT_SPACE))
-                } catch (e: JSONException) {
-                    // Finally not JSON...
-                    Timber.e(e)
-                }
+        if (message.startsWith("{")) {
+            // JSON Detected
+            try {
+                val o = JSONObject(message)
+                logJson(o.toString(INDENT_SPACE))
+            } catch (e: JSONException) {
+                // Finally this is not a JSON string...
+                Timber.e(e)
+            }
+        } else if (message.startsWith("[")) {
+            // JSON Array detected
+            try {
+                val o = JSONArray(message)
+                logJson(o.toString(INDENT_SPACE))
+            } catch (e: JSONException) {
+                // Finally not JSON...
+                Timber.e(e)
             }
-            // Else not a json string to log
         }
+        // Else not a json string to log
     }
 
     private fun logJson(formattedJson: String) {

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt

@@ -23,6 +23,7 @@ import androidx.work.WorkManager
 import com.zhuinden.monarchy.Monarchy
 import org.matrix.android.sdk.BuildConfig
 import org.matrix.android.sdk.api.auth.AuthenticationService
+import org.matrix.android.sdk.api.auth.HomeServerHistoryService
 import org.matrix.android.sdk.api.legacy.LegacySessionImporter
 import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.internal.SessionManager
@@ -47,6 +48,7 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
     @Inject internal lateinit var backgroundDetectionObserver: BackgroundDetectionObserver
     @Inject internal lateinit var olmManager: OlmManager
     @Inject internal lateinit var sessionManager: SessionManager
+    @Inject internal lateinit var homeServerHistoryService: HomeServerHistoryService
 
     init {
         Monarchy.init(context)
@@ -65,6 +67,8 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
 
     fun rawService() = rawService
 
+    fun homeServerHistoryService() = homeServerHistoryService
+
     fun legacySessionImporter(): LegacySessionImporter {
         return legacySessionImporter
     }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt

@@ -41,6 +41,16 @@ interface AuthenticationService {
      */
     fun getLoginFlowOfSession(sessionId: String, callback: MatrixCallback<LoginFlowResult>): Cancelable
 
+    /**
+     * Get a SSO url
+     */
+    fun getSsoUrl(redirectUrl: String, deviceId: String?, providerId: String?): String?
+
+    /**
+     * Get the sign in or sign up fallback URL
+     */
+    fun getFallbackUrl(forSignIn: Boolean, deviceId: String?): String?
+
     /**
      * Return a LoginWizard, to login to the homeserver. The login flow has to be retrieved first.
      */

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/HomeServerHistoryService.kt

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.auth
+
+/**
+ * A simple service to remember homeservers you already connected to.
+ */
+interface HomeServerHistoryService {
+
+    fun getKnownServersUrls(): List<String>
+
+    fun addHomeServerToHistory(url: String)
+
+    fun clearHistory()
+}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt

@@ -19,6 +19,7 @@ package org.matrix.android.sdk.api.auth.data
 sealed class LoginFlowResult {
     data class Success(
             val supportedLoginTypes: List<String>,
+            val ssoIdentityProviders: List<SsoIdentityProvider>?,
             val isLoginAndRegistrationSupported: Boolean,
             val homeServerUrl: String,
             val isOutdatedHomeserver: Boolean

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/SsoIdentityProvider.kt

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.auth.data
+
+import android.os.Parcelable
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import kotlinx.parcelize.Parcelize
+
+@JsonClass(generateAdapter = true)
+@Parcelize
+data class SsoIdentityProvider(
+        /**
+         * The id field would be opaque with the accepted characters matching unreserved URI characters as defined in RFC3986
+         * - this was chosen to avoid having to encode special characters in the URL. Max length 128.
+         */
+        @Json(name = "id") val id: String,
+        /**
+         * The name field should be the human readable string intended for printing by the client.
+         */
+        @Json(name = "name") val name: String?,
+        /**
+         * The icon field is the only optional field and should point to an icon representing the IdP.
+         * If present then it must be an HTTPS URL to an image resource.
+         * This should be hosted by the homeserver service provider to not leak the client's IP address unnecessarily.
+         */
+        @Json(name = "icon") val iconUrl: String?
+) : Parcelable {
+
+    companion object {
+        // Not really defined by the spec, but we may define some ids here
+        const val ID_GOOGLE = "google"
+        const val ID_GITHUB = "github"
+        const val ID_APPLE = "apple"
+        const val ID_FACEBOOK = "facebook"
+        const val ID_TWITTER = "twitter"
+    }
+}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/cache/CacheStrategy.kt

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.api.raw
+package org.matrix.android.sdk.api.cache
 
-sealed class RawCacheStrategy {
+sealed class CacheStrategy {
     // Data is always fetched from the server
-    object NoCache : RawCacheStrategy()
+    object NoCache : CacheStrategy()
 
     // Once data is retrieved, it is stored for the provided amount of time.
     // In case of error, and if strict is set to false, the cache can be returned if available
-    data class TtlCache(val validityDurationInMillis: Long, val strict: Boolean) : RawCacheStrategy()
+    data class TtlCache(val validityDurationInMillis: Long, val strict: Boolean) : CacheStrategy()
 
     // Once retrieved, the data is stored in cache and will be always get from the cache
-    object InfiniteCache : RawCacheStrategy()
+    object InfiniteCache : CacheStrategy()
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawService.kt

@@ -16,6 +16,8 @@
 
 package org.matrix.android.sdk.api.raw
 
+import org.matrix.android.sdk.api.cache.CacheStrategy
+
 /**
  * Useful methods to fetch raw data from the server. The access token will not be used to fetched the data
  */
@@ -23,7 +25,7 @@ interface RawService {
     /**
      * Get a URL, either from cache or from the remote server, depending on the cache strategy
      */
-    suspend fun getUrl(url: String, rawCacheStrategy: RawCacheStrategy): String
+    suspend fun getUrl(url: String, cacheStrategy: CacheStrategy): String
 
     /**
      * Specific case for the well-known file. Cache validity is 8 hours

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt

@@ -35,6 +35,7 @@ import org.matrix.android.sdk.api.session.group.GroupService
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
 import org.matrix.android.sdk.api.session.identity.IdentityService
 import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
+import org.matrix.android.sdk.api.session.media.MediaService
 import org.matrix.android.sdk.api.session.permalinks.PermalinkService
 import org.matrix.android.sdk.api.session.profile.ProfileService
 import org.matrix.android.sdk.api.session.pushers.PushersService
@@ -181,6 +182,11 @@ interface Session :
      */
     fun widgetService(): WidgetService
 
+    /**
+     * Returns the media service associated with the session
+     */
+    fun mediaService(): MediaService
+
     /**
      * Returns the integration manager service associated with the session
      */

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallState.kt

@@ -36,7 +36,7 @@ sealed class CallState {
      * Connected. Incoming/Outgoing call, ice layer connecting or connected
      * Notice that the PeerState failed is not always final, if you switch network, new ice candidtates
      * could be exchanged, and the connection could go back to connected
-     * */
+     */
     data class Connected(val iceConnectionState: PeerConnection.PeerConnectionState) : CallState()
 
     /** Terminated.  Incoming/Outgoing call, the call is terminated */

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt

@@ -20,7 +20,8 @@ import android.net.Uri
 import android.os.Parcelable
 import androidx.exifinterface.media.ExifInterface
 import com.squareup.moshi.JsonClass
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
+import org.matrix.android.sdk.api.util.MimeTypes.normalizeMimeType
 
 @Parcelize
 @JsonClass(generateAdapter = true)
@@ -45,5 +46,5 @@ data class ContentAttachmentData(
         VIDEO
     }
 
-    fun getSafeMimeType() = if (mimeType == "image/jpg") "image/jpeg" else mimeType
+    fun getSafeMimeType() = mimeType?.normalizeMimeType()
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt

@@ -49,6 +49,12 @@ object EventType {
     const val STATE_ROOM_JOIN_RULES = "m.room.join_rules"
     const val STATE_ROOM_GUEST_ACCESS = "m.room.guest_access"
     const val STATE_ROOM_POWER_LEVELS = "m.room.power_levels"
+
+    /**
+     * Note that this Event has been deprecated, see
+     * - https://matrix.org/docs/spec/client_server/r0.6.1#historical-events
+     * - https://github.com/matrix-org/matrix-doc/pull/2432
+     */
     const val STATE_ROOM_ALIASES = "m.room.aliases"
     const val STATE_ROOM_TOMBSTONE = "m.room.tombstone"
     const val STATE_ROOM_CANONICAL_ALIAS = "m.room.canonical_alias"

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt

@@ -18,8 +18,12 @@ package org.matrix.android.sdk.api.session.file
 
 import android.net.Uri
 import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.room.model.message.MessageWithAttachmentContent
+import org.matrix.android.sdk.api.session.room.model.message.getFileName
+import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
 import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.internal.crypto.attachments.ElementToDecrypt
+import org.matrix.android.sdk.internal.crypto.attachments.toElementToDecrypt
 import java.io.File
 
 /**
@@ -27,23 +31,6 @@ import java.io.File
  */
 interface FileService {
 
-    enum class DownloadMode {
-        /**
-         * Download file in external storage
-         */
-        TO_EXPORT,
-
-        /**
-         * Download file in cache
-         */
-        FOR_INTERNAL_USE,
-
-        /**
-         * Download file in file provider path
-         */
-        FOR_EXTERNAL_SHARE
-    }
-
     enum class FileState {
         IN_CACHE,
         DOWNLOADING,
@@ -54,34 +41,79 @@ interface FileService {
      * Download a file.
      * Result will be a decrypted file, stored in the cache folder. url parameter will be used to create unique filename to avoid name collision.
      */
-    fun downloadFile(
-            downloadMode: DownloadMode,
-            id: String,
-            fileName: String,
-            mimeType: String?,
-            url: String?,
-            elementToDecrypt: ElementToDecrypt?,
-            callback: MatrixCallback<File>): Cancelable
+    fun downloadFile(fileName: String,
+                     mimeType: String?,
+                     url: String?,
+                     elementToDecrypt: ElementToDecrypt?,
+                     callback: MatrixCallback<File>): Cancelable
 
-    fun isFileInCache(mxcUrl: String, mimeType: String?): Boolean
+    fun downloadFile(messageContent: MessageWithAttachmentContent,
+                     callback: MatrixCallback<File>): Cancelable =
+            downloadFile(
+                    fileName = messageContent.getFileName(),
+                    mimeType = messageContent.mimeType,
+                    url = messageContent.getFileUrl(),
+                    elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt(),
+                    callback = callback
+            )
+
+    fun isFileInCache(mxcUrl: String?,
+                      fileName: String,
+                      mimeType: String?,
+                      elementToDecrypt: ElementToDecrypt?
+    ): Boolean
+
+    fun isFileInCache(messageContent: MessageWithAttachmentContent) =
+            isFileInCache(
+                    mxcUrl = messageContent.getFileUrl(),
+                    fileName = messageContent.getFileName(),
+                    mimeType = messageContent.mimeType,
+                    elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt())
 
     /**
      * Use this URI and pass it to intent using flag Intent.FLAG_GRANT_READ_URI_PERMISSION
      * (if not other app won't be able to access it)
      */
-    fun getTemporarySharableURI(mxcUrl: String, mimeType: String?): Uri?
+    fun getTemporarySharableURI(mxcUrl: String?,
+                                fileName: String,
+                                mimeType: String?,
+                                elementToDecrypt: ElementToDecrypt?): Uri?
+
+    fun getTemporarySharableURI(messageContent: MessageWithAttachmentContent): Uri? =
+            getTemporarySharableURI(
+                    mxcUrl = messageContent.getFileUrl(),
+                    fileName = messageContent.getFileName(),
+                    mimeType = messageContent.mimeType,
+                    elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt()
+            )
 
     /**
      * Get information on the given file.
      * Mimetype should be the same one as passed to downloadFile (limitation for now)
      */
-    fun fileState(mxcUrl: String, mimeType: String?): FileState
+    fun fileState(mxcUrl: String?,
+                  fileName: String,
+                  mimeType: String?,
+                  elementToDecrypt: ElementToDecrypt?): FileState
+
+    fun fileState(messageContent: MessageWithAttachmentContent): FileState =
+            fileState(
+                    mxcUrl = messageContent.getFileUrl(),
+                    fileName = messageContent.getFileName(),
+                    mimeType = messageContent.mimeType,
+                    elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt()
+            )
 
     /**
-     * Clears all the files downloaded by the service
+     * Clears all the files downloaded by the service, including decrypted files
      */
     fun clearCache()
 
+    /**
+     * Clears all the decrypted files by the service
+     */
+    fun clearDecryptedCache()
+
     /**
      * Get size of cached files
      */

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerService.kt

@@ -16,9 +16,6 @@
 
 package org.matrix.android.sdk.api.session.integrationmanager
 
-import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.util.Cancelable
-
 /**
  * This is the entry point to manage integration. You can grab an instance of this service through an active session.
  */
@@ -80,19 +77,17 @@ interface IntegrationManagerService {
     /**
      * Offers to enable or disable the integration.
      * @param enable the param to change
-     * @param callback the matrix callback to listen for result.
      * @return Cancelable
      */
-    fun setIntegrationEnabled(enable: Boolean, callback: MatrixCallback<Unit>): Cancelable
+    suspend fun setIntegrationEnabled(enable: Boolean)
 
     /**
      * Offers to allow or disallow a widget.
      * @param stateEventId the eventId of the state event defining the widget.
      * @param allowed the param to change
-     * @param callback the matrix callback to listen for result.
      * @return Cancelable
      */
-    fun setWidgetAllowed(stateEventId: String, allowed: Boolean, callback: MatrixCallback<Unit>): Cancelable
+    suspend fun setWidgetAllowed(stateEventId: String, allowed: Boolean)
 
     /**
      * Returns true if the widget is allowed, false otherwise.
@@ -105,7 +100,7 @@ interface IntegrationManagerService {
      * @param widgetType the widget type to check for
      * @param domain the domain to check for
      */
-    fun setNativeWidgetDomainAllowed(widgetType: String, domain: String, allowed: Boolean, callback: MatrixCallback<Unit>): Cancelable
+    suspend fun setNativeWidgetDomainAllowed(widgetType: String, domain: String, allowed: Boolean)
 
     /**
      * Returns true if the widget domain is allowed, false otherwise.

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/media/MediaService.kt

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.media
+
+import org.matrix.android.sdk.api.cache.CacheStrategy
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.util.JsonDict
+
+interface MediaService {
+    /**
+     * Extract URLs from an Event.
+     * @return the list of URLs contains in the body of the Event. It does not mean that URLs in this list have UrlPreview data
+     */
+    fun extractUrls(event: Event): List<String>
+
+    /**
+     * Get Raw Url Preview data from the homeserver. There is no cache management for this request
+     * @param url The url to get the preview data from
+     * @param timestamp The optional timestamp
+     */
+    suspend fun getRawPreviewUrl(url: String, timestamp: Long?): JsonDict
+
+    /**
+     * Get Url Preview data from the homeserver, or from cache, depending on the cache strategy
+     * @param url The url to get the preview data from
+     * @param timestamp The optional timestamp. Note that this parameter is not taken into account
+     * if the data is already in cache and the cache strategy allow to use it
+     * @param cacheStrategy the cache strategy, see the type for more details
+     */
+    suspend fun getPreviewUrl(url: String, timestamp: Long?, cacheStrategy: CacheStrategy): PreviewUrlData
+
+    /**
+     * Clear the cache of all retrieved UrlPreview data
+     */
+    suspend fun clearCache()
+}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/media/PreviewUrlData.kt

@@ -0,0 +1,51 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.media
+
+/**
+ * Facility data class to get the common field of a PreviewUrl response form the server
+ *
+ * Example of return data for the url `https://matrix.org`:
+ * <pre>
+ * {
+ *     "matrix:image:size": 112805,
+ *     "og:description": "Matrix is an open standard for interoperable, decentralised, real-time communication",
+ *     "og:image": "mxc://matrix.org/2020-12-03_uFqjagCCTJbaaJxb",
+ *     "og:image:alt": "Matrix is an open standard for interoperable, decentralised, real-time communication",
+ *     "og:image:height": 467,
+ *     "og:image:type": "image/jpeg",
+ *     "og:image:width": 911,
+ *     "og:locale": "en_US",
+ *     "og:site_name": "Matrix.org",
+ *     "og:title": "Matrix.org",
+ *     "og:type": "website",
+ *     "og:url": "https://matrix.org"
+ * }
+ * </pre>
+ */
+data class PreviewUrlData(
+        // Value of field "og:url". If not provided, this is the value passed in parameter
+        val url: String,
+        // Value of field "og:site_name"
+        val siteName: String?,
+        // Value of field "og:title"
+        val title: String?,
+        // Value of field "og:description"
+        val description: String?,
+        // Value of field "og:image"
+        val mxcUrl: String?
+)

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt

@@ -18,6 +18,7 @@ package org.matrix.android.sdk.api.session.room
 
 import androidx.lifecycle.LiveData
 import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.room.alias.AliasService
 import org.matrix.android.sdk.api.session.room.call.RoomCallService
 import org.matrix.android.sdk.api.session.room.crypto.RoomCryptoService
 import org.matrix.android.sdk.api.session.room.members.MembershipService
@@ -46,6 +47,7 @@ interface Room :
         DraftService,
         ReadService,
         TypingService,
+        AliasService,
         TagsService,
         MembershipService,
         StateService,

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomDirectoryService.kt

@@ -17,6 +17,7 @@
 package org.matrix.android.sdk.api.session.room
 
 import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsParams
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsResponse
 import org.matrix.android.sdk.api.session.room.model.thirdparty.ThirdPartyProtocol
@@ -39,4 +40,14 @@ interface RoomDirectoryService {
      * Includes both the available protocols and all fields required for queries against each protocol.
      */
     fun getThirdPartyProtocol(callback: MatrixCallback<Map<String, ThirdPartyProtocol>>): Cancelable
+
+    /**
+     * Get the visibility of a room in the directory
+     */
+    suspend fun getRoomDirectoryVisibility(roomId: String): RoomDirectoryVisibility
+
+    /**
+     * Set the visibility of a room in the directory
+     */
+    suspend fun setRoomDirectoryVisibility(roomId: String, roomDirectoryVisibility: RoomDirectoryVisibility)
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt

@@ -18,12 +18,15 @@ package org.matrix.android.sdk.api.session.room
 
 import androidx.lifecycle.LiveData
 import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
+import org.matrix.android.sdk.api.session.room.peeking.PeekResult
 import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.internal.session.room.alias.RoomAliasDescription
 
 /**
  * This interface defines methods to get rooms. It's implemented at the session level.
@@ -120,7 +123,12 @@ interface RoomService {
      */
     fun getRoomIdByAlias(roomAlias: String,
                          searchOnServer: Boolean,
-                         callback: MatrixCallback<Optional<String>>): Cancelable
+                         callback: MatrixCallback<Optional<RoomAliasDescription>>): Cancelable
+
+    /**
+     * Delete a room alias
+     */
+    suspend fun deleteRoomAlias(roomAlias: String)
 
     /**
      * Return a live data of all local changes membership that happened since the session has been opened.
@@ -158,4 +166,16 @@ interface RoomService {
      * @return a LiveData of the optional found room member
      */
     fun getRoomMemberLive(userId: String, roomId: String): LiveData<Optional<RoomMemberSummary>>
+
+    /**
+     * Get some state events about a room
+     */
+    fun getRoomState(roomId: String, callback: MatrixCallback<List<Event>>)
+
+    /**
+     * Use this if you want to get information from a room that you are not yet in (or invited)
+     * It might be possible to get some information on this room if it is public or if guest access is allowed
+     * This call will try to gather some information on this room, but it could fail and get nothing more
+     */
+    fun peekRoom(roomIdOrAlias: String, callback: MatrixCallback<PeekResult>)
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/alias/AliasService.kt

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.room.alias
+
+interface AliasService {
+    /**
+     * Get list of local alias of the room
+     * @return the list of the aliases (full aliases, not only the local part)
+     */
+    suspend fun getRoomAliases(): List<String>
+
+    /**
+     * Add local alias to the room
+     * @param aliasLocalPart the local part of the alias.
+     * Ex: for the alias "#my_alias:example.org", the local part is "my_alias"
+     */
+    suspend fun addAlias(aliasLocalPart: String)
+}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/alias/RoomAliasError.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.room.alias
+
+sealed class RoomAliasError : Throwable() {
+    object AliasEmpty : RoomAliasError()
+    object AliasNotAvailable : RoomAliasError()
+    object AliasInvalid : RoomAliasError()
+}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/CreateRoomFailure.kt

@@ -18,13 +18,10 @@ package org.matrix.android.sdk.api.session.room.failure
 
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.MatrixError
+import org.matrix.android.sdk.api.session.room.alias.RoomAliasError
 
 sealed class CreateRoomFailure : Failure.FeatureFailure() {
     object CreatedWithTimeout : CreateRoomFailure()
     data class CreatedWithFederationFailure(val matrixError: MatrixError) : CreateRoomFailure()
-    sealed class RoomAliasError : CreateRoomFailure() {
-        object AliasEmpty : RoomAliasError()
-        object AliasNotAvailable : RoomAliasError()
-        object AliasInvalid : RoomAliasError()
-    }
+    data class AliasError(val aliasError: RoomAliasError) : CreateRoomFailure()
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomAliasesContent.kt

@@ -21,6 +21,9 @@ import com.squareup.moshi.JsonClass
 
 /**
  * Class representing the EventType.STATE_ROOM_ALIASES state event content
+ * Note that this Event has been deprecated, see
+ * - https://matrix.org/docs/spec/client_server/r0.6.1#historical-events
+ * - https://github.com/matrix-org/matrix-doc/pull/2432
  */
 @JsonClass(generateAdapter = true)
 data class RoomAliasesContent(

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomCanonicalAliasContent.kt

@@ -24,5 +24,14 @@ import com.squareup.moshi.JsonClass
  */
 @JsonClass(generateAdapter = true)
 data class RoomCanonicalAliasContent(
-        @Json(name = "alias") val canonicalAlias: String? = null
+        /**
+         * The canonical alias for the room. If not present, null, or empty the room should be considered to have no canonical alias.
+         */
+        @Json(name = "alias") val canonicalAlias: String? = null,
+
+        /**
+         * Alternative aliases the room advertises.
+         * This list can have aliases despite the alias field being null, empty, or otherwise not present.
+         */
+        @Json(name = "alt_aliases") val alternativeAliases: List<String>? = null
 )

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageContent.kt

@@ -20,6 +20,7 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import org.matrix.android.sdk.api.session.events.model.Content
 import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.api.util.MimeTypes
 import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileInfo
 
 @JsonClass(generateAdapter = true)
@@ -54,5 +55,5 @@ data class MessageImageContent(
         @Json(name = "file") override val encryptedFileInfo: EncryptedFileInfo? = null
 ) : MessageImageInfoContent {
     override val mimeType: String?
-        get() = encryptedFileInfo?.mimetype ?: info?.mimeType ?: "image/*"
+        get() = encryptedFileInfo?.mimetype ?: info?.mimeType ?: MimeTypes.Images
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageStickerContent.kt

@@ -27,6 +27,7 @@ data class MessageStickerContent(
         /**
          * Set in local, not from server
          */
+        @Transient
         override val msgType: String = MessageType.MSGTYPE_STICKER_LOCAL,
 
         /**

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt

@@ -33,4 +33,7 @@ object MessageType {
     // Add, in local, a fake message type in order to StickerMessage can inherit Message class
     // Because sticker isn't a message type but a event type without msgtype field
     const val MSGTYPE_STICKER_LOCAL = "org.matrix.android.sdk.sticker"
+
+    const val MSGTYPE_CONFETTI = "nic.custom.confetti"
+    const val MSGTYPE_SNOW = "nic.custom.snow"
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/peeking/PeekResult.kt

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.room.peeking
+
+sealed class PeekResult {
+    data class Success(
+            val roomId: String,
+            val alias: String?,
+            val name: String?,
+            val topic: String?,
+            val avatarUrl: String?,
+            val numJoinedMembers: Int?,
+            val viaServers: List<String>
+    ) : PeekResult()
+
+    data class PeekingNotAllowed(
+            val roomId: String,
+            val alias: String?,
+            val viaServers: List<String>
+    ) : PeekResult()
+
+    object UnknownAlias : PeekResult()
+}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/state/StateService.kt

@@ -18,11 +18,11 @@ package org.matrix.android.sdk.api.session.room.state
 
 import android.net.Uri
 import androidx.lifecycle.LiveData
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.model.GuestAccess
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
-import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
 import org.matrix.android.sdk.api.util.JsonDict
 import org.matrix.android.sdk.api.util.Optional
 
@@ -31,39 +31,41 @@ interface StateService {
     /**
      * Update the topic of the room
      */
-    fun updateTopic(topic: String, callback: MatrixCallback<Unit>): Cancelable
+    suspend fun updateTopic(topic: String)
 
     /**
      * Update the name of the room
      */
-    fun updateName(name: String, callback: MatrixCallback<Unit>): Cancelable
-
-    /**
-     * Add new alias to the room.
-     */
-    fun addRoomAlias(roomAlias: String, callback: MatrixCallback<Unit>): Cancelable
+    suspend fun updateName(name: String)
 
     /**
      * Update the canonical alias of the room
+     * @param alias the canonical alias, or null to reset the canonical alias of this room
+     * @param altAliases the alternative aliases for this room. It should include the canonical alias if any.
      */
-    fun updateCanonicalAlias(alias: String, callback: MatrixCallback<Unit>): Cancelable
+    suspend fun updateCanonicalAlias(alias: String?, altAliases: List<String>)
 
     /**
      * Update the history readability of the room
      */
-    fun updateHistoryReadability(readability: RoomHistoryVisibility, callback: MatrixCallback<Unit>): Cancelable
+    suspend fun updateHistoryReadability(readability: RoomHistoryVisibility)
+
+    /**
+     * Update the join rule and/or the guest access
+     */
+    suspend fun updateJoinRule(joinRules: RoomJoinRules?, guestAccess: GuestAccess?)
 
     /**
      * Update the avatar of the room
      */
-    fun updateAvatar(avatarUri: Uri, fileName: String, callback: MatrixCallback<Unit>): Cancelable
+    suspend fun updateAvatar(avatarUri: Uri, fileName: String)
 
     /**
      * Delete the avatar of the room
      */
-    fun deleteAvatar(callback: MatrixCallback<Unit>): Cancelable
+    suspend fun deleteAvatar()
 
-    fun sendStateEvent(eventType: String, stateKey: String?, body: JsonDict, callback: MatrixCallback<Unit>): Cancelable
+    suspend fun sendStateEvent(eventType: String, stateKey: String?, body: JsonDict)
 
     fun getStateEvent(eventType: String, stateKey: QueryStringValue = QueryStringValue.NoCondition): Event?
 

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/EventTypeFilter.kt

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.room.timeline
+
+data class EventTypeFilter(
+        /**
+         * Allowed event type.
+         */
+        val eventType: String,
+        /**
+         * Allowed state key. Set null if you want to allow all events,
+         * otherwise allowed events will be filtered according to the given stateKey.
+         */
+        val stateKey: String?
+)

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEventFilters.kt

@@ -36,5 +36,5 @@ data class TimelineEventFilters(
         /**
          * If [filterTypes] is true, the list of types allowed by the list.
          */
-        val allowedTypes: List<String> = emptyList()
+        val allowedTypes: List<EventTypeFilter> = emptyList()
 )

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadsService.kt

@@ -16,9 +16,6 @@
 
 package org.matrix.android.sdk.api.session.room.uploads
 
-import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.util.Cancelable
-
 /**
  * This interface defines methods to get event with uploads (= attachments) sent to a room. It's implemented at the room level.
  */
@@ -29,7 +26,5 @@ interface UploadsService {
      * @param numberOfEvents the expected number of events to retrieve. The result can contain less events.
      * @param since token to get next page, or null to get the first page
      */
-    fun getUploads(numberOfEvents: Int,
-                   since: String?,
-                   callback: MatrixCallback<GetUploadsResult>): Cancelable
+    suspend fun getUploads(numberOfEvents: Int, since: String?): GetUploadsResult
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsService.kt

@@ -16,22 +16,16 @@
 
 package org.matrix.android.sdk.api.session.terms
 
-import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.util.Cancelable
-
 interface TermsService {
     enum class ServiceType {
         IntegrationManager,
         IdentityService
     }
 
-    fun getTerms(serviceType: ServiceType,
-                 baseUrl: String,
-                 callback: MatrixCallback<GetTermsResponse>): Cancelable
+    suspend fun getTerms(serviceType: ServiceType, baseUrl: String): GetTermsResponse
 
-    fun agreeToTerms(serviceType: ServiceType,
-                     baseUrl: String,
-                     agreedUrls: List<String>,
-                     token: String?,
-                     callback: MatrixCallback<Unit>): Cancelable
+    suspend fun agreeToTerms(serviceType: ServiceType,
+                             baseUrl: String,
+                             agreedUrls: List<String>,
+                             token: String?)
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MimeTypes.kt

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.util
+
+import org.matrix.android.sdk.api.extensions.orFalse
+
+// The Android SDK does not provide constant for mime type, add some of them here
+object MimeTypes {
+    const val Any: String = "*/*"
+    const val OctetStream = "application/octet-stream"
+
+    const val Images = "image/*"
+
+    const val Png = "image/png"
+    const val BadJpg = "image/jpg"
+    const val Jpeg = "image/jpeg"
+    const val Gif = "image/gif"
+
+    fun String?.normalizeMimeType() = if (this == BadJpg) Jpeg else this
+
+    fun String?.isMimeTypeImage() = this?.startsWith("image/").orFalse()
+    fun String?.isMimeTypeVideo() = this?.startsWith("video/").orFalse()
+    fun String?.isMimeTypeAudio() = this?.startsWith("audio/").orFalse()
+}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/UrlExtensions.kt

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.util
+
+import java.net.URLEncoder
+
+/**
+ * Append param and value to a Url, using "?" or "&". Value parameter will be encoded
+ * Return this for chaining purpose
+ */
+fun StringBuilder.appendParamToUrl(param: String, value: String): StringBuilder {
+    if (contains("?")) {
+        append("&")
+    } else {
+        append("?")
+    }
+
+    append(param)
+    append("=")
+    append(URLEncoder.encode(value, "utf-8"))
+
+    return this
+}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt

@@ -33,6 +33,7 @@ import org.matrix.android.sdk.internal.di.AuthDatabase
 import org.matrix.android.sdk.internal.legacy.DefaultLegacySessionImporter
 import org.matrix.android.sdk.internal.wellknown.WellknownModule
 import io.realm.RealmConfiguration
+import org.matrix.android.sdk.api.auth.HomeServerHistoryService
 import java.io.File
 
 @Module(includes = [WellknownModule::class])
@@ -80,4 +81,7 @@ internal abstract class AuthModule {
 
     @Binds
     abstract fun bindDirectLoginTask(task: DefaultDirectLoginTask): DirectLoginTask
+
+    @Binds
+    abstract fun bindHomeServerHistoryService(service: DefaultHomeServerHistoryService): HomeServerHistoryService
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/Constants.kt

@@ -14,24 +14,25 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.api.auth
+package org.matrix.android.sdk.internal.auth
 
 /**
  * Path to use when the client does not supported any or all login flows
  * Ref: https://matrix.org/docs/spec/client_server/latest#login-fallback
- * */
-const val LOGIN_FALLBACK_PATH = "/_matrix/static/client/login/"
+ */
+internal const val LOGIN_FALLBACK_PATH = "/_matrix/static/client/login/"
 
 /**
  * Path to use when the client does not supported any or all registration flows
  * Not documented
  */
-const val REGISTER_FALLBACK_PATH = "/_matrix/static/client/register/"
+internal const val REGISTER_FALLBACK_PATH = "/_matrix/static/client/register/"
 
 /**
  * Path to use when the client want to connect using SSO
  * Ref: https://matrix.org/docs/spec/client_server/latest#sso-client-login
  */
-const val SSO_REDIRECT_PATH = "/_matrix/client/r0/login/sso/redirect"
+internal const val SSO_REDIRECT_PATH = "/_matrix/client/r0/login/sso/redirect"
+internal const val MSC2858_SSO_REDIRECT_PATH = "/_matrix/client/unstable/org.matrix.msc2858/login/sso/redirect"
 
-const val SSO_REDIRECT_URL_PARAM = "redirectUrl"
+internal const val SSO_REDIRECT_URL_PARAM = "redirectUrl"

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt

@@ -26,6 +26,7 @@ import org.matrix.android.sdk.api.auth.AuthenticationService
 import org.matrix.android.sdk.api.auth.data.Credentials
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 import org.matrix.android.sdk.api.auth.data.LoginFlowResult
+import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 import org.matrix.android.sdk.api.auth.login.LoginWizard
 import org.matrix.android.sdk.api.auth.registration.RegistrationWizard
 import org.matrix.android.sdk.api.auth.wellknown.WellknownResult
@@ -33,6 +34,7 @@ import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.NoOpCancellable
+import org.matrix.android.sdk.api.util.appendParamToUrl
 import org.matrix.android.sdk.internal.SessionManager
 import org.matrix.android.sdk.internal.auth.data.LoginFlowResponse
 import org.matrix.android.sdk.internal.auth.data.RiotConfig
@@ -98,6 +100,52 @@ internal class DefaultAuthenticationService @Inject constructor(
         }
     }
 
+    override fun getSsoUrl(redirectUrl: String, deviceId: String?, providerId: String?): String? {
+        val homeServerUrlBase = getHomeServerUrlBase() ?: return null
+
+        return buildString {
+            append(homeServerUrlBase)
+            if (providerId != null) {
+                append(MSC2858_SSO_REDIRECT_PATH)
+                append("/$providerId")
+            } else {
+                append(SSO_REDIRECT_PATH)
+            }
+            // Set the redirect url
+            appendParamToUrl(SSO_REDIRECT_URL_PARAM, redirectUrl)
+            deviceId?.takeIf { it.isNotBlank() }?.let {
+                // But https://github.com/matrix-org/synapse/issues/5755
+                appendParamToUrl("device_id", it)
+            }
+        }
+    }
+
+    override fun getFallbackUrl(forSignIn: Boolean, deviceId: String?): String? {
+        val homeServerUrlBase = getHomeServerUrlBase() ?: return null
+
+        return buildString {
+            append(homeServerUrlBase)
+            if (forSignIn) {
+                append(LOGIN_FALLBACK_PATH)
+                deviceId?.takeIf { it.isNotBlank() }?.let {
+                    // But https://github.com/matrix-org/synapse/issues/5755
+                    appendParamToUrl("device_id", it)
+                }
+            } else {
+                // For sign up
+                append(REGISTER_FALLBACK_PATH)
+            }
+        }
+    }
+
+    private fun getHomeServerUrlBase(): String? {
+        return pendingSessionData
+                ?.homeServerConnectionConfig
+                ?.homeServerUri
+                ?.toString()
+                ?.trim { it == '/' }
+    }
+
     override fun getLoginFlow(homeServerConnectionConfig: HomeServerConnectionConfig, callback: MatrixCallback<LoginFlowResult>): Cancelable {
         pendingSessionData = null
 
@@ -278,6 +326,7 @@ internal class DefaultAuthenticationService @Inject constructor(
         }
         return LoginFlowResult.Success(
                 loginFlowResponse.flows.orEmpty().mapNotNull { it.type },
+                loginFlowResponse.flows.orEmpty().firstOrNull { it.type == LoginFlowTypes.SSO }?.ssoIdentityProvider,
                 versions.isLoginAndRegistrationSupportedBySdk(),
                 homeServerUrl,
                 !versions.isSupportedBySdk()

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultHomeServerHistoryService.kt

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.auth
+
+import com.zhuinden.monarchy.Monarchy
+import io.realm.kotlin.where
+import org.matrix.android.sdk.api.auth.HomeServerHistoryService
+import org.matrix.android.sdk.internal.database.model.KnownServerUrlEntity
+import org.matrix.android.sdk.internal.di.GlobalDatabase
+import javax.inject.Inject
+
+class DefaultHomeServerHistoryService @Inject constructor(
+        @GlobalDatabase private val monarchy: Monarchy
+) : HomeServerHistoryService {
+
+    override fun getKnownServersUrls(): List<String> {
+        return monarchy.fetchAllMappedSync(
+                { realm ->
+                    realm.where<KnownServerUrlEntity>()
+                },
+                { it.url }
+        )
+    }
+
+    override fun addHomeServerToHistory(url: String) {
+        monarchy.writeAsync { realm ->
+            KnownServerUrlEntity(url).let {
+                realm.insertOrUpdate(it)
+            }
+        }
+    }
+
+    override fun clearHistory() {
+        monarchy.runTransactionSync { it.where<KnownServerUrlEntity>().findAll().deleteAllFromRealm() }
+    }
+}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginFlowResponse.kt

@@ -18,6 +18,7 @@ package org.matrix.android.sdk.internal.auth.data
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
 
 @JsonClass(generateAdapter = true)
 internal data class LoginFlowResponse(
@@ -34,5 +35,13 @@ internal data class LoginFlow(
          * The login type. This is supplied as the type when logging in.
          */
         @Json(name = "type")
-        val type: String?
+        val type: String?,
+
+        /**
+         * Augments m.login.sso flow discovery definition to include metadata on the supported IDPs
+         * the client can show a button for each of the supported providers
+         * See MSC #2858
+         */
+        @Json(name = "org.matrix.msc2858.identity_providers")
+        val ssoIdentityProvider: List<SsoIdentityProvider>?
 )

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/LocalizedFlowDataLoginTerms.kt

@@ -17,7 +17,7 @@
 package org.matrix.android.sdk.internal.auth.registration
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 /**
  * This class represent a localized privacy policy for registration Flow.

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationFlowResponse.kt

@@ -51,6 +51,18 @@ data class RegistrationFlowResponse(
          * The information that the client will need to know in order to use a given type of authentication.
          * For each login stage type presented, that type may be present as a key in this dictionary.
          * For example, the public key of reCAPTCHA stage could be given here.
+         * other example
+         *  "params": {
+         *       "m.login.sso": {
+         *          "identity_providers": [
+         *              {
+         *                  "id": "google",
+         *                  "name": "Google",
+         *                  "icon": "https://..."
+         *              }
+         *          ]
+         *      }
+         *  }
          */
         @Json(name = "params")
         val params: JsonDict? = null

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/ElementToDecrypt.kt

@@ -18,7 +18,7 @@ package org.matrix.android.sdk.internal.crypto.attachments
 
 import android.os.Parcelable
 import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileInfo
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 fun EncryptedFileInfo.toElementToDecrypt(): ElementToDecrypt? {
     // Check the validity of some fields

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt

@@ -20,6 +20,7 @@ import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.session.room.membership.LoadRoomMembersTask
 import org.matrix.android.sdk.internal.session.room.send.LocalEchoRepository
 import org.matrix.android.sdk.internal.session.room.send.SendResponse
 import org.matrix.android.sdk.internal.task.Task
@@ -35,11 +36,19 @@ internal interface SendEventTask : Task<SendEventTask.Params, String> {
 internal class DefaultSendEventTask @Inject constructor(
         private val localEchoRepository: LocalEchoRepository,
         private val encryptEventTask: DefaultEncryptEventTask,
+        private val loadRoomMembersTask: LoadRoomMembersTask,
         private val roomAPI: RoomAPI,
         private val eventBus: EventBus) : SendEventTask {
 
     override suspend fun execute(params: SendEventTask.Params): String {
         try {
+            // Make sure to load all members in the room before sending the event.
+            params.event.roomId
+                    ?.takeIf { params.encrypt }
+                    ?.let { roomId ->
+                        loadRoomMembersTask.execute(LoadRoomMembersTask.Params(roomId))
+                    }
+
             val event = handleEncryption(params)
             val localId = event.eventId!!
 

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt

@@ -31,6 +31,7 @@ import org.matrix.android.sdk.internal.extensions.toUnsignedInt
 import org.matrix.olm.OlmSAS
 import org.matrix.olm.OlmUtility
 import timber.log.Timber
+import java.util.Locale
 
 /**
  * Represents an ongoing short code interactive key verification between two devices.
@@ -344,7 +345,7 @@ internal abstract class SASDefaultVerificationTransaction(
     }
 
     protected fun hashUsingAgreedHashMethod(toHash: String): String? {
-        if ("sha256".toLowerCase() == accepted?.hash?.toLowerCase()) {
+        if ("sha256" == accepted?.hash?.toLowerCase(Locale.ROOT)) {
             val olmUtil = OlmUtility()
             val hashBytes = olmUtil.sha256(toHash)
             olmUtil.releaseUtility()
@@ -354,12 +355,11 @@ internal abstract class SASDefaultVerificationTransaction(
     }
 
     private fun macUsingAgreedMethod(message: String, info: String): String? {
-        if (SAS_MAC_SHA256_LONGKDF.toLowerCase() == accepted?.messageAuthenticationCode?.toLowerCase()) {
-            return getSAS().calculateMacLongKdf(message, info)
-        } else if (SAS_MAC_SHA256.toLowerCase() == accepted?.messageAuthenticationCode?.toLowerCase()) {
-            return getSAS().calculateMac(message, info)
+        return when (accepted?.messageAuthenticationCode?.toLowerCase(Locale.ROOT)) {
+            SAS_MAC_SHA256_LONGKDF -> getSAS().calculateMacLongKdf(message, info)
+            SAS_MAC_SHA256         -> getSAS().calculateMac(message, info)
+            else                   -> null
         }
-        return null
     }
 
     override fun getDecimalCodeRepresentation(): String {

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt

@@ -20,6 +20,9 @@ import io.realm.DynamicRealm
 import io.realm.RealmMigration
 import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntityFields
 import org.matrix.android.sdk.internal.database.model.PendingThreePidEntityFields
+import org.matrix.android.sdk.internal.database.model.PreviewUrlCacheEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomMembersLoadStatusType
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
 import timber.log.Timber
 import javax.inject.Inject
@@ -27,7 +30,7 @@ import javax.inject.Inject
 class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
 
     companion object {
-        const val SESSION_STORE_SCHEMA_VERSION = 5L
+        const val SESSION_STORE_SCHEMA_VERSION = 7L
     }
 
     override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
@@ -38,6 +41,8 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
         if (oldVersion <= 2) migrateTo3(realm)
         if (oldVersion <= 3) migrateTo4(realm)
         if (oldVersion <= 4) migrateTo5(realm)
+        if (oldVersion <= 5) migrateTo6(realm)
+        if (oldVersion <= 6) migrateTo7(realm)
     }
 
     private fun migrateTo1(realm: DynamicRealm) {
@@ -89,4 +94,32 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
                 ?.removeField("adminE2EByDefault")
                 ?.removeField("preferredJitsiDomain")
     }
+
+    private fun migrateTo6(realm: DynamicRealm) {
+        Timber.d("Step 5 -> 6")
+        realm.schema.create("PreviewUrlCacheEntity")
+                .addField(PreviewUrlCacheEntityFields.URL, String::class.java)
+                .setRequired(PreviewUrlCacheEntityFields.URL, true)
+                .addPrimaryKey(PreviewUrlCacheEntityFields.URL)
+                .addField(PreviewUrlCacheEntityFields.URL_FROM_SERVER, String::class.java)
+                .addField(PreviewUrlCacheEntityFields.SITE_NAME, String::class.java)
+                .addField(PreviewUrlCacheEntityFields.TITLE, String::class.java)
+                .addField(PreviewUrlCacheEntityFields.DESCRIPTION, String::class.java)
+                .addField(PreviewUrlCacheEntityFields.MXC_URL, String::class.java)
+                .addField(PreviewUrlCacheEntityFields.LAST_UPDATED_TIMESTAMP, Long::class.java)
+    }
+
+    private fun migrateTo7(realm: DynamicRealm) {
+        Timber.d("Step 6 -> 7")
+        realm.schema.get("RoomEntity")
+                ?.addField(RoomEntityFields.MEMBERS_LOAD_STATUS_STR, String::class.java)
+                ?.transform { obj ->
+                    if (obj.getBoolean("areAllMembersLoaded")) {
+                        obj.setString("membersLoadStatusStr", RoomMembersLoadStatusType.LOADED.name)
+                    } else {
+                        obj.setString("membersLoadStatusStr", RoomMembersLoadStatusType.NONE.name)
+                    }
+                }
+                ?.removeField("areAllMembersLoaded")
+    }
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/KnownServerUrlEntity.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.database.model
+
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+internal open class KnownServerUrlEntity(
+        @PrimaryKey
+        var url: String = ""
+) : RealmObject() {
+    companion object
+}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PreviewUrlCacheEntity.kt

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.database.model
+
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+internal open class PreviewUrlCacheEntity(
+        @PrimaryKey
+        var url: String = "",
+
+        var urlFromServer: String? = null,
+        var siteName: String? = null,
+        var title: String? = null,
+        var description: String? = null,
+        var mxcUrl: String? = null,
+
+        var lastUpdatedTimestamp: Long = 0L
+) : RealmObject() {
+
+    companion object
+}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomEntity.kt

@@ -23,8 +23,7 @@ import io.realm.annotations.PrimaryKey
 
 internal open class RoomEntity(@PrimaryKey var roomId: String = "",
                                var chunks: RealmList<ChunkEntity> = RealmList(),
-                               var sendingTimelineEvents: RealmList<TimelineEventEntity> = RealmList(),
-                               var areAllMembersLoaded: Boolean = false
+                               var sendingTimelineEvents: RealmList<TimelineEventEntity> = RealmList()
 ) : RealmObject() {
 
     private var membershipStr: String = Membership.NONE.name
@@ -36,5 +35,14 @@ internal open class RoomEntity(@PrimaryKey var roomId: String = "",
             membershipStr = value.name
         }
 
+    private var membersLoadStatusStr: String = RoomMembersLoadStatusType.NONE.name
+    var membersLoadStatus: RoomMembersLoadStatusType
+        get() {
+            return RoomMembersLoadStatusType.valueOf(membersLoadStatusStr)
+        }
+        set(value) {
+            membersLoadStatusStr = value.name
+        }
+
     companion object
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomMembersLoadStatusType.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.database.model
+
+internal enum class RoomMembersLoadStatusType {
+    NONE,
+    LOADING,
+    LOADED
+}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt

@@ -48,6 +48,7 @@ import io.realm.annotations.RealmModule
             PushRulesEntity::class,
             PushRuleEntity::class,
             PushConditionEntity::class,
+            PreviewUrlCacheEntity::class,
             PusherEntity::class,
             PusherDataEntity::class,
             ReadReceiptsSummaryEntity::class,

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PreviewUrlCacheEntityQueries.kt

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.database.query
+
+import io.realm.Realm
+import io.realm.kotlin.createObject
+import io.realm.kotlin.where
+import org.matrix.android.sdk.internal.database.model.PreviewUrlCacheEntity
+import org.matrix.android.sdk.internal.database.model.PreviewUrlCacheEntityFields
+
+/**
+ * Get the current PreviewUrlCacheEntity, return null if it does not exist
+ */
+internal fun PreviewUrlCacheEntity.Companion.get(realm: Realm, url: String): PreviewUrlCacheEntity? {
+    return realm.where<PreviewUrlCacheEntity>()
+            .equalTo(PreviewUrlCacheEntityFields.URL, url)
+            .findFirst()
+}
+
+/**
+ * Get the current PreviewUrlCacheEntity, create one if it does not exist
+ */
+internal fun PreviewUrlCacheEntity.Companion.getOrCreate(realm: Realm, url: String): PreviewUrlCacheEntity {
+    return get(realm, url) ?: realm.createObject(url)
+}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt

@@ -71,8 +71,23 @@ internal fun TimelineEventEntity.Companion.latestEvent(realm: Realm,
 }
 
 internal fun RealmQuery<TimelineEventEntity>.filterEvents(filters: TimelineEventFilters): RealmQuery<TimelineEventEntity> {
-    if (filters.filterTypes) {
-        `in`(TimelineEventEntityFields.ROOT.TYPE, filters.allowedTypes.toTypedArray())
+    if (filters.filterTypes && filters.allowedTypes.isNotEmpty()) {
+        beginGroup()
+        filters.allowedTypes.forEachIndexed { index, filter ->
+            if (filter.stateKey == null) {
+                equalTo(TimelineEventEntityFields.ROOT.TYPE, filter.eventType)
+            } else {
+                beginGroup()
+                equalTo(TimelineEventEntityFields.ROOT.TYPE, filter.eventType)
+                and()
+                equalTo(TimelineEventEntityFields.ROOT.STATE_KEY, filter.stateKey)
+                endGroup()
+            }
+            if (index != filters.allowedTypes.size - 1) {
+                or()
+            }
+        }
+        endGroup()
     }
     if (filters.filterUseless) {
         not()

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixComponent.kt

@@ -25,6 +25,7 @@ import okhttp3.OkHttpClient
 import org.matrix.android.sdk.api.Matrix
 import org.matrix.android.sdk.api.MatrixConfiguration
 import org.matrix.android.sdk.api.auth.AuthenticationService
+import org.matrix.android.sdk.api.auth.HomeServerHistoryService
 import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.internal.SessionManager
 import org.matrix.android.sdk.internal.auth.AuthModule
@@ -62,6 +63,8 @@ internal interface MatrixComponent {
 
     fun rawService(): RawService
 
+    fun homeServerHistoryService(): HomeServerHistoryService
+
     fun context(): Context
 
     fun matrixConfiguration(): MatrixConfiguration
@@ -71,9 +74,6 @@ internal interface MatrixComponent {
     @CacheDirectory
     fun cacheDir(): File
 
-    @ExternalFilesDirectory
-    fun externalFilesDir(): File?
-
     fun olmManager(): OlmManager
 
     fun taskExecutor(): TaskExecutor

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixModule.kt

@@ -57,13 +57,6 @@ internal object MatrixModule {
         return context.cacheDir
     }
 
-    @JvmStatic
-    @Provides
-    @ExternalFilesDirectory
-    fun providesExternalFilesDir(context: Context): File? {
-        return context.getExternalFilesDir(null)
-    }
-
     @JvmStatic
     @Provides
     @MatrixScope

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt

@@ -16,14 +16,15 @@
 
 package org.matrix.android.sdk.internal.network
 
-import org.matrix.android.sdk.api.failure.Failure
-import org.matrix.android.sdk.api.failure.shouldBeRetried
-import org.matrix.android.sdk.internal.network.ssl.CertUtil
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.delay
 import org.greenrobot.eventbus.EventBus
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.shouldBeRetried
+import org.matrix.android.sdk.internal.network.ssl.CertUtil
 import retrofit2.Call
 import retrofit2.awaitResponse
+import timber.log.Timber
 import java.io.IOException
 
 internal suspend inline fun <DATA : Any> executeRequest(eventBus: EventBus?,
@@ -49,6 +50,9 @@ internal class Request<DATA : Any>(private val eventBus: EventBus?) {
                 throw response.toFailure(eventBus)
             }
         } catch (exception: Throwable) {
+            // Log some details about the request which has failed
+            Timber.e("Exception when executing request ${apiCall.request().method} ${apiCall.request().url.toString().substringBefore("?")}")
+
             // Check if this is a certificateException
             CertUtil.getCertificateException(exception)
                     // TODO Support certificate error once logged

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultRawService.kt

@@ -16,7 +16,7 @@
 
 package org.matrix.android.sdk.internal.raw
 
-import org.matrix.android.sdk.api.raw.RawCacheStrategy
+import org.matrix.android.sdk.api.cache.CacheStrategy
 import org.matrix.android.sdk.api.raw.RawService
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
@@ -25,15 +25,15 @@ internal class DefaultRawService @Inject constructor(
         private val getUrlTask: GetUrlTask,
         private val cleanRawCacheTask: CleanRawCacheTask
 ) : RawService {
-    override suspend fun getUrl(url: String, rawCacheStrategy: RawCacheStrategy): String {
-        return getUrlTask.execute(GetUrlTask.Params(url, rawCacheStrategy))
+    override suspend fun getUrl(url: String, cacheStrategy: CacheStrategy): String {
+        return getUrlTask.execute(GetUrlTask.Params(url, cacheStrategy))
     }
 
     override suspend fun getWellknown(userId: String): String {
         val homeServerDomain = userId.substringAfter(":")
         return getUrl(
                 "https://$homeServerDomain/.well-known/matrix/client",
-                RawCacheStrategy.TtlCache(TimeUnit.HOURS.toMillis(8), false)
+                CacheStrategy.TtlCache(TimeUnit.HOURS.toMillis(8), false)
         )
     }
 

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GetUrlTask.kt

@@ -18,7 +18,7 @@ package org.matrix.android.sdk.internal.raw
 
 import com.zhuinden.monarchy.Monarchy
 import okhttp3.ResponseBody
-import org.matrix.android.sdk.api.raw.RawCacheStrategy
+import org.matrix.android.sdk.api.cache.CacheStrategy
 import org.matrix.android.sdk.internal.database.model.RawCacheEntity
 import org.matrix.android.sdk.internal.database.query.get
 import org.matrix.android.sdk.internal.database.query.getOrCreate
@@ -32,7 +32,7 @@ import javax.inject.Inject
 internal interface GetUrlTask : Task<GetUrlTask.Params, String> {
     data class Params(
             val url: String,
-            val rawCacheStrategy: RawCacheStrategy
+            val cacheStrategy: CacheStrategy
     )
 }
 
@@ -42,14 +42,14 @@ internal class DefaultGetUrlTask @Inject constructor(
 ) : GetUrlTask {
 
     override suspend fun execute(params: GetUrlTask.Params): String {
-        return when (params.rawCacheStrategy) {
-            RawCacheStrategy.NoCache       -> doRequest(params.url)
-            is RawCacheStrategy.TtlCache   -> doRequestWithCache(
+        return when (params.cacheStrategy) {
+            CacheStrategy.NoCache       -> doRequest(params.url)
+            is CacheStrategy.TtlCache   -> doRequestWithCache(
                     params.url,
-                    params.rawCacheStrategy.validityDurationInMillis,
-                    params.rawCacheStrategy.strict
+                    params.cacheStrategy.validityDurationInMillis,
+                    params.cacheStrategy.strict
             )
-            RawCacheStrategy.InfiniteCache -> doRequestWithCache(
+            CacheStrategy.InfiniteCache -> doRequestWithCache(
                     params.url,
                     Long.MAX_VALUE,
                     true

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GlobalRealmMigration.kt

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.raw
+
+import io.realm.DynamicRealm
+import io.realm.RealmMigration
+import org.matrix.android.sdk.internal.database.model.KnownServerUrlEntityFields
+import timber.log.Timber
+
+internal object GlobalRealmMigration : RealmMigration {
+
+    // Current schema version
+    const val SCHEMA_VERSION = 1L
+
+    override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
+        Timber.d("Migrating Auth Realm from $oldVersion to $newVersion")
+
+        if (oldVersion <= 0) migrateTo1(realm)
+    }
+
+    private fun migrateTo1(realm: DynamicRealm) {
+        realm.schema.create("KnownServerUrlEntity")
+                .addField(KnownServerUrlEntityFields.URL, String::class.java)
+                .addPrimaryKey(KnownServerUrlEntityFields.URL)
+                .setRequired(KnownServerUrlEntityFields.URL, true)
+    }
+}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GlobalRealmModule.kt

@@ -17,6 +17,7 @@
 package org.matrix.android.sdk.internal.raw
 
 import io.realm.annotations.RealmModule
+import org.matrix.android.sdk.internal.database.model.KnownServerUrlEntity
 import org.matrix.android.sdk.internal.database.model.RawCacheEntity
 
 /**
@@ -24,6 +25,7 @@ import org.matrix.android.sdk.internal.database.model.RawCacheEntity
  */
 @RealmModule(library = true,
         classes = [
-            RawCacheEntity::class
+            RawCacheEntity::class,
+            KnownServerUrlEntity::class
         ])
 internal class GlobalRealmModule