Merge pull request #1993 from learningequality/release-v0.5.x

0.5 -> Develop

Author: rtibbles

kolibri/core/assets/src/state/actions.js

@@ -428,39 +428,53 @@ function saveLogs(store) {
   }
 }
 
+function fetchPoints(store) {
+  if (!getters.isSuperuser(store.state) && getters.isUserLoggedIn(store.state)) {
+    const userProgressModel = UserProgressResource.getModel(getters.currentUserId(store.state));
+    userProgressModel.fetch().then(progress => {
+      store.dispatch('SET_TOTAL_PROGRESS', progress.progress);
+    });
+  }
+}
+
 /**
- * Update the progress percentage
- * To be called periodically by content renderers on interval or on pause
- * Must be called after initContentSession
- * @param {float} progressPercent
- * @param {boolean} forceSave
+ * Helper function to handle common functionality between updateProgress and updateExerciseProgress
+ * @param  {VuexStore} store        The currently active Vuex store
+ * @param  {Number} sessionProgress The progress made in this session
+ * @param  {[type]} summaryProgress The progress made on this content overall
+ * @param {boolean} forceSave       Force saving of logs?
  */
-function updateProgress(store, progressPercent, forceSave = false) {
+function _updateProgress(store, sessionProgress, summaryProgress, forceSave = false) {
   /* Create aliases for logs */
   const summaryLog = store.state.core.logging.summary;
   const sessionLog = store.state.core.logging.session;
 
   /* Store original value to check if 100% reached this iteration */
   const originalProgress = summaryLog.progress;
 
-  /* Calculate progress based on progressPercent */
-  const sessionProgress = sessionLog.progress + progressPercent;
-  const summaryProgress = summaryLog.id
-    ? Math.min(1, summaryLog.progress_before_current_session + sessionProgress)
-    : 0;
-
   /* Update the logging state with new progress information */
   store.dispatch('SET_LOGGING_PROGRESS', sessionProgress, summaryProgress);
 
-  /* Determine if progress threshold has been met */
-  const progressThresholdMet =
-    sessionProgress - sessionLog.progress_at_last_save >= progressThreshold;
-
-  /* Mark completion time if 100% progress reached */
+  /* Mark completion time if 100% progress reached
+   * Also, increase totalProgress model to avoid a refetch from server
+   */
   const completedContent = originalProgress < 1 && summaryProgress === 1;
   if (completedContent) {
     store.dispatch('SET_LOGGING_COMPLETION_TIME', now());
+    if (!getters.isSuperuser(store.state) && getters.isUserLoggedIn(store.state)) {
+      const userProgressModel = UserProgressResource.getModel(getters.currentUserId(store.state));
+      // Fetch first to ensure we never accidentally have an undefined progress
+      userProgressModel.fetch().then(progress => {
+        userProgressModel.set({
+          progress: progress.progress + 1,
+        });
+      });
+      fetchPoints(store);
+    }
   }
+  /* Determine if progress threshold has been met */
+  const progressThresholdMet =
+    sessionProgress - sessionLog.progress_at_last_save >= progressThreshold;
 
   /* Save models if needed */
   if (forceSave || completedContent || progressThresholdMet) {
@@ -469,22 +483,34 @@ function updateProgress(store, progressPercent, forceSave = false) {
   return summaryProgress;
 }
 
+/**
+ * Update the progress percentage
+ * To be called periodically by content renderers on interval or on pause
+ * Must be called after initContentSession
+ * @param {float} progressPercent
+ * @param {boolean} forceSave
+ */
+function updateProgress(store, progressPercent, forceSave = false) {
+  /* Create aliases for logs */
+  const summaryLog = store.state.core.logging.summary;
+  const sessionLog = store.state.core.logging.session;
+
+  /* Calculate progress based on progressPercent */
+  // TODO rtibbles: Delegate this to the renderers?
+  const sessionProgress = sessionLog.progress + progressPercent;
+  const summaryProgress = summaryLog.id
+    ? Math.min(1, summaryLog.progress_before_current_session + sessionProgress)
+    : 0;
+
+  return _updateProgress(store, sessionProgress, summaryProgress, forceSave);
+}
+
 /**
 summary and session log progress update for exercise
 **/
 function updateExerciseProgress(store, progressPercent, forceSave = false) {
   /* Update the logging state with new progress information */
-  store.dispatch('SET_LOGGING_PROGRESS', progressPercent, progressPercent);
-
-  /* Mark completion time if 100% progress reached */
-  if (progressPercent === 1) {
-    store.dispatch('SET_LOGGING_COMPLETION_TIME', now());
-  }
-
-  /* Save models if needed */
-  if (forceSave || progressPercent === 1) {
-    saveLogs(store);
-  }
+  return _updateProgress(store, progressPercent, progressPercent, forceSave);
 }
 
 /**
@@ -702,15 +728,6 @@ function updateMasteryAttemptState(
   });
 }
 
-function fetchPoints(store) {
-  if (!getters.isSuperuser(store.state) && getters.isUserLoggedIn(store.state)) {
-    const userProgressModel = UserProgressResource.getModel(store.state.core.session.user_id);
-    userProgressModel.fetch().then(progress => {
-      store.dispatch('SET_TOTAL_PROGRESS', progress.progress);
-    });
-  }
-}
-
 export {
   handleError,
   handleApiError,

kolibri/core/assets/src/state/store.js

@@ -85,9 +85,6 @@ const mutations = {
   },
   SET_LOGGING_PROGRESS(state, sessionProgress, summaryProgress) {
     state.core.logging.session.progress = sessionProgress;
-    if (state.core.logging.summary.progress < 1.0 && summaryProgress >= 1.0) {
-      state.core.totalProgress += 1;
-    }
     state.core.logging.summary.progress = summaryProgress;
   },
   SET_LOGGING_COMPLETION_TIME(state, time) {

kolibri/plugins/learn/assets/src/views/content-page/index.vue

@@ -136,9 +136,42 @@
     },
     data: () => ({ wasIncomplete: false }),
     computed: {
+      /**
+        * Detects whether an Android device is using WebView.
+        * Based on https://developer.chrome.com/multidevice/user-agent#webview_user_agent
+        */
+      isAndroidWebView() {
+        const ua = window.navigator.userAgent;
+        const isAndroid = /Android/.test(ua);
+
+        if (isAndroid) {
+          const androidVersion = parseFloat(ua.match(/Android\s([0-9\.]*)/)[1]);
+          const isChrome = /Chrome/.test(ua);
+
+          // WebView UA in Lollipop and Above
+          // Android >=5.0
+          if (androidVersion >= 5.0 && isChrome && /wv/.test(ua)) {
+            return true;
+          }
+
+          // WebView UA in KitKat to Lollipop
+          // Android >= 4.4
+          if (androidVersion >= 4.4 && androidVersion < 5.0 && isChrome && /Version\//.test(ua)) {
+            return true;
+          }
+
+          // Old WebView UA
+          // Android < 4.4
+          if (androidVersion < 4.4 && /Version\//.test(ua) && /\/534.30/.test(ua)) {
+            return true;
+          }
+        }
+
+        return false;
+      },
       canDownload() {
         if (this.content) {
-          return this.content.kind !== ContentNodeKinds.EXERCISE;
+          return this.content.kind !== ContentNodeKinds.EXERCISE && !this.isAndroidWebView;
         }
         return false;
       },