diff --git a/briar-android/src/org/briarproject/android/AppModule.java b/briar-android/src/org/briarproject/android/AppModule.java index 0b5b031b92f9ed23e4293f214ab0ebb250364c8a..68d37071af3aa1476aab1596b89943180e2aa8ca 100644 --- a/briar-android/src/org/briarproject/android/AppModule.java +++ b/briar-android/src/org/briarproject/android/AppModule.java @@ -76,7 +76,9 @@ public class AppModule { private volatile SecretKey key = null; public boolean databaseExists() { - return dir.isDirectory() && dir.listFiles().length > 0; + if (!dir.isDirectory()) return false; + File[] files = dir.listFiles(); + return files != null && files.length > 0; } public File getDatabaseDirectory() { diff --git a/briar-tests/src/org/briarproject/TestDatabaseConfig.java b/briar-tests/src/org/briarproject/TestDatabaseConfig.java index e4efc42047eb88ccf6b93f6ca23cd576938c2cbd..4066b149e24f369b0051a2257b1c4853666b13b0 100644 --- a/briar-tests/src/org/briarproject/TestDatabaseConfig.java +++ b/briar-tests/src/org/briarproject/TestDatabaseConfig.java @@ -17,7 +17,9 @@ public class TestDatabaseConfig implements DatabaseConfig { } public boolean databaseExists() { - return dir.isDirectory() && dir.listFiles().length > 0; + if (!dir.isDirectory()) return false; + File[] files = dir.listFiles(); + return files != null && files.length > 0; } public File getDatabaseDirectory() {