Merge branch 'master' into 8981-illegalstateexception

dogi · web-flow · commit 9b08aa620f84 · 2025-11-10T21:39:28.000-05:00
diff --git a/app/src/main/java/org/ole/planet/myplanet/repository/SurveyRepositoryImpl.kt b/app/src/main/java/org/ole/planet/myplanet/repository/SurveyRepositoryImpl.kt
@@ -2,7 +2,6 @@ package org.ole.planet.myplanet.repository
 
 import android.content.Context
 import dagger.hilt.android.qualifiers.ApplicationContext
-import io.realm.Sort
 import javax.inject.Inject
 import org.json.JSONException
 import org.json.JSONObject
diff --git a/app/src/main/java/org/ole/planet/myplanet/service/AutoSyncWorker.kt b/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
diff --git a/app/src/main/java/org/ole/planet/myplanet/service/UploadManager.kt b/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) {
diff --git a/app/src/main/java/org/ole/planet/myplanet/service/UserProfileDbHandler.kt b/app/src/main/java/org/ole/planet/myplanet/service/UserProfileDbHandler.kt
@@ -3,16 +3,15 @@ package org.ole.planet.myplanet.service
 import android.content.Context
 import android.content.SharedPreferences
 import dagger.hilt.android.qualifiers.ApplicationContext
-import io.realm.Realm
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
 import java.util.UUID
 import javax.inject.Inject
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.ole.planet.myplanet.datamanager.DatabaseService
 import org.ole.planet.myplanet.di.AppPreferences
 import org.ole.planet.myplanet.model.RealmMyLibrary
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/BaseDashboardFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/BaseDashboardFragment.kt
@@ -17,8 +17,8 @@ import androidx.lifecycle.lifecycleScope
 import com.bumptech.glide.Glide
 import com.google.android.flexbox.FlexDirection
 import com.google.android.flexbox.FlexboxLayout
-import io.realm.Realm
 import io.realm.Case
+import io.realm.Realm
 import io.realm.RealmChangeListener
 import io.realm.RealmObject
 import io.realm.RealmResults
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/notification/NotificationsFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/notification/NotificationsFragment.kt
@@ -14,7 +14,6 @@ import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
-import io.realm.Sort
 import java.util.ArrayList
 import java.util.Date
 import javax.inject.Inject
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/news/AdapterNews.kt b/app/src/main/java/org/ole/planet/myplanet/ui/news/AdapterNews.kt
@@ -12,7 +12,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import android.widget.LinearLayout
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AlertDialog
 import androidx.cardview.widget.CardView
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/news/NewsActions.kt b/app/src/main/java/org/ole/planet/myplanet/ui/news/NewsActions.kt
@@ -7,7 +7,6 @@ import android.view.ViewGroup
 import android.widget.EditText
 import android.widget.FrameLayout
 import android.widget.ImageView
-import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/survey/AdapterSurvey.kt b/app/src/main/java/org/ole/planet/myplanet/ui/survey/AdapterSurvey.kt
@@ -18,13 +18,9 @@ import org.ole.planet.myplanet.model.RealmExamQuestion
 import org.ole.planet.myplanet.model.RealmMembershipDoc
 import org.ole.planet.myplanet.model.RealmStepExam
 import org.ole.planet.myplanet.model.RealmSubmission
-import org.ole.planet.myplanet.model.RealmSubmission.Companion.getNoOfSubmissionByTeam
-import org.ole.planet.myplanet.model.RealmSubmission.Companion.getNoOfSubmissionByUser
-import org.ole.planet.myplanet.model.RealmSubmission.Companion.getRecentSubmissionDate
 import org.ole.planet.myplanet.service.UserProfileDbHandler
 import org.ole.planet.myplanet.ui.submission.AdapterMySubmission
 import org.ole.planet.myplanet.utilities.DiffUtils
-import org.ole.planet.myplanet.utilities.TimeUtils.formatDate
 
 class AdapterSurvey(
     private val context: Context,
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/team/AdapterTeamList.kt b/app/src/main/java/org/ole/planet/myplanet/ui/team/AdapterTeamList.kt
@@ -18,7 +18,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/team/teamTask/AdapterTask.kt b/app/src/main/java/org/ole/planet/myplanet/ui/team/teamTask/AdapterTask.kt
@@ -2,7 +2,6 @@ package org.ole.planet.myplanet.ui.team.teamTask
 
 import android.app.AlertDialog
 import android.content.Context
-import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/app/src/main/java/org/ole/planet/myplanet/utilities/ANRWatchdog.kt b/app/src/main/java/org/ole/planet/myplanet/utilities/ANRWatchdog.kt
@@ -1,10 +1,8 @@
 package org.ole.planet.myplanet.utilities
 
+import android.os.Handler
 import android.os.Looper
 import android.os.SystemClock
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import org.ole.planet.myplanet.MainApplication
 
 class ANRWatchdog(private val timeout: Long = DEFAULT_ANR_TIMEOUT, private val listener: ANRListener? = null) {
     companion object {
@@ -13,6 +11,9 @@ class ANRWatchdog(private val timeout: Long = DEFAULT_ANR_TIMEOUT, private val l
 
     private var isWatching = false
     private var tick = 0L
+    private val mainHandler = Handler(Looper.getMainLooper())
+    private val tickUpdater = Runnable { updateTick() }
+
 
     private fun updateTick() {
         tick = SystemClock.elapsedRealtime()
@@ -29,7 +30,7 @@ class ANRWatchdog(private val timeout: Long = DEFAULT_ANR_TIMEOUT, private val l
 
         isWatching = true
         tick = SystemClock.elapsedRealtime()
-        MainApplication.applicationScope.launch(Dispatchers.Main) { updateTick() }
+        mainHandler.post(tickUpdater)
 
         Thread({
             val threadName = Thread.currentThread().name
@@ -38,7 +39,7 @@ class ANRWatchdog(private val timeout: Long = DEFAULT_ANR_TIMEOUT, private val l
             while (isWatching) {
                 val lastTick = tick
                 val currentTime = SystemClock.elapsedRealtime()
-                MainApplication.applicationScope.launch(Dispatchers.Main) { updateTick() }
+                mainHandler.post(tickUpdater)
 
                 try {
                     Thread.sleep(timeout / 2)
@@ -68,12 +69,12 @@ class ANRWatchdog(private val timeout: Long = DEFAULT_ANR_TIMEOUT, private val l
                     }
                 }
             }
-
             Thread.currentThread().name = threadName
         }, "ANRWatchdog").start()
     }
 
     fun stop() {
         isWatching = false
+        mainHandler.removeCallbacks(tickUpdater)
     }
 }
