courses: smoother step progress caching (fixes #13068) (#13079)

Co-authored-by: dogi <dogi@users.noreply.github.com>

Author: Okuro3499

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdk = 26
         targetSdk = 36
-        versionCode = 5356
-        versionName = "0.53.56"
+        versionCode = 5357
+        versionName = "0.53.57"
         ndkVersion = '26.3.11579264'
         vectorDrawables.useSupportLibrary = true
     }

app/src/main/java/org/ole/planet/myplanet/ui/courses/CourseStepFragment.kt

@@ -56,6 +56,7 @@ class CourseStepFragment : BaseContainerFragment(), ImageCaptureCallback {
     private var saveInProgress: Job? = null
     private var loadDataJob: Job? = null
     private var inlineResourceAdapter: InlineResourceAdapter? = null
+    private var pendingProgressSave = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -151,8 +152,12 @@ class CourseStepFragment : BaseContainerFragment(), ImageCaptureCallback {
                         textWithSpans.removeSpan(urlSpan)
                     }
                 }
-                if (isVisible && data.userHasCourse) {
-                    launchSaveCourseProgress()
+                if (data.userHasCourse) {
+                    if (isResumed) {
+                        launchSaveCourseProgress()
+                    } else {
+                        pendingProgressSave = true
+                    }
                 }
             }
         }
@@ -250,6 +255,14 @@ class CourseStepFragment : BaseContainerFragment(), ImageCaptureCallback {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        if (pendingProgressSave) {
+            pendingProgressSave = false
+            launchSaveCourseProgress()
+        }
+    }
+
     override fun setMenuVisibility(visible: Boolean) {
         super.setMenuVisibility(visible)
         if (!isAdded || !::step.isInitialized) return
@@ -298,6 +311,7 @@ class CourseStepFragment : BaseContainerFragment(), ImageCaptureCallback {
     override fun onDestroyView() {
         super.onDestroyView()
         loadDataJob?.cancel()
+        pendingProgressSave = false
         CameraUtils.release()
     }
 }

app/src/main/java/org/ole/planet/myplanet/ui/courses/TakeCourseFragment.kt

@@ -38,6 +38,8 @@ class TakeCourseFragment : Fragment(), ViewPager.OnPageChangeListener, View.OnCl
     lateinit var userSessionManager: UserSessionManager
     @Inject
     lateinit var coursesRepository: CoursesRepository
+    private var courseId: String? = null
+    private var userModel: RealmUser? = null
     private var currentCourse: RealmMyCourse? = null
     lateinit var steps: List<RealmCourseStep?>
     var position = 0
@@ -401,9 +403,6 @@ class TakeCourseFragment : Fragment(), ViewPager.OnPageChangeListener, View.OnCl
     private val isValidClickLeft: Boolean get() = binding.viewPager2.adapter != null && binding.viewPager2.currentItem > 0
 
     companion object {
-        var courseId: String? = null
-        var userModel: RealmUser? = null
-
         @JvmStatic
         fun newInstance(b: Bundle?): TakeCourseFragment {
             val takeCourseFragment = TakeCourseFragment()

app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt

@@ -897,8 +897,9 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
     }
 
     override fun openCallFragment(f: Fragment) {
-        val tag = f::class.java.simpleName
-        openCallFragment(f,tag)
+        val id = f.arguments?.getString("id")
+        val tag = if (id != null) "${f::class.java.simpleName}_$id" else f::class.java.simpleName
+        openCallFragment(f, tag)
     }
 
     override fun openLibraryDetailFragment(library: RealmMyLibrary?) {