Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix boot crash when Provisioner can't find ExternalFilesDir

Browse Source 
closes #1332
!630
This commit is contained in:
Hans-Christoph Steiner 2018-03-07 15:30:41 +01:00
parent 6055874d9d
commit dffac4e797
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/org/fdroid/fdroid/Provisioner.java
View File

@ -21,6 +21,7 @@ import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream; import java.util.zip.ZipInputStream;
@ -48,8 +49,11 @@ public class Provisioner {
* search for provision files and process them * search for provision files and process them
*/ */
public static void scanAndProcess(Context context) { public static void scanAndProcess(Context context) {
File externalFilesDir = context.getExternalFilesDir(null);
File provisionDir = new File(context.getExternalFilesDir(null).getAbsolutePath(), NEW_PROVISIONS_DIR); if (externalFilesDir == null) {
return;
}
File provisionDir = new File(externalFilesDir.getAbsolutePath(), NEW_PROVISIONS_DIR);
if (!provisionDir.isDirectory()) { if (!provisionDir.isDirectory()) {
Utils.debugLog(TAG, "Provisions dir does not exists: '" + provisionDir.getAbsolutePath() + "' moving on ..."); Utils.debugLog(TAG, "Provisions dir does not exists: '" + provisionDir.getAbsolutePath() + "' moving on ...");
@ -105,13 +109,17 @@ public class Provisioner {
} }
public List<File> findProvisionFiles(Context context) { public List<File> findProvisionFiles(Context context) {
String provisionDirPath = context.getExternalFilesDir(null).getAbsolutePath() + File.separator + NEW_PROVISIONS_DIR; File externalFilesDir = context.getExternalFilesDir(null);
return findProvisionFilesInDir(new File(provisionDirPath)); if (externalFilesDir == null) {
return Collections.emptyList();
}
File provisionDir = new File(externalFilesDir.getAbsolutePath(), NEW_PROVISIONS_DIR);
return findProvisionFilesInDir(provisionDir);
} }
protected List<File> findProvisionFilesInDir(File file) { protected List<File> findProvisionFilesInDir(File file) {
if (file == null || !file.isDirectory()) { if (file == null || !file.isDirectory()) {
return new ArrayList<>(); return Collections.emptyList();
} }
try { try {
File[] files = file.listFiles(new FilenameFilter() { File[] files = file.listFiles(new FilenameFilter() {