From 427096838db0d9650fecbe9925b2584b74813b8a Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Sat, 10 Nov 2012 12:54:23 -0800
Subject: [PATCH] Check if SD card is available before building external
 directory path.

---
 .../apps/mytracks/io/file/TrackWriterImpl.java      | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java
index 04dfbee8e..b45be01c8 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java
@@ -194,23 +194,22 @@ class TrackWriterImpl implements TrackWriter {
    * Checks and returns whether we're ready to create the output file.
    */
   protected boolean canWriteFile() {
-    if (directory == null) {
-      String dirName =
-          FileUtils.buildExternalDirectoryPath(writer.getExtension());
-      directory = newFile(dirName);
-    }
-
     if (!FileUtils.isSdCardAvailable()) {
       Log.i(Constants.TAG, "Could not find SD card.");
       errorMessage = R.string.external_storage_error_no_storage;
       return false;
     }
+    
+    if (directory == null) {
+      String dirName =
+          FileUtils.buildExternalDirectoryPath(writer.getExtension());
+      directory = newFile(dirName);
+    }
     if (!FileUtils.ensureDirectoryExists(directory)) {
       Log.i(Constants.TAG, "Could not create export directory.");
       errorMessage = R.string.external_storage_save_error_create_dir;
       return false;
     }
-
     return true;
   }