From abd8f59a07e1c7bef1f4a3710779d4e7522b79a2 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Fri, 21 Jun 2013 17:38:43 -0700
Subject: [PATCH] Improve the wording where there is no backup.

---
 MyTracks/res/values/strings.xml                     |  6 ++++--
 .../apps/mytracks/io/backup/ExternalFileBackup.java |  3 +--
 .../mytracks/io/backup/RestoreChooserActivity.java  | 13 +++++++++++--
 .../android/apps/mytracks/util/FileUtils.java       |  1 +
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index cf3f976be..1635b5125 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -1527,8 +1527,10 @@ limitations under the License.
   <string name="settings_backup_restore_no_backup"
     translation_description="In the 'Backup and reset' settings, after pressing the 'Restore now'
       option, the message in the alert dialog informing the user that there is no backup to restore
-      from.">
-    No backup found.
+      from.
+      
+      %1$s the directory. E.g., '/MyTracks/backups'.">
+    No backups found in %1$s.
   </string>
   <string name="settings_backup_restore_progress_message"
     translation_description="In the 'Backup and reset' settings, after pressing the 'Restore now'
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java
index 943273042..a72997c3a 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java
@@ -59,7 +59,6 @@ class ExternalFileBackup {
     BACKUP_FILENAME_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
   }
 
-  private static final String BACKUPS_SUBDIR = "backups";
   private static final int BACKUP_FORMAT_VERSION = 1;
   private static final String ZIP_ENTRY_NAME =
       "backup.mytracks.v" + BACKUP_FORMAT_VERSION;
@@ -86,7 +85,7 @@ class ExternalFileBackup {
    * @param create whether to try creating the directory if it doesn't exist
    */
   private File getBackupsDirectory(boolean create) {
-    String directoryPath = FileUtils.getDirectoryPath(BACKUPS_SUBDIR);
+    String directoryPath = FileUtils.getDirectoryPath(FileUtils.BACKUPS_DIR);
     final File dir = new File(directoryPath);
     Log.d(Constants.TAG, "Dir: " + dir.getAbsolutePath());
     if (create) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java
index 632c8e85b..0556911c3 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java
@@ -64,14 +64,14 @@ public class RestoreChooserActivity extends Activity {
     }
 
     if (!externalFileBackup.isBackupsDirectoryAvailable(false)) {
-      Toast.makeText(this, R.string.settings_backup_restore_no_backup, Toast.LENGTH_LONG).show();
+      showNoBackupMessage();
       finish();
       return;
     }
 
     backupDates = externalFileBackup.getAvailableBackups();
     if (backupDates == null || backupDates.length == 0) {
-      Toast.makeText(this, R.string.settings_backup_restore_no_backup, Toast.LENGTH_LONG).show();
+      showNoBackupMessage();
       finish();
       return;
     }
@@ -118,4 +118,13 @@ public class RestoreChooserActivity extends Activity {
         .setTitle(R.string.settings_backup_restore_select_title)
         .create();
   }
+
+  /**
+   * Shows a no backup message.
+   */
+  private void showNoBackupMessage() {
+    String message = getString(R.string.settings_backup_restore_no_backup,
+        FileUtils.getDirectoryDisplayName(FileUtils.BACKUPS_DIR));
+    Toast.makeText(this, message, Toast.LENGTH_LONG).show();
+  }
 }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java
index ac70130bf..9e52ddcf8 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java
@@ -31,6 +31,7 @@ public class FileUtils {
   private FileUtils() {}
 
   public static final String TEMP_DIR = "tmp";
+  public static final String BACKUPS_DIR = "backups";
   
   /**
    * Name of the top-level directory inside the SD card where our files will be