Skip to content

Commit 745e775

Browse files
Merge pull request #16430 from nextcloud/better-upload-notification-controls
enhance(upload): notifications
2 parents 760f245 + 79f55f1 commit 745e775

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

app/src/main/java/com/nextcloud/client/jobs/upload/UploadNotificationManager.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ package com.nextcloud.client.jobs.upload
99

1010
import android.app.PendingIntent
1111
import android.content.Context
12+
import androidx.core.app.NotificationCompat
1213
import com.nextcloud.client.jobs.notification.WorkerNotificationManager
1314
import com.nextcloud.utils.numberFormatter.NumberFormatter
1415
import com.owncloud.android.R
@@ -51,6 +52,10 @@ class UploadNotificationManager(private val context: Context, viewThemeUtils: Vi
5152
setContentText(progressText)
5253
setOngoing(false)
5354
clearActions()
55+
setStyle(
56+
NotificationCompat.BigTextStyle()
57+
.bigText(context.getString(R.string.upload_notification_manager_content_intent_description))
58+
)
5459
addAction(UploadBroadcastAction.PauseAndCancel(operation).pauseAction(context))
5560
addAction(UploadBroadcastAction.PauseAndCancel(operation).cancelAction(context))
5661
setContentIntent(startIntent)

app/src/main/java/com/nextcloud/client/jobs/utils/UploadErrorNotificationManager.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,11 @@ object UploadErrorNotificationManager {
125125
setProgress(0, 0, false)
126126
clearActions()
127127

128+
setStyle(
129+
NotificationCompat.BigTextStyle()
130+
.bigText(context.getString(R.string.upload_notification_manager_content_intent_description))
131+
)
132+
128133
// actions for all error types
129134
addAction(UploadBroadcastAction.PauseAndCancel(operation).pauseAction(context))
130135
addAction(UploadBroadcastAction.PauseAndCancel(operation).cancelAction(context))

app/src/main/res/values/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -607,6 +607,8 @@
607607
<string name="network_error_connect_timeout_exception">An error occurred while waiting for the server. Could not complete operation.</string>
608608
<string name="network_host_not_available">Could not complete operation. Server unavailable.</string>
609609

610+
<string name="upload_notification_manager_content_intent_description">You can remove or resume it from Uploads</string>
611+
610612
<string name="forbidden_permissions">You are not permitted %s</string>
611613
<string name="forbidden_permissions_rename">to rename this file</string>
612614
<string name="forbidden_permissions_delete">to delete this file</string>

0 commit comments

Comments
 (0)