Minor updates

- Added reset support to uploads
- Some bugfixes
- Updated lib versions

Author: woxblom

README.md

@@ -20,7 +20,7 @@ you it is possible to disable that.
     }
 
     dependencies {
-        compile 'com.projectplace.android:syncmanager:1.1.0'
+        compile 'com.projectplace.android:syncmanager:1.1.1'
     }
 ```
 

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:4.1.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -17,5 +17,6 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }

gradle.properties

@@ -15,4 +15,6 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true

sample/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
+    compileSdkVersion 29
     buildToolsVersion "25.0.3"
 
     defaultConfig {
         applicationId "com.projectplace.android.syncmanager.sample"
-        minSdkVersion 11
-        targetSdkVersion 25
+        minSdkVersion 16
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
     }
@@ -20,10 +20,10 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.squareup.retrofit:retrofit:1.9.0'
-    compile 'joda-time:joda-time:2.3'
-    compile project(':syncmanager')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation 'junit:junit:4.12'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'com.squareup.retrofit:retrofit:1.9.0'
+    implementation 'joda-time:joda-time:2.10.1'
+    implementation project(':syncmanager')
 }

sample/src/main/java/com/projectplace/android/syncmanager/sample/MainActivity.java

@@ -17,6 +17,8 @@
 package com.projectplace.android.syncmanager.sample;
 
 import android.os.Bundle;
+
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.TextView;
@@ -134,6 +136,10 @@ public void onUploadDone(SyncUpload syncUpload) {
         renderText();
     }
 
+    @Override
+    public void onSyncAborted(@NonNull SyncObject syncObject) {
+    }
+
     private void renderText() {
         String accessToken = MySharedPreferences.getInstance().getAccessToken();
         mAccessToken.setText(accessToken != null ? accessToken : "null");

syncmanager/build.gradle

@@ -12,12 +12,12 @@ repositories {
 }
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 29
     buildToolsVersion '28.0.3'
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
     }
@@ -31,7 +31,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.annotation:annotation:1.0.0'
+    implementation 'androidx.annotation:annotation:1.1.0'
     androidTestImplementation 'junit:junit:4.12'
 }
 

syncmanager/gradle.properties

@@ -1,5 +1,5 @@
 BIN_TRAY_NAME = AndroidSyncManager
-LIB_VERSION = 1.1.1
+LIB_VERSION = 1.1.2
 LIB_GROUP_ID = com.projectplace.android
 
 # The artifact name should be the same as the library module name

syncmanager/src/main/java/com/projectplace/android/syncmanager/SyncManager.java

@@ -336,6 +336,7 @@ protected void onPostExecute(Void aVoid) {
                     }
                     if (syncUpload.getSyncListener() != null) {
                         syncUpload.getSyncListener().onUploadDone(syncUpload);
+                        syncUpload.setSyncListener(null);
                     }
                 }
             }.executeOnExecutor(AsyncTask.SERIAL_EXECUTOR);
@@ -410,6 +411,7 @@ protected void onPostExecute(Void isDone) {
                             }
                             if (syncFetch.getSyncListener() != null) {
                                 syncFetch.getSyncListener().onFetchDone(syncFetch);
+                                syncFetch.setSyncListener(null);
                             }
                         }
                     }.executeOnExecutor(AsyncTask.SERIAL_EXECUTOR);
@@ -435,6 +437,7 @@ public void onSyncAborted(@NonNull SyncObject syncObject) {
         }
         if (syncObject.getSyncListener() != null) {
             syncObject.getSyncListener().onSyncAborted(syncObject);
+            syncObject.setSyncListener(null);
         }
     }
 

syncmanager/src/main/java/com/projectplace/android/syncmanager/SyncObject.java

@@ -80,6 +80,7 @@ void setManagerSyncListener(@NonNull SyncListener listener) {
 
     void reset() {
         mError = null;
+        mErrorMessage = null;
         mFailed = false;
         mStarted = false;
         mListenerCalled = false;
@@ -140,6 +141,8 @@ public void run() {
     }
 
     private void syncDone() {
+        if (mManagerSyncListener == null) return;
+
         if (this instanceof SyncFetch) {
             mManagerSyncListener.onFetchDone((SyncFetch) this);
         } else {

syncmanager/src/main/java/com/projectplace/android/syncmanager/SyncUpload.java

@@ -28,6 +28,11 @@ public SyncUpload() {
         setIsBackgroundSync(false);
     }
 
+    public void reset() {
+        super.reset();
+        mUploadSucceeded = false;
+    }
+
     /**
      * An extra prepare runnable can be added to the sync object to be able to run prepare operations outside the sync
      * object. This will be called directly after the sync object has been added to the sync manager.