Skip to content

I
InstiApp
You need to sign in or sign up before continuing.
Commit 1b4fadb0 authored by Varun Patil's avatar Varun Patil
Browse files
Options

Parse timestamps natively fornews and PT blogs 

Fixes crash on Marshmallow
parent bd38c2aa
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 55 deletions
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/adapter/NewsAdapter.java
View file @ 1b4fadb0
......@@ -54,21 +54,18 @@ public class NewsAdapter extends RecyclerView.Adapter<NewsAdapter.ViewHolder> {
NewsArticle article = newsArticles.get(position);
Markwon.setMarkdown(holder.articleTitle, article.getTitle());
holder.articleBody.setText(article.getBody().getBodyName());
try {
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.US);
Date publishedDate = dateFormat.parse(article.getPublished());
Calendar calendar = Calendar.getInstance();
calendar.setTime(publishedDate);
DateFormat displayFormat;
if (calendar.get(Calendar.YEAR) == Calendar.getInstance().get(Calendar.YEAR)) {
displayFormat = new SimpleDateFormat("EEE, MMM d, HH:mm", Locale.US);
} else {
displayFormat = new SimpleDateFormat("EEE, MMM d, ''yy, HH:mm", Locale.US);
}
holder.articlePublished.setText(displayFormat.format(publishedDate));
} catch (ParseException e) {
e.printStackTrace();
Date publishedDate = article.getPublished();
Calendar calendar = Calendar.getInstance();
calendar.setTime(publishedDate);
DateFormat displayFormat;
if (calendar.get(Calendar.YEAR) == Calendar.getInstance().get(Calendar.YEAR)) {
displayFormat = new SimpleDateFormat("EEE, MMM d, HH:mm", Locale.US);
} else {
displayFormat = new SimpleDateFormat("EEE, MMM d, ''yy, HH:mm", Locale.US);
}
holder.articlePublished.setText(displayFormat.format(publishedDate));
Markwon.setMarkdown(holder.articleContent, article.getContent());
}
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/adapter/PlacementBlogAdapter.java
View file @ 1b4fadb0
......@@ -51,21 +51,18 @@ public class PlacementBlogAdapter extends RecyclerView.Adapter<PlacementBlogAdap
public void onBindViewHolder(ViewHolder holder, int position) {
PlacementBlogPost post = posts.get(position);
Markwon.setMarkdown(holder.postTitle, post.getTitle());
try {
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.US);
Date publishedDate = dateFormat.parse(post.getPublished());
Calendar calendar = Calendar.getInstance();
calendar.setTime(publishedDate);
DateFormat displayFormat;
if (calendar.get(Calendar.YEAR) == Calendar.getInstance().get(Calendar.YEAR)) {
displayFormat = new SimpleDateFormat("EEE, MMM d, HH:mm", Locale.US);
} else {
displayFormat = new SimpleDateFormat("EEE, MMM d, ''yy, HH:mm", Locale.US);
}
holder.postPublished.setText(displayFormat.format(publishedDate));
} catch (ParseException e) {
holder.postPublished.setText(post.getPublished());
Date publishedDate = post.getPublished();
Calendar calendar = Calendar.getInstance();
calendar.setTime(publishedDate);
DateFormat displayFormat;
if (calendar.get(Calendar.YEAR) == Calendar.getInstance().get(Calendar.YEAR)) {
displayFormat = new SimpleDateFormat("EEE, MMM d, HH:mm", Locale.US);
} else {
displayFormat = new SimpleDateFormat("EEE, MMM d, ''yy, HH:mm", Locale.US);
}
holder.postPublished.setText(displayFormat.format(publishedDate));
Markwon.setMarkdown(holder.postContent, post.getContent());
}
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/adapter/TrainingBlogAdapter.java
View file @ 1b4fadb0
......@@ -51,21 +51,18 @@ public class TrainingBlogAdapter extends RecyclerView.Adapter<TrainingBlogAdapte
public void onBindViewHolder(ViewHolder holder, int position) {
TrainingBlogPost post = posts.get(position);
Markwon.setMarkdown(holder.postTitle, post.getTitle());
try {
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.US);
Date publishedDate = dateFormat.parse(post.getPublished());
Calendar calendar = Calendar.getInstance();
calendar.setTime(publishedDate);
DateFormat displayFormat;
if (calendar.get(Calendar.YEAR) == Calendar.getInstance().get(Calendar.YEAR)) {
displayFormat = new SimpleDateFormat("EEE, MMM d, HH:mm", Locale.US);
} else {
displayFormat = new SimpleDateFormat("EEE, MMM d, ''yy, HH:mm", Locale.US);
}
holder.postPublished.setText(displayFormat.format(publishedDate));
} catch (ParseException e) {
holder.postPublished.setText(post.getPublished());
Date publishedDate = post.getPublished();
Calendar calendar = Calendar.getInstance();
calendar.setTime(publishedDate);
DateFormat displayFormat;
if (calendar.get(Calendar.YEAR) == Calendar.getInstance().get(Calendar.YEAR)) {
displayFormat = new SimpleDateFormat("EEE, MMM d, HH:mm", Locale.US);
} else {
displayFormat = new SimpleDateFormat("EEE, MMM d, ''yy, HH:mm", Locale.US);
}
holder.postPublished.setText(displayFormat.format(publishedDate));
Markwon.setMarkdown(holder.postContent, post.getContent());
}
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/NewsArticle.java
View file @ 1b4fadb0
......@@ -6,7 +6,7 @@ import android.arch.persistence.room.PrimaryKey;
import com.google.gson.annotations.SerializedName;
import java.util.Map;
import java.sql.Timestamp;
@Entity(tableName = "news")
......@@ -33,13 +33,13 @@ public class NewsArticle {
@ColumnInfo(name = "published")
@SerializedName("published")
private String published;
private Timestamp published;
@ColumnInfo(name = "body")
@SerializedName("body")
private Body body;
public NewsArticle(String articleID, String link, String title, String content, String published, Body body) {
public NewsArticle(String articleID, String link, String title, String content, Timestamp published, Body body) {
this.articleID = articleID;
this.link = link;
this.title = title;
......@@ -80,11 +80,11 @@ public class NewsArticle {
this.content = content;
}
public String getPublished() {
public Timestamp getPublished() {
return published;
}
public void setPublished(String published) {
public void setPublished(Timestamp published) {
this.published = published;
}
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/PlacementBlogPost.java
View file @ 1b4fadb0
......@@ -6,6 +6,8 @@ import android.arch.persistence.room.PrimaryKey;
import com.google.gson.annotations.SerializedName;
import java.sql.Timestamp;
@Entity(tableName = "placementBlogPosts")
public class PlacementBlogPost {
......@@ -31,9 +33,9 @@ public class PlacementBlogPost {
@ColumnInfo(name = "published")
@SerializedName("published")
private String published;
private Timestamp published;
public PlacementBlogPost(String postID, String link, String title, String content, String published) {
public PlacementBlogPost(String postID, String link, String title, String content, Timestamp published) {
this.postID = postID;
this.link = link;
this.title = title;
......@@ -73,11 +75,11 @@ public class PlacementBlogPost {
this.content = content;
}
public String getPublished() {
public Timestamp getPublished() {
return published;
}
public void setPublished(String published) {
public void setPublished(Timestamp published) {
this.published = published;
}
}
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/TrainingBlogPost.java
View file @ 1b4fadb0
......@@ -6,6 +6,8 @@ import android.arch.persistence.room.PrimaryKey;
import com.google.gson.annotations.SerializedName;
import java.sql.Timestamp;
@Entity(tableName = "trainingBlogPosts")
public class TrainingBlogPost {
......@@ -31,9 +33,9 @@ public class TrainingBlogPost {
@ColumnInfo(name = "published")
@SerializedName("published")
private String published;
private Timestamp published;
public TrainingBlogPost(String postID, String link, String title, String content, String published) {
public TrainingBlogPost(String postID, String link, String title, String content, Timestamp published) {
this.postID = postID;
this.link = link;
this.title = title;
......@@ -73,11 +75,11 @@ public class TrainingBlogPost {
this.content = content;
}
public String getPublished() {
public Timestamp getPublished() {
return published;
}
public void setPublished(String published) {
public void setPublished(Timestamp published) {
this.published = published;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment