Merge pull request #269 from pennlabs/fix-dining

adelq · adelq · commit 35a96dafe391 · 2015-09-11T19:35:35.000-04:00
Fix #258
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningFragment.java b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningFragment.java
@@ -110,7 +110,9 @@ public void call(final List<DiningHall> diningHalls) {
                             public void run() {
                                 DiningAdapter adapter = new DiningAdapter(mActivity, diningHalls);
                                 mListView.setAdapter(adapter);
-                                loadingPanel.setVisibility(View.GONE);
+                                if (loadingPanel != null) {
+                                    loadingPanel.setVisibility(View.GONE);
+                                }
                             }
                         });
                     }

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,9 @@ public void call(final List<DiningHall> diningHalls) {`
`110`	`110`	`public void run() {`
`111`	`111`	`DiningAdapter adapter = new DiningAdapter(mActivity, diningHalls);`
`112`	`112`	`mListView.setAdapter(adapter);`
`113`		`- loadingPanel.setVisibility(View.GONE);`
	`113`	`+ if (loadingPanel != null) {`
	`114`	`+ loadingPanel.setVisibility(View.GONE);`
	`115`	`+ }`
`114`	`116`	`}`
`115`	`117`	`});`
`116`	`118`	`}`