TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-24 23:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for NPE on import

Browse Source
This commit is contained in:
Moxie Marlinspike 2013-05-21 13:25:44 -07:00
parent a0a6c3f211
commit e080449383
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/thoughtcrime/securesms/database/ApplicationExporter.java
View File

@ -103,7 +103,7 @@ public class ApplicationExporter {
File directory = new File(getExportDirectoryPath() + File.separator + directoryName); File directory = new File(getExportDirectoryPath() + File.separator + directoryName);
File importDirectory = new File(context.getFilesDir().getParent() + File.separator + directoryName); File importDirectory = new File(context.getFilesDir().getParent() + File.separator + directoryName);
if (directory.exists()) { if (directory.exists() && directory.isDirectory()) {
importDirectory.mkdirs(); importDirectory.mkdirs();
File[] contents = directory.listFiles(); File[] contents = directory.listFiles();
@ -112,7 +112,7 @@ public class ApplicationExporter {
if (exportedFile.isFile()) { if (exportedFile.isFile()) {
File localFile = new File(importDirectory.getAbsolutePath() + File.separator + exportedFile.getName()); File localFile = new File(importDirectory.getAbsolutePath() + File.separator + exportedFile.getName());
migrateFile(exportedFile, localFile); migrateFile(exportedFile, localFile);
} else { } else if (exportedFile.isDirectory()) {
importDirectory(context, directoryName + File.separator + exportedFile.getName()); importDirectory(context, directoryName + File.separator + exportedFile.getName());
} }
} }