Release Student 6.21.1 (245)

instructure · Dec 9, 2022 · 5a462b7 · 5a462b7
2 parents 0be501f + 212d5a4
commit 5a462b7
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 15 deletions.
diff --git a/apps/student/build.gradle b/apps/student/build.gradle
@@ -55,8 +55,8 @@ android {
         applicationId "com.instructure.candroid"
         minSdkVersion Versions.MIN_SDK
         targetSdkVersion Versions.TARGET_SDK
-        versionCode = 244
-        versionName = '6.21.0'
+        versionCode = 245
+        versionName = '6.21.1'
 
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true

diff --git a/...c/androidTest/java/com/instructure/student/ui/renderTests/TextSubmissionViewRenderTest.kt b/...c/androidTest/java/com/instructure/student/ui/renderTests/TextSubmissionViewRenderTest.kt
@@ -16,6 +16,7 @@
 package com.instructure.student.ui.renderTests
 
 import android.os.Build
+import com.instructure.canvas.espresso.Stub
 import com.instructure.student.espresso.StudentRenderTest
 import com.instructure.student.mobius.assignmentDetails.submissionDetails.content.TextSubmissionViewFragment
 import com.instructure.student.ui.pages.renderPages.TextSubmissionViewRenderPage
@@ -27,6 +28,7 @@ class TextSubmissionViewRenderTest : StudentRenderTest() {
 
     private val page = TextSubmissionViewRenderPage()
 
+    @Stub
     @Test
     fun displaysProgressBarPriorToLoading() {
         loadPageWithHtml("Sample Text")

diff --git a/apps/student/src/main/java/com/instructure/student/fragment/AssignmentBasicFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/AssignmentBasicFragment.kt
@@ -137,7 +137,7 @@ class AssignmentBasicFragment : ParentFragment() {
         }
 
         loadHtmlJob = assignmentWebViewWrapper.webView.loadHtmlWithIframes(requireContext(), description, {
-            assignmentWebViewWrapper.loadHtml(it, assignment.name)
+            assignmentWebViewWrapper?.loadHtml(it, assignment.name)
         }, {
             LtiLaunchFragment.routeLtiLaunchFragment(requireContext(), canvasContext, it)
         })

diff --git a/apps/student/src/main/java/com/instructure/student/fragment/AssignmentListFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/AssignmentListFragment.kt
@@ -215,10 +215,12 @@ class AssignmentListFragment : ParentFragment(), Bookmarkable {
                     backgroundColor = requireContext().getColor(R.color.backgroundInfo)
                 }
             }
-            if (filterPosition == 0) {
-                BadgeUtils.detachBadgeDrawable(badgeDrawable, toolbar, R.id.menu_filter_assignments)
-            } else {
-                BadgeUtils.attachBadgeDrawable(badgeDrawable!!, toolbar, R.id.menu_filter_assignments)
+            toolbar?.let {
+                if (filterPosition == 0) {
+                    BadgeUtils.detachBadgeDrawable(badgeDrawable, it, R.id.menu_filter_assignments)
+                } else {
+                    BadgeUtils.attachBadgeDrawable(badgeDrawable!!, it, R.id.menu_filter_assignments)
+                }
             }
         }, 100)
     }

diff --git a/apps/student/src/main/java/com/instructure/student/fragment/CalendarEventFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/CalendarEventFragment.kt
@@ -233,9 +233,9 @@ class CalendarEventFragment : ParentFragment() {
     }
 
     private fun loadCalendarHtml(html: String, contentDescription: String?) {
-        calendarEventWebViewWrapper.setVisible()
-        calendarEventWebViewWrapper.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.backgroundLightest))
-        calendarEventWebViewWrapper.loadHtml(html, contentDescription, baseUrl = scheduleItem?.htmlUrl)
+        calendarEventWebViewWrapper?.setVisible()
+        calendarEventWebViewWrapper?.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.backgroundLightest))
+        calendarEventWebViewWrapper?.loadHtml(html, contentDescription, baseUrl = scheduleItem?.htmlUrl)
     }
 
     private fun setUpCallback() {

diff --git a/apps/student/src/main/java/com/instructure/student/fragment/DiscussionDetailsFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/DiscussionDetailsFragment.kt
@@ -716,16 +716,18 @@ class DiscussionDetailsFragment : ParentFragment(), Bookmarkable {
     }
 
     private fun loadHTMLTopic(html: String, contentDescription: String?) {
-        setupHeaderWebView()
-        discussionTopicHeaderWebViewWrapper.loadHtml(html, contentDescription, baseUrl = discussionTopicHeader.htmlUrl)
+        if (discussionTopicHeaderWebViewWrapper != null) {
+            setupHeaderWebView()
+            discussionTopicHeaderWebViewWrapper.loadHtml(html, contentDescription, baseUrl = discussionTopicHeader.htmlUrl)
+        }
     }
 
     private fun loadDiscussionTopicViews(html: String) {
         discussionRepliesWebViewWrapper.setVisible()
         discussionProgressBar.setGone()
 
         loadHeaderHtmlJob = discussionRepliesWebViewWrapper.webView.loadHtmlWithIframes(requireContext(), html, {
-            discussionRepliesWebViewWrapper.loadDataWithBaseUrl(CanvasWebView.getReferrer(true), html, "text/html", "UTF-8", null)
+            discussionRepliesWebViewWrapper?.loadDataWithBaseUrl(CanvasWebView.getReferrer(true), html, "text/html", "UTF-8", null)
         })
 
         swipeRefreshLayout.isRefreshing = false

diff --git a/apps/student/src/main/java/com/instructure/student/fragment/PageDetailsFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/PageDetailsFragment.kt
@@ -204,7 +204,7 @@ class PageDetailsFragment : InternalWebviewFragment(), Bookmarkable {
 
             // Load the html with the helper function to handle iframe cases
             loadHtmlJob = canvasWebViewWrapper.webView.loadHtmlWithIframes(requireContext(), body, {
-                canvasWebViewWrapper.loadHtml(it, page.title, baseUrl = page.htmlUrl)
+                canvasWebViewWrapper?.loadHtml(it, page.title, baseUrl = page.htmlUrl)
             }) {
                 LtiLaunchFragment.routeLtiLaunchFragment(requireContext(), canvasContext, it)
             }

diff --git a/...rc/main/java/com/instructure/student/mobius/assignmentDetails/ui/AssignmentDetailsView.kt b/...rc/main/java/com/instructure/student/mobius/assignmentDetails/ui/AssignmentDetailsView.kt
@@ -233,7 +233,7 @@ class AssignmentDetailsView(
     }
 
     private fun loadDescriptionHtml(html: String, contentDescription: String?, baseUrl: String?) {
-        descriptionWebViewWrapper.loadHtml(html, contentDescription, baseUrl = baseUrl)
+        descriptionWebViewWrapper?.loadHtml(html, contentDescription, baseUrl = baseUrl)
     }
 
     private fun renderQuizDetails(quizDescriptionViewState: QuizDescriptionViewState) {