Merge branch '762-fix-possible-NPEs' into 'v1-oreo' (60d10b1f) · Commits · e / os / eDrive

app/src/main/java/foundation/e/drive/operations/ListFileRemoteOperation.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -146,7 +146,8 @@ public class ListFileRemoteOperation extends RemoteOperation<ArrayList<RemoteFil
		syncedFolder.setToSync(true);

		final File localFolder = new File(syncedFolder.getLocalFolder());
		if (localFolder.listFiles().length == 0) {
		final File[] files = localFolder.listFiles();
		if (files != null && files.length == 0) {
		localFolder.delete();
		}

		@@ -166,7 +167,7 @@ public class ListFileRemoteOperation extends RemoteOperation<ArrayList<RemoteFil
		*/
		private boolean isHiddenFile(RemoteFile file) {
		final String fileName = CommonUtils.getFileNameFromPath(file.getRemotePath());
		return fileName.startsWith(".");
		return fileName != null && fileName.startsWith(".");
		}

		/**
		@@ -175,8 +176,9 @@ public class ListFileRemoteOperation extends RemoteOperation<ArrayList<RemoteFil
		* @return
		*/
		private boolean shouldSkipSyncedFolder(SyncedFolder syncedFolder) {
		final String fileName = CommonUtils.getFileNameFromPath(syncedFolder.getRemoteFolder());
		return (syncedFolder.isMediaType()
		&& CommonUtils.getFileNameFromPath(syncedFolder.getRemoteFolder()).startsWith("."))
		&& fileName != null && fileName.startsWith("."))
		\|\| !syncedFolder.isScanRemote();
		}