From cc26ade921ffef59b8cf1d47bd4a2b7f42a5b12c Mon Sep 17 00:00:00 2001 From: stom79 Date: Wed, 16 Jan 2019 15:06:21 +0100 Subject: [PATCH] Fix issue #736 --- app/build.gradle | 4 ++-- .../etalab/mastodon/activities/PeertubeUploadActivity.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ba8f5ad51..630c5594e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -60,7 +60,7 @@ ext.swipebackLibraryVersion = '1.0.3' ext.ratethisappLibraryVersion = '1.2.0' ext.uploadServiceVersion = "3.4.2" ext.torrentstreamVersion = "2.6.1" -ext.uploadServiceVersion = "3.4.2" + dependencies { implementation "com.android.support:appcompat-v7:$supportLibraryVersion" @@ -90,7 +90,7 @@ dependencies { implementation 'com.android.support:multidex:1.0.3' implementation 'com.google.android.exoplayer:exoplayer:2.9.3' implementation "com.github.TorrentStream:TorrentStream-Android:$torrentstreamVersion" - implementation "net.gotev:uploadservice:$uploadServiceVersion" + implementation 'com.github.stom79:android-upload-service:3.4.2-Mastalab' implementation 'com.github.mabbas007:TagsEditText:1.0.5' implementation 'com.jaredrummler:material-spinner:1.3.1' playstoreImplementation "io.github.kobakei:ratethisapp:$ratethisappLibraryVersion" diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/PeertubeUploadActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/PeertubeUploadActivity.java index 0706cd695..194477298 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/PeertubeUploadActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/PeertubeUploadActivity.java @@ -347,9 +347,10 @@ public class PeertubeUploadActivity extends BaseActivity implements OnRetrievePe uploadConfig.getCancelled().message = getString(R.string.toast_cancelled); uploadConfig.getCompleted().actions.add(new UploadNotificationAction(R.drawable.ic_check, getString(R.string.video_uploaded_action), clickIntent)); + String uploadId = new MultipartUploadRequest(PeertubeUploadActivity.this, "https://" + Helper.getLiveInstance(PeertubeUploadActivity.this) + "/api/v1/videos/upload") - .addFileToUpload(uri.toString(), "videofile") + .addFileToUpload(uri.toString().replace("file://",""), "videofile") .addHeader("Authorization", "Bearer " + token) .setNotificationConfig(uploadConfig) .addParameter("name", filename)