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

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

@@ -14,6 +14,7 @@ import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.Calendar;
 
 
 import app.insti.ItemClickListener;
@@ -38,7 +39,7 @@ public class FeedAdapter extends RecyclerView.Adapter<FeedAdapter.ViewHolder> {
 
         Date startTime = currentEvent.getEventStartTime();
         Date endTime = currentEvent.getEventEndTime();
-        Date timeNow = currentEvent.getTimeNow();
+        Date timeNow = Calendar.getInstance().getTime();
         boolean eventStarted = timeNow.compareTo(startTime) > 0;
         boolean eventEnded = timeNow.compareTo(endTime) > 0;