Pixelfed
/
PixelDroid-App-Android
mirror of https://gitlab.shinice.net/pixeldroid/PixelDroid
1
0
Fork 0
Code Issues Releases Wiki Activity

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:
Matthieu 2022-01-23 12:13:48 +00:00
parent cac1b48fa5 699938a837
commit 486630dee2
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/pixeldroid/app/postCreation/PostCreationActivity.kt
View File

@ -336,7 +336,7 @@ class PostCreationActivity : BaseActivity() {
.subscribe { percentage -> .subscribe { percentage ->
data.progress = percentage.toInt() data.progress = percentage.toInt()
binding.uploadProgressBar.progress = binding.uploadProgressBar.progress =
photoData.sumBy { it.progress ?: 0 } / photoData.size photoData.sumOf { it.progress ?: 0 } / photoData.size
} }
var postSub: Disposable? = null var postSub: Disposable? = null

1
app/src/main/java/org/pixeldroid/app/postCreation/camera/CameraFragment.kt
View File

@ -320,7 +320,6 @@ class CameraFragment : Fragment() {
type = "image/*" type = "image/*"
action = Intent.ACTION_GET_CONTENT action = Intent.ACTION_GET_CONTENT
addCategory(Intent.CATEGORY_OPENABLE) addCategory(Intent.CATEGORY_OPENABLE)
putExtra(Intent.EXTRA_LOCAL_ONLY, true)
putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true) putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
uploadImageResultContract.launch( uploadImageResultContract.launch(
Intent.createChooser(this, null) Intent.createChooser(this, null)