* This would not affect progress notification, as it's ongoing and managed by the upload
* service.
*
@@ -179,7 +184,7 @@ public final UploadNotificationConfig setRingToneEnabled(Boolean enabled) {
* @param channelId notification channel ID
* @return {@link UploadNotificationConfig}
*/
- public final UploadNotificationConfig setNotificationChannelId(@NonNull String channelId){
+ public final UploadNotificationConfig setNotificationChannelId(@NonNull String channelId) {
this.notificationChannelId = channelId;
return this;
}
@@ -204,7 +209,7 @@ public UploadNotificationStatusConfig getCancelled() {
return cancelled;
}
- public String getNotificationChannelId(){
+ public String getNotificationChannelId() {
return notificationChannelId;
}
diff --git a/uploadservice/src/main/java/net/gotev/uploadservice/UploadNotificationStatusConfig.java b/uploadservice/src/main/java/net/gotev/uploadservice/UploadNotificationStatusConfig.java
index d81d2bed..ee002bfe 100644
--- a/uploadservice/src/main/java/net/gotev/uploadservice/UploadNotificationStatusConfig.java
+++ b/uploadservice/src/main/java/net/gotev/uploadservice/UploadNotificationStatusConfig.java
@@ -6,10 +6,11 @@
import android.graphics.Bitmap;
import android.os.Parcel;
import android.os.Parcelable;
-import android.support.v4.app.NotificationCompat;
import java.util.ArrayList;
+import androidx.core.app.NotificationCompat;
+
/**
* @author Aleksandar Gotev
*/
@@ -98,7 +99,7 @@ public void writeToParcel(Parcel dest, int flags) {
dest.writeTypedList(this.actions);
}
- public UploadNotificationStatusConfig(){
+ public UploadNotificationStatusConfig() {
}
protected UploadNotificationStatusConfig(Parcel in) {
diff --git a/uploadservice/src/main/java/net/gotev/uploadservice/UploadTask.java b/uploadservice/src/main/java/net/gotev/uploadservice/UploadTask.java
index 0cdd18d9..50983b20 100644
--- a/uploadservice/src/main/java/net/gotev/uploadservice/UploadTask.java
+++ b/uploadservice/src/main/java/net/gotev/uploadservice/UploadTask.java
@@ -9,7 +9,6 @@
import android.net.Uri;
import android.os.Build;
import android.os.Handler;
-import android.support.v4.app.NotificationCompat;
import java.io.File;
import java.io.IOException;
@@ -19,9 +18,12 @@
import java.util.Iterator;
import java.util.List;
+import androidx.core.app.NotificationCompat;
+
/**
* Base class to subclass when creating upload tasks. It contains the logic common to all the tasks,
* such as notification management, status broadcast, retry logic and some utility methods.
+ *
* @author Aleksandar Gotev
*/
public abstract class UploadTask implements Runnable {
@@ -95,6 +97,7 @@ public abstract class UploadTask implements Runnable {
/**
* Implementation of the upload logic.
+ *
* @throws Exception if an error occurs
*/
abstract protected void upload() throws Exception;
@@ -102,7 +105,8 @@ public abstract class UploadTask implements Runnable {
/**
* Implement in subclasses to be able to do something when the upload is successful.
*/
- protected void onSuccessfulUpload() {}
+ protected void onSuccessfulUpload() {
+ }
public UploadTask() {
startTime = new Date().getTime();
@@ -114,7 +118,7 @@ public UploadTask() {
* custom parameters set in {@link UploadRequest#initializeIntent(Intent)} method.
*
* @param service Upload Service instance. You should use this reference as your context.
- * @param intent intent sent to the service to start the upload
+ * @param intent intent sent to the service to start the upload
* @throws IOException if an I/O exception occurs while initializing
*/
protected void init(UploadService service, Intent intent) throws IOException {
@@ -173,7 +177,8 @@ public final void run() {
while (shouldContinue && System.currentTimeMillis() < (beforeSleepTs + errorDelay)) {
try {
Thread.sleep(2000);
- } catch (Throwable ignored) { }
+ } catch (Throwable ignored) {
+ }
}
errorDelay *= UploadService.BACKOFF_MULTIPLIER;
@@ -192,6 +197,7 @@ public final void run() {
/**
* Sets the last time the notification was updated.
* This is handled automatically and you should never call this method.
+ *
* @param lastProgressNotificationTime time in milliseconds
* @return {@link UploadTask}
*/
@@ -204,6 +210,7 @@ protected final UploadTask setLastProgressNotificationTime(long lastProgressNoti
* Sets the upload notification ID for this task.
* This gets called by {@link UploadService} when the task is initialized.
* You should never call this method.
+ *
* @param notificationId notification ID
* @return {@link UploadTask}
*/
@@ -216,7 +223,7 @@ protected final UploadTask setNotificationId(int notificationId) {
* Broadcasts a progress update.
*
* @param uploadedBytes number of bytes which has been uploaded to the server
- * @param totalBytes total bytes of the request
+ * @param totalBytes total bytes of the request
*/
protected final void broadcastProgress(final long uploadedBytes, final long totalBytes) {
@@ -228,12 +235,12 @@ protected final void broadcastProgress(final long uploadedBytes, final long tota
setLastProgressNotificationTime(currentTime);
Logger.debug(LOG_TAG, "Broadcasting upload progress for " + params.id
- + ": " + uploadedBytes + " bytes of " + totalBytes);
+ + ": " + uploadedBytes + " bytes of " + totalBytes);
final UploadInfo uploadInfo = new UploadInfo(params.id, startTime, uploadedBytes,
- totalBytes, (attempts - 1),
- successfullyUploadedFiles,
- pathStringListFrom(params.files));
+ totalBytes, (attempts - 1),
+ successfullyUploadedFiles,
+ pathStringListFrom(params.files));
BroadcastData data = new BroadcastData()
.setStatus(BroadcastData.Status.IN_PROGRESS)
@@ -280,9 +287,9 @@ protected final void broadcastCompleted(final ServerResponse response) {
+ " for " + params.id);
final UploadInfo uploadInfo = new UploadInfo(params.id, startTime, uploadedBytes,
- totalBytes, (attempts - 1),
- successfullyUploadedFiles,
- pathStringListFrom(params.files));
+ totalBytes, (attempts - 1),
+ successfullyUploadedFiles,
+ pathStringListFrom(params.files));
final UploadNotificationConfig notificationConfig = params.notificationConfig;
@@ -290,7 +297,7 @@ protected final void broadcastCompleted(final ServerResponse response) {
if (successfulUpload && notificationConfig.getCompleted().message != null) {
updateNotification(uploadInfo, notificationConfig.getCompleted());
- } else if (notificationConfig.getError().message != null){
+ } else if (notificationConfig.getError().message != null) {
updateNotification(uploadInfo, notificationConfig.getError());
}
}
@@ -331,9 +338,9 @@ protected final void broadcastCancelled() {
Logger.debug(LOG_TAG, "Broadcasting cancellation for upload with ID: " + params.id);
final UploadInfo uploadInfo = new UploadInfo(params.id, startTime, uploadedBytes,
- totalBytes, (attempts - 1),
- successfullyUploadedFiles,
- pathStringListFrom(params.files));
+ totalBytes, (attempts - 1),
+ successfullyUploadedFiles,
+ pathStringListFrom(params.files));
final UploadNotificationConfig notificationConfig = params.notificationConfig;
@@ -362,6 +369,7 @@ public void run() {
/**
* Add a file to the list of the successfully uploaded files and remove it from the file list
+ *
* @param file file on the device
*/
protected final void addSuccessfullyUploadedFile(UploadFile file) {
@@ -376,7 +384,7 @@ protected final void addSuccessfullyUploadedFile(UploadFile file) {
* This will automatically remove them from the params.getFiles() list.
*/
protected final void addAllFilesToSuccessfullyUploadedFiles() {
- for (Iterator