Merge branch 'master' into migrate-resource-upload-coordinator and resolve conflicts

Author: Okuro3499

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdk = 26
         targetSdk = 36
-        versionCode = 5548
-        versionName = "0.55.48"
+        versionCode = 5585
+        versionName = "0.55.85"
         ndkVersion = '26.3.11579264'
         vectorDrawables.useSupportLibrary = true
     }

app/src/main/AndroidManifest.xml

@@ -85,8 +85,6 @@
         <activity
             android:name=".ui.resources.AddResourceActivity"
             android:theme="@style/AppTheme" />
-        <activity android:name=".ui.viewer.AudioPlayerActivity"
-            android:configChanges="orientation|screenSize" />
         <activity
             android:name=".ui.feedback.FeedbackDetailActivity"
             android:theme="@style/AppTheme" />
@@ -96,19 +94,9 @@
             android:label="@string/title_activity_dashboard"
             android:windowSoftInputMode="adjustResize"
             android:theme="@style/FullscreenTheme" />
-        <activity android:name=".ui.viewer.PDFReaderActivity"
-            android:configChanges="orientation|screenSize" />
         <activity android:name=".ui.viewer.WebViewActivity"
             android:configChanges="orientation|screenSize" />
-        <activity android:name=".ui.viewer.VideoViewerActivity"
-            android:configChanges="orientation|screenSize" />
-        <activity android:name=".ui.viewer.ImageViewerActivity"
-            android:configChanges="orientation|screenSize" />
-        <activity android:name=".ui.viewer.TextFileViewerActivity"
-            android:configChanges="orientation|screenSize" />
-        <activity android:name=".ui.viewer.MarkdownViewerActivity"
-            android:configChanges="orientation|screenSize" />
-        <activity android:name=".ui.viewer.CSVViewerActivity"
+        <activity android:name=".ui.viewer.ResourceViewerActivity"
             android:configChanges="orientation|screenSize" />
         <activity
             android:name=".ui.dictionary.DictionaryActivity"

app/src/main/java/org/ole/planet/myplanet/model/RealmMyCourse.kt

@@ -1,20 +1,15 @@
 package org.ole.planet.myplanet.model
 
 import android.text.TextUtils
-import android.util.Base64
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import io.realm.Realm
 import io.realm.RealmList
 import io.realm.RealmObject
 import io.realm.annotations.Index
 import io.realm.annotations.PrimaryKey
-import org.ole.planet.myplanet.model.RealmMyLibrary.Companion.createStepResource
-import org.ole.planet.myplanet.model.RealmStepExam.Companion.insertCourseStepsExams
 import org.ole.planet.myplanet.services.SharedPrefManager
-import org.ole.planet.myplanet.utils.DownloadUtils.extractLinks
 import org.ole.planet.myplanet.utils.JsonUtils
-import org.ole.planet.myplanet.utils.UrlUtils
 
 open class RealmMyCourse : RealmObject() {
     @PrimaryKey
@@ -65,62 +60,13 @@ open class RealmMyCourse : RealmObject() {
         private val concatenatedLinks = HashSet<String>()
 
         @JvmStatic
-        fun insertMyCourses(userId: String?, myCoursesDoc: JsonObject?, mRealm: Realm, spm: SharedPrefManager) {
-            val id = JsonUtils.getString("_id", myCoursesDoc)
-            var myMyCoursesDB = mRealm.where(RealmMyCourse::class.java).equalTo("id", id).findFirst()
-            if (myMyCoursesDB == null) {
-                myMyCoursesDB = mRealm.createObject(RealmMyCourse::class.java, id)
-            }
-            myMyCoursesDB?.setUserId(userId)
-            myMyCoursesDB?.courseId = JsonUtils.getString("_id", myCoursesDoc)
-            myMyCoursesDB?.courseRev = JsonUtils.getString("_rev", myCoursesDoc)
-            myMyCoursesDB?.languageOfInstruction = JsonUtils.getString("languageOfInstruction", myCoursesDoc)
-            myMyCoursesDB?.courseTitle = JsonUtils.getString("courseTitle", myCoursesDoc)
-            myMyCoursesDB?.memberLimit = JsonUtils.getInt("memberLimit", myCoursesDoc)
-            val description = JsonUtils.getString("description", myCoursesDoc)
-            myMyCoursesDB?.description = description
-            val links = extractLinks(description)
-            val baseUrl = UrlUtils.getUrl()
+        fun addConcatenatedLink(link: String) {
             synchronized(concatenatedLinks) {
-                for (link in links) {
-                    concatenatedLinks.add("$baseUrl/$link")
-                }
+                concatenatedLinks.add(link)
             }
-            myMyCoursesDB?.method = JsonUtils.getString("method", myCoursesDoc)
-            myMyCoursesDB?.gradeLevel = JsonUtils.getString("gradeLevel", myCoursesDoc)
-            myMyCoursesDB?.subjectLevel = JsonUtils.getString("subjectLevel", myCoursesDoc)
-            myMyCoursesDB?.createdDate = JsonUtils.getLong("createdDate", myCoursesDoc)
-            val courseStepsJsonArray = JsonUtils.getJsonArray("steps", myCoursesDoc)
-            val stepsSize = courseStepsJsonArray.size()
-            myMyCoursesDB?.setNumberOfSteps(stepsSize)
-            val courseStepsList = mutableListOf<RealmCourseStep>()
-
-            for (i in 0 until stepsSize) {
-                val stepElement = courseStepsJsonArray[i]
-                val stepId = Base64.encodeToString(stepElement.toString().toByteArray(), Base64.NO_WRAP)
-                val stepJson = stepElement.asJsonObject
-                val step = RealmCourseStep()
-                step.id = stepId
-                step.stepTitle = JsonUtils.getString("stepTitle", stepJson)
-                val stepDescription = JsonUtils.getString("description", stepJson)
-                step.description = stepDescription
-                val stepLinks = extractLinks(stepDescription)
-                synchronized(concatenatedLinks) {
-                    for (stepLink in stepLinks) {
-                        concatenatedLinks.add("$baseUrl/$stepLink")
-                    }
-                }
-                insertCourseStepsAttachments(myMyCoursesDB?.courseId, stepId, JsonUtils.getJsonArray("resources", stepJson), mRealm, spm)
-                insertExam(stepJson, mRealm, stepId, i + 1, myMyCoursesDB?.courseId)
-                insertSurvey(stepJson, mRealm, stepId, i + 1, myMyCoursesDB?.courseId, myMyCoursesDB?.createdDate)
-                step.noOfResources = JsonUtils.getJsonArray("resources", stepJson).size()
-                step.courseId = myMyCoursesDB?.courseId
-                courseStepsList.add(step)
-            }
-            myMyCoursesDB?.courseSteps = RealmList()
-            myMyCoursesDB?.courseSteps?.addAll(courseStepsList)
         }
 
+
         @JvmStatic
         fun saveConcatenatedLinksToPrefs(spm: SharedPrefManager) {
             val existingJsonLinks = spm.getConcatenatedLinks()
@@ -142,49 +88,9 @@ open class RealmMyCourse : RealmObject() {
         }
 
 
-        private fun insertExam(stepContainer: JsonObject, mRealm: Realm, stepId: String, i: Int, myCoursesID: String?) {
-            if (stepContainer.has("exam")) {
-                val `object` = stepContainer.getAsJsonObject("exam")
-                `object`.addProperty("stepNumber", i)
-                insertCourseStepsExams(myCoursesID, stepId, `object`, mRealm)
-            }
-        }
 
-        private fun insertSurvey(stepContainer: JsonObject, mRealm: Realm, stepId: String, i: Int, myCoursesID: String?, createdDate: Long?) {
-            if (stepContainer.has("survey")) {
-                val `object` = stepContainer.getAsJsonObject("survey")
-                `object`.addProperty("stepNumber", i)
-                `object`.addProperty("createdDate", createdDate)
-                insertCourseStepsExams(myCoursesID, stepId, `object`, mRealm)
-            }
-        }
 
-        private fun insertCourseStepsAttachments(myCoursesID: String?, stepId: String?, resources: JsonArray, mRealm: Realm?, spm: SharedPrefManager) {
-            resources.forEach { resource ->
-                if (mRealm != null) {
-                    createStepResource(mRealm, resource.asJsonObject, myCoursesID, stepId, spm)
-                }
-            }
-        }
 
-        @JvmStatic
-        fun insert(mRealm: Realm, myCoursesDoc: JsonObject?, spm: SharedPrefManager) {
-            val startedTransaction = !mRealm.isInTransaction
-            if (startedTransaction) {
-                mRealm.beginTransaction()
-            }
-            try {
-                insertMyCourses("", myCoursesDoc, mRealm, spm)
-                if (startedTransaction) {
-                    mRealm.commitTransaction()
-                }
-            } catch (e: Exception) {
-                if (startedTransaction && mRealm.isInTransaction) {
-                    mRealm.cancelTransaction()
-                }
-                throw e
-            }
-        }
 
         @JvmStatic
         fun serialize(course: RealmMyCourse, realm: Realm): JsonObject {

app/src/main/java/org/ole/planet/myplanet/repository/ActivitiesRepository.kt

@@ -22,6 +22,7 @@ interface ActivitiesRepository {
     suspend fun getUnuploadedLoginActivities(): List<org.ole.planet.myplanet.model.LoginActivityData>
     suspend fun markActivitiesUploaded(ids: Array<String>, revMap: Map<String, com.google.gson.JsonObject?>)
     suspend fun recordSyncActivity(userId: String)
+    suspend fun recordSyncUserChallengeAction(userId: String)
     suspend fun insertActivity(json: JsonObject)
     suspend fun getRecentLogin(): RealmOfflineActivity?
     suspend fun insertSearchActivityFromNewsLog(log: org.ole.planet.myplanet.model.RealmNewsLog)

app/src/main/java/org/ole/planet/myplanet/repository/ActivitiesRepositoryImpl.kt

@@ -235,6 +235,19 @@ class ActivitiesRepositoryImpl @Inject constructor(
     }
 
 
+    override suspend fun recordSyncUserChallengeAction(userId: String) {
+        executeTransaction { realm ->
+            val action = realm.createObject(
+                org.ole.planet.myplanet.model.RealmUserChallengeActions::class.java,
+                UUID.randomUUID().toString()
+            )
+            action.userId = userId
+            action.actionType = "sync"
+            action.resourceId = null
+            action.time = System.currentTimeMillis()
+        }
+    }
+
     override suspend fun recordSyncActivity(userId: String) {
         val user = userRepository.get().getUserById(userId)
         if (user == null || user.id?.startsWith("guest") == true) {

app/src/main/java/org/ole/planet/myplanet/repository/CoursesRepository.kt

@@ -60,7 +60,7 @@ interface CoursesRepository {
     suspend fun removeCourseFromShelf(courseId: String, userId: String)
     suspend fun logCourseVisit(courseId: String, title: String, userId: String)
     suspend fun getCurrentProgress(steps: List<RealmCourseStep?>?, userId: String?, courseId: String?): Int
-    suspend fun getCourseProgress(userId: String?): java.util.HashMap<String?, com.google.gson.JsonObject>
+    suspend fun getCourseProgress(userId: String?, courseIds: List<String>): java.util.HashMap<String?, com.google.gson.JsonObject>
     suspend fun isStepCompleted(stepId: String?, userId: String?): Boolean
     suspend fun hasUnfinishedSurveys(courseId: String, userId: String?): Boolean
     suspend fun getCourseTags(courseId: String): List<RealmTag>