diff --git a/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt b/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt index 9c1bd8f7ed..a58126b22f 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt +++ b/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt @@ -258,9 +258,13 @@ class UploadAndShareFilesWorker(val context: Context, workerParameters: WorkerPa notification = mBuilder!! .setContentTitle(failureTitle) .setContentText(failureText) + .setOngoing(false) .build() - mNotifyManager!!.notify(notificationId, notification) + // Cancel original notification + mNotifyManager?.cancel(notificationId) + // Then show information about failure + mNotifyManager!!.notify(SystemClock.uptimeMillis().toInt(), notification) } companion object { diff --git a/app/src/main/java/com/nextcloud/talk/upload/chunked/ChunkedFileUploader.kt b/app/src/main/java/com/nextcloud/talk/upload/chunked/ChunkedFileUploader.kt index 82b4b7f8dd..f3872b8471 100644 --- a/app/src/main/java/com/nextcloud/talk/upload/chunked/ChunkedFileUploader.kt +++ b/app/src/main/java/com/nextcloud/talk/upload/chunked/ChunkedFileUploader.kt @@ -57,6 +57,7 @@ import com.nextcloud.talk.utils.Mimetype import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.MediaType import okhttp3.OkHttpClient +import okhttp3.Protocol import okhttp3.Response import java.io.File import java.io.IOException @@ -290,6 +291,7 @@ class ChunkedFileUploader( okHttpClientBuilder.followRedirects(false) okHttpClientBuilder.followSslRedirects(false) // okHttpClientBuilder.readTimeout(Duration.ofMinutes(30)) // TODO set timeout + okHttpClientBuilder.protocols(listOf(Protocol.HTTP_1_1)) okHttpClientBuilder.authenticator( RestModule.MagicAuthenticator( ApiUtils.getCredentials(