fix: Handle multiple exceptions on CourseUnitNavigationActivity (#1766)

- Added temporary empty list checks UnitLists - handle onRestoreInstanceState. fixes: LEARNER-9264
openedx-unsupported · Mar 24, 2023 · 44ab1cc · 44ab1cc
1 parent c71282d
commit 44ab1cc
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/CourseBaseActivity.java b/OpenEdXMobile/src/main/java/org/edx/mobile/view/CourseBaseActivity.java
@@ -73,6 +73,12 @@ protected void onCreate(Bundle arg0) {
         restore(bundle);
     }
 
+    @Override
+    protected void onRestoreInstanceState(Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+        restore(savedInstanceState);
+    }
+
     @Override
     protected void onResume() {
         super.onResume();

diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/CourseUnitNavigationActivity.java b/OpenEdXMobile/src/main/java/org/edx/mobile/view/CourseUnitNavigationActivity.java
@@ -218,6 +218,9 @@ protected void onResume() {
 
     @Override
     public void navigatePreviousComponent() {
+        if (pagerAdapter.getItemCount() == 0) {
+            return;
+        }
         int index = pager2.getCurrentItem();
         if (index > 0) {
             pager2.setCurrentItem(index - 1);
@@ -226,6 +229,9 @@ public void navigatePreviousComponent() {
 
     @Override
     public void navigateNextComponent() {
+        if (pagerAdapter.getItemCount() == 0) {
+            return;
+        }
         int index = pager2.getCurrentItem();
         if (index < pagerAdapter.getItemCount() - 1) {
             pager2.setCurrentItem(index + 1);
@@ -316,6 +322,10 @@ private void setCurrentUnit(CourseComponent component) {
     }
 
     private void tryToUpdateForEndOfSequential() {
+        if (pagerAdapter.getItemCount() == 0) {
+            return;
+        }
+
         int curIndex = pager2.getCurrentItem();
         setCurrentUnit(pagerAdapter.getUnit(curIndex));
 
@@ -390,15 +400,13 @@ private void updateDataModel() {
         if (refreshCourse) {
             initAdapter();
         }
+        if (pagerAdapter != null)
+            pagerAdapter.notifyDataSetChanged();
 
         if (index >= 0) {
             pager2.setCurrentItem(index, false);
             tryToUpdateForEndOfSequential();
         }
-
-        if (pagerAdapter != null)
-            pagerAdapter.notifyDataSetChanged();
-
     }
 
     @Override