fixed #49

TUM-Dev · Aug 18, 2014 · fa3c911 · fa3c911
1 parent e154794
commit fa3c911
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/app/src/main/java/de/tum/in/tumcampus/fragments/CafeteriaDetailsSectionFragment.java b/app/src/main/java/de/tum/in/tumcampus/fragments/CafeteriaDetailsSectionFragment.java
@@ -106,8 +106,7 @@ public boolean setViewValue(View view, Cursor cursor,
                 if (view.getId() == R.id.tx_menu) {
                     TextView menu = (TextView) view;
 
-                    String m = cursor.getString(cursor
-                            .getColumnIndex("names"));
+                    String m = cursor.getString(cursor.getColumnIndex("names"));
                     menu.setText(CafeteriaMenuCard.menuToSpan(CafeteriaDetailsSectionFragment.this.getActivity(),m));
                     return true;
                 } else if (view.getId() == R.id.tx_price) {

diff --git a/app/src/main/java/de/tum/in/tumcampus/models/managers/CafeteriaManager.java b/app/src/main/java/de/tum/in/tumcampus/models/managers/CafeteriaManager.java
@@ -154,14 +154,20 @@ public void onRequestCard(Context context) {
             downloadFromExternal(true);
         } catch (Exception e) {
             e.printStackTrace();
+            return;
         }
         CafeteriaMenuCard card = new CafeteriaMenuCard();
-        CafeteriaManager cafeteriaManager = new CafeteriaManager(context);
         CafeteriaMenuManager cmm = new CafeteriaMenuManager(context);
+        try {
+            cmm.downloadFromExternal(true);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return;
+        }
         SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
 
         // Get all available cafeterias from database
-        Cursor cursor = cafeteriaManager.getAllFromDb("% %");
+        Cursor cursor = getAllFromDb("% %");
         String cafeteriaId="", cafeteriaName = "";
 
         //TODO: Make selection of shown cafeteria more intelligent (use location, timetable)