fixed rare npe when doing file migration

Daniel Gultsch created 9 years ago

Change summary

src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java | 6 
1 file changed, 5 insertions(+), 1 deletion(-)

Detailed changes

src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java

@@ -411,7 +411,11 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 			if (oldFilesDirectory.exists() && oldFilesDirectory.isDirectory()) {
 				newFilesDirectory.mkdirs();
 				newVideosDirectory.mkdirs();
-				for(File file : oldFilesDirectory.listFiles()) {
+				final File[] files = oldFilesDirectory.listFiles();
+				if (files == null) {
+					return;
+				}
+				for(File file : files) {
 					if (file.getName().equals(".nomedia")) {
 						if (file.delete()) {
 							Log.d(Config.LOGTAG,"deleted nomedia file in "+oldFilesDirectory.getAbsolutePath());