sync: smoother auto working (fixes #8984) (#8998)

Co-authored-by: dogi <[email protected]>

Author: Okuro3499

app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdk = 26
         targetSdk = 36
-        versionCode = 3713
-        versionName = "0.37.13"
+        versionCode = 3714
+        versionName = "0.37.14"
         ndkVersion = '26.3.11579264'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

app/src/main/java/org/ole/planet/myplanet/service/AutoSyncWorker.kt

@@ -9,6 +9,8 @@ import androidx.work.Worker
 import androidx.work.WorkerParameters
 import dagger.hilt.android.EntryPointAccessors
 import java.util.Date
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
 import org.ole.planet.myplanet.MainApplication
 import org.ole.planet.myplanet.callback.SuccessListener
 import org.ole.planet.myplanet.callback.SyncListener
@@ -26,11 +28,11 @@ class AutoSyncWorker(
     private val context: Context,
     workerParams: WorkerParameters
 ) : Worker(context, workerParams), SyncListener, CheckVersionCallback, SuccessListener {
-    
     private lateinit var preferences: SharedPreferences
     private lateinit var syncManager: SyncManager
     private lateinit var uploadManager: UploadManager
     private lateinit var uploadToShelfService: UploadToShelfService
+    private val backgroundExecutor: ExecutorService = Executors.newSingleThreadExecutor()
 
     override fun doWork(): Result {
         preferences = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
@@ -78,22 +80,24 @@ class AutoSyncWorker(
             }
             if (!MainApplication.isSyncRunning) {
                 MainApplication.isSyncRunning = true
-                uploadManager.uploadExamResult(this)
-                uploadManager.uploadFeedback(this)
-                uploadManager.uploadAchievement()
-                uploadManager.uploadResourceActivities("")
-                uploadManager.uploadUserActivities(this)
-                uploadManager.uploadCourseActivities()
-                uploadManager.uploadSearchActivity()
-                uploadManager.uploadRating()
-                uploadManager.uploadResource(this)
-                uploadManager.uploadNews()
-                uploadManager.uploadTeams()
-                uploadManager.uploadTeamTask()
-                uploadManager.uploadMeetups()
-                uploadManager.uploadCrashLog()
-                uploadManager.uploadSubmissions()
-                uploadManager.uploadActivities { MainApplication.isSyncRunning = false }
+                backgroundExecutor.execute {
+                    uploadManager.uploadExamResult(this@AutoSyncWorker)
+                    uploadManager.uploadFeedback(this@AutoSyncWorker)
+                    uploadManager.uploadAchievement()
+                    uploadManager.uploadResourceActivities("")
+                    uploadManager.uploadUserActivities(this@AutoSyncWorker)
+                    uploadManager.uploadCourseActivities()
+                    uploadManager.uploadSearchActivity()
+                    uploadManager.uploadRating()
+                    uploadManager.uploadResource(this@AutoSyncWorker)
+                    uploadManager.uploadNews()
+                    uploadManager.uploadTeams()
+                    uploadManager.uploadTeamTask()
+                    uploadManager.uploadMeetups()
+                    uploadManager.uploadCrashLog()
+                    uploadManager.uploadSubmissions()
+                    uploadManager.uploadActivities { MainApplication.isSyncRunning = false }
+                }
             }
         }
     }
@@ -103,6 +107,11 @@ class AutoSyncWorker(
         settings.edit { putLong("lastUsageUploaded", Date().time) }
     }
 
+    override fun onStopped() {
+        super.onStopped()
+        backgroundExecutor.shutdown()
+    }
+
     private fun isAppInForeground(context: Context): Boolean {
         val activityManager = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
         val runningProcesses = activityManager.runningAppProcesses ?: return false

app/src/main/java/org/ole/planet/myplanet/service/UploadManager.kt

@@ -187,9 +187,11 @@ class UploadManager @Inject constructor(
             submissionsToUpload.processInBatches { data ->
                 try {
                     val response: JsonObject? = if (TextUtils.isEmpty(data._id)) {
-                        apiInterface?.postDoc(UrlUtils.header, "application/json", "${UrlUtils.getUrl()}/submissions", data.serialized)?.execute()?.body()
+                        apiInterface.postDoc(UrlUtils.header, "application/json", "${UrlUtils.getUrl()}/submissions", data.serialized)
+                            .execute().body()
                     } else {
-                        apiInterface?.putDoc(UrlUtils.header, "application/json", "${UrlUtils.getUrl()}/submissions/${data._id}", data.serialized)?.execute()?.body()
+                        apiInterface.putDoc(UrlUtils.header, "application/json", "${UrlUtils.getUrl()}/submissions/${data._id}", data.serialized)
+                            .execute().body()
                     }
 
                     if (response != null && data.id != null) {