Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 14:19:53 +01:00
Code Issues Projects Releases Wiki Activity

Check that result of File#listFiles() is not null.

Browse Source
This commit is contained in:
akwizgran
2016-04-26 17:50:28 +01:00
committed by str4d
parent f73f0aa4ab
commit d06a6e25cb
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/org/briarproject/android/AppModule.java
View File

@@ -76,7 +76,9 @@ public class AppModule {
private volatile SecretKey key = null; private volatile SecretKey key = null;
public boolean databaseExists() { 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() { public File getDatabaseDirectory() {

4
briar-tests/src/org/briarproject/TestDatabaseConfig.java
View File

@@ -17,7 +17,9 @@ public class TestDatabaseConfig implements DatabaseConfig {
} }
public boolean databaseExists() { 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() { public File getDatabaseDirectory() {