Merge branch 'dev' into beta

jguerinet · Feb 9, 2015 · 1b6dbed · 1b6dbed
2 parents 1e9c698 + ff64c28
commit 1b6dbed
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/MyMartlet/AndroidManifest.xml b/MyMartlet/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="ca.appvelopers.mcgillmobile"
-    android:versionCode="9"
+    android:versionCode="10"
     android:versionName="2.0" >
 
     <uses-sdk

diff --git a/MyMartlet/src/ca/appvelopers/mcgillmobile/fragment/ScheduleFragment.java b/MyMartlet/src/ca/appvelopers/mcgillmobile/fragment/ScheduleFragment.java
@@ -148,13 +148,7 @@ public View loadView(int orientation){
      * @return The starting date
      */
     private DateTime getStartingDate(){
-        //Clear the current course list, add the courses that are for this semester
-        mClassList.clear();
-        for(ClassItem classItem : App.getClasses()){
-            if(classItem.getTerm().equals(mTerm)){
-                mClassList.add(classItem);
-            }
-        }
+        fillClassList();
 
         //Date is by default set to today
         DateTime date = DateTime.now();
@@ -171,6 +165,19 @@ private DateTime getStartingDate(){
         return date;
     }
 
+    /**
+     * Fills the class list with the current term's classes
+     */
+    private void fillClassList(){
+        //Clear the current course list, add the courses that are for this semester
+        mClassList.clear();
+        for(ClassItem classItem : App.getClasses()){
+            if(classItem.getTerm().equals(mTerm)){
+                mClassList.add(classItem);
+            }
+        }
+    }
+
     //Downloads the list of classes for the given term
     private void executeClassDownloader(){
         new ClassDownloader(mActivity, mTerm){
@@ -196,6 +203,12 @@ protected void onPostExecute(Boolean loadInfo) {
     public List<ClassItem> getClassesForDate(Day day, DateTime date){
         List<ClassItem> courses = new ArrayList<ClassItem>();
 
+        //Make sure the class list is initialized
+        if(mClassList == null){
+            mClassList = new ArrayList<ClassItem>();
+            fillClassList();
+        }
+
         //Go through the list of courses, find which ones have the same day and are for the given date
         for(ClassItem course : mClassList){
             if(course.isForDate(date) && course.getDays().contains(day)){