contacts: don't assume the device has an sdcard

Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Conflicts:
	src/com/android/contacts/common/MoreContactUtils.java
	src/com/android/contacts/common/vcard/ImportVCardActivity.java

Change-Id: I5c8abfd53527f4ea83e6202c953affd589810774

3 files changed, 18 insertions, 8 deletions

diff --git a/src/com/android/contacts/common/MoreContactUtils.java b/src/com/android/contacts/common/MoreContactUtils.java
index 87043ca0..e7a97a37 100644
--- a/src/com/android/contacts/common/MoreContactUtils.java
+++ b/src/com/android/contacts/common/MoreContactUtils.java
@@ -323,14 +323,14 @@ public class MoreContactUtils {
     }
 
     public static boolean sdCardExist(Context context) {
-        boolean ret = false;
+        String sdcardPath = getSDPath(context);
+        if (sdcardPath == null) {
+            return false;
+        }
         StorageManager mStorageManager = (StorageManager) context
                 .getSystemService(Context.STORAGE_SERVICE);
-        if (mStorageManager.getVolumeState(getSDPath(context)).equals(
-                android.os.Environment.MEDIA_MOUNTED)) {
-            ret = true;
-        }
-        return ret;
+        return mStorageManager.getVolumeState(sdcardPath).equals(
+                android.os.Environment.MEDIA_MOUNTED);
     }
 
     public static String getSDPath(Context context) {
diff --git a/src/com/android/contacts/common/vcard/ImportVCardActivity.java b/src/com/android/contacts/common/vcard/ImportVCardActivity.java
index 04705054..24f24dd1 100644
--- a/src/com/android/contacts/common/vcard/ImportVCardActivity.java
+++ b/src/com/android/contacts/common/vcard/ImportVCardActivity.java
@@ -1067,7 +1067,12 @@ public class ImportVCardActivity extends Activity {
                 file = Environment.getExternalStorageDirectory();
                 break;
             case VCardService.EXTERNAL_PATH:
-                file = new File(MoreContactUtils.getSDPath(this));
+                final String sdcardPath = MoreContactUtils.getSDPath(this);
+                if (sdcardPath != null) {
+                    file = new File(sdcardPath);
+                } else {
+                    file = Environment.getExternalStorageDirectory();
+                }
                 break;
             default:
                 file = Environment.getExternalStorageDirectory();
diff --git a/src/com/android/contacts/common/vcard/VCardService.java b/src/com/android/contacts/common/vcard/VCardService.java
index 14a86656..f11598a1 100644
--- a/src/com/android/contacts/common/vcard/VCardService.java
+++ b/src/com/android/contacts/common/vcard/VCardService.java
@@ -156,7 +156,12 @@ public class VCardService extends Service {
 
     private void initExporterParams() {
         if (mStorage == EXTERNAL_PATH) {
-            mTargetDirectory = new File(MoreContactUtils.getSDPath(this));
+            String targetDirectory = MoreContactUtils.getSDPath(this);
+            if (targetDirectory != null) {
+                mTargetDirectory = new File(targetDirectory);
+            } else {
+                mTargetDirectory = Environment.getExternalStorageDirectory();
+            }
         } else {
             mTargetDirectory = Environment.getExternalStorageDirectory();
         }