Merge branch 'remote_images' into 'master'
Allow remote images in upload (e.g. Nextcloud) Closes #314 See merge request pixeldroid/PixelDroid!412
This commit is contained in:
commit
486630dee2
|
@ -336,7 +336,7 @@ class PostCreationActivity : BaseActivity() {
|
|||
.subscribe { percentage ->
|
||||
data.progress = percentage.toInt()
|
||||
binding.uploadProgressBar.progress =
|
||||
photoData.sumBy { it.progress ?: 0 } / photoData.size
|
||||
photoData.sumOf { it.progress ?: 0 } / photoData.size
|
||||
}
|
||||
|
||||
var postSub: Disposable? = null
|
||||
|
|
|
@ -320,7 +320,6 @@ class CameraFragment : Fragment() {
|
|||
type = "image/*"
|
||||
action = Intent.ACTION_GET_CONTENT
|
||||
addCategory(Intent.CATEGORY_OPENABLE)
|
||||
putExtra(Intent.EXTRA_LOCAL_ONLY, true)
|
||||
putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
|
||||
uploadImageResultContract.launch(
|
||||
Intent.createChooser(this, null)
|
||||
|
|
Loading…
Reference in New Issue