Merge remote-tracking branch 'refs/remotes/origin/develop' into feat/…

…offline

# Conflicts:
#	app/src/main/java/org/openedx/app/AppActivity.kt
#	app/src/main/java/org/openedx/app/di/AppModule.kt
#	app/src/main/java/org/openedx/app/room/AppDatabase.kt
#	core/src/main/java/org/openedx/core/data/api/CourseApi.kt
#	core/src/main/java/org/openedx/core/module/db/DownloadDao.kt
#	core/src/main/res/values/strings.xml
#	course/src/main/java/org/openedx/course/presentation/dates/CourseDatesScreen.kt
#	course/src/main/java/org/openedx/course/presentation/dates/CourseDatesViewModel.kt
#	course/src/main/java/org/openedx/course/presentation/dates/DashboardUIState.kt

app/src/main/AndroidManifest.xml

@@ -114,6 +114,7 @@
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
         </service>
+
     </application>
 
 </manifest>

app/src/main/java/org/openedx/app/AppActivity.kt

@@ -31,6 +31,7 @@ import org.openedx.core.presentation.global.WindowSizeHolder
 import org.openedx.core.ui.WindowSize
 import org.openedx.core.ui.WindowType
 import org.openedx.core.utils.Logger
+import org.openedx.core.worker.CalendarSyncScheduler
 import org.openedx.course.presentation.download.DownloadDialogManager
 import org.openedx.profile.presentation.ProfileRouter
 import org.openedx.whatsnew.WhatsNewManager
@@ -54,6 +55,7 @@ class AppActivity : AppCompatActivity(), InsetHolder, WindowSizeHolder {
     private val corePreferencesManager by inject<CorePreferences>()
     private val profileRouter by inject<ProfileRouter>()
     private val downloadDialogManager by inject<DownloadDialogManager>()
+    private val calendarSyncScheduler by inject<CalendarSyncScheduler>()
 
     private val branchLogger = Logger(BRANCH_TAG)
 
@@ -173,6 +175,8 @@ class AppActivity : AppCompatActivity(), InsetHolder, WindowSizeHolder {
                 )
             }
         }
+
+        calendarSyncScheduler.scheduleDailySync()
     }
 
     override fun onStart() {

app/src/main/java/org/openedx/app/AppRouter.kt

@@ -8,6 +8,7 @@ import org.openedx.auth.presentation.logistration.LogistrationFragment
 import org.openedx.auth.presentation.restore.RestorePasswordFragment
 import org.openedx.auth.presentation.signin.SignInFragment
 import org.openedx.auth.presentation.signup.SignUpFragment
+import org.openedx.core.CalendarRouter
 import org.openedx.core.FragmentViewType
 import org.openedx.core.presentation.course.CourseViewMode
 import org.openedx.core.presentation.global.app_upgrade.AppUpgradeRouter
@@ -46,6 +47,7 @@ import org.openedx.profile.domain.model.Account
 import org.openedx.profile.presentation.ProfileRouter
 import org.openedx.profile.presentation.anothersaccount.AnothersProfileFragment
 import org.openedx.profile.presentation.calendar.CalendarFragment
+import org.openedx.profile.presentation.calendar.CoursesToSyncFragment
 import org.openedx.profile.presentation.delete.DeleteProfileFragment
 import org.openedx.profile.presentation.edit.EditProfileFragment
 import org.openedx.profile.presentation.manageaccount.ManageAccountFragment
@@ -56,7 +58,7 @@ import org.openedx.whatsnew.WhatsNewRouter
 import org.openedx.whatsnew.presentation.whatsnew.WhatsNewFragment
 
 class AppRouter : AuthRouter, DiscoveryRouter, DashboardRouter, CourseRouter, DiscussionRouter,
-    ProfileRouter, AppUpgradeRouter, WhatsNewRouter {
+    ProfileRouter, AppUpgradeRouter, WhatsNewRouter, CalendarRouter {
 
     //region AuthRouter
     override fun navigateToMain(
@@ -411,6 +413,10 @@ class AppRouter : AuthRouter, DiscoveryRouter, DashboardRouter, CourseRouter, Di
     override fun navigateToCalendarSettings(fm: FragmentManager) {
         replaceFragmentWithBackStack(fm, CalendarFragment())
     }
+
+    override fun navigateToCoursesToSync(fm: FragmentManager) {
+        replaceFragmentWithBackStack(fm, CoursesToSyncFragment())
+    }
     //endregion
 
     fun getVisibleFragment(fm: FragmentManager): Fragment? {

app/src/main/java/org/openedx/app/AppViewModel.kt

@@ -122,7 +122,7 @@ class AppViewModel(
         if (System.currentTimeMillis() - logoutHandledAt > 5000) {
             if (event.isForced) {
                 logoutHandledAt = System.currentTimeMillis()
-                preferencesManager.clear()
+                preferencesManager.clearCorePreferences()
                 withContext(dispatcher) {
                     room.clearAllTables()
                 }

app/src/main/java/org/openedx/app/data/storage/PreferencesManager.kt

@@ -4,19 +4,21 @@ import android.content.Context
 import com.google.gson.Gson
 import org.openedx.app.BuildConfig
 import org.openedx.core.data.model.User
+import org.openedx.core.data.storage.CalendarPreferences
 import org.openedx.core.data.storage.CorePreferences
 import org.openedx.core.data.storage.InAppReviewPreferences
 import org.openedx.core.domain.model.AppConfig
 import org.openedx.core.domain.model.VideoQuality
 import org.openedx.core.domain.model.VideoSettings
 import org.openedx.core.extension.replaceSpace
+import org.openedx.core.system.CalendarManager
 import org.openedx.course.data.storage.CoursePreferences
 import org.openedx.profile.data.model.Account
 import org.openedx.profile.data.storage.ProfilePreferences
 import org.openedx.whatsnew.data.storage.WhatsNewPreferences
 
 class PreferencesManager(context: Context) : CorePreferences, ProfilePreferences,
-    WhatsNewPreferences, InAppReviewPreferences, CoursePreferences {
+    WhatsNewPreferences, InAppReviewPreferences, CoursePreferences, CalendarPreferences {
 
     private val sharedPreferences =
         context.getSharedPreferences(BuildConfig.APPLICATION_ID, Context.MODE_PRIVATE)
@@ -37,7 +39,7 @@ class PreferencesManager(context: Context) : CorePreferences, ProfilePreferences
         }.apply()
     }
 
-    private fun getLong(key: String): Long = sharedPreferences.getLong(key, 0L)
+    private fun getLong(key: String, defValue: Long = 0): Long = sharedPreferences.getLong(key, defValue)
 
     private fun saveBoolean(key: String, value: Boolean) {
         sharedPreferences.edit().apply {
@@ -49,7 +51,7 @@ class PreferencesManager(context: Context) : CorePreferences, ProfilePreferences
         return sharedPreferences.getBoolean(key, defValue)
     }
 
-    override fun clear() {
+    override fun clearCorePreferences() {
         sharedPreferences.edit().apply {
             remove(ACCESS_TOKEN)
             remove(REFRESH_TOKEN)
@@ -59,6 +61,14 @@ class PreferencesManager(context: Context) : CorePreferences, ProfilePreferences
         }.apply()
     }
 
+    override fun clearCalendarPreferences() {
+        sharedPreferences.edit().apply {
+            remove(CALENDAR_ID)
+            remove(IS_CALENDAR_SYNC_ENABLED)
+            remove(HIDE_INACTIVE_COURSES)
+        }.apply()
+    }
+
     override var accessToken: String
         set(value) {
             saveString(ACCESS_TOKEN, value)
@@ -83,6 +93,12 @@ class PreferencesManager(context: Context) : CorePreferences, ProfilePreferences
         }
         get() = getLong(EXPIRES_IN)
 
+    override var calendarId: Long
+        set(value) {
+            saveLong(CALENDAR_ID, value)
+        }
+        get() = getLong(CALENDAR_ID, CalendarManager.CALENDAR_DOES_NOT_EXIST)
+
     override var user: User?
         set(value) {
             val userJson = Gson().toJson(value)
@@ -165,6 +181,24 @@ class PreferencesManager(context: Context) : CorePreferences, ProfilePreferences
         }
         get() = getBoolean(RESET_APP_DIRECTORY, true)
 
+    override var isCalendarSyncEnabled: Boolean
+        set(value) {
+            saveBoolean(IS_CALENDAR_SYNC_ENABLED, value)
+        }
+        get() = getBoolean(IS_CALENDAR_SYNC_ENABLED, true)
+
+    override var calendarUser: String
+        set(value) {
+            saveString(CALENDAR_USER, value)
+        }
+        get() = getString(CALENDAR_USER)
+
+    override var isHideInactiveCourses: Boolean
+        set(value) {
+            saveBoolean(HIDE_INACTIVE_COURSES, value)
+        }
+        get() = getBoolean(HIDE_INACTIVE_COURSES, true)
+
     override fun setCalendarSyncEventsDialogShown(courseName: String) {
         saveBoolean(courseName.replaceSpace("_"), true)
     }
@@ -186,6 +220,10 @@ class PreferencesManager(context: Context) : CorePreferences, ProfilePreferences
         private const val VIDEO_SETTINGS_STREAMING_QUALITY = "video_settings_streaming_quality"
         private const val VIDEO_SETTINGS_DOWNLOAD_QUALITY = "video_settings_download_quality"
         private const val APP_CONFIG = "app_config"
+        private const val CALENDAR_ID = "CALENDAR_ID"
         private const val RESET_APP_DIRECTORY = "reset_app_directory"
+        private const val IS_CALENDAR_SYNC_ENABLED = "IS_CALENDAR_SYNC_ENABLED"
+        private const val HIDE_INACTIVE_COURSES = "HIDE_INACTIVE_COURSES"
+        private const val CALENDAR_USER = "CALENDAR_USER"
     }
 }

app/src/main/java/org/openedx/app/di/AppModule.kt

@@ -18,16 +18,19 @@ import org.openedx.app.data.storage.PreferencesManager
 import org.openedx.app.deeplink.DeepLinkRouter
 import org.openedx.app.room.AppDatabase
 import org.openedx.app.room.DATABASE_NAME
+import org.openedx.app.room.DatabaseManager
 import org.openedx.auth.presentation.AgreementProvider
 import org.openedx.auth.presentation.AuthAnalytics
 import org.openedx.auth.presentation.AuthRouter
 import org.openedx.auth.presentation.sso.FacebookAuthHelper
 import org.openedx.auth.presentation.sso.GoogleAuthHelper
 import org.openedx.auth.presentation.sso.MicrosoftAuthHelper
 import org.openedx.auth.presentation.sso.OAuthHelper
+import org.openedx.core.CalendarRouter
 import org.openedx.core.ImageProcessor
 import org.openedx.core.config.Config
 import org.openedx.core.data.model.CourseEnrollments
+import org.openedx.core.data.storage.CalendarPreferences
 import org.openedx.core.data.storage.CorePreferences
 import org.openedx.core.data.storage.InAppReviewPreferences
 import org.openedx.core.module.DownloadWorkerController
@@ -49,7 +52,9 @@ import org.openedx.core.system.notifier.DiscoveryNotifier
 import org.openedx.core.system.notifier.DownloadNotifier
 import org.openedx.core.system.notifier.VideoNotifier
 import org.openedx.core.system.notifier.app.AppNotifier
+import org.openedx.core.system.notifier.calendar.CalendarNotifier
 import org.openedx.core.utils.FileUtil
+import org.openedx.core.worker.CalendarSyncScheduler
 import org.openedx.course.data.storage.CoursePreferences
 import org.openedx.course.presentation.CourseAnalytics
 import org.openedx.course.presentation.CourseRouter
@@ -65,11 +70,12 @@ import org.openedx.discussion.system.notifier.DiscussionNotifier
 import org.openedx.profile.data.storage.ProfilePreferences
 import org.openedx.profile.presentation.ProfileAnalytics
 import org.openedx.profile.presentation.ProfileRouter
-import org.openedx.profile.system.notifier.ProfileNotifier
+import org.openedx.profile.system.notifier.profile.ProfileNotifier
 import org.openedx.whatsnew.WhatsNewManager
 import org.openedx.whatsnew.WhatsNewRouter
 import org.openedx.whatsnew.data.storage.WhatsNewPreferences
 import org.openedx.whatsnew.presentation.WhatsNewAnalytics
+import org.openedx.core.DatabaseManager as IDatabaseManager
 
 val appModule = module {
 
@@ -80,12 +86,15 @@ val appModule = module {
     single<WhatsNewPreferences> { get<PreferencesManager>() }
     single<InAppReviewPreferences> { get<PreferencesManager>() }
     single<CoursePreferences> { get<PreferencesManager>() }
+    single<CalendarPreferences> { get<PreferencesManager>() }
 
     single { ResourceManager(get()) }
     single { AppCookieManager(get(), get()) }
     single { ReviewManagerFactory.create(get()) }
-    single { CalendarManager(get(), get(), get()) }
+    single { CalendarManager(get(), get()) }
     single { DownloadDialogManager(get(), get(), get(), get()) }
+    single { DatabaseManager(get(), get(), get(), get()) }
+    single<IDatabaseManager> { get<DatabaseManager>() }
 
     single { ImageProcessor(get()) }
 
@@ -102,6 +111,7 @@ val appModule = module {
     single { DownloadNotifier() }
     single { VideoNotifier() }
     single { DiscoveryNotifier() }
+    single { CalendarNotifier() }
 
     single { AppRouter() }
     single<AuthRouter> { get<AppRouter>() }
@@ -113,6 +123,7 @@ val appModule = module {
     single<WhatsNewRouter> { get<AppRouter>() }
     single<AppUpgradeRouter> { get<AppRouter>() }
     single { DeepLinkRouter(get(), get(), get(), get(), get(), get()) }
+    single<CalendarRouter> { get<AppRouter>() }
 
     single { NetworkConnection(get()) }
 
@@ -154,6 +165,11 @@ val appModule = module {
         room.downloadDao()
     }
 
+    single {
+        val room = get<AppDatabase>()
+        room.calendarDao()
+    }
+
     single {
         FileDownloader()
     }
@@ -191,4 +207,6 @@ val appModule = module {
     single { DownloadHelper(get(), get()) }
 
     factory { OfflineProgressSyncScheduler(get()) }
+
+    single { CalendarSyncScheduler(get()) }
 }

app/src/main/java/org/openedx/app/di/ScreenModule.kt

@@ -12,8 +12,10 @@ import org.openedx.auth.presentation.restore.RestorePasswordViewModel
 import org.openedx.auth.presentation.signin.SignInViewModel
 import org.openedx.auth.presentation.signup.SignUpViewModel
 import org.openedx.core.Validator
+import org.openedx.core.domain.interactor.CalendarInteractor
 import org.openedx.core.presentation.dialog.selectorbottomsheet.SelectDialogViewModel
 import org.openedx.core.presentation.settings.video.VideoQualityViewModel
+import org.openedx.core.repository.CalendarRepository
 import org.openedx.core.ui.WindowSize
 import org.openedx.course.data.repository.CourseRepository
 import org.openedx.course.domain.interactor.CourseInteractor
@@ -59,6 +61,9 @@ import org.openedx.profile.domain.interactor.ProfileInteractor
 import org.openedx.profile.domain.model.Account
 import org.openedx.profile.presentation.anothersaccount.AnothersProfileViewModel
 import org.openedx.profile.presentation.calendar.CalendarViewModel
+import org.openedx.profile.presentation.calendar.CoursesToSyncViewModel
+import org.openedx.profile.presentation.calendar.DisableCalendarSyncDialogViewModel
+import org.openedx.profile.presentation.calendar.NewCalendarDialogViewModel
 import org.openedx.profile.presentation.delete.DeleteProfileViewModel
 import org.openedx.profile.presentation.edit.EditProfileViewModel
 import org.openedx.profile.presentation.manageaccount.ManageAccountViewModel
@@ -111,6 +116,8 @@ val screenModule = module {
             get(),
             get(),
             get(),
+            get(),
+            get(),
             courseId,
             infoType,
         )
@@ -192,14 +199,21 @@ val screenModule = module {
             get(),
             get(),
             get(),
-            get()
+            get(),
+            get(),
         )
     }
     viewModel { ManageAccountViewModel(get(), get(), get(), get(), get()) }
-    viewModel { CalendarViewModel(get()) }
+    viewModel { CalendarViewModel(get(), get(), get(), get(), get(), get(), get()) }
+    viewModel { CoursesToSyncViewModel(get(), get(), get(), get()) }
+    viewModel { NewCalendarDialogViewModel(get(), get(), get(), get(), get(), get()) }
+    viewModel { DisableCalendarSyncDialogViewModel(get(), get(), get(), get()) }
+    factory { CalendarRepository(get(), get(), get()) }
+    factory { CalendarInteractor(get()) }
 
     single { CourseRepository(get(), get(), get(), get(), get()) }
     factory { CourseInteractor(get()) }
+
     viewModel { (pathId: String, infoType: String) ->
         CourseInfoViewModel(
             pathId,
@@ -223,7 +237,8 @@ val screenModule = module {
             get(),
             get(),
             get(),
-            get()
+            get(),
+            get(),
         )
     }
     viewModel { (courseId: String, courseTitle: String, enrollmentMode: String, resumeBlockId: String) ->
@@ -241,7 +256,6 @@ val screenModule = module {
             get(),
             get(),
             get(),
-            get(),
             get()
         )
     }
@@ -331,10 +345,9 @@ val screenModule = module {
             get(),
         )
     }
-    viewModel { (courseId: String, courseTitle: String, enrollmentMode: String) ->
+    viewModel { (courseId: String, enrollmentMode: String) ->
         CourseDatesViewModel(
             courseId,
-            courseTitle,
             enrollmentMode,
             get(),
             get(),
@@ -343,7 +356,8 @@ val screenModule = module {
             get(),
             get(),
             get(),
-            get()
+            get(),
+            get(),
         )
     }
     viewModel { (courseId: String, handoutsType: String) ->