filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Safer code

Browse Source
This commit is contained in:
Benoit Marty 2020-02-26 17:28:27 +01:00
parent d3e7e7e109
commit b8eeede5fd
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vector/src/main/java/im/vector/riotx/features/media/BigImageViewerActivity.kt
View File

@ -28,11 +28,8 @@ import kotlinx.android.synthetic.main.activity_big_image_viewer.*
import javax.inject.Inject import javax.inject.Inject
class BigImageViewerActivity : VectorBaseActivity() { class BigImageViewerActivity : VectorBaseActivity() {
@Inject lateinit var sessionHolder: ActiveSessionHolder @Inject lateinit var sessionHolder: ActiveSessionHolder
private val imageUrl by lazy { intent.getStringExtra(EXTRA_IMAGE_URL) }
override fun injectWith(injector: ScreenComponent) { override fun injectWith(injector: ScreenComponent) {
injector.inject(this) injector.inject(this)
} }
@ -48,13 +45,19 @@ class BigImageViewerActivity : VectorBaseActivity() {
setDisplayHomeAsUpEnabled(true) setDisplayHomeAsUpEnabled(true)
} }
val contentUrlResolver = sessionHolder.getActiveSession().contentUrlResolver() val uri = sessionHolder.getSafeActiveSession()
val fullSize = contentUrlResolver.resolveFullSize(imageUrl) ?.contentUrlResolver()
bigImageViewerImageView.showImage(fullSize?.toUri()) ?.resolveFullSize(intent.getStringExtra(EXTRA_IMAGE_URL))
?.toUri()
if (uri == null) {
finish()
} else {
bigImageViewerImageView.showImage(uri)
}
} }
companion object { companion object {
private const val EXTRA_TITLE = "EXTRA_TITLE" private const val EXTRA_TITLE = "EXTRA_TITLE"
private const val EXTRA_IMAGE_URL = "EXTRA_IMAGE_URL" private const val EXTRA_IMAGE_URL = "EXTRA_IMAGE_URL"