gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-08 21:40:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2532 from nextcloud/bugfix/2519/file_upload

Browse Source 
File upload always fails for 1MB+
This commit is contained in:
Marcel Hibbe 2022-10-28 16:38:52 +02:00 committed by GitHub
commit 037e0b3b25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt
View File

@ -258,9 +258,13 @@ class UploadAndShareFilesWorker(val context: Context, workerParameters: WorkerPa
notification = mBuilder!! notification = mBuilder!!
.setContentTitle(failureTitle) .setContentTitle(failureTitle)
.setContentText(failureText) .setContentText(failureText)
.setOngoing(false)
.build() .build()
mNotifyManager!!.notify(notificationId, notification) // Cancel original notification
mNotifyManager?.cancel(notificationId)
// Then show information about failure
mNotifyManager!!.notify(SystemClock.uptimeMillis().toInt(), notification)
} }
companion object { companion object {

2
app/src/main/java/com/nextcloud/talk/upload/chunked/ChunkedFileUploader.kt
View File

@ -57,6 +57,7 @@ import com.nextcloud.talk.utils.Mimetype
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
import okhttp3.MediaType import okhttp3.MediaType
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import okhttp3.Protocol
import okhttp3.Response import okhttp3.Response
import java.io.File import java.io.File
import java.io.IOException import java.io.IOException
@ -290,6 +291,7 @@ class ChunkedFileUploader(
okHttpClientBuilder.followRedirects(false) okHttpClientBuilder.followRedirects(false)
okHttpClientBuilder.followSslRedirects(false) okHttpClientBuilder.followSslRedirects(false)
// okHttpClientBuilder.readTimeout(Duration.ofMinutes(30)) // TODO set timeout // okHttpClientBuilder.readTimeout(Duration.ofMinutes(30)) // TODO set timeout
okHttpClientBuilder.protocols(listOf(Protocol.HTTP_1_1))
okHttpClientBuilder.authenticator( okHttpClientBuilder.authenticator(
RestModule.MagicAuthenticator( RestModule.MagicAuthenticator(
ApiUtils.getCredentials( ApiUtils.getCredentials(