Skip to content

Commit cc0632f

Browse files
committed
use correct thread dispatchers
1 parent 83a17ba commit cc0632f

File tree

1 file changed

+61
-56
lines changed

1 file changed

+61
-56
lines changed

app/src/main/java/org/ole/planet/myplanet/ui/sync/ProcessUserDataActivity.kt

Lines changed: 61 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ abstract class ProcessUserDataActivity : PermissionActivity(), SuccessListener {
6767

6868
@Inject
6969
lateinit var userRepository: UserRepository
70-
7170
lateinit var settings: SharedPreferences
7271
val customProgressDialog: DialogUtils.CustomProgressDialog by lazy {
7372
DialogUtils.CustomProgressDialog(this)
@@ -198,78 +197,84 @@ abstract class ProcessUserDataActivity : PermissionActivity(), SuccessListener {
198197
})
199198
return
200199
} else if (source == "login") {
201-
uploadManager.uploadUserActivities(this@ProcessUserDataActivity)
200+
lifecycleScope.launch(Dispatchers.IO) {
201+
uploadManager.uploadUserActivities(this@ProcessUserDataActivity)
202+
}
202203
return
203204
}
204205
customProgressDialog.setText(this.getString(R.string.uploading_data_to_server_please_wait))
205206
customProgressDialog.show()
206207

207-
uploadManager.uploadAchievement()
208-
uploadManager.uploadNews()
209-
uploadManager.uploadResourceActivities("")
210-
uploadManager.uploadCourseActivities()
211-
uploadManager.uploadSearchActivity()
212-
uploadManager.uploadTeams()
213-
uploadManager.uploadRating()
214-
uploadManager.uploadTeamTask()
215-
uploadManager.uploadMeetups()
216-
uploadManager.uploadSubmissions()
217-
uploadManager.uploadCrashLog()
218-
219-
val asyncOperationsCounter = AtomicInteger(0)
220-
val totalAsyncOperations = 6
221-
222-
fun checkAllOperationsComplete() {
223-
if (asyncOperationsCounter.incrementAndGet() == totalAsyncOperations) {
224-
runOnUiThread {
225-
if (!isFinishing && !isDestroyed) {
226-
customProgressDialog.dismiss()
227-
Toast.makeText(this@ProcessUserDataActivity, "upload complete", Toast.LENGTH_SHORT).show()
208+
lifecycleScope.launch {
209+
val asyncOperationsCounter = AtomicInteger(0)
210+
val totalAsyncOperations = 6
211+
212+
fun checkAllOperationsComplete() {
213+
if (asyncOperationsCounter.incrementAndGet() == totalAsyncOperations) {
214+
runOnUiThread {
215+
if (!isFinishing && !isDestroyed) {
216+
customProgressDialog.dismiss()
217+
Toast.makeText(this@ProcessUserDataActivity, "upload complete", Toast.LENGTH_SHORT).show()
218+
}
228219
}
229220
}
230221
}
231-
}
232222

233-
uploadToShelfService.uploadUserData {
234-
uploadToShelfService.uploadHealth()
235-
checkAllOperationsComplete()
236-
}
237-
238-
uploadManager.uploadUserActivities(object : SuccessListener {
239-
override fun onSuccess(success: String?) {
223+
uploadManager.uploadAchievement()
224+
uploadManager.uploadNews()
225+
uploadManager.uploadResourceActivities("")
226+
uploadManager.uploadCourseActivities()
227+
uploadManager.uploadSearchActivity()
228+
uploadManager.uploadTeams()
229+
uploadManager.uploadRating()
230+
uploadManager.uploadTeamTask()
231+
uploadManager.uploadMeetups()
232+
uploadManager.uploadSubmissions()
233+
uploadManager.uploadCrashLog()
234+
235+
uploadToShelfService.uploadUserData {
236+
uploadToShelfService.uploadHealth()
240237
checkAllOperationsComplete()
241238
}
242-
})
243239

244-
uploadManager.uploadExamResult(object : SuccessListener {
245-
override fun onSuccess(success: String?) {
246-
checkAllOperationsComplete()
247-
}
248-
})
240+
uploadManager.uploadUserActivities(object : SuccessListener {
241+
override fun onSuccess(success: String?) {
242+
checkAllOperationsComplete()
243+
}
244+
})
249245

250-
uploadManager.uploadFeedback(object : SuccessListener {
251-
override fun onSuccess(success: String?) {
252-
checkAllOperationsComplete()
246+
launch(Dispatchers.IO) {
247+
uploadManager.uploadExamResult(object : SuccessListener {
248+
override fun onSuccess(success: String?) {
249+
checkAllOperationsComplete()
250+
}
251+
})
253252
}
254-
})
255253

256-
uploadManager.uploadResource(object : SuccessListener {
257-
override fun onSuccess(success: String?) {
258-
checkAllOperationsComplete()
259-
}
260-
})
254+
uploadManager.uploadFeedback(object : SuccessListener {
255+
override fun onSuccess(success: String?) {
256+
checkAllOperationsComplete()
257+
}
258+
})
261259

262-
uploadManager.uploadSubmitPhotos(object : SuccessListener {
263-
override fun onSuccess(success: String?) {
264-
checkAllOperationsComplete()
265-
}
266-
})
260+
uploadManager.uploadResource(object : SuccessListener {
261+
override fun onSuccess(success: String?) {
262+
checkAllOperationsComplete()
263+
}
264+
})
267265

268-
uploadManager.uploadActivities(object : SuccessListener {
269-
override fun onSuccess(success: String?) {
270-
checkAllOperationsComplete()
271-
}
272-
})
266+
uploadManager.uploadSubmitPhotos(object : SuccessListener {
267+
override fun onSuccess(success: String?) {
268+
checkAllOperationsComplete()
269+
}
270+
})
271+
272+
uploadManager.uploadActivities(object : SuccessListener {
273+
override fun onSuccess(success: String?) {
274+
checkAllOperationsComplete()
275+
}
276+
})
277+
}
273278
}
274279

275280
protected fun hideKeyboard(view: View?) {

0 commit comments

Comments
 (0)