Fix potential crashing if changelog item doesn't have all fields

This commit is contained in:
Moez Bhatti
2015-12-06 18:11:32 -05:00
parent c0e31adda3
commit 5fccbd78db
2 changed files with 81 additions and 30 deletions
@@ -3,10 +3,10 @@ package com.moez.QKSMS.common;
import android.util.Log; import android.util.Log;
import com.android.volley.toolbox.StringRequest; import com.android.volley.toolbox.StringRequest;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.annotations.SerializedName;
import com.moez.QKSMS.BuildConfig; import com.moez.QKSMS.BuildConfig;
import com.moez.QKSMS.R; import com.moez.QKSMS.R;
import com.moez.QKSMS.data.Conversation; import com.moez.QKSMS.data.Conversation;
import com.moez.QKSMS.model.ChangeModel;
import com.moez.QKSMS.transaction.SmsHelper; import com.moez.QKSMS.transaction.SmsHelper;
import com.moez.QKSMS.ui.MainActivity; import com.moez.QKSMS.ui.MainActivity;
import com.moez.QKSMS.ui.base.QKActivity; import com.moez.QKSMS.ui.base.QKActivity;
@@ -17,7 +17,6 @@ import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator;
import java.util.Date; import java.util.Date;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
@@ -77,48 +76,50 @@ public class DialogHelper {
StringRequest request = new StringRequest(url, response -> { StringRequest request = new StringRequest(url, response -> {
Gson gson = new Gson(); Gson gson = new Gson();
Change[] changes = gson.fromJson(response, Change[].class); ChangeModel[] changes = gson.fromJson(response, ChangeModel[].class);
// Fill in the localized date strings, and the `Long` time so that we can sort them
SimpleDateFormat dateParser = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat dateParser = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat dateRevisionParser = new SimpleDateFormat("yyyy-MM-dd-'r'H"); // For multiple updates in a day SimpleDateFormat dateRevisionParser = new SimpleDateFormat("yyyy-MM-dd-'r'H"); // For multiple updates in a day
SimpleDateFormat dateFormatter = new SimpleDateFormat("MMMM d, yyyy"); SimpleDateFormat dateFormatter = new SimpleDateFormat("MMMM d, yyyy");
for (Change change : changes) { for (ChangeModel change : changes) {
try { try {
Date date; Date date;
if (change.date.length() > 11) { if (change.getDate().length() > 11) {
date = dateRevisionParser.parse(change.date); date = dateRevisionParser.parse(change.getDate());
} else { } else {
date = dateParser.parse(change.date); date = dateParser.parse(change.getDate());
} }
change.date = dateFormatter.format(date); change.setDate(dateFormatter.format(date));
change.dateLong = date.getTime(); change.setDateLong(date.getTime());
} catch (ParseException e) { } catch (ParseException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
Arrays.sort(changes, (lhs, rhs) -> Long.valueOf(rhs.dateLong).compareTo(lhs.dateLong)); Arrays.sort(changes, (lhs, rhs) -> Long.valueOf(rhs.getDateLong()).compareTo(lhs.getDateLong()));
// Only show changelogs for current and past versions
boolean currentVersionReached = false; boolean currentVersionReached = false;
ArrayList<String> versions = new ArrayList<>(); ArrayList<String> versions = new ArrayList<>();
ArrayList<String> dates = new ArrayList<>(); ArrayList<String> dates = new ArrayList<>();
ArrayList<String> changelists = new ArrayList<>(); ArrayList<String> changelists = new ArrayList<>();
for (Change change : changes) { for (ChangeModel change : changes) {
if (change.version.equals(BuildConfig.VERSION_NAME)) { if (change.getVersion().equals(BuildConfig.VERSION_NAME)) {
currentVersionReached = true; currentVersionReached = true;
} }
if (currentVersionReached) { if (currentVersionReached) {
versions.add(change.version); versions.add(change.getVersion());
dates.add(change.date); dates.add(change.getDate());
String changelist = ""; String changelist = "";
for (int i = 0; i < change.changes.size(); i++) { for (int i = 0; i < change.getChanges().size(); i++) {
String changeItem = change.changes.get(i); String changeItem = change.getChanges().get(i);
changelist += " • "; changelist += " • ";
changelist += changeItem; changelist += changeItem;
if (i < change.changes.size() - 1) { if (i < change.getChanges().size() - 1) {
changelist += "\n"; changelist += "\n";
} }
} }
@@ -144,17 +145,4 @@ public class DialogHelper {
context.getRequestQueue().add(request); context.getRequestQueue().add(request);
} }
private class Change implements Comparator<Long> {
@SerializedName("version_name") String version;
@SerializedName("release_date") String date;
@SerializedName("changes") ArrayList<String> changes;
long dateLong = 0;
@Override
public int compare(Long lhs, Long rhs) {
return lhs.compareTo(rhs);
}
}
} }
@@ -0,0 +1,63 @@
package com.moez.QKSMS.model;
import com.google.gson.annotations.SerializedName;
import java.util.ArrayList;
import java.util.Comparator;
public class ChangeModel implements Comparator<Long> {
@SerializedName("version_name") private String mVersion;
@SerializedName("release_date") private String mDate;
@SerializedName("changes") private ArrayList<String> mChanges;
long mDateLong = 0;
public String getVersion() {
if (mVersion == null) {
return "";
}
return mVersion;
}
public void setVersion(String version) {
mVersion = version;
}
public String getDate() {
if (mDate == null) {
return "";
}
return mDate;
}
public void setDate(String date) {
mDate = date;
}
public ArrayList<String> getChanges() {
if (mChanges == null) {
return new ArrayList<>();
}
return mChanges;
}
public void setChanges(ArrayList<String> changes) {
mChanges = changes;
}
public long getDateLong() {
return mDateLong;
}
public void setDateLong(long date) {
mDateLong = date;
}
@Override
public int compare(Long lhs, Long rhs) {
return lhs.compareTo(rhs);
}
}