Merge remote branch 'origin/master' into 100530-translations

astrid/src-legacy/com/timsu/astrid/utilities/BackupService.java

@@ -1,27 +1,30 @@
 package com.timsu.astrid.utilities;
 
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.Date;
-
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.os.IBinder;
-
 import com.timsu.astrid.R;
 
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.Date;
+
 /**
  * Inspired heavily by SynchronizationService
  */
 public class BackupService extends Service {
 
-    /** when after phone starts to start first back up */
-    private static final long BACKUP_OFFSET = 5*60*1000L;
+    /**
+     * when after phone starts to start first back up
+     */
+    private static final long BACKUP_OFFSET = 5 * 60 * 1000L;
 
-    /** how often to back up */
+    /**
+     * how often to back up
+     */
     private static final long BACKUP_INTERVAL = AlarmManager.INTERVAL_DAY;
     private static final String BACKUP_ACTION = "backup";
     private static final String BACKUP_FILE_NAME_REGEX = "auto\\.\\d{6}\\-\\d{4}\\.xml";
@@ -58,13 +61,13 @@ public class BackupService extends Service {
                             DateUtilities.getFormattedDate(ctx.getResources(), new Date())));
         } catch (Exception e) {
             // unable to backup.
-            if(e == null || e.getMessage() == null) {
+            if (e == null || e.getMessage() == null) {
                 Preferences.setBackupSummary(ctx,
                         ctx.getString(R.string.prefs_backup_desc_failure_null));
             } else {
                 Preferences.setBackupSummary(ctx,
-                    ctx.getString(R.string.prefs_backup_desc_failure,
-                            e.toString()));
+                        ctx.getString(R.string.prefs_backup_desc_failure,
+                                e.toString()));
             }
         }
     }
@@ -99,7 +102,8 @@ public class BackupService extends Service {
             @Override
             public boolean accept(File file, String s) {
                 if (s.matches(BACKUP_FILE_NAME_REGEX)) {
-                    String dateString = s.substring(12, 18);
+                    String dateString = s.substring(TasksXmlExporter.FILENAME_DATE_BEGIN_INDEX,
+                            TasksXmlExporter.FILENAME_DATE_END_INDEX);
                     return DateUtilities.wasCreatedBefore(dateString, DAYS_TO_KEEP_BACKUP);
                 }
                 return false;

astrid/src-legacy/com/timsu/astrid/utilities/TasksXmlExporter.java

@@ -1,16 +1,5 @@
 package com.timsu.astrid.utilities;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.xmlpull.v1.XmlSerializer;
-
 import android.content.Context;
 import android.database.Cursor;
 import android.os.Environment;
@@ -18,7 +7,6 @@ import android.os.Looper;
 import android.util.Log;
 import android.util.Xml;
 import android.widget.Toast;
-
 import com.timsu.astrid.R;
 import com.timsu.astrid.data.alerts.AlertController;
 import com.timsu.astrid.data.sync.SyncDataController;
@@ -29,6 +17,12 @@ import com.timsu.astrid.data.tag.TagModelForView;
 import com.timsu.astrid.data.task.TaskController;
 import com.timsu.astrid.data.task.TaskIdentifier;
 import com.timsu.astrid.data.task.TaskModelForXml;
+import org.xmlpull.v1.XmlSerializer;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.*;
 
 public class TasksXmlExporter {
 
@@ -57,6 +51,8 @@ public class TasksXmlExporter {
     public static final String ASTRID_DIR = "/astrid";
     private static final String EXPORT_FILE_NAME = "user.%s.xml";
     private static final String BACKUP_FILE_NAME = "auto.%s.xml";
+    public static final int FILENAME_DATE_BEGIN_INDEX = 5;
+    public static final int FILENAME_DATE_END_INDEX = 11;
 
     public TasksXmlExporter(boolean isService) {
         this.isService = isService;