diff --git a/app/build.gradle b/app/build.gradle
index f7ad7ef16..f3d047808 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -127,11 +127,13 @@ dependencies {
implementation project(path: ':profile')
implementation project(path: ':discussion')
implementation project(path: ':whatsnew')
+ implementation project(path: ':dates')
implementation project(path: ':downloads')
ksp "androidx.room:room-compiler:$room_version"
implementation "androidx.core:core-splashscreen:$core_splashscreen_version"
+ implementation "androidx.datastore:datastore-preferences:1.2.0"
api platform("com.google.firebase:firebase-bom:$firebase_version")
api "com.google.firebase:firebase-messaging"
diff --git a/app/schemas/org.openedx.app.room.AppDatabase/4.json b/app/schemas/org.openedx.app.room.AppDatabase/4.json
index 0bf47775d..53c0f4277 100644
--- a/app/schemas/org.openedx.app.room.AppDatabase/4.json
+++ b/app/schemas/org.openedx.app.room.AppDatabase/4.json
@@ -131,26 +131,22 @@
{
"fieldPath": "media.bannerImage",
"columnName": "bannerImage",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "media.courseImage",
"columnName": "courseImage",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "media.courseVideo",
"columnName": "courseVideo",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "media.image",
"columnName": "image",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
}
],
"primaryKey": {
@@ -158,9 +154,7 @@
"columnNames": [
"id"
]
- },
- "indices": [],
- "foreignKeys": []
+ }
},
{
"tableName": "course_enrolled_table",
@@ -301,62 +295,52 @@
{
"fieldPath": "course.coursewareAccess.hasAccess",
"columnName": "hasAccess",
- "affinity": "INTEGER",
- "notNull": false
+ "affinity": "INTEGER"
},
{
"fieldPath": "course.coursewareAccess.errorCode",
"columnName": "errorCode",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "course.coursewareAccess.developerMessage",
"columnName": "developerMessage",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "course.coursewareAccess.userMessage",
"columnName": "userMessage",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "course.coursewareAccess.additionalContextUserMessage",
"columnName": "additionalContextUserMessage",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "course.coursewareAccess.userFragment",
"columnName": "userFragment",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "course.media.bannerImage",
"columnName": "bannerImage",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "course.media.courseImage",
"columnName": "courseImage",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "course.media.courseVideo",
"columnName": "courseVideo",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "course.media.image",
"columnName": "image",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "course.courseSharingUtmParameters.facebook",
@@ -373,8 +357,7 @@
{
"fieldPath": "certificate.certificateURL",
"columnName": "certificateURL",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "progress.assignmentsCompleted",
@@ -391,38 +374,32 @@
{
"fieldPath": "courseStatus.lastVisitedModuleId",
"columnName": "lastVisitedModuleId",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "courseStatus.lastVisitedModulePath",
"columnName": "lastVisitedModulePath",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "courseStatus.lastVisitedBlockId",
"columnName": "lastVisitedBlockId",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "courseStatus.lastVisitedUnitDisplayName",
"columnName": "lastVisitedUnitDisplayName",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "courseAssignments.futureAssignments",
"columnName": "futureAssignments",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "courseAssignments.pastAssignments",
"columnName": "pastAssignments",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
}
],
"primaryKey": {
@@ -430,9 +407,7 @@
"columnNames": [
"courseId"
]
- },
- "indices": [],
- "foreignKeys": []
+ }
},
{
"tableName": "course_structure_table",
@@ -477,8 +452,7 @@
{
"fieldPath": "start",
"columnName": "start",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "startDisplay",
@@ -495,8 +469,7 @@
{
"fieldPath": "end",
"columnName": "end",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "isSelfPaced",
@@ -507,68 +480,57 @@
{
"fieldPath": "coursewareAccess.hasAccess",
"columnName": "hasAccess",
- "affinity": "INTEGER",
- "notNull": false
+ "affinity": "INTEGER"
},
{
"fieldPath": "coursewareAccess.errorCode",
"columnName": "errorCode",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "coursewareAccess.developerMessage",
"columnName": "developerMessage",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "coursewareAccess.userMessage",
"columnName": "userMessage",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "coursewareAccess.additionalContextUserMessage",
"columnName": "additionalContextUserMessage",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "coursewareAccess.userFragment",
"columnName": "userFragment",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "media.bannerImage",
"columnName": "bannerImage",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "media.courseImage",
"columnName": "courseImage",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "media.courseVideo",
"columnName": "courseVideo",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "media.image",
"columnName": "image",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "certificate.certificateURL",
"columnName": "certificateURL",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "progress.assignmentsCompleted",
@@ -588,9 +550,7 @@
"columnNames": [
"id"
]
- },
- "indices": [],
- "foreignKeys": []
+ }
},
{
"tableName": "download_model",
@@ -647,8 +607,7 @@
{
"fieldPath": "lastModified",
"columnName": "lastModified",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
}
],
"primaryKey": {
@@ -656,9 +615,7 @@
"columnNames": [
"id"
]
- },
- "indices": [],
- "foreignKeys": []
+ }
},
{
"tableName": "offline_x_block_progress_table",
@@ -700,9 +657,7 @@
"columnNames": [
"id"
]
- },
- "indices": [],
- "foreignKeys": []
+ }
},
{
"tableName": "course_calendar_event_table",
@@ -726,9 +681,7 @@
"columnNames": [
"event_id"
]
- },
- "indices": [],
- "foreignKeys": []
+ }
},
{
"tableName": "course_calendar_state_table",
@@ -758,9 +711,7 @@
"columnNames": [
"course_id"
]
- },
- "indices": [],
- "foreignKeys": []
+ }
},
{
"tableName": "download_course_preview_table",
@@ -775,20 +726,17 @@
{
"fieldPath": "name",
"columnName": "course_name",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "image",
"columnName": "course_image",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "totalSize",
"columnName": "total_size",
- "affinity": "INTEGER",
- "notNull": false
+ "affinity": "INTEGER"
}
],
"primaryKey": {
@@ -796,9 +744,7 @@
"columnNames": [
"course_id"
]
- },
- "indices": [],
- "foreignKeys": []
+ }
},
{
"tableName": "course_enrollment_details_table",
@@ -849,62 +795,52 @@
{
"fieldPath": "courseAccessDetails.auditAccessExpires",
"columnName": "auditAccessExpires",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "courseAccessDetails.coursewareAccess.hasAccess",
"columnName": "hasAccess",
- "affinity": "INTEGER",
- "notNull": false
+ "affinity": "INTEGER"
},
{
"fieldPath": "courseAccessDetails.coursewareAccess.errorCode",
"columnName": "errorCode",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "courseAccessDetails.coursewareAccess.developerMessage",
"columnName": "developerMessage",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "courseAccessDetails.coursewareAccess.userMessage",
"columnName": "userMessage",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "courseAccessDetails.coursewareAccess.additionalContextUserMessage",
"columnName": "additionalContextUserMessage",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "courseAccessDetails.coursewareAccess.userFragment",
"columnName": "userFragment",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "certificate.certificateURL",
"columnName": "certificateURL",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "enrollmentDetails.created",
"columnName": "created",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "enrollmentDetails.mode",
"columnName": "mode",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "enrollmentDetails.isActive",
@@ -915,8 +851,7 @@
{
"fieldPath": "enrollmentDetails.upgradeDeadline",
"columnName": "upgradeDeadline",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "courseInfoOverview.name",
@@ -963,26 +898,22 @@
{
"fieldPath": "courseInfoOverview.media.bannerImage",
"columnName": "bannerImage",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "courseInfoOverview.media.courseImage",
"columnName": "courseImage",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "courseInfoOverview.media.courseVideo",
"columnName": "courseVideo",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "courseInfoOverview.media.image",
"columnName": "image",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "courseInfoOverview.courseSharingUtmParameters.facebook",
@@ -1002,9 +933,7 @@
"columnNames": [
"id"
]
- },
- "indices": [],
- "foreignKeys": []
+ }
},
{
"tableName": "video_progress_table",
@@ -1040,9 +969,7 @@
"columnNames": [
"block_id"
]
- },
- "indices": [],
- "foreignKeys": []
+ }
},
{
"tableName": "course_progress_table",
@@ -1123,98 +1050,82 @@
{
"fieldPath": "certificateData.certStatus",
"columnName": "certificate_certStatus",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "certificateData.certWebViewUrl",
"columnName": "certificate_certWebViewUrl",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "certificateData.downloadUrl",
"columnName": "certificate_downloadUrl",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "certificateData.certificateAvailableDate",
"columnName": "certificate_certificateAvailableDate",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "completionSummary.completeCount",
"columnName": "completion_completeCount",
- "affinity": "INTEGER",
- "notNull": false
+ "affinity": "INTEGER"
},
{
"fieldPath": "completionSummary.incompleteCount",
"columnName": "completion_incompleteCount",
- "affinity": "INTEGER",
- "notNull": false
+ "affinity": "INTEGER"
},
{
"fieldPath": "completionSummary.lockedCount",
"columnName": "completion_lockedCount",
- "affinity": "INTEGER",
- "notNull": false
+ "affinity": "INTEGER"
},
{
"fieldPath": "courseGrade.letterGrade",
"columnName": "grade_letterGrade",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "courseGrade.percent",
"columnName": "grade_percent",
- "affinity": "REAL",
- "notNull": false
+ "affinity": "REAL"
},
{
"fieldPath": "courseGrade.isPassing",
"columnName": "grade_isPassing",
- "affinity": "INTEGER",
- "notNull": false
+ "affinity": "INTEGER"
},
{
"fieldPath": "gradingPolicy.assignmentPolicies",
"columnName": "grading_assignmentPolicies",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "gradingPolicy.gradeRange",
"columnName": "grading_gradeRange",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "gradingPolicy.assignmentColors",
"columnName": "grading_assignmentColors",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "verificationData.link",
"columnName": "verification_link",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "verificationData.status",
"columnName": "verification_status",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
},
{
"fieldPath": "verificationData.statusDate",
"columnName": "verification_statusDate",
- "affinity": "TEXT",
- "notNull": false
+ "affinity": "TEXT"
}
],
"primaryKey": {
@@ -1222,12 +1133,9 @@
"columnNames": [
"courseId"
]
- },
- "indices": [],
- "foreignKeys": []
+ }
}
],
- "views": [],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '7ea446decde04c9c16700cb3981703c2')"
diff --git a/app/schemas/org.openedx.app.room.AppDatabase/6.json b/app/schemas/org.openedx.app.room.AppDatabase/6.json
new file mode 100644
index 000000000..de1e51a90
--- /dev/null
+++ b/app/schemas/org.openedx.app.room.AppDatabase/6.json
@@ -0,0 +1,1206 @@
+{
+ "formatVersion": 1,
+ "database": {
+ "version": 6,
+ "identityHash": "3c35a346cc635ac7115a9f5021306a61",
+ "entities": [
+ {
+ "tableName": "course_discovery_table",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `blocksUrl` TEXT NOT NULL, `courseId` TEXT NOT NULL, `effort` TEXT NOT NULL, `enrollmentStart` TEXT NOT NULL, `enrollmentEnd` TEXT NOT NULL, `hidden` INTEGER NOT NULL, `invitationOnly` INTEGER NOT NULL, `mobileAvailable` INTEGER NOT NULL, `name` TEXT NOT NULL, `number` TEXT NOT NULL, `org` TEXT NOT NULL, `pacing` TEXT NOT NULL, `shortDescription` TEXT NOT NULL, `start` TEXT NOT NULL, `end` TEXT NOT NULL, `startDisplay` TEXT NOT NULL, `startType` TEXT NOT NULL, `overview` TEXT NOT NULL, `isEnrolled` INTEGER NOT NULL, `bannerImage` TEXT, `courseImage` TEXT, `courseVideo` TEXT, `image` TEXT, PRIMARY KEY(`id`))",
+ "fields": [
+ {
+ "fieldPath": "id",
+ "columnName": "id",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "blocksUrl",
+ "columnName": "blocksUrl",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "courseId",
+ "columnName": "courseId",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "effort",
+ "columnName": "effort",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "enrollmentStart",
+ "columnName": "enrollmentStart",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "enrollmentEnd",
+ "columnName": "enrollmentEnd",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "hidden",
+ "columnName": "hidden",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "invitationOnly",
+ "columnName": "invitationOnly",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "mobileAvailable",
+ "columnName": "mobileAvailable",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "name",
+ "columnName": "name",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "number",
+ "columnName": "number",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "org",
+ "columnName": "org",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "pacing",
+ "columnName": "pacing",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "shortDescription",
+ "columnName": "shortDescription",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "start",
+ "columnName": "start",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "end",
+ "columnName": "end",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "startDisplay",
+ "columnName": "startDisplay",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "startType",
+ "columnName": "startType",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "overview",
+ "columnName": "overview",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "isEnrolled",
+ "columnName": "isEnrolled",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "media.bannerImage",
+ "columnName": "bannerImage",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "media.courseImage",
+ "columnName": "courseImage",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "media.courseVideo",
+ "columnName": "courseVideo",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "media.image",
+ "columnName": "image",
+ "affinity": "TEXT"
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": false,
+ "columnNames": [
+ "id"
+ ]
+ }
+ },
+ {
+ "tableName": "course_enrolled_table",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`courseId` TEXT NOT NULL, `auditAccessExpires` TEXT NOT NULL, `created` TEXT NOT NULL, `mode` TEXT NOT NULL, `isActive` INTEGER NOT NULL, `id` TEXT NOT NULL, `name` TEXT NOT NULL, `number` TEXT NOT NULL, `org` TEXT NOT NULL, `start` TEXT NOT NULL, `startDisplay` TEXT NOT NULL, `startType` TEXT NOT NULL, `end` TEXT NOT NULL, `dynamicUpgradeDeadline` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `course_image_link` TEXT NOT NULL, `courseAbout` TEXT NOT NULL, `courseUpdates` TEXT NOT NULL, `courseHandouts` TEXT NOT NULL, `discussionUrl` TEXT NOT NULL, `videoOutline` TEXT NOT NULL, `isSelfPaced` INTEGER NOT NULL, `hasAccess` INTEGER, `errorCode` TEXT, `developerMessage` TEXT, `userMessage` TEXT, `additionalContextUserMessage` TEXT, `userFragment` TEXT, `bannerImage` TEXT, `courseImage` TEXT, `courseVideo` TEXT, `image` TEXT, `facebook` TEXT NOT NULL, `twitter` TEXT NOT NULL, `certificateURL` TEXT, `assignments_completed` INTEGER NOT NULL, `total_assignments_count` INTEGER NOT NULL, `lastVisitedModuleId` TEXT, `lastVisitedModulePath` TEXT, `lastVisitedBlockId` TEXT, `lastVisitedUnitDisplayName` TEXT, `futureAssignments` TEXT, `pastAssignments` TEXT, PRIMARY KEY(`courseId`))",
+ "fields": [
+ {
+ "fieldPath": "courseId",
+ "columnName": "courseId",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "auditAccessExpires",
+ "columnName": "auditAccessExpires",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "created",
+ "columnName": "created",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "mode",
+ "columnName": "mode",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "isActive",
+ "columnName": "isActive",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "course.id",
+ "columnName": "id",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "course.name",
+ "columnName": "name",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "course.number",
+ "columnName": "number",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "course.org",
+ "columnName": "org",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "course.start",
+ "columnName": "start",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "course.startDisplay",
+ "columnName": "startDisplay",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "course.startType",
+ "columnName": "startType",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "course.end",
+ "columnName": "end",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "course.dynamicUpgradeDeadline",
+ "columnName": "dynamicUpgradeDeadline",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "course.subscriptionId",
+ "columnName": "subscriptionId",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "course.courseImage",
+ "columnName": "course_image_link",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "course.courseAbout",
+ "columnName": "courseAbout",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "course.courseUpdates",
+ "columnName": "courseUpdates",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "course.courseHandouts",
+ "columnName": "courseHandouts",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "course.discussionUrl",
+ "columnName": "discussionUrl",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "course.videoOutline",
+ "columnName": "videoOutline",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "course.isSelfPaced",
+ "columnName": "isSelfPaced",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "course.coursewareAccess.hasAccess",
+ "columnName": "hasAccess",
+ "affinity": "INTEGER"
+ },
+ {
+ "fieldPath": "course.coursewareAccess.errorCode",
+ "columnName": "errorCode",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "course.coursewareAccess.developerMessage",
+ "columnName": "developerMessage",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "course.coursewareAccess.userMessage",
+ "columnName": "userMessage",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "course.coursewareAccess.additionalContextUserMessage",
+ "columnName": "additionalContextUserMessage",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "course.coursewareAccess.userFragment",
+ "columnName": "userFragment",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "course.media.bannerImage",
+ "columnName": "bannerImage",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "course.media.courseImage",
+ "columnName": "courseImage",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "course.media.courseVideo",
+ "columnName": "courseVideo",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "course.media.image",
+ "columnName": "image",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "course.courseSharingUtmParameters.facebook",
+ "columnName": "facebook",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "course.courseSharingUtmParameters.twitter",
+ "columnName": "twitter",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "certificate.certificateURL",
+ "columnName": "certificateURL",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "progress.assignmentsCompleted",
+ "columnName": "assignments_completed",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "progress.totalAssignmentsCount",
+ "columnName": "total_assignments_count",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "courseStatus.lastVisitedModuleId",
+ "columnName": "lastVisitedModuleId",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "courseStatus.lastVisitedModulePath",
+ "columnName": "lastVisitedModulePath",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "courseStatus.lastVisitedBlockId",
+ "columnName": "lastVisitedBlockId",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "courseStatus.lastVisitedUnitDisplayName",
+ "columnName": "lastVisitedUnitDisplayName",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "courseAssignments.futureAssignments",
+ "columnName": "futureAssignments",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "courseAssignments.pastAssignments",
+ "columnName": "pastAssignments",
+ "affinity": "TEXT"
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": false,
+ "columnNames": [
+ "courseId"
+ ]
+ }
+ },
+ {
+ "tableName": "course_structure_table",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`root` TEXT NOT NULL, `id` TEXT NOT NULL, `blocks` TEXT NOT NULL, `name` TEXT NOT NULL, `number` TEXT NOT NULL, `org` TEXT NOT NULL, `start` TEXT, `startDisplay` TEXT NOT NULL, `startType` TEXT NOT NULL, `end` TEXT, `isSelfPaced` INTEGER NOT NULL, `hasAccess` INTEGER, `errorCode` TEXT, `developerMessage` TEXT, `userMessage` TEXT, `additionalContextUserMessage` TEXT, `userFragment` TEXT, `bannerImage` TEXT, `courseImage` TEXT, `courseVideo` TEXT, `image` TEXT, `certificateURL` TEXT, `assignments_completed` INTEGER NOT NULL, `total_assignments_count` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+ "fields": [
+ {
+ "fieldPath": "root",
+ "columnName": "root",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "id",
+ "columnName": "id",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "blocks",
+ "columnName": "blocks",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "name",
+ "columnName": "name",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "number",
+ "columnName": "number",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "org",
+ "columnName": "org",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "start",
+ "columnName": "start",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "startDisplay",
+ "columnName": "startDisplay",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "startType",
+ "columnName": "startType",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "end",
+ "columnName": "end",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "isSelfPaced",
+ "columnName": "isSelfPaced",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "coursewareAccess.hasAccess",
+ "columnName": "hasAccess",
+ "affinity": "INTEGER"
+ },
+ {
+ "fieldPath": "coursewareAccess.errorCode",
+ "columnName": "errorCode",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "coursewareAccess.developerMessage",
+ "columnName": "developerMessage",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "coursewareAccess.userMessage",
+ "columnName": "userMessage",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "coursewareAccess.additionalContextUserMessage",
+ "columnName": "additionalContextUserMessage",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "coursewareAccess.userFragment",
+ "columnName": "userFragment",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "media.bannerImage",
+ "columnName": "bannerImage",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "media.courseImage",
+ "columnName": "courseImage",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "media.courseVideo",
+ "columnName": "courseVideo",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "media.image",
+ "columnName": "image",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "certificate.certificateURL",
+ "columnName": "certificateURL",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "progress.assignmentsCompleted",
+ "columnName": "assignments_completed",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "progress.totalAssignmentsCount",
+ "columnName": "total_assignments_count",
+ "affinity": "INTEGER",
+ "notNull": true
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": false,
+ "columnNames": [
+ "id"
+ ]
+ }
+ },
+ {
+ "tableName": "download_model",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `title` TEXT NOT NULL, `courseId` TEXT NOT NULL, `size` INTEGER NOT NULL, `path` TEXT NOT NULL, `url` TEXT NOT NULL, `type` TEXT NOT NULL, `downloadedState` TEXT NOT NULL, `lastModified` TEXT, PRIMARY KEY(`id`))",
+ "fields": [
+ {
+ "fieldPath": "id",
+ "columnName": "id",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "title",
+ "columnName": "title",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "courseId",
+ "columnName": "courseId",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "size",
+ "columnName": "size",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "path",
+ "columnName": "path",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "url",
+ "columnName": "url",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "type",
+ "columnName": "type",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "downloadedState",
+ "columnName": "downloadedState",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "lastModified",
+ "columnName": "lastModified",
+ "affinity": "TEXT"
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": false,
+ "columnNames": [
+ "id"
+ ]
+ }
+ },
+ {
+ "tableName": "offline_x_block_progress_table",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `courseId` TEXT NOT NULL, `url` TEXT NOT NULL, `type` TEXT NOT NULL, `data` TEXT NOT NULL, PRIMARY KEY(`id`))",
+ "fields": [
+ {
+ "fieldPath": "blockId",
+ "columnName": "id",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "courseId",
+ "columnName": "courseId",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "jsonProgress.url",
+ "columnName": "url",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "jsonProgress.type",
+ "columnName": "type",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "jsonProgress.data",
+ "columnName": "data",
+ "affinity": "TEXT",
+ "notNull": true
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": false,
+ "columnNames": [
+ "id"
+ ]
+ }
+ },
+ {
+ "tableName": "course_calendar_event_table",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`event_id` INTEGER NOT NULL, `course_id` TEXT NOT NULL, PRIMARY KEY(`event_id`))",
+ "fields": [
+ {
+ "fieldPath": "eventId",
+ "columnName": "event_id",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "courseId",
+ "columnName": "course_id",
+ "affinity": "TEXT",
+ "notNull": true
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": false,
+ "columnNames": [
+ "event_id"
+ ]
+ }
+ },
+ {
+ "tableName": "course_calendar_state_table",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`course_id` TEXT NOT NULL, `checksum` INTEGER NOT NULL, `is_course_sync_enabled` INTEGER NOT NULL, PRIMARY KEY(`course_id`))",
+ "fields": [
+ {
+ "fieldPath": "courseId",
+ "columnName": "course_id",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "checksum",
+ "columnName": "checksum",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "isCourseSyncEnabled",
+ "columnName": "is_course_sync_enabled",
+ "affinity": "INTEGER",
+ "notNull": true
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": false,
+ "columnNames": [
+ "course_id"
+ ]
+ }
+ },
+ {
+ "tableName": "download_course_preview_table",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`course_id` TEXT NOT NULL, `course_name` TEXT, `course_image` TEXT, `total_size` INTEGER, PRIMARY KEY(`course_id`))",
+ "fields": [
+ {
+ "fieldPath": "id",
+ "columnName": "course_id",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "name",
+ "columnName": "course_name",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "image",
+ "columnName": "course_image",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "totalSize",
+ "columnName": "total_size",
+ "affinity": "INTEGER"
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": false,
+ "columnNames": [
+ "course_id"
+ ]
+ }
+ },
+ {
+ "tableName": "course_enrollment_details_table",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `courseUpdates` TEXT NOT NULL, `courseHandouts` TEXT NOT NULL, `discussionUrl` TEXT NOT NULL, `hasUnmetPrerequisites` INTEGER NOT NULL, `isTooEarly` INTEGER NOT NULL, `isStaff` INTEGER NOT NULL, `auditAccessExpires` TEXT, `hasAccess` INTEGER, `errorCode` TEXT, `developerMessage` TEXT, `userMessage` TEXT, `additionalContextUserMessage` TEXT, `userFragment` TEXT, `certificateURL` TEXT, `created` TEXT, `mode` TEXT, `isActive` INTEGER NOT NULL, `upgradeDeadline` TEXT, `name` TEXT NOT NULL, `number` TEXT NOT NULL, `org` TEXT NOT NULL, `start` INTEGER, `startDisplay` TEXT NOT NULL, `startType` TEXT NOT NULL, `end` INTEGER, `isSelfPaced` INTEGER NOT NULL, `courseAbout` TEXT NOT NULL, `bannerImage` TEXT, `courseImage` TEXT, `courseVideo` TEXT, `image` TEXT, `facebook` TEXT NOT NULL, `twitter` TEXT NOT NULL, PRIMARY KEY(`id`))",
+ "fields": [
+ {
+ "fieldPath": "id",
+ "columnName": "id",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "courseUpdates",
+ "columnName": "courseUpdates",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "courseHandouts",
+ "columnName": "courseHandouts",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "discussionUrl",
+ "columnName": "discussionUrl",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "courseAccessDetails.hasUnmetPrerequisites",
+ "columnName": "hasUnmetPrerequisites",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "courseAccessDetails.isTooEarly",
+ "columnName": "isTooEarly",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "courseAccessDetails.isStaff",
+ "columnName": "isStaff",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "courseAccessDetails.auditAccessExpires",
+ "columnName": "auditAccessExpires",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "courseAccessDetails.coursewareAccess.hasAccess",
+ "columnName": "hasAccess",
+ "affinity": "INTEGER"
+ },
+ {
+ "fieldPath": "courseAccessDetails.coursewareAccess.errorCode",
+ "columnName": "errorCode",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "courseAccessDetails.coursewareAccess.developerMessage",
+ "columnName": "developerMessage",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "courseAccessDetails.coursewareAccess.userMessage",
+ "columnName": "userMessage",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "courseAccessDetails.coursewareAccess.additionalContextUserMessage",
+ "columnName": "additionalContextUserMessage",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "courseAccessDetails.coursewareAccess.userFragment",
+ "columnName": "userFragment",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "certificate.certificateURL",
+ "columnName": "certificateURL",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "enrollmentDetails.created",
+ "columnName": "created",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "enrollmentDetails.mode",
+ "columnName": "mode",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "enrollmentDetails.isActive",
+ "columnName": "isActive",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "enrollmentDetails.upgradeDeadline",
+ "columnName": "upgradeDeadline",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "courseInfoOverview.name",
+ "columnName": "name",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "courseInfoOverview.number",
+ "columnName": "number",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "courseInfoOverview.org",
+ "columnName": "org",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "courseInfoOverview.start",
+ "columnName": "start",
+ "affinity": "INTEGER"
+ },
+ {
+ "fieldPath": "courseInfoOverview.startDisplay",
+ "columnName": "startDisplay",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "courseInfoOverview.startType",
+ "columnName": "startType",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "courseInfoOverview.end",
+ "columnName": "end",
+ "affinity": "INTEGER"
+ },
+ {
+ "fieldPath": "courseInfoOverview.isSelfPaced",
+ "columnName": "isSelfPaced",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "courseInfoOverview.courseAbout",
+ "columnName": "courseAbout",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "courseInfoOverview.media.bannerImage",
+ "columnName": "bannerImage",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "courseInfoOverview.media.courseImage",
+ "columnName": "courseImage",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "courseInfoOverview.media.courseVideo",
+ "columnName": "courseVideo",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "courseInfoOverview.media.image",
+ "columnName": "image",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "courseInfoOverview.courseSharingUtmParameters.facebook",
+ "columnName": "facebook",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "courseInfoOverview.courseSharingUtmParameters.twitter",
+ "columnName": "twitter",
+ "affinity": "TEXT",
+ "notNull": true
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": false,
+ "columnNames": [
+ "id"
+ ]
+ }
+ },
+ {
+ "tableName": "course_dates_table",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `first_component_block_id` TEXT, `course_id` TEXT NOT NULL, `due_date` TEXT, `assignment_title` TEXT, `learner_has_access` INTEGER, `relative` INTEGER, `course_name` TEXT)",
+ "fields": [
+ {
+ "fieldPath": "id",
+ "columnName": "id",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "firstComponentBlockId",
+ "columnName": "first_component_block_id",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "courseId",
+ "columnName": "course_id",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "dueDate",
+ "columnName": "due_date",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "assignmentTitle",
+ "columnName": "assignment_title",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "learnerHasAccess",
+ "columnName": "learner_has_access",
+ "affinity": "INTEGER"
+ },
+ {
+ "fieldPath": "relative",
+ "columnName": "relative",
+ "affinity": "INTEGER"
+ },
+ {
+ "fieldPath": "courseName",
+ "columnName": "course_name",
+ "affinity": "TEXT"
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": true,
+ "columnNames": [
+ "id"
+ ]
+ }
+ },
+ {
+ "tableName": "video_progress_table",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`block_id` TEXT NOT NULL, `video_url` TEXT NOT NULL, `video_time` INTEGER, `duration` INTEGER, PRIMARY KEY(`block_id`))",
+ "fields": [
+ {
+ "fieldPath": "blockId",
+ "columnName": "block_id",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "videoUrl",
+ "columnName": "video_url",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "videoTime",
+ "columnName": "video_time",
+ "affinity": "INTEGER"
+ },
+ {
+ "fieldPath": "duration",
+ "columnName": "duration",
+ "affinity": "INTEGER"
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": false,
+ "columnNames": [
+ "block_id"
+ ]
+ }
+ },
+ {
+ "tableName": "course_progress_table",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`courseId` TEXT NOT NULL, `verifiedMode` TEXT NOT NULL, `accessExpiration` TEXT NOT NULL, `creditCourseRequirements` TEXT NOT NULL, `end` TEXT NOT NULL, `enrollmentMode` TEXT NOT NULL, `hasScheduledContent` INTEGER NOT NULL, `sectionScores` TEXT NOT NULL, `studioUrl` TEXT NOT NULL, `username` TEXT NOT NULL, `userHasPassingGrade` INTEGER NOT NULL, `disableProgressGraph` INTEGER NOT NULL, `certificate_certStatus` TEXT, `certificate_certWebViewUrl` TEXT, `certificate_downloadUrl` TEXT, `certificate_certificateAvailableDate` TEXT, `completion_completeCount` INTEGER, `completion_incompleteCount` INTEGER, `completion_lockedCount` INTEGER, `grade_letterGrade` TEXT, `grade_percent` REAL, `grade_isPassing` INTEGER, `grading_assignmentPolicies` TEXT, `grading_gradeRange` TEXT, `grading_assignmentColors` TEXT, `verification_link` TEXT, `verification_status` TEXT, `verification_statusDate` TEXT, PRIMARY KEY(`courseId`))",
+ "fields": [
+ {
+ "fieldPath": "courseId",
+ "columnName": "courseId",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "verifiedMode",
+ "columnName": "verifiedMode",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "accessExpiration",
+ "columnName": "accessExpiration",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "creditCourseRequirements",
+ "columnName": "creditCourseRequirements",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "end",
+ "columnName": "end",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "enrollmentMode",
+ "columnName": "enrollmentMode",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "hasScheduledContent",
+ "columnName": "hasScheduledContent",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "sectionScores",
+ "columnName": "sectionScores",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "studioUrl",
+ "columnName": "studioUrl",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "username",
+ "columnName": "username",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "userHasPassingGrade",
+ "columnName": "userHasPassingGrade",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "disableProgressGraph",
+ "columnName": "disableProgressGraph",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "certificateData.certStatus",
+ "columnName": "certificate_certStatus",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "certificateData.certWebViewUrl",
+ "columnName": "certificate_certWebViewUrl",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "certificateData.downloadUrl",
+ "columnName": "certificate_downloadUrl",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "certificateData.certificateAvailableDate",
+ "columnName": "certificate_certificateAvailableDate",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "completionSummary.completeCount",
+ "columnName": "completion_completeCount",
+ "affinity": "INTEGER"
+ },
+ {
+ "fieldPath": "completionSummary.incompleteCount",
+ "columnName": "completion_incompleteCount",
+ "affinity": "INTEGER"
+ },
+ {
+ "fieldPath": "completionSummary.lockedCount",
+ "columnName": "completion_lockedCount",
+ "affinity": "INTEGER"
+ },
+ {
+ "fieldPath": "courseGrade.letterGrade",
+ "columnName": "grade_letterGrade",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "courseGrade.percent",
+ "columnName": "grade_percent",
+ "affinity": "REAL"
+ },
+ {
+ "fieldPath": "courseGrade.isPassing",
+ "columnName": "grade_isPassing",
+ "affinity": "INTEGER"
+ },
+ {
+ "fieldPath": "gradingPolicy.assignmentPolicies",
+ "columnName": "grading_assignmentPolicies",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "gradingPolicy.gradeRange",
+ "columnName": "grading_gradeRange",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "gradingPolicy.assignmentColors",
+ "columnName": "grading_assignmentColors",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "verificationData.link",
+ "columnName": "verification_link",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "verificationData.status",
+ "columnName": "verification_status",
+ "affinity": "TEXT"
+ },
+ {
+ "fieldPath": "verificationData.statusDate",
+ "columnName": "verification_statusDate",
+ "affinity": "TEXT"
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": false,
+ "columnNames": [
+ "courseId"
+ ]
+ }
+ }
+ ],
+ "setupQueries": [
+ "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+ "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '3c35a346cc635ac7115a9f5021306a61')"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 65c64e538..831fe4a86 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -48,12 +48,6 @@
-
-
-
-
-
-
diff --git a/app/src/main/java/org/openedx/app/AnalyticsManager.kt b/app/src/main/java/org/openedx/app/AnalyticsManager.kt
index 6c29cdf12..5e96784d8 100644
--- a/app/src/main/java/org/openedx/app/AnalyticsManager.kt
+++ b/app/src/main/java/org/openedx/app/AnalyticsManager.kt
@@ -6,6 +6,7 @@ import org.openedx.core.presentation.DownloadsAnalytics
import org.openedx.core.presentation.dialog.appreview.AppReviewAnalytics
import org.openedx.course.presentation.CourseAnalytics
import org.openedx.dashboard.presentation.DashboardAnalytics
+import org.openedx.dates.presentation.DatesAnalytics
import org.openedx.discovery.presentation.DiscoveryAnalytics
import org.openedx.discussion.presentation.DiscussionAnalytics
import org.openedx.foundation.interfaces.Analytics
@@ -23,7 +24,8 @@ class AnalyticsManager :
DiscussionAnalytics,
ProfileAnalytics,
WhatsNewAnalytics,
- DownloadsAnalytics {
+ DownloadsAnalytics,
+ DatesAnalytics {
private val analytics: MutableList = mutableListOf()
diff --git a/app/src/main/java/org/openedx/app/AppActivity.kt b/app/src/main/java/org/openedx/app/AppActivity.kt
index b904bf6a1..f0a71f713 100644
--- a/app/src/main/java/org/openedx/app/AppActivity.kt
+++ b/app/src/main/java/org/openedx/app/AppActivity.kt
@@ -2,9 +2,6 @@ package org.openedx.app
import android.content.Intent
import android.content.res.Configuration
-import android.graphics.Color
-import android.net.Uri
-import android.os.Build
import android.os.Bundle
import android.view.View
import android.view.WindowManager
@@ -26,7 +23,6 @@ import org.openedx.app.databinding.ActivityAppBinding
import org.openedx.app.deeplink.DeepLink
import org.openedx.auth.presentation.logistration.LogistrationFragment
import org.openedx.auth.presentation.signin.SignInFragment
-import org.openedx.core.ApiConstants
import org.openedx.core.data.storage.CorePreferences
import org.openedx.core.presentation.dialog.downloaddialog.DownloadDialogManager
import org.openedx.core.presentation.global.InsetHolder
@@ -70,13 +66,6 @@ class AppActivity : AppCompatActivity(), InsetHolder, WindowSizeHolder {
private val authCode: String?
get() {
val data = intent?.data
- if (
- data is Uri &&
- data.scheme == BuildConfig.APPLICATION_ID &&
- data.host == ApiConstants.BrowserLogin.REDIRECT_HOST
- ) {
- return data.getQueryParameter(ApiConstants.BrowserLogin.CODE_QUERY_PARAM)
- }
return null
}
@@ -160,12 +149,8 @@ class AppActivity : AppCompatActivity(), InsetHolder, WindowSizeHolder {
WindowCompat.setDecorFitsSystemWindows(this, false)
val insetsController = WindowInsetsControllerCompat(this, binding.root)
insetsController.isAppearanceLightStatusBars = !isUsingNightModeResources()
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
- insetsController.systemBarsBehavior =
- WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
- } else {
- window.statusBarColor = Color.TRANSPARENT
- }
+ insetsController.systemBarsBehavior =
+ WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
}
}
@@ -176,7 +161,7 @@ class AppActivity : AppCompatActivity(), InsetHolder, WindowSizeHolder {
val fragment = if (viewModel.isLogistrationEnabled && authCode == null) {
LogistrationFragment()
} else {
- SignInFragment.newInstance(null, null, authCode = authCode)
+ SignInFragment.newInstance(null, null)
}
addFragment(fragment)
}
@@ -224,7 +209,7 @@ class AppActivity : AppCompatActivity(), InsetHolder, WindowSizeHolder {
this.intent = intent
if (authCode != null) {
- addFragment(SignInFragment.newInstance(null, null, authCode = authCode))
+ addFragment(SignInFragment.newInstance(null, null))
}
val extras = intent.extras
diff --git a/app/src/main/java/org/openedx/app/AppAnalytics.kt b/app/src/main/java/org/openedx/app/AppAnalytics.kt
index 55b26b492..997ab096d 100644
--- a/app/src/main/java/org/openedx/app/AppAnalytics.kt
+++ b/app/src/main/java/org/openedx/app/AppAnalytics.kt
@@ -20,6 +20,10 @@ enum class AppAnalyticsEvent(val eventName: String, val biValue: String) {
"MainDashboard:Discover",
"edx.bi.app.main_dashboard.discover"
),
+ DATES(
+ "MainDashboard:DATES",
+ "edx.bi.app.main_dashboard.dates"
+ ),
DOWNLOADS(
"MainDashboard:Downloads",
"edx.bi.app.main_dashboard.downloads"
diff --git a/app/src/main/java/org/openedx/app/AppRouter.kt b/app/src/main/java/org/openedx/app/AppRouter.kt
index 4678344ee..a511dc839 100644
--- a/app/src/main/java/org/openedx/app/AppRouter.kt
+++ b/app/src/main/java/org/openedx/app/AppRouter.kt
@@ -13,6 +13,7 @@ import org.openedx.core.CalendarRouter
import org.openedx.core.FragmentViewType
import org.openedx.core.presentation.global.appupgrade.AppUpgradeRouter
import org.openedx.core.presentation.global.appupgrade.UpgradeRequiredFragment
+import org.openedx.core.presentation.global.webview.SSOWebContentFragment
import org.openedx.core.presentation.global.webview.WebContentFragment
import org.openedx.core.presentation.settings.video.VideoQualityFragment
import org.openedx.core.presentation.settings.video.VideoQualityType
@@ -29,6 +30,7 @@ import org.openedx.course.presentation.unit.video.YoutubeVideoFullScreenFragment
import org.openedx.course.settings.download.DownloadQueueFragment
import org.openedx.courses.presentation.AllEnrolledCoursesFragment
import org.openedx.dashboard.presentation.DashboardRouter
+import org.openedx.dates.presentation.DatesRouter
import org.openedx.discovery.presentation.DiscoveryRouter
import org.openedx.discovery.presentation.NativeDiscoveryFragment
import org.openedx.discovery.presentation.WebViewDiscoveryFragment
@@ -69,7 +71,8 @@ class AppRouter :
AppUpgradeRouter,
WhatsNewRouter,
CalendarRouter,
- DownloadsRouter {
+ DownloadsRouter,
+ DatesRouter {
// region AuthRouter
override fun navigateToMain(
@@ -406,7 +409,7 @@ class AppRouter :
if (isLogistrationEnabled) {
replaceFragment(fm, LogistrationFragment())
} else {
- replaceFragment(fm, SignInFragment())
+ replaceFragment(fm, SignInFragment.newInstance(null, null))
}
}
}
@@ -432,6 +435,13 @@ class AppRouter :
)
}
+ override fun navigateToSSOWebContent(fm: FragmentManager, title: String, url: String) {
+ replaceFragmentWithBackStack(
+ fm,
+ SSOWebContentFragment.newInstance(title = title, url = url)
+ )
+ }
+
override fun navigateToManageAccount(fm: FragmentManager) {
replaceFragmentWithBackStack(fm, ManageAccountFragment())
}
diff --git a/app/src/main/java/org/openedx/app/AppViewModel.kt b/app/src/main/java/org/openedx/app/AppViewModel.kt
index e195a7940..bafddb19b 100644
--- a/app/src/main/java/org/openedx/app/AppViewModel.kt
+++ b/app/src/main/java/org/openedx/app/AppViewModel.kt
@@ -29,6 +29,7 @@ import org.openedx.core.system.notifier.app.SignInEvent
import org.openedx.core.utils.Directories
import org.openedx.foundation.presentation.BaseViewModel
import org.openedx.foundation.presentation.SingleEventLiveData
+import org.openedx.foundation.system.ResourceManager
import org.openedx.foundation.utils.FileUtil
@SuppressLint("StaticFieldLeak")
@@ -42,8 +43,9 @@ class AppViewModel(
private val deepLinkRouter: DeepLinkRouter,
private val fileUtil: FileUtil,
private val downloadNotifier: DownloadNotifier,
- private val context: Context
-) : BaseViewModel() {
+ private val context: Context,
+ resourceManager: ResourceManager,
+) : BaseViewModel(resourceManager) {
private val _logoutUser = SingleEventLiveData()
val logoutUser: LiveData
diff --git a/app/src/main/java/org/openedx/app/MainFragment.kt b/app/src/main/java/org/openedx/app/MainFragment.kt
index 82092e439..397216b74 100644
--- a/app/src/main/java/org/openedx/app/MainFragment.kt
+++ b/app/src/main/java/org/openedx/app/MainFragment.kt
@@ -27,6 +27,7 @@ import org.openedx.core.presentation.global.appupgrade.AppUpgradeRecommendedBox
import org.openedx.core.presentation.global.appupgrade.UpgradeRequiredFragment
import org.openedx.core.presentation.global.viewBinding
import org.openedx.core.system.notifier.app.AppUpgradeEvent
+import org.openedx.dates.presentation.dates.DatesFragment
import org.openedx.discovery.presentation.DiscoveryRouter
import org.openedx.downloads.presentation.download.DownloadsFragment
import org.openedx.learn.presentation.LearnFragment
@@ -104,6 +105,9 @@ class MainFragment : Fragment(R.layout.fragment_main) {
if (viewModel.isDownloadsFragmentEnabled) {
add(R.id.fragmentDownloads to { DownloadsFragment() })
}
+ if (viewModel.isDatesFragmentEnabled) {
+ add(R.id.fragmentDates to { DatesFragment() })
+ }
add(R.id.fragmentProfile to { ProfileFragment() })
}
}
@@ -113,12 +117,14 @@ class MainFragment : Fragment(R.layout.fragment_main) {
R.id.fragmentLearn to resources.getString(R.string.app_navigation_learn),
R.id.fragmentDiscover to resources.getString(R.string.app_navigation_discovery),
R.id.fragmentDownloads to resources.getString(R.string.app_navigation_downloads),
+ R.id.fragmentDates to resources.getString(R.string.app_navigation_dates),
R.id.fragmentProfile to resources.getString(R.string.app_navigation_profile),
)
val tabIconSelectors = mapOf(
R.id.fragmentLearn to R.drawable.app_ic_learn_selector,
R.id.fragmentDiscover to R.drawable.app_ic_discover_selector,
R.id.fragmentDownloads to R.drawable.app_ic_downloads_selector,
+ R.id.fragmentDates to R.drawable.app_ic_dates_selector,
R.id.fragmentProfile to R.drawable.app_ic_profile_selector
)
@@ -136,6 +142,7 @@ class MainFragment : Fragment(R.layout.fragment_main) {
R.id.fragmentLearn -> viewModel.logLearnTabClickedEvent()
R.id.fragmentDiscover -> viewModel.logDiscoveryTabClickedEvent()
R.id.fragmentDownloads -> viewModel.logDownloadsTabClickedEvent()
+ R.id.fragmentDates -> viewModel.logDatesTabClickedEvent()
R.id.fragmentProfile -> viewModel.logProfileTabClickedEvent()
}
menuIdToIndex[menuItem.itemId]?.let { index ->
@@ -174,6 +181,7 @@ class MainFragment : Fragment(R.layout.fragment_main) {
R.id.fragmentLearn
}
+ HomeTab.DATES.name -> R.id.fragmentDates
HomeTab.PROFILE.name -> R.id.fragmentProfile
else -> R.id.fragmentLearn
}
diff --git a/app/src/main/java/org/openedx/app/MainViewModel.kt b/app/src/main/java/org/openedx/app/MainViewModel.kt
index 8723d6dbe..828b14a39 100644
--- a/app/src/main/java/org/openedx/app/MainViewModel.kt
+++ b/app/src/main/java/org/openedx/app/MainViewModel.kt
@@ -18,13 +18,15 @@ import org.openedx.core.system.notifier.app.AppNotifier
import org.openedx.core.system.notifier.app.AppUpgradeEvent
import org.openedx.discovery.presentation.DiscoveryNavigator
import org.openedx.foundation.presentation.BaseViewModel
+import org.openedx.foundation.system.ResourceManager
class MainViewModel(
private val config: Config,
private val notifier: DiscoveryNotifier,
private val analytics: AppAnalytics,
private val appNotifier: AppNotifier,
-) : BaseViewModel() {
+ private val resourceManager: ResourceManager,
+) : BaseViewModel(resourceManager) {
private val _isBottomBarEnabled = MutableLiveData(true)
val isBottomBarEnabled: LiveData
@@ -41,6 +43,7 @@ class MainViewModel(
val isDiscoveryTypeWebView get() = config.getDiscoveryConfig().isViewTypeWebView()
val getDiscoveryFragment get() = DiscoveryNavigator(isDiscoveryTypeWebView).getDiscoveryFragment()
+ val isDatesFragmentEnabled get() = config.getDatesConfig().isEnabled
val isDownloadsFragmentEnabled get() = config.getDownloadsConfig().isEnabled
override fun onCreate(owner: LifecycleOwner) {
@@ -65,6 +68,10 @@ class MainViewModel(
logScreenEvent(AppAnalyticsEvent.DOWNLOADS)
}
+ fun logDatesTabClickedEvent() {
+ logScreenEvent(AppAnalyticsEvent.DATES)
+ }
+
fun logProfileTabClickedEvent() {
logScreenEvent(AppAnalyticsEvent.PROFILE)
}
diff --git a/app/src/main/java/org/openedx/app/data/networking/HeadersInterceptor.kt b/app/src/main/java/org/openedx/app/data/networking/HeadersInterceptor.kt
index a4daf0809..baafe5a86 100644
--- a/app/src/main/java/org/openedx/app/data/networking/HeadersInterceptor.kt
+++ b/app/src/main/java/org/openedx/app/data/networking/HeadersInterceptor.kt
@@ -25,7 +25,7 @@ class HeadersInterceptor(
addHeader("Accept", "application/json")
val httpAgent = System.getProperty("http.agent") ?: ""
- addHeader("User-Agent", "$httpAgent ${appData.versionName}")
+ addHeader("User-Agent", "$httpAgent ${appData.appUserAgent}")
}.build()
)
}
diff --git a/app/src/main/java/org/openedx/app/data/storage/DataStoreEncryption.kt b/app/src/main/java/org/openedx/app/data/storage/DataStoreEncryption.kt
new file mode 100644
index 000000000..cdf574af1
--- /dev/null
+++ b/app/src/main/java/org/openedx/app/data/storage/DataStoreEncryption.kt
@@ -0,0 +1,86 @@
+package org.openedx.app.data.storage
+
+import android.security.keystore.KeyGenParameterSpec
+import android.security.keystore.KeyProperties
+import android.util.Base64
+import android.util.Log
+import java.security.KeyStore
+import javax.crypto.Cipher
+import javax.crypto.KeyGenerator
+import javax.crypto.SecretKey
+import javax.crypto.spec.GCMParameterSpec
+
+class DataStoreEncryption {
+
+ private companion object {
+ const val TAG = "DataStoreEncryption"
+ const val ANDROID_KEYSTORE = "AndroidKeyStore"
+ const val KEY_ALIAS = "openedx_datastore_key"
+ const val TRANSFORMATION = "AES/GCM/NoPadding"
+ const val GCM_IV_LENGTH = 12
+ const val GCM_TAG_LENGTH = 16
+ const val GCM_TAG_LENGTH_BITS = GCM_TAG_LENGTH * 8
+ const val KEY_SIZE = 256
+ }
+
+ private val keyStore: KeyStore = KeyStore.getInstance(ANDROID_KEYSTORE).apply { load(null) }
+
+ private fun getOrCreateSecretKey(): SecretKey {
+ keyStore.getEntry(KEY_ALIAS, null)?.let { entry ->
+ return (entry as KeyStore.SecretKeyEntry).secretKey
+ }
+
+ val keyGenerator = KeyGenerator.getInstance(
+ KeyProperties.KEY_ALGORITHM_AES,
+ ANDROID_KEYSTORE
+ )
+
+ val keyGenParameterSpec = KeyGenParameterSpec.Builder(
+ KEY_ALIAS,
+ KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT
+ )
+ .setBlockModes(KeyProperties.BLOCK_MODE_GCM)
+ .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
+ .setKeySize(KEY_SIZE)
+ .build()
+
+ keyGenerator.init(keyGenParameterSpec)
+ return keyGenerator.generateKey()
+ }
+
+ fun encrypt(plainText: String): String {
+ if (plainText.isEmpty()) return ""
+
+ val cipher = Cipher.getInstance(TRANSFORMATION)
+ cipher.init(Cipher.ENCRYPT_MODE, getOrCreateSecretKey())
+
+ val iv = cipher.iv
+ val encryptedBytes = cipher.doFinal(plainText.toByteArray(Charsets.UTF_8))
+
+ val combined = ByteArray(iv.size + encryptedBytes.size)
+ System.arraycopy(iv, 0, combined, 0, iv.size)
+ System.arraycopy(encryptedBytes, 0, combined, iv.size, encryptedBytes.size)
+
+ return Base64.encodeToString(combined, Base64.NO_WRAP)
+ }
+
+ fun decrypt(encryptedText: String): String {
+ if (encryptedText.isEmpty()) return ""
+
+ return try {
+ val combined = Base64.decode(encryptedText, Base64.NO_WRAP)
+
+ val iv = combined.copyOfRange(0, GCM_IV_LENGTH)
+ val encryptedBytes = combined.copyOfRange(GCM_IV_LENGTH, combined.size)
+
+ val cipher = Cipher.getInstance(TRANSFORMATION)
+ val spec = GCMParameterSpec(GCM_TAG_LENGTH_BITS, iv)
+ cipher.init(Cipher.DECRYPT_MODE, getOrCreateSecretKey(), spec)
+
+ String(cipher.doFinal(encryptedBytes), Charsets.UTF_8)
+ } catch (e: Exception) {
+ Log.e(TAG, "Decryption failed", e)
+ ""
+ }
+ }
+}
diff --git a/app/src/main/java/org/openedx/app/data/storage/PreferencesManager.kt b/app/src/main/java/org/openedx/app/data/storage/PreferencesManager.kt
index 3c8ea881e..48b0d58a1 100644
--- a/app/src/main/java/org/openedx/app/data/storage/PreferencesManager.kt
+++ b/app/src/main/java/org/openedx/app/data/storage/PreferencesManager.kt
@@ -1,23 +1,49 @@
package org.openedx.app.data.storage
import android.content.Context
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.longPreferencesKey
+import androidx.datastore.preferences.core.stringPreferencesKey
+import androidx.datastore.preferences.preferencesDataStore
import com.google.gson.Gson
-import org.openedx.app.BuildConfig
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
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.CalendarType
import org.openedx.core.domain.model.VideoQuality
import org.openedx.core.domain.model.VideoSettings
import org.openedx.core.system.CalendarManager
+import org.openedx.core.system.notifier.app.AppNotifier
+import org.openedx.core.system.notifier.app.LogoutEvent
import org.openedx.course.data.storage.CoursePreferences
import org.openedx.foundation.extension.replaceSpace
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) :
+private val Context.dataStore: DataStore by preferencesDataStore(
+ name = "openedx_prefs",
+ produceMigrations = { context ->
+ listOf(SharedPrefsToDataStoreMigration(context))
+ }
+)
+
+class PreferencesManager(
+ private val context: Context,
+ private val appNotifier: AppNotifier,
+) :
CorePreferences,
ProfilePreferences,
WhatsNewPreferences,
@@ -25,219 +51,211 @@ class PreferencesManager(context: Context) :
CoursePreferences,
CalendarPreferences {
- private val sharedPreferences =
- context.getSharedPreferences(BuildConfig.APPLICATION_ID, Context.MODE_PRIVATE)
-
- private fun saveString(key: String, value: String) {
- sharedPreferences.edit().apply {
- putString(key, value)
- }.apply()
+ private val dataStore: DataStore
+ get() = context.dataStore
+
+ private val encryption = DataStoreEncryption()
+
+ private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+
+ @Volatile
+ private var isKeyInvalidated = false
+
+ private object Keys {
+ val ACCESS_TOKEN = stringPreferencesKey("access_token")
+ val REFRESH_TOKEN = stringPreferencesKey("refresh_token")
+ val PUSH_TOKEN = stringPreferencesKey("push_token")
+ val EXPIRES_IN = longPreferencesKey("expires_in")
+ val USER = stringPreferencesKey("user")
+ val ACCOUNT = stringPreferencesKey("account")
+ val VIDEO_SETTINGS_WIFI_DOWNLOAD_ONLY =
+ booleanPreferencesKey("video_settings_wifi_download_only")
+ val VIDEO_SETTINGS_STREAMING_QUALITY =
+ stringPreferencesKey("video_settings_streaming_quality")
+ val VIDEO_SETTINGS_DOWNLOAD_QUALITY =
+ stringPreferencesKey("video_settings_download_quality")
+ val APP_CONFIG = stringPreferencesKey("app_config")
+ val CAN_RESET_APP_DIRECTORY = booleanPreferencesKey("reset_app_directory")
+ val IS_RELATIVE_DATES_ENABLED = booleanPreferencesKey("is_relative_dates_enabled")
+ val CALENDAR_ID = longPreferencesKey("calendar_id")
+ val CALENDAR_USER = stringPreferencesKey("calendar_user")
+ val CALENDAR_TYPE = stringPreferencesKey("calendar_type")
+ val IS_CALENDAR_SYNC_ENABLED = booleanPreferencesKey("is_calendar_sync_enabled")
+ val IS_HIDE_INACTIVE_COURSES = booleanPreferencesKey("hide_inactive_courses")
+ val LAST_WHATS_NEW_VERSION = stringPreferencesKey("last_whats_new_version")
+ val LAST_REVIEW_VERSION = stringPreferencesKey("last_review_version")
+ val WAS_POSITIVE_RATED = booleanPreferencesKey("app_was_positive_rated")
+
+ fun calendarSyncDialogShown(courseName: String) =
+ booleanPreferencesKey("calendar_sync_dialog_${courseName.replaceSpace("_")}")
}
- private fun getString(key: String, defValue: String = ""): String {
- return sharedPreferences.getString(key, defValue) ?: defValue
- }
+ private fun getValue(key: Preferences.Key, defaultValue: T): T =
+ runBlocking(Dispatchers.IO) {
+ dataStore.data.map { it[key] ?: defaultValue }.first()
+ }
- private fun saveLong(key: String, value: Long) {
- sharedPreferences.edit().apply {
- putLong(key, value)
- }.apply()
+ private fun setValue(key: Preferences.Key, value: T) {
+ runBlocking(Dispatchers.IO) { dataStore.edit { it[key] = value } }
}
- private fun getLong(key: String, defValue: Long = 0): Long = sharedPreferences.getLong(key, defValue)
-
- private fun saveBoolean(key: String, value: Boolean) {
- sharedPreferences.edit().apply {
- putBoolean(key, value)
- }.apply()
+ private fun getEncryptedString(key: Preferences.Key, defaultValue: String): String {
+ val encrypted = if (!isKeyInvalidated) getValue(key, "") else ""
+ if (encrypted.isEmpty()) return defaultValue
+ val decrypted = encryption.decrypt(encrypted)
+ if (decrypted.isEmpty()) {
+ // Encrypted data exists but decryption failed — keystore likely invalidated.
+ // Clear corrupted data and force re-login.
+ isKeyInvalidated = true
+ scope.launch {
+ clearCorePreferences()
+ appNotifier.send(LogoutEvent(true))
+ }
+ }
+ return decrypted.ifEmpty { defaultValue }
}
- private fun getBoolean(key: String, defValue: Boolean = false): Boolean {
- return sharedPreferences.getBoolean(key, defValue)
+ private fun setEncryptedString(key: Preferences.Key, value: String) {
+ val encrypted = if (value.isEmpty()) "" else encryption.encrypt(value)
+ setValue(key, encrypted)
}
- override fun clearCorePreferences() {
- sharedPreferences.edit().apply {
- remove(ACCESS_TOKEN)
- remove(REFRESH_TOKEN)
- remove(USER)
- remove(ACCOUNT)
- remove(EXPIRES_IN)
- }.apply()
+ override suspend fun clearCorePreferences() {
+ dataStore.edit { prefs ->
+ prefs.remove(Keys.ACCESS_TOKEN)
+ prefs.remove(Keys.REFRESH_TOKEN)
+ prefs.remove(Keys.PUSH_TOKEN)
+ prefs.remove(Keys.EXPIRES_IN)
+ prefs.remove(Keys.USER)
+ prefs.remove(Keys.ACCOUNT)
+ }
}
- override fun clearCalendarPreferences() {
- sharedPreferences.edit().apply {
- remove(CALENDAR_ID)
- remove(IS_CALENDAR_SYNC_ENABLED)
- remove(HIDE_INACTIVE_COURSES)
- }.apply()
+ override suspend fun clearCalendarPreferences() {
+ dataStore.edit { prefs ->
+ prefs.remove(Keys.CALENDAR_ID)
+ prefs.remove(Keys.CALENDAR_TYPE)
+ prefs.remove(Keys.IS_CALENDAR_SYNC_ENABLED)
+ prefs.remove(Keys.IS_HIDE_INACTIVE_COURSES)
+ }
}
override var accessToken: String
- set(value) {
- saveString(ACCESS_TOKEN, value)
- }
- get() = getString(ACCESS_TOKEN)
+ get() = getEncryptedString(Keys.ACCESS_TOKEN, "")
+ set(value) = setEncryptedString(Keys.ACCESS_TOKEN, value)
override var refreshToken: String
- set(value) {
- saveString(REFRESH_TOKEN, value)
- }
- get() = getString(REFRESH_TOKEN)
+ get() = getEncryptedString(Keys.REFRESH_TOKEN, "")
+ set(value) = setEncryptedString(Keys.REFRESH_TOKEN, value)
override var pushToken: String
- set(value) {
- saveString(PUSH_TOKEN, value)
- }
- get() = getString(PUSH_TOKEN)
+ get() = getEncryptedString(Keys.PUSH_TOKEN, "")
+ set(value) = setEncryptedString(Keys.PUSH_TOKEN, value)
override var accessTokenExpiresAt: Long
- set(value) {
- saveLong(EXPIRES_IN, value)
- }
- get() = getLong(EXPIRES_IN)
-
- override var calendarId: Long
- set(value) {
- saveLong(CALENDAR_ID, value)
- }
- get() = getLong(CALENDAR_ID, CalendarManager.CALENDAR_DOES_NOT_EXIST)
+ get() = getValue(Keys.EXPIRES_IN, 0L)
+ set(value) = setValue(Keys.EXPIRES_IN, value)
override var user: User?
- set(value) {
- val userJson = Gson().toJson(value)
- saveString(USER, userJson)
- }
get() {
- val userString = getString(USER)
- return Gson().fromJson(userString, User::class.java)
- }
-
- override var profile: Account?
- set(value) {
- val accountJson = Gson().toJson(value)
- saveString(ACCOUNT, accountJson)
- }
- get() {
- val accountString = getString(ACCOUNT)
- return Gson().fromJson(accountString, Account::class.java)
+ val json = getEncryptedString(Keys.USER, "")
+ return if (json.isEmpty()) null else Gson().fromJson(json, User::class.java)
}
+ set(value) = setEncryptedString(Keys.USER, Gson().toJson(value))
override var videoSettings: VideoSettings
- set(value) {
- saveBoolean(VIDEO_SETTINGS_WIFI_DOWNLOAD_ONLY, value.wifiDownloadOnly)
- saveString(VIDEO_SETTINGS_STREAMING_QUALITY, value.videoStreamingQuality.name)
- saveString(VIDEO_SETTINGS_DOWNLOAD_QUALITY, value.videoDownloadQuality.name)
- }
get() {
- val wifiDownloadOnly = getBoolean(VIDEO_SETTINGS_WIFI_DOWNLOAD_ONLY, defValue = true)
- val streamingQualityString =
- getString(VIDEO_SETTINGS_STREAMING_QUALITY, defValue = VideoQuality.AUTO.name)
- val downloadQualityString =
- getString(VIDEO_SETTINGS_DOWNLOAD_QUALITY, defValue = VideoQuality.AUTO.name)
-
+ val wifiDownloadOnly = getValue(Keys.VIDEO_SETTINGS_WIFI_DOWNLOAD_ONLY, true)
+ val streamingQuality =
+ getValue(Keys.VIDEO_SETTINGS_STREAMING_QUALITY, VideoQuality.AUTO.name)
+ val downloadQuality =
+ getValue(Keys.VIDEO_SETTINGS_DOWNLOAD_QUALITY, VideoQuality.AUTO.name)
return VideoSettings(
wifiDownloadOnly = wifiDownloadOnly,
- videoStreamingQuality = VideoQuality.valueOf(streamingQualityString),
- videoDownloadQuality = VideoQuality.valueOf(downloadQualityString)
+ videoStreamingQuality = VideoQuality.valueOf(streamingQuality),
+ videoDownloadQuality = VideoQuality.valueOf(downloadQuality)
)
}
-
- override var appConfig: AppConfig
set(value) {
- val appConfigJson = Gson().toJson(value)
- saveString(APP_CONFIG, appConfigJson)
+ runBlocking(Dispatchers.IO) {
+ dataStore.edit { prefs ->
+ prefs[Keys.VIDEO_SETTINGS_WIFI_DOWNLOAD_ONLY] = value.wifiDownloadOnly
+ prefs[Keys.VIDEO_SETTINGS_STREAMING_QUALITY] = value.videoStreamingQuality.name
+ prefs[Keys.VIDEO_SETTINGS_DOWNLOAD_QUALITY] = value.videoDownloadQuality.name
+ }
+ }
}
+
+ override var appConfig: AppConfig
get() {
- val appConfigString = getString(APP_CONFIG, getDefaultAppConfig())
- return Gson().fromJson(appConfigString, AppConfig::class.java)
+ val json = getValue(Keys.APP_CONFIG, Gson().toJson(AppConfig()))
+ return Gson().fromJson(json, AppConfig::class.java)
}
+ set(value) = setValue(Keys.APP_CONFIG, Gson().toJson(value))
- private fun getDefaultAppConfig() = Gson().toJson(AppConfig())
+ override var canResetAppDirectory: Boolean
+ get() = getValue(Keys.CAN_RESET_APP_DIRECTORY, true)
+ set(value) = setValue(Keys.CAN_RESET_APP_DIRECTORY, value)
- override var lastWhatsNewVersion: String
- set(value) {
- saveString(LAST_WHATS_NEW_VERSION, value)
+ override var isRelativeDatesEnabled: Boolean
+ get() = getValue(Keys.IS_RELATIVE_DATES_ENABLED, true)
+ set(value) = setValue(Keys.IS_RELATIVE_DATES_ENABLED, value)
+
+ override var profile: Account?
+ get() {
+ val json = getEncryptedString(Keys.ACCOUNT, "")
+ return if (json.isEmpty()) null else Gson().fromJson(json, Account::class.java)
}
- get() = getString(LAST_WHATS_NEW_VERSION)
+ set(value) = setEncryptedString(Keys.ACCOUNT, Gson().toJson(value))
+
+ override var lastWhatsNewVersion: String
+ get() = getValue(Keys.LAST_WHATS_NEW_VERSION, "")
+ set(value) = setValue(Keys.LAST_WHATS_NEW_VERSION, value)
override var lastReviewVersion: InAppReviewPreferences.VersionName
- set(value) {
- val versionNameJson = Gson().toJson(value)
- saveString(LAST_REVIEW_VERSION, versionNameJson)
- }
get() {
- val versionNameString = getString(LAST_REVIEW_VERSION)
- return Gson().fromJson(
- versionNameString,
- InAppReviewPreferences.VersionName::class.java
- )
- ?: InAppReviewPreferences.VersionName.default
+ val json = getValue(Keys.LAST_REVIEW_VERSION, "")
+ return if (json.isEmpty()) {
+ InAppReviewPreferences.VersionName.default
+ } else {
+ Gson().fromJson(json, InAppReviewPreferences.VersionName::class.java)
+ ?: InAppReviewPreferences.VersionName.default
+ }
}
+ set(value) = setValue(Keys.LAST_REVIEW_VERSION, Gson().toJson(value))
override var wasPositiveRated: Boolean
- set(value) {
- saveBoolean(APP_WAS_POSITIVE_RATED, value)
- }
- get() = getBoolean(APP_WAS_POSITIVE_RATED)
+ get() = getValue(Keys.WAS_POSITIVE_RATED, false)
+ set(value) = setValue(Keys.WAS_POSITIVE_RATED, value)
- override var canResetAppDirectory: Boolean
- set(value) {
- saveBoolean(RESET_APP_DIRECTORY, value)
- }
- 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 calendarId: Long
+ get() = getValue(Keys.CALENDAR_ID, CalendarManager.CALENDAR_DOES_NOT_EXIST)
+ set(value) = setValue(Keys.CALENDAR_ID, value)
override var calendarUser: String
- set(value) {
- saveString(CALENDAR_USER, value)
- }
- get() = getString(CALENDAR_USER)
+ get() = getValue(Keys.CALENDAR_USER, "")
+ set(value) = setValue(Keys.CALENDAR_USER, value)
- override var isRelativeDatesEnabled: Boolean
- set(value) {
- saveBoolean(IS_RELATIVE_DATES_ENABLED, value)
+ override var calendarType: CalendarType
+ get() {
+ val stored = getValue(Keys.CALENDAR_TYPE, CalendarType.LOCAL.name)
+ return runCatching { CalendarType.valueOf(stored) }.getOrDefault(CalendarType.LOCAL)
}
- get() = getBoolean(IS_RELATIVE_DATES_ENABLED, true)
+ set(value) = setValue(Keys.CALENDAR_TYPE, value.name)
+
+ override var isCalendarSyncEnabled: Boolean
+ get() = getValue(Keys.IS_CALENDAR_SYNC_ENABLED, true)
+ set(value) = setValue(Keys.IS_CALENDAR_SYNC_ENABLED, value)
override var isHideInactiveCourses: Boolean
- set(value) {
- saveBoolean(HIDE_INACTIVE_COURSES, value)
- }
- get() = getBoolean(HIDE_INACTIVE_COURSES, true)
+ get() = getValue(Keys.IS_HIDE_INACTIVE_COURSES, true)
+ set(value) = setValue(Keys.IS_HIDE_INACTIVE_COURSES, value)
override fun setCalendarSyncEventsDialogShown(courseName: String) {
- saveBoolean(courseName.replaceSpace("_"), true)
+ setValue(Keys.calendarSyncDialogShown(courseName), true)
}
- override fun isCalendarSyncEventsDialogShown(courseName: String): Boolean =
- getBoolean(courseName.replaceSpace("_"))
-
- companion object {
- private const val ACCESS_TOKEN = "access_token"
- private const val REFRESH_TOKEN = "refresh_token"
- private const val PUSH_TOKEN = "push_token"
- private const val EXPIRES_IN = "expires_in"
- private const val USER = "user"
- private const val ACCOUNT = "account"
- private const val LAST_WHATS_NEW_VERSION = "last_whats_new_version"
- private const val LAST_REVIEW_VERSION = "last_review_version"
- private const val APP_WAS_POSITIVE_RATED = "app_was_positive_rated"
- private const val VIDEO_SETTINGS_WIFI_DOWNLOAD_ONLY = "video_settings_wifi_download_only"
- 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 IS_RELATIVE_DATES_ENABLED = "IS_RELATIVE_DATES_ENABLED"
- private const val HIDE_INACTIVE_COURSES = "HIDE_INACTIVE_COURSES"
- private const val CALENDAR_USER = "CALENDAR_USER"
+ override fun isCalendarSyncEventsDialogShown(courseName: String): Boolean {
+ return getValue(Keys.calendarSyncDialogShown(courseName), false)
}
}
diff --git a/app/src/main/java/org/openedx/app/data/storage/SharedPrefsToDataStoreMigration.kt b/app/src/main/java/org/openedx/app/data/storage/SharedPrefsToDataStoreMigration.kt
new file mode 100644
index 000000000..2d5b6a805
--- /dev/null
+++ b/app/src/main/java/org/openedx/app/data/storage/SharedPrefsToDataStoreMigration.kt
@@ -0,0 +1,149 @@
+package org.openedx.app.data.storage
+
+import android.content.Context
+import android.content.SharedPreferences
+import androidx.datastore.core.DataMigration
+import androidx.datastore.preferences.core.MutablePreferences
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.longPreferencesKey
+import androidx.datastore.preferences.core.stringPreferencesKey
+import org.openedx.app.BuildConfig
+
+class SharedPrefsToDataStoreMigration(
+ private val context: Context,
+) : DataMigration {
+
+ private fun getOldPrefs(): SharedPreferences =
+ context.getSharedPreferences(BuildConfig.APPLICATION_ID, Context.MODE_PRIVATE)
+
+ override suspend fun shouldMigrate(currentData: Preferences): Boolean =
+ getOldPrefs().all.isNotEmpty()
+
+ override suspend fun migrate(currentData: Preferences): Preferences {
+ val oldPrefs = getOldPrefs()
+ val encryption = DataStoreEncryption()
+
+ return currentData.toMutablePreferences().apply {
+ migrateEncryptedStrings(oldPrefs, encryption)
+ migrateLongs(oldPrefs)
+ migrateStrings(oldPrefs)
+ migrateBooleans(oldPrefs)
+ }
+ }
+
+ private fun MutablePreferences.migrateEncryptedStrings(
+ oldPrefs: SharedPreferences,
+ encryption: DataStoreEncryption,
+ ) {
+ val key = ::stringPreferencesKey
+ oldPrefs.migrateEncrypted(this, encryption, "access_token", key("access_token"))
+ oldPrefs.migrateEncrypted(this, encryption, "refresh_token", key("refresh_token"))
+ oldPrefs.migrateEncrypted(this, encryption, "push_token", key("push_token"))
+ oldPrefs.migrateEncrypted(this, encryption, "user", key("user"))
+ oldPrefs.migrateEncrypted(this, encryption, "account", key("account"))
+ }
+
+ private fun MutablePreferences.migrateLongs(oldPrefs: SharedPreferences) {
+ val key = ::longPreferencesKey
+ oldPrefs.migrateLong(this, "expires_in", key("expires_in"))
+ oldPrefs.migrateLong(this, "CALENDAR_ID", key("calendar_id"))
+ }
+
+ private fun MutablePreferences.migrateStrings(oldPrefs: SharedPreferences) {
+ val key = ::stringPreferencesKey
+ oldPrefs.migrateString(
+ this,
+ "video_settings_streaming_quality",
+ key("video_settings_streaming_quality")
+ )
+ oldPrefs.migrateString(
+ this,
+ "video_settings_download_quality",
+ key("video_settings_download_quality")
+ )
+ oldPrefs.migrateString(this, "app_config", key("app_config"))
+ oldPrefs.migrateString(this, "last_whats_new_version", key("last_whats_new_version"))
+ oldPrefs.migrateString(this, "last_review_version", key("last_review_version"))
+ oldPrefs.migrateString(this, "CALENDAR_USER", key("calendar_user"))
+ }
+
+ private fun MutablePreferences.migrateBooleans(oldPrefs: SharedPreferences) {
+ val key = ::booleanPreferencesKey
+ oldPrefs.migrateBoolean(
+ this,
+ "video_settings_wifi_download_only",
+ key("video_settings_wifi_download_only"),
+ true,
+ )
+ oldPrefs.migrateBoolean(
+ this,
+ "reset_app_directory",
+ key("reset_app_directory"),
+ true,
+ )
+ oldPrefs.migrateBoolean(
+ this,
+ "app_was_positive_rated",
+ key("app_was_positive_rated"),
+ )
+ oldPrefs.migrateBoolean(
+ this,
+ "IS_RELATIVE_DATES_ENABLED",
+ key("is_relative_dates_enabled"),
+ true,
+ )
+ oldPrefs.migrateBoolean(
+ this,
+ "IS_CALENDAR_SYNC_ENABLED",
+ key("is_calendar_sync_enabled"),
+ true,
+ )
+ oldPrefs.migrateBoolean(
+ this,
+ "HIDE_INACTIVE_COURSES",
+ key("hide_inactive_courses"),
+ true,
+ )
+ }
+
+ override suspend fun cleanUp() {
+ getOldPrefs().edit().clear().commit()
+ }
+
+ private fun SharedPreferences.migrateEncrypted(
+ prefs: MutablePreferences,
+ encryption: DataStoreEncryption,
+ oldKey: String,
+ newKey: Preferences.Key,
+ ) {
+ getString(oldKey, null)?.takeIf { it.isNotEmpty() }?.let {
+ prefs[newKey] = encryption.encrypt(it)
+ }
+ }
+
+ private fun SharedPreferences.migrateString(
+ prefs: MutablePreferences,
+ oldKey: String,
+ newKey: Preferences.Key,
+ ) {
+ getString(oldKey, null)?.let { prefs[newKey] = it }
+ }
+
+ private fun SharedPreferences.migrateLong(
+ prefs: MutablePreferences,
+ oldKey: String,
+ newKey: Preferences.Key,
+ ) {
+ if (contains(oldKey)) prefs[newKey] = getLong(oldKey, 0L)
+ }
+
+ private fun SharedPreferences.migrateBoolean(
+ prefs: MutablePreferences,
+ oldKey: String,
+ newKey: Preferences.Key,
+ defValue: Boolean = false,
+ ) {
+ if (contains(oldKey)) prefs[newKey] = getBoolean(oldKey, defValue)
+ }
+}
diff --git a/app/src/main/java/org/openedx/app/deeplink/DeepLinkRouter.kt b/app/src/main/java/org/openedx/app/deeplink/DeepLinkRouter.kt
index 2192a6b89..32d8ed20e 100644
--- a/app/src/main/java/org/openedx/app/deeplink/DeepLinkRouter.kt
+++ b/app/src/main/java/org/openedx/app/deeplink/DeepLinkRouter.kt
@@ -212,7 +212,9 @@ class DeepLinkRouter(
fm = fm,
courseId = courseId,
courseTitle = "",
- openTab = "VIDEOS"
+ openTab = "VIDEOS",
+ resumeBlockId = "",
+
)
}
}
@@ -223,7 +225,8 @@ class DeepLinkRouter(
fm = fm,
courseId = courseId,
courseTitle = "",
- openTab = "DATES"
+ openTab = "DATES",
+ resumeBlockId = "",
)
}
}
@@ -234,7 +237,8 @@ class DeepLinkRouter(
fm = fm,
courseId = courseId,
courseTitle = "",
- openTab = "DISCUSSIONS"
+ openTab = "DISCUSSIONS",
+ resumeBlockId = "",
)
}
}
@@ -245,7 +249,8 @@ class DeepLinkRouter(
fm = fm,
courseId = courseId,
courseTitle = "",
- openTab = "MORE"
+ openTab = "MORE",
+ resumeBlockId = "",
)
}
}
diff --git a/app/src/main/java/org/openedx/app/deeplink/HomeTab.kt b/app/src/main/java/org/openedx/app/deeplink/HomeTab.kt
index ce72703ad..e687f1589 100644
--- a/app/src/main/java/org/openedx/app/deeplink/HomeTab.kt
+++ b/app/src/main/java/org/openedx/app/deeplink/HomeTab.kt
@@ -4,6 +4,7 @@ enum class HomeTab {
LEARN,
PROGRAMS,
DISCOVER,
+ DATES,
DOWNLOADS,
PROFILE
}
diff --git a/app/src/main/java/org/openedx/app/di/AppModule.kt b/app/src/main/java/org/openedx/app/di/AppModule.kt
index cdb240387..267b73432 100644
--- a/app/src/main/java/org/openedx/app/di/AppModule.kt
+++ b/app/src/main/java/org/openedx/app/di/AppModule.kt
@@ -23,7 +23,6 @@ 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.BrowserAuthHelper
import org.openedx.auth.presentation.sso.FacebookAuthHelper
import org.openedx.auth.presentation.sso.GoogleAuthHelper
import org.openedx.auth.presentation.sso.MicrosoftAuthHelper
@@ -65,6 +64,8 @@ import org.openedx.course.utils.ImageProcessor
import org.openedx.course.worker.OfflineProgressSyncScheduler
import org.openedx.dashboard.presentation.DashboardAnalytics
import org.openedx.dashboard.presentation.DashboardRouter
+import org.openedx.dates.presentation.DatesAnalytics
+import org.openedx.dates.presentation.DatesRouter
import org.openedx.discovery.presentation.DiscoveryAnalytics
import org.openedx.discovery.presentation.DiscoveryRouter
import org.openedx.discussion.presentation.DiscussionAnalytics
@@ -86,7 +87,7 @@ import org.openedx.core.DatabaseManager as IDatabaseManager
val appModule = module {
single { Config(get()) }
- single { PreferencesManager(get()) }
+ single { PreferencesManager(get(), get()) }
single { get() }
single { get() }
single { get() }
@@ -131,6 +132,7 @@ val appModule = module {
single { DeepLinkRouter(get(), get(), get(), get(), get(), get()) }
single { get() }
single { get() }
+ single { get() }
single { NetworkConnection(get()) }
@@ -177,6 +179,11 @@ val appModule = module {
room.calendarDao()
}
+ single {
+ val room = get()
+ room.datesDao()
+ }
+
single {
FileDownloader()
}
@@ -209,13 +216,13 @@ val appModule = module {
single { get() }
single { get() }
single { get() }
+ single { get() }
single { get() }
factory { AgreementProvider(get(), get()) }
factory { FacebookAuthHelper() }
factory { GoogleAuthHelper(get()) }
factory { MicrosoftAuthHelper() }
- factory { BrowserAuthHelper(get()) }
factory { OAuthHelper(get(), get(), get()) }
factory { VideoPreviewHelper(get(), get()) }
diff --git a/app/src/main/java/org/openedx/app/di/ScreenModule.kt b/app/src/main/java/org/openedx/app/di/ScreenModule.kt
index 1d3604050..1799dafc6 100644
--- a/app/src/main/java/org/openedx/app/di/ScreenModule.kt
+++ b/app/src/main/java/org/openedx/app/di/ScreenModule.kt
@@ -1,6 +1,7 @@
package org.openedx.app.di
-import org.koin.androidx.viewmodel.dsl.viewModel
+import android.content.res.Resources
+import org.koin.core.module.dsl.viewModel
import org.koin.core.qualifier.named
import org.koin.dsl.module
import org.openedx.app.AppViewModel
@@ -42,6 +43,9 @@ import org.openedx.courses.presentation.DashboardGalleryViewModel
import org.openedx.dashboard.data.repository.DashboardRepository
import org.openedx.dashboard.domain.interactor.DashboardInteractor
import org.openedx.dashboard.presentation.DashboardListViewModel
+import org.openedx.dates.data.repository.DatesRepository
+import org.openedx.dates.domain.interactor.DatesInteractor
+import org.openedx.dates.presentation.dates.DatesViewModel
import org.openedx.discovery.data.repository.DiscoveryRepository
import org.openedx.discovery.domain.interactor.DiscoveryInteractor
import org.openedx.discovery.presentation.NativeDiscoveryViewModel
@@ -84,19 +88,20 @@ val screenModule = module {
viewModel {
AppViewModel(
- get(),
- get(),
- get(),
- get(),
- get(named("IODispatcher")),
- get(),
- get(),
- get(),
- get(),
- get(),
+ config = get(),
+ appNotifier = get(),
+ room = get(),
+ preferencesManager = get(),
+ dispatcher = get(named("IODispatcher")),
+ analytics = get(),
+ deepLinkRouter = get(),
+ fileUtil = get(),
+ downloadNotifier = get(),
+ context = get(),
+ resourceManager = get(),
)
}
- viewModel { MainViewModel(get(), get(), get(), get()) }
+ viewModel { MainViewModel(get(), get(), get(), get(), get()) }
factory { AuthRepository(get(), get(), get()) }
factory { AuthInteractor(get()) }
@@ -112,7 +117,8 @@ val screenModule = module {
)
}
- viewModel { (courseId: String?, infoType: String?, authCode: String) ->
+ val lang = Resources.getSystem().configuration.locales[0].language
+ viewModel { (courseId: String?, infoType: String?) ->
SignInViewModel(
get(),
get(),
@@ -130,7 +136,8 @@ val screenModule = module {
get(),
courseId,
infoType,
- authCode,
+ lang,
+ get()
)
}
@@ -156,20 +163,30 @@ val screenModule = module {
viewModel { DashboardListViewModel(get(), get(), get(), get(), get(), get()) }
viewModel { (windowSize: WindowSize) ->
DashboardGalleryViewModel(
- get(),
- get(),
- get(),
- get(),
- get(),
- get(),
- get(),
- get(),
- windowSize
+ config = get(),
+ interactor = get(),
+ resourceManager = get(),
+ discoveryNotifier = get(),
+ networkConnection = get(),
+ fileUtil = get(),
+ dashboardRouter = get(),
+ corePreferences = get(),
+ windowSize = windowSize
+ )
+ }
+ viewModel {
+ AllEnrolledCoursesViewModel(
+ config = get(),
+ networkConnection = get(),
+ interactor = get(),
+ resourceManager = get(),
+ discoveryNotifier = get(),
+ analytics = get(),
+ dashboardRouter = get(),
)
}
- viewModel { AllEnrolledCoursesViewModel(get(), get(), get(), get(), get(), get(), get()) }
viewModel { (openTab: String) ->
- LearnViewModel(openTab, get(), get(), get())
+ LearnViewModel(openTab, get(), get(), get(), get())
}
factory { DiscoveryRepository(get(), get(), get()) }
@@ -177,13 +194,14 @@ val screenModule = module {
viewModel { NativeDiscoveryViewModel(get(), get(), get(), get(), get(), get()) }
viewModel { (querySearch: String) ->
WebViewDiscoveryViewModel(
- querySearch,
- get(),
- get(),
- get(),
- get(),
- get(),
- get(),
+ querySearch = querySearch,
+ appData = get(),
+ config = get(),
+ networkConnection = get(),
+ corePreferences = get(),
+ router = get(),
+ analytics = get(),
+ resourceManager = get(),
)
}
@@ -208,8 +226,16 @@ val screenModule = module {
account
)
}
- viewModel { VideoSettingsViewModel(get(), get(), get(), get()) }
- viewModel { (qualityType: String) -> VideoQualityViewModel(qualityType, get(), get(), get()) }
+ viewModel { VideoSettingsViewModel(get(), get(), get(), get(), get()) }
+ viewModel { (qualityType: String) ->
+ VideoQualityViewModel(
+ qualityType,
+ get(),
+ get(),
+ get(),
+ get()
+ )
+ }
viewModel { DeleteProfileViewModel(get(), get(), get(), get(), get()) }
viewModel { (username: String) -> AnothersProfileViewModel(get(), get(), username) }
viewModel {
@@ -227,11 +253,19 @@ val screenModule = module {
get(),
)
}
- viewModel { ManageAccountViewModel(get(), get(), get(), get(), get()) }
- viewModel { CalendarViewModel(get(), get(), get(), get(), get(), get(), get(), get()) }
+ viewModel {
+ ManageAccountViewModel(
+ interactor = get(),
+ resourceManager = get(),
+ notifier = get(),
+ analytics = get(),
+ profileRouter = get(),
+ )
+ }
+ viewModel { CalendarViewModel(get(), get(), 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()) }
+ viewModel { DisableCalendarSyncDialogViewModel(get(), get(), get(), get(), get()) }
factory { CalendarRepository(get(), get(), get()) }
factory { CalendarInteractor(get()) }
@@ -309,6 +343,7 @@ val screenModule = module {
courseId,
courseTitle,
get(),
+ get(),
)
}
viewModel { (courseId: String, courseTitle: String) ->
@@ -352,30 +387,31 @@ val screenModule = module {
get(),
get(),
get(),
+ get(),
)
}
viewModel { (courseId: String) ->
CourseVideoViewModel(
- courseId,
- get(),
- get(),
- get(),
- get(),
- get(),
- get(),
- get(),
- get(),
- get(),
- get(),
- get(),
- get(),
- get(),
- get(),
- get(),
+ courseId = courseId,
+ config = get(),
+ interactor = get(),
+ resourceManager = get(),
+ networkConnection = get(),
+ preferencesManager = get(),
+ courseNotifier = get(),
+ downloadDialogManager = get(),
+ fileUtil = get(),
+ courseRouter = get(),
+ analytics = get(),
+ videoPreviewHelper = get(),
+ coreAnalytics = get(),
+ downloadDao = get(),
+ workerController = get(),
+ downloadHelper = get(),
)
}
- viewModel { (courseId: String) -> BaseVideoViewModel(courseId, get()) }
- viewModel { (courseId: String) -> VideoViewModel(courseId, get(), get(), get(), get()) }
+ viewModel { (courseId: String) -> BaseVideoViewModel(courseId, get(), get()) }
+ viewModel { (courseId: String) -> VideoViewModel(courseId, get(), get(), get(), get(), get()) }
viewModel { (courseId: String, videoUrl: String, blockId: String) ->
VideoUnitViewModel(
courseId,
@@ -385,7 +421,8 @@ val screenModule = module {
get(),
get(),
get(),
- get()
+ get(),
+ get(),
)
}
viewModel { (courseId: String, videoUrl: String, blockId: String) ->
@@ -400,35 +437,37 @@ val screenModule = module {
get(),
get(),
get(),
+ get()
)
}
viewModel { (courseId: String, enrollmentMode: String) ->
CourseDatesViewModel(
- courseId,
- enrollmentMode,
- get(),
- get(),
- get(),
- get(),
- get(),
- get(),
- get(),
- get(),
- get(),
- get(),
+ courseId = courseId,
+ enrollmentMode = enrollmentMode,
+ courseNotifier = get(),
+ interactor = get(),
+ courseAnalytics = get(),
+ config = get(),
+ calendarInteractor = get(),
+ calendarNotifier = get(),
+ corePreferences = get(),
+ courseRouter = get(),
+ calendarRouter = get(),
+ resourceManager = get(),
)
}
viewModel { (courseId: String, handoutsType: String) ->
HandoutsViewModel(
courseId,
handoutsType,
- get(),
- get(),
- get(),
+ config = get(),
+ interactor = get(),
+ courseAnalytics = get(),
+ resourceManager = get(),
)
}
viewModel { CourseSearchViewModel(get(), get(), get(), get(), get()) }
- viewModel { SelectDialogViewModel(get()) }
+ viewModel { SelectDialogViewModel(get(), get()) }
single { DiscussionRepository(get(), get(), get()) }
factory { DiscussionInteractor(get()) }
@@ -436,11 +475,11 @@ val screenModule = module {
DiscussionTopicsViewModel(
courseId,
courseTitle,
- get(),
- get(),
- get(),
- get(),
- get()
+ interactor = get(),
+ resourceManager = get(),
+ analytics = get(),
+ courseNotifier = get(),
+ discussionRouter = get(),
)
}
viewModel { (courseId: String, topicId: String, threadType: String) ->
@@ -488,6 +527,7 @@ val screenModule = module {
get(),
get(),
get(),
+ get(),
)
}
@@ -500,6 +540,7 @@ val screenModule = module {
get(),
get(),
get(),
+ get()
)
}
viewModel { (blockId: String, courseId: String) ->
@@ -512,10 +553,22 @@ val screenModule = module {
get(),
get(),
get(),
+ get()
)
}
- viewModel { ProgramViewModel(get(), get(), get(), get(), get(), get(), get(), get()) }
+ viewModel {
+ ProgramViewModel(
+ appData = get(),
+ config = get(),
+ networkConnection = get(),
+ router = get(),
+ notifier = get(),
+ edxCookieManager = get(),
+ resourceManager = get(),
+ interactor = get(),
+ )
+ }
viewModel { (courseId: String, courseTitle: String) ->
CourseOfflineViewModel(
@@ -530,6 +583,7 @@ val screenModule = module {
get(),
get(),
get(),
+ get(),
get()
)
}
@@ -537,7 +591,8 @@ val screenModule = module {
CourseProgressViewModel(
courseId,
get(),
- get()
+ get(),
+ get(),
)
}
@@ -559,19 +614,19 @@ val screenModule = module {
downloadsRouter = get(),
networkConnection = get(),
interactor = get(),
+ downloadDialogManager = get(),
resourceManager = get(),
+ fileUtil = get(),
config = get(),
+ analytics = get(),
+ discoveryNotifier = get(),
+ courseNotifier = get(),
+ router = get(),
preferencesManager = get(),
coreAnalytics = get(),
downloadDao = get(),
workerController = get(),
downloadHelper = get(),
- downloadDialogManager = get(),
- fileUtil = get(),
- analytics = get(),
- discoveryNotifier = get(),
- courseNotifier = get(),
- router = get()
)
}
viewModel { (courseId: String) ->
@@ -583,4 +638,28 @@ val screenModule = module {
analytics = get()
)
}
+
+ factory {
+ DatesRepository(
+ api = get(),
+ dao = get(),
+ preferencesManager = get(),
+ )
+ }
+ factory {
+ DatesInteractor(
+ repository = get()
+ )
+ }
+ viewModel {
+ DatesViewModel(
+ datesRouter = get(),
+ networkConnection = get(),
+ resourceManager = get(),
+ datesInteractor = get(),
+ corePreferences = get(),
+ analytics = get(),
+ calendarSyncScheduler = get()
+ )
+ }
}
diff --git a/app/src/main/java/org/openedx/app/room/AppDatabase.kt b/app/src/main/java/org/openedx/app/room/AppDatabase.kt
index b2f275bb3..3a3316bd0 100644
--- a/app/src/main/java/org/openedx/app/room/AppDatabase.kt
+++ b/app/src/main/java/org/openedx/app/room/AppDatabase.kt
@@ -6,6 +6,7 @@ import androidx.room.RoomDatabase
import androidx.room.TypeConverters
import org.openedx.core.data.model.room.CourseCalendarEventEntity
import org.openedx.core.data.model.room.CourseCalendarStateEntity
+import org.openedx.core.data.model.room.CourseDateEntity
import org.openedx.core.data.model.room.CourseEnrollmentDetailsEntity
import org.openedx.core.data.model.room.CourseProgressEntity
import org.openedx.core.data.model.room.CourseStructureEntity
@@ -19,11 +20,12 @@ import org.openedx.core.module.db.DownloadDao
import org.openedx.core.module.db.DownloadModelEntity
import org.openedx.course.data.storage.CourseConverter
import org.openedx.dashboard.data.DashboardDao
+import org.openedx.dates.data.storage.DatesDao
import org.openedx.discovery.data.converter.DiscoveryConverter
import org.openedx.discovery.data.model.room.CourseEntity
import org.openedx.discovery.data.storage.DiscoveryDao
-const val DATABASE_VERSION = 5
+const val DATABASE_VERSION = 6
const val DATABASE_NAME = "OpenEdX_db"
@Suppress("MagicNumber")
@@ -38,6 +40,7 @@ const val DATABASE_NAME = "OpenEdX_db"
CourseCalendarStateEntity::class,
DownloadCoursePreview::class,
CourseEnrollmentDetailsEntity::class,
+ CourseDateEntity::class,
VideoProgressEntity::class,
CourseProgressEntity::class,
],
@@ -45,7 +48,8 @@ const val DATABASE_NAME = "OpenEdX_db"
AutoMigration(1, 2),
AutoMigration(2, 3),
AutoMigration(3, 4),
- AutoMigration(4, DATABASE_VERSION),
+ AutoMigration(4, 5),
+ AutoMigration(5, DATABASE_VERSION),
],
version = DATABASE_VERSION
)
@@ -55,5 +59,6 @@ abstract class AppDatabase : RoomDatabase() {
abstract fun courseDao(): CourseDao
abstract fun dashboardDao(): DashboardDao
abstract fun downloadDao(): DownloadDao
+ abstract fun datesDao(): DatesDao
abstract fun calendarDao(): CalendarDao
}
diff --git a/app/src/main/res/drawable/app_ic_dates_cloud_fill.xml b/app/src/main/res/drawable/app_ic_dates_cloud_fill.xml
new file mode 100644
index 000000000..a3fdccec3
--- /dev/null
+++ b/app/src/main/res/drawable/app_ic_dates_cloud_fill.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/app_ic_dates_cloud_outline.xml b/app/src/main/res/drawable/app_ic_dates_cloud_outline.xml
new file mode 100644
index 000000000..000fc5893
--- /dev/null
+++ b/app/src/main/res/drawable/app_ic_dates_cloud_outline.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/app_ic_dates_selector.xml b/app/src/main/res/drawable/app_ic_dates_selector.xml
new file mode 100644
index 000000000..9e20819bf
--- /dev/null
+++ b/app/src/main/res/drawable/app_ic_dates_selector.xml
@@ -0,0 +1,5 @@
+
+
+