From b7459c9deded9473698dcf5d9a5cc749816ea8b3 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Tue, 17 Mar 2015 01:03:32 +0100 Subject: [PATCH] Fixed crash when navigating to folder without read permissions (fixes #244). --- .../syncthingandroid/activities/FolderPickerActivity.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java b/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java index a9d209cc0..279f5fb4c 100644 --- a/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java +++ b/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java @@ -179,6 +179,10 @@ private void displayFolder(File folder) { mLocation = folder; mFilesAdapter.clear(); File[] contents = mLocation.listFiles(); + // In case we don't have read access to the folder, just display nothing. + if (contents == null) + contents = new File[]{}; + Arrays.sort(contents, new Comparator() { public int compare(File f1, File f2) { if (f1.isDirectory() && f2.isFile())