Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the same DateFormat for the DB and XML parsing, English locale

Browse Source
This commit is contained in:
Daniel Martí 2014-01-08 12:52:41 +01:00
parent fe41108ed6
commit 8411dd4f9c
4 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/org/fdroid/fdroid/DB.java
View File

@ -548,7 +548,8 @@ public class DB {
// The date format used for storing dates (e.g. lastupdated, added) in the // The date format used for storing dates (e.g. lastupdated, added) in the
// database. // database.
private SimpleDateFormat mDateFormat = new SimpleDateFormat("yyyy-MM-dd"); public static SimpleDateFormat dateFormat = new SimpleDateFormat(
"yyyy-MM-dd", Locale.ENGLISH);
private DB(Context ctx) { private DB(Context ctx) {
@ -740,10 +741,10 @@ public class DB {
app.curVercode = c.getInt(9); app.curVercode = c.getInt(9);
String sAdded = c.getString(10); String sAdded = c.getString(10);
app.added = (sAdded == null || sAdded.length() == 0) ? null app.added = (sAdded == null || sAdded.length() == 0) ? null
: mDateFormat.parse(sAdded); : dateFormat.parse(sAdded);
String sLastUpdated = c.getString(11); String sLastUpdated = c.getString(11);
app.lastUpdated = (sLastUpdated == null || sLastUpdated app.lastUpdated = (sLastUpdated == null || sLastUpdated
.length() == 0) ? null : mDateFormat .length() == 0) ? null : dateFormat
.parse(sLastUpdated); .parse(sLastUpdated);
app.compatible = c.getInt(12) == 1; app.compatible = c.getInt(12) == 1;
app.ignoreAllUpdates = c.getInt(13) == 1; app.ignoreAllUpdates = c.getInt(13) == 1;
@ -823,7 +824,7 @@ public class DB {
apk.minSdkVersion = c.getInt(6); apk.minSdkVersion = c.getInt(6);
String sApkAdded = c.getString(7); String sApkAdded = c.getString(7);
apk.added = (sApkAdded == null || sApkAdded.length() == 0) ? null apk.added = (sApkAdded == null || sApkAdded.length() == 0) ? null
: mDateFormat.parse(sApkAdded); : dateFormat.parse(sApkAdded);
apk.features = CommaSeparatedList.make(c.getString(8)); apk.features = CommaSeparatedList.make(c.getString(8));
apk.nativecode = CommaSeparatedList.make(c.getString(9)); apk.nativecode = CommaSeparatedList.make(c.getString(9));
apk.compatible = compatible; apk.compatible = compatible;
@ -1147,10 +1148,10 @@ public class DB {
values.put("dogecoinAddr", upapp.detail_dogecoinAddr); values.put("dogecoinAddr", upapp.detail_dogecoinAddr);
values.put("flattrID", upapp.detail_flattrID); values.put("flattrID", upapp.detail_flattrID);
values.put("added", values.put("added",
upapp.added == null ? "" : mDateFormat.format(upapp.added)); upapp.added == null ? "" : dateFormat.format(upapp.added));
values.put( values.put(
"lastUpdated", "lastUpdated",
upapp.added == null ? "" : mDateFormat upapp.added == null ? "" : dateFormat
.format(upapp.lastUpdated)); .format(upapp.lastUpdated));
values.put("curVersion", upapp.curVersion); values.put("curVersion", upapp.curVersion);
values.put("curVercode", upapp.curVercode); values.put("curVercode", upapp.curVercode);
@ -1195,7 +1196,7 @@ public class DB {
values.put("apkName", upapk.apkName); values.put("apkName", upapk.apkName);
values.put("minSdkVersion", upapk.minSdkVersion); values.put("minSdkVersion", upapk.minSdkVersion);
values.put("added", values.put("added",
upapk.added == null ? "" : mDateFormat.format(upapk.added)); upapk.added == null ? "" : dateFormat.format(upapk.added));
values.put("permissions", values.put("permissions",
CommaSeparatedList.str(upapk.detail_permissions)); CommaSeparatedList.str(upapk.detail_permissions));
values.put("features", CommaSeparatedList.str(upapk.features)); values.put("features", CommaSeparatedList.str(upapk.features));
@ -1235,7 +1236,7 @@ public class DB {
repo.lastetag = c.getString(9); repo.lastetag = c.getString(9);
try { try {
repo.lastUpdated = c.getString(10) != null ? repo.lastUpdated = c.getString(10) != null ?
mDateFormat.parse( c.getString(10)) : dateFormat.parse( c.getString(10)) :
null; null;
} catch (ParseException e) { } catch (ParseException e) {
Log.e("FDroid", "Error parsing date " + c.getString(10)); Log.e("FDroid", "Error parsing date " + c.getString(10));
@ -1350,7 +1351,7 @@ public class DB {
*/ */
public void refreshLastUpdates() { public void refreshLastUpdates() {
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
values.put("lastUpdated", mDateFormat.format(new Date())); values.put("lastUpdated", dateFormat.format(new Date()));
db.update(TABLE_REPO, values, "inuse = 1", db.update(TABLE_REPO, values, "inuse = 1",
new String[] {}); new String[] {});
} }
@ -1358,7 +1359,7 @@ public class DB {
public void writeLastEtag(Repo repo) { public void writeLastEtag(Repo repo) {
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
values.put("lastetag", repo.lastetag); values.put("lastetag", repo.lastetag);
values.put("lastUpdated", mDateFormat.format(new Date())); values.put("lastUpdated", dateFormat.format(new Date()));
db.update(TABLE_REPO, values, "address = ?", db.update(TABLE_REPO, values, "address = ?",
new String[] { repo.address }); new String[] { repo.address });
} }

13
src/org/fdroid/fdroid/FDroid.java
View File

@ -19,19 +19,15 @@
package org.fdroid.fdroid; package org.fdroid.fdroid;
import android.content.*;
import android.content.res.Configuration;
import android.support.v4.view.MenuItemCompat;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.AlertDialog.Builder; import android.app.AlertDialog.Builder;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.content.*;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.res.Configuration;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import android.support.v4.view.ViewPager;
import android.util.Log; import android.util.Log;
import android.view.ContextThemeWrapper; import android.view.ContextThemeWrapper;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -39,6 +35,11 @@ import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.*; import android.widget.*;
import android.support.v4.app.FragmentActivity;
import android.support.v4.view.MenuItemCompat;
import android.support.v4.view.ViewPager;
import org.fdroid.fdroid.compat.TabManager; import org.fdroid.fdroid.compat.TabManager;
import org.fdroid.fdroid.views.AppListFragmentPageAdapter; import org.fdroid.fdroid.views.AppListFragmentPageAdapter;

11
src/org/fdroid/fdroid/RepoXMLHandler.java
View File

@ -26,7 +26,6 @@ import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler; import org.xml.sax.helpers.DefaultHandler;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -61,10 +60,6 @@ public class RepoXMLHandler extends DefaultHandler {
private int progressCounter = 0; private int progressCounter = 0;
private ProgressListener progressListener; private ProgressListener progressListener;
// The date format used in the repo XML file.
private SimpleDateFormat mXMLDateFormat = new SimpleDateFormat("yyyy-MM-dd");
private int totalAppCount; private int totalAppCount;
public RepoXMLHandler(DB.Repo repo, List<DB.App> appsList, ProgressListener listener) { public RepoXMLHandler(DB.Repo repo, List<DB.App> appsList, ProgressListener listener) {
@ -162,7 +157,7 @@ public class RepoXMLHandler extends DefaultHandler {
} }
} else if (curel.equals("added")) { } else if (curel.equals("added")) {
try { try {
curapk.added = str.length() == 0 ? null : mXMLDateFormat curapk.added = str.length() == 0 ? null : DB.dateFormat
.parse(str); .parse(str);
} catch (ParseException e) { } catch (ParseException e) {
curapk.added = null; curapk.added = null;
@ -209,7 +204,7 @@ public class RepoXMLHandler extends DefaultHandler {
curapp.detail_trackerURL = str; curapp.detail_trackerURL = str;
} else if (curel.equals("added")) { } else if (curel.equals("added")) {
try { try {
curapp.added = str.length() == 0 ? null : mXMLDateFormat curapp.added = str.length() == 0 ? null : DB.dateFormat
.parse(str); .parse(str);
} catch (ParseException e) { } catch (ParseException e) {
curapp.added = null; curapp.added = null;
@ -217,7 +212,7 @@ public class RepoXMLHandler extends DefaultHandler {
} else if (curel.equals("lastupdated")) { } else if (curel.equals("lastupdated")) {
try { try {
curapp.lastUpdated = str.length() == 0 ? null curapp.lastUpdated = str.length() == 0 ? null
: mXMLDateFormat.parse(str); : DB.dateFormat.parse(str);
} catch (ParseException e) { } catch (ParseException e) {
curapp.lastUpdated = null; curapp.lastUpdated = null;
} }

3
src/org/fdroid/fdroid/Utils.java
View File

@ -31,6 +31,7 @@ import java.io.OutputStream;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.util.Formatter; import java.util.Formatter;
import java.util.Locale;
import android.content.Context; import android.content.Context;
@ -44,7 +45,7 @@ public final class Utils {
"%.0f B", "%.0f KiB", "%.1f MiB", "%.2f GiB" }; "%.0f B", "%.0f KiB", "%.1f MiB", "%.2f GiB" };
public static final SimpleDateFormat LOG_DATE_FORMAT = public static final SimpleDateFormat LOG_DATE_FORMAT =
new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ENGLISH);