Merge pull request #9131 from nextcloud/fix-npe-when-uploading-files

Fix NPE crash when uploading files

src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -949,7 +949,7 @@ public class FileDisplayActivity extends FileActivity
     }
 
     private void requestUploadOfFilesFromFileSystem(String localBasePath, String[] filePaths, int resultCode) {
-        if (filePaths != null) {
+        if (localBasePath != null && filePaths != null) {
             if (!localBasePath.endsWith("/")) {
                 localBasePath = localBasePath + "/";
             }