diff options
| author | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2014-12-02 17:34:01 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-12-16 15:52:32 +0000 |
| commit | c13a1c2e5ce6ea0b78e46f314c1980a4f0c7a2f4 (patch) | |
| tree | e03a4d4e0b3244c9f8698ebb89d9629234a6e27e /android | |
| parent | 8c68463dae09e123bae9fc5947329cfa1f314ad3 (diff) | |
Android: prevent NPE due to lack of permissions on a directory
Change-Id: Ia2f4c04ad4c524e8b72870acb0735793624f0916
Reviewed-on: https://gerrit.libreoffice.org/13278
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'android')
| -rw-r--r-- | android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FolderIconView.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FolderIconView.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FolderIconView.java index 5960e5ea4668..723e36167fec 100644 --- a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FolderIconView.java +++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FolderIconView.java @@ -83,6 +83,10 @@ public class FolderIconView extends View{ if( dir == null ) return;//TODO File[] contents = dir.listFiles();//TODO consider filtering thumbs to match grid. + if( contents == null ) + // dir is not a directory, + // or user does not have permissions to read it + return; Stack<Bitmap> thumbs = new Stack<Bitmap>(); BitmapFactory factory = new BitmapFactory(); for( File file : contents ){ |