Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-06-11 23:01:21 +02:00
commit b6d615773e

View file

@ -356,10 +356,11 @@ public class FavouritesDbHelper {
fld.mkdirs();
}
int back = 1;
DecimalFormat formatter = new DecimalFormat("00");
File firstModified = null;
long firstModifiedMin = System.currentTimeMillis();
while(back <= BACKUP_CNT) {
File bak = new File(fld, BACKUP_FOLDER +"_" + back +".gpx.bz2");
File bak = new File(fld, "favourites_backup_" + formatter.format(back) +".gpx.bz2");
if (!bak.exists()) {
return bak;
} else if (bak.lastModified() < firstModifiedMin) {