fix: NPE on accessing ProfileModel

- check user session before making API calls - logout in case user session is not available LEARNER-9223
openedx-unsupported · Feb 13, 2023 · 265fc86 · 265fc86
1 parent f908a2e
commit 265fc86
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 6 deletions.
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/module/prefs/LoginPrefs.java b/OpenEdXMobile/src/main/java/org/edx/mobile/module/prefs/LoginPrefs.java
@@ -186,7 +186,7 @@ public String getUsername() {
 
     @Nullable
     public String getUserEmail() {
-        return getCurrentUserProfile().email;
+        return isUserLoggedIn() ? getCurrentUserProfile().email : null;
     }
 
     @Nullable

diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/util/CalendarUtils.kt b/OpenEdXMobile/src/main/java/org/edx/mobile/util/CalendarUtils.kt
@@ -420,7 +420,7 @@ object CalendarUtils {
      */
     @JvmStatic
     fun getUserAccountForSync(environment: IEdxEnvironment): String {
-        return environment.loginPrefs.currentUserProfile.email ?: LOCAL_USER
+        return environment.loginPrefs.userEmail ?: LOCAL_USER
     }
 
     /**

diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/CourseBaseActivity.java b/OpenEdXMobile/src/main/java/org/edx/mobile/view/CourseBaseActivity.java
@@ -9,6 +9,7 @@
 import org.edx.mobile.base.BaseFragmentActivity;
 import org.edx.mobile.course.CourseAPI;
 import org.edx.mobile.databinding.ActivityCourseBaseBinding;
+import org.edx.mobile.event.LogoutEvent;
 import org.edx.mobile.http.notifications.FullScreenErrorNotification;
 import org.edx.mobile.interfaces.RefreshListener;
 import org.edx.mobile.model.api.CourseUpgradeResponse;
@@ -19,6 +20,7 @@
 import org.edx.mobile.services.CourseManager;
 import org.edx.mobile.view.common.MessageType;
 import org.edx.mobile.view.common.TaskProcessCallback;
+import org.greenrobot.eventbus.EventBus;
 
 import javax.inject.Inject;
 
@@ -110,6 +112,10 @@ protected void restore(Bundle savedInstanceState) {
      * Method to force update the course structure from server.
      */
     protected void updateCourseStructure(String courseId, String componentId) {
+        if (!environment.getLoginPrefs().isUserLoggedIn()) {
+            EventBus.getDefault().post(new LogoutEvent());
+            return;
+        }
         getHierarchyCall = courseApi.getCourseStructureWithoutStale(courseId);
         getHierarchyCall.enqueue(new CourseAPI.GetCourseStructureCallback(this, courseId,
                 new ProgressViewController(binding.loadingIndicator.loadingIndicator), errorNotification,
@@ -143,7 +149,7 @@ protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
         // If the data is available then trigger the callback
         // after basic initialization
-        if (courseComponentId != null) {
+        if (courseComponentId != null && environment.getLoginPrefs().isUserLoggedIn()) {
             onLoadData();
         }
     }
@@ -216,6 +222,10 @@ protected boolean isOnCourseOutline() {
     @Override
     public void onRefresh() {
         errorNotification.hideError();
+        if (!environment.getLoginPrefs().isUserLoggedIn()) {
+            EventBus.getDefault().post(new LogoutEvent());
+            return;
+        }
         if (isOnCourseOutline()) {
             if (getIntent() != null) {
                 restore(getIntent().getBundleExtra(Router.EXTRA_BUNDLE));

diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/CourseOutlineFragment.java b/OpenEdXMobile/src/main/java/org/edx/mobile/view/CourseOutlineFragment.java
@@ -44,6 +44,7 @@
 import org.edx.mobile.deeplink.ScreenDef;
 import org.edx.mobile.event.CourseDashboardRefreshEvent;
 import org.edx.mobile.event.CourseUpgradedEvent;
+import org.edx.mobile.event.LogoutEvent;
 import org.edx.mobile.event.MainDashboardRefreshEvent;
 import org.edx.mobile.event.MediaStatusChangeEvent;
 import org.edx.mobile.event.NetworkConnectivityChangeEvent;
@@ -412,7 +413,11 @@ private void fetchCourseComponent() {
         // Check if course data is available in persistable cache
         loadingIndicator.setVisibility(View.VISIBLE);
         // Prepare the loader. Either re-connect with an existing one or start a new one.
-        getLoaderManager().initLoader(0, null, this);
+        if (environment.getLoginPrefs().isUserLoggedIn()) {
+            getLoaderManager().initLoader(0, null, this);
+        } else {
+            EventBus.getDefault().post(new LogoutEvent());
+        }
     }
 
     private void trackAATestCourseOutline() {
@@ -461,6 +466,10 @@ public void onLoaderReset(Loader<AsyncTaskResult<CourseComponent>> loader) {
     }
 
     public void getCourseComponentFromServer(boolean showProgress, boolean forceRefresh) {
+        if (!environment.getLoginPrefs().isUserLoggedIn()) {
+            EventBus.getDefault().post(new LogoutEvent());
+            return;
+        }
         if (loadingIndicator.getVisibility() == View.VISIBLE) {
             showProgress = true;
         }
@@ -486,6 +495,9 @@ protected void onResponse(@NonNull final CourseComponent courseComponent) {
             @Override
             protected void onFailure(@NonNull Throwable error) {
                 super.onFailure(error);
+                if (!isAdded()) {
+                    return;
+                }
                 if (error instanceof CourseContentNotValidException) {
                     errorNotification.showError(getContext(), error);
                     logger.error(error, true);
@@ -992,7 +1004,7 @@ public void onRevisit() {
     }
 
     public void fetchLastAccessed() {
-        if (isOnCourseOutline && !isVideoMode) {
+        if (isOnCourseOutline && !isVideoMode && environment.getLoginPrefs().isUserLoggedIn()) {
             courseApi.getCourseStatusInfo(courseData.getCourseId()).enqueue(
                     new ErrorHandlingCallback<CourseComponentStatusResponse>(
                             getContextOrThrow()) {

diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/MyCoursesListFragment.kt b/OpenEdXMobile/src/main/java/org/edx/mobile/view/MyCoursesListFragment.kt
@@ -144,7 +144,10 @@ class MyCoursesListFragment : OfflineSupportBaseFragment(), RefreshListener {
             viewLifecycleOwner,
             NonNullObserver { enrolledCourses ->
                 populateCourseData(data = enrolledCourses)
-                if (environment.appFeaturesPrefs.isIAPEnabled(environment.loginPrefs.isOddUserId)) {
+                // Checking if the user is logged-in as we need userId to enable IAP
+                if (environment.loginPrefs.isUserLoggedIn &&
+                    environment.appFeaturesPrefs.isIAPEnabled(environment.loginPrefs.isOddUserId)
+                ) {
                     initInAppPurchaseSetup()
                     resetPurchase()
                     iapViewModel.detectUnfulfilledPurchase(

diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/viewModel/CourseViewModel.kt b/OpenEdXMobile/src/main/java/org/edx/mobile/viewModel/CourseViewModel.kt
@@ -5,6 +5,8 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import org.edx.mobile.core.IEdxEnvironment
+import org.edx.mobile.http.HttpStatus
+import org.edx.mobile.http.HttpStatusException
 import org.edx.mobile.http.model.NetworkResponseCallback
 import org.edx.mobile.http.model.Result
 import org.edx.mobile.logger.Logger
@@ -37,6 +39,10 @@ class CourseViewModel @Inject constructor(
         type: CoursesRequestType,
         showProgress: Boolean = true
     ) {
+        if (environment.loginPrefs.isUserLoggedIn.not()) {
+            _handleError.value = HttpStatusException(HttpStatus.UNAUTHORIZED, "")
+            return
+        }
         _showProgress.postValue(showProgress)
         courseRepository.fetchEnrolledCourses(
             type = type,