diff --git a/SWADroid.apk b/SWADroid.apk index 2619baad..e2cf2949 100644 Binary files a/SWADroid.apk and b/SWADroid.apk differ diff --git a/src/es/ugr/swad/swadroid/SWADMain.java b/src/es/ugr/swad/swadroid/SWADMain.java index f054c608..567598d2 100644 --- a/src/es/ugr/swad/swadroid/SWADMain.java +++ b/src/es/ugr/swad/swadroid/SWADMain.java @@ -42,6 +42,7 @@ import android.widget.SimpleCursorAdapter; import android.widget.Spinner; import android.widget.TextView; import android.widget.Toast; +import es.ugr.swad.swadroid.Global; import es.ugr.swad.swadroid.model.Course; import es.ugr.swad.swadroid.model.DataBaseHelper; import es.ugr.swad.swadroid.model.Model; @@ -338,8 +339,8 @@ public class SWADMain extends MenuExpandableListActivity { private void createSpinnerAdapter(){ Spinner spinner = (Spinner) this.findViewById(R.id.spinner); - listCourses = dbHelper.getAllRows(Global.DB_TABLE_COURSES,"","name"); - dbCursor = dbHelper.getDb().getCursor(Global.DB_TABLE_COURSES,"","name"); + listCourses = dbHelper.getAllRows(Global.DB_TABLE_COURSES, null, "name"); + dbCursor = dbHelper.getDb().getCursor(Global.DB_TABLE_COURSES, null, "name"); startManagingCursor(dbCursor); if(listCourses.size() != 0){ SimpleCursorAdapter adapter = new SimpleCursorAdapter (this, @@ -407,7 +408,7 @@ public class SWADMain extends MenuExpandableListActivity { private void createMenu(){ Log.i(TAG, String.valueOf(Global.getSelectedCourseCode())); - if(listCourses != null){ + if(listCourses.size() != 0){ Course courseSelected; if(Global.getSelectedCourseCode()!=-1){ String where = "id="+String.valueOf(Global.getSelectedCourseCode()); diff --git a/src/es/ugr/swad/swadroid/model/DataBaseHelper.java b/src/es/ugr/swad/swadroid/model/DataBaseHelper.java index d1949d2a..a0ff05eb 100644 --- a/src/es/ugr/swad/swadroid/model/DataBaseHelper.java +++ b/src/es/ugr/swad/swadroid/model/DataBaseHelper.java @@ -242,11 +242,13 @@ public class DataBaseHelper { List rows = db.getEntityList(table, where, orderby); Model row; - Iterator iter = rows.iterator(); - while (iter.hasNext()) { - Entity ent = iter.next(); - row = createObjectByTable(table, ent); - result.add(row); + if (rows != null) { + Iterator iter = rows.iterator(); + while (iter.hasNext()) { + Entity ent = iter.next(); + row = createObjectByTable(table, ent); + result.add(row); + } } return result; diff --git a/src/es/ugr/swad/swadroid/model/package.html b/src/es/ugr/swad/swadroid/model/package.html new file mode 100644 index 00000000..305ad666 --- /dev/null +++ b/src/es/ugr/swad/swadroid/model/package.html @@ -0,0 +1,7 @@ + + + + +Contains classes for manipulate application model. + +