Merge branch 'master' of https://github.com/unstablebrainiac/IITB-App

app/src/main/java/app/insti/adapter/FeedAdapter.java

@@ -65,7 +65,7 @@ public class FeedAdapter extends RecyclerView.Adapter<FeedAdapter.ViewHolder> {
         if (timestamp != null) {
             Date Date = new Date(timestamp.getTime());
             SimpleDateFormat simpleDateFormatDate = new SimpleDateFormat("dd MMM");
-            SimpleDateFormat simpleDateFormatTime = new SimpleDateFormat("HH:mm a");
+            SimpleDateFormat simpleDateFormatTime = new SimpleDateFormat("HH:mm");
 
             subtitle += simpleDateFormatDate.format(Date) + " | " + simpleDateFormatTime.format(Date);
         }

app/src/main/java/app/insti/fragment/BodyFragment.java

@@ -132,17 +132,22 @@ public class BodyFragment extends BackHandledFragment {
         super.onStart();
 
         /* Initialize */
+        bodyDisplayed = false;
         appDatabase = AppDatabase.getAppDatabase(getContext());
         body = min_body;
         displayBody();
-        new getDbBody().execute(min_body.getBodyID());
 
-        updateBody();
+        /* Check if full body was passed */
+        if (min_body.getBodyDescription() == null) {
+            new getDbBody().execute(min_body.getBodyID());
+            updateBody();
+        }
 
         bodySwipeRefreshLayout = getActivity().findViewById(R.id.body_swipe_refresh_layout);
         bodySwipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
             @Override
             public void onRefresh() {
+                bodyDisplayed = false;
                 updateBody();
             }
         });

app/src/main/java/app/insti/fragment/EventFragment.java

@@ -151,7 +151,7 @@ public class EventFragment extends BackHandledFragment {
         Timestamp timestamp = event.getEventStartTime();
         Date Date = new Date(timestamp.getTime());
         SimpleDateFormat simpleDateFormatDate = new SimpleDateFormat("dd MMM");
-        SimpleDateFormat simpleDateFormatTime = new SimpleDateFormat("HH:mm a");
+        SimpleDateFormat simpleDateFormatTime = new SimpleDateFormat("HH:mm");
         eventDate.setText(simpleDateFormatDate.format(Date));
         eventTime.setText(simpleDateFormatTime.format(Date));
         StringBuilder eventVenueName = new StringBuilder();