From e080449383ed2b76f1b48e04c6eaa5287c3965a0 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Tue, 21 May 2013 13:25:44 -0700
Subject: [PATCH] Fix for NPE on import

---
 .../thoughtcrime/securesms/database/ApplicationExporter.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/database/ApplicationExporter.java b/src/org/thoughtcrime/securesms/database/ApplicationExporter.java
index 5bf461468e..d577b00ca2 100644
--- a/src/org/thoughtcrime/securesms/database/ApplicationExporter.java
+++ b/src/org/thoughtcrime/securesms/database/ApplicationExporter.java
@@ -103,7 +103,7 @@ public class ApplicationExporter {
     File directory       = new File(getExportDirectoryPath() + File.separator + directoryName);
     File importDirectory = new File(context.getFilesDir().getParent() + File.separator + directoryName);
 
-    if (directory.exists()) {
+    if (directory.exists() && directory.isDirectory()) {
       importDirectory.mkdirs();
 
       File[] contents = directory.listFiles();
@@ -112,7 +112,7 @@ public class ApplicationExporter {
         if (exportedFile.isFile()) {
           File localFile = new File(importDirectory.getAbsolutePath() + File.separator + exportedFile.getName());
           migrateFile(exportedFile, localFile);
-        } else {
+        } else if (exportedFile.isDirectory()) {
           importDirectory(context, directoryName + File.separator + exportedFile.getName());
         }
       }