From 03cf950bab502701fff95c7c2e0089345f902058 Mon Sep 17 00:00:00 2001 From: Matthieu <24-artectrex@users.noreply.shinice.net> Date: Mon, 25 Jan 2021 18:18:56 +0100 Subject: [PATCH 1/2] Add check before proceding to upload to fix multi upload --- .../java/com/h/pixeldroid/postCreation/PostCreationActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/h/pixeldroid/postCreation/PostCreationActivity.kt b/app/src/main/java/com/h/pixeldroid/postCreation/PostCreationActivity.kt index e4c414b7..1618f084 100644 --- a/app/src/main/java/com/h/pixeldroid/postCreation/PostCreationActivity.kt +++ b/app/src/main/java/com/h/pixeldroid/postCreation/PostCreationActivity.kt @@ -302,7 +302,7 @@ class PostCreationActivity : BaseActivity() { }, { data.progress = 100 - if(photoData.all{it.progress == 100}){ + if(photoData.all{it.progress == 100 && it.uploadId != null}){ binding.uploadProgressBar.visibility = View.GONE binding.uploadCompletedTextview.visibility = View.VISIBLE post() From ed1d35b5394136bde5e13e854c60b00034794523 Mon Sep 17 00:00:00 2001 From: Matthieu <24-artectrex@users.noreply.shinice.net> Date: Mon, 25 Jan 2021 18:54:55 +0100 Subject: [PATCH 2/2] Fix media descriptions being wrapped with string --- .../com/h/pixeldroid/postCreation/PostCreationActivity.kt | 6 +++++- app/src/main/java/com/h/pixeldroid/utils/api/PixelfedAPI.kt | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/h/pixeldroid/postCreation/PostCreationActivity.kt b/app/src/main/java/com/h/pixeldroid/postCreation/PostCreationActivity.kt index 1618f084..a3052b95 100644 --- a/app/src/main/java/com/h/pixeldroid/postCreation/PostCreationActivity.kt +++ b/app/src/main/java/com/h/pixeldroid/postCreation/PostCreationActivity.kt @@ -284,7 +284,11 @@ class PostCreationActivity : BaseActivity() { } var postSub: Disposable? = null - val inter = pixelfedAPI.mediaUpload("Bearer $accessToken", data.imageDescription, requestBody.parts[0]) + + val description = data.imageDescription?.let { MultipartBody.Part.createFormData("description", it) } + + + val inter = pixelfedAPI.mediaUpload("Bearer $accessToken", description, requestBody.parts[0]) postSub = inter .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/h/pixeldroid/utils/api/PixelfedAPI.kt b/app/src/main/java/com/h/pixeldroid/utils/api/PixelfedAPI.kt index d79392b8..e92a1ee0 100644 --- a/app/src/main/java/com/h/pixeldroid/utils/api/PixelfedAPI.kt +++ b/app/src/main/java/com/h/pixeldroid/utils/api/PixelfedAPI.kt @@ -256,7 +256,7 @@ interface PixelfedAPI { fun mediaUpload( //The authorization header needs to be of the form "Bearer " @Header("Authorization") authorization: String, - @Part("description") description: String?, + @Part description: MultipartBody.Part? = null, @Part file: MultipartBody.Part ): Observable