diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java index 7c52943d..4a7e4a00 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java @@ -3,10 +3,10 @@ package com.moez.QKSMS.common; import android.util.Log; import com.android.volley.toolbox.StringRequest; import com.google.gson.Gson; -import com.google.gson.annotations.SerializedName; import com.moez.QKSMS.BuildConfig; import com.moez.QKSMS.R; import com.moez.QKSMS.data.Conversation; +import com.moez.QKSMS.model.ChangeModel; import com.moez.QKSMS.transaction.SmsHelper; import com.moez.QKSMS.ui.MainActivity; import com.moez.QKSMS.ui.base.QKActivity; @@ -17,7 +17,6 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; -import java.util.Comparator; import java.util.Date; import java.util.HashSet; import java.util.Set; @@ -77,48 +76,50 @@ public class DialogHelper { StringRequest request = new StringRequest(url, response -> { 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 dateRevisionParser = new SimpleDateFormat("yyyy-MM-dd-'r'H"); // For multiple updates in a day SimpleDateFormat dateFormatter = new SimpleDateFormat("MMMM d, yyyy"); - for (Change change : changes) { + for (ChangeModel change : changes) { try { Date date; - if (change.date.length() > 11) { - date = dateRevisionParser.parse(change.date); + if (change.getDate().length() > 11) { + date = dateRevisionParser.parse(change.getDate()); } else { - date = dateParser.parse(change.date); + date = dateParser.parse(change.getDate()); } - change.date = dateFormatter.format(date); - change.dateLong = date.getTime(); + change.setDate(dateFormatter.format(date)); + change.setDateLong(date.getTime()); } catch (ParseException e) { 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; ArrayList versions = new ArrayList<>(); ArrayList dates = new ArrayList<>(); ArrayList changelists = new ArrayList<>(); - for (Change change : changes) { - if (change.version.equals(BuildConfig.VERSION_NAME)) { + for (ChangeModel change : changes) { + if (change.getVersion().equals(BuildConfig.VERSION_NAME)) { currentVersionReached = true; } if (currentVersionReached) { - versions.add(change.version); - dates.add(change.date); + versions.add(change.getVersion()); + dates.add(change.getDate()); String changelist = ""; - for (int i = 0; i < change.changes.size(); i++) { - String changeItem = change.changes.get(i); + for (int i = 0; i < change.getChanges().size(); i++) { + String changeItem = change.getChanges().get(i); changelist += " • "; changelist += changeItem; - if (i < change.changes.size() - 1) { + if (i < change.getChanges().size() - 1) { changelist += "\n"; } } @@ -144,17 +145,4 @@ public class DialogHelper { context.getRequestQueue().add(request); } - private class Change implements Comparator { - @SerializedName("version_name") String version; - @SerializedName("release_date") String date; - @SerializedName("changes") ArrayList changes; - - long dateLong = 0; - - @Override - public int compare(Long lhs, Long rhs) { - return lhs.compareTo(rhs); - } - } - } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/model/ChangeModel.java b/QKSMS/src/main/java/com/moez/QKSMS/model/ChangeModel.java new file mode 100644 index 00000000..decab010 --- /dev/null +++ b/QKSMS/src/main/java/com/moez/QKSMS/model/ChangeModel.java @@ -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 { + @SerializedName("version_name") private String mVersion; + @SerializedName("release_date") private String mDate; + @SerializedName("changes") private ArrayList 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 getChanges() { + if (mChanges == null) { + return new ArrayList<>(); + } + + return mChanges; + } + + public void setChanges(ArrayList 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); + } +}