mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-09-01 14:45:08 +00:00
Code Issues Releases Wiki Activity

Allow browsing sdcard when there is an unreadable file in it (eg .android_secure)

Browse Source 
Summary:
On my Samsung Galaxy S5 mini (Android 6.0.1) browsing the sdcard is not possible because there
is a hidden file .android_secure that is not readable by a normal user.
For such a file File.exists() returns false while File.listFiles() does return it
and SftpSubsystem.writeAttrs() throws an exception

Test Plan:
On a device where the SDCard cannot be browsed (I think its API 23 and up)
install kdeconnect with this patch and verify that the SDCard can now be browsed successfully

Reviewers: #kde_connect, albertvaka

Reviewed By: #kde_connect, albertvaka

Subscribers: albertvaka, nicolasfella, kdeconnect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D17644
This commit is contained in:
Erik Duisters
2018-12-17 19:10:47 +01:00
parent 32952f6d6c
commit 78c69a0cdc
1 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/org/kde/kdeconnect/Plugins/SftpPlugin/SimpleSftpServer.java
View File

@@ -28,7 +28,6 @@ import org.apache.sshd.SshServer;
import org.apache.sshd.common.Session; import org.apache.sshd.common.Session;
import org.apache.sshd.common.file.FileSystemFactory; import org.apache.sshd.common.file.FileSystemFactory;
import org.apache.sshd.common.file.FileSystemView; import org.apache.sshd.common.file.FileSystemView;
import org.apache.sshd.common.file.SshFile;
import org.apache.sshd.common.file.nativefs.NativeFileSystemView; import org.apache.sshd.common.file.nativefs.NativeFileSystemView;
import org.apache.sshd.common.file.nativefs.NativeSshFile; import org.apache.sshd.common.file.nativefs.NativeSshFile;
import org.apache.sshd.common.keyprovider.AbstractKeyPairProvider; import org.apache.sshd.common.keyprovider.AbstractKeyPairProvider;
@@ -214,10 +213,11 @@ class SimpleSftpServer {
this.context = context; this.context = context;
} }
// NativeFileSystemView.getFile(), NativeSshFile.getParentFile() and NativeSshFile.listSshFiles() call
// createNativeSshFile to create new NativeSshFiles so override that instead of getFile() to always create a AndroidSshFile
@Override @Override
protected SshFile getFile(final String dir, final String file) { public AndroidSshFile createNativeSshFile(String name, File file, String username) {
File fileObj = new File(dir, file); return new AndroidSshFile(this, name, file, username, context);
return new AndroidSshFile(this, fileObj, userName, context);
} }
} }
@@ -226,8 +226,8 @@ class SimpleSftpServer {
final private Context context; final private Context context;
final private File file; final private File file;
AndroidSshFile(final AndroidFileSystemView view, final File file, final String userName, Context context) { AndroidSshFile(final AndroidFileSystemView view, String name, final File file, final String userName, Context context) {
super(view, file.getAbsolutePath(), file, userName); super(view, name, file, userName);
this.context = context; this.context = context;
this.file = file; this.file = file;
} }
@@ -279,6 +279,29 @@ class SimpleSftpServer {
return ret; return ret;
} }
// Based on https://github.com/wolpi/prim-ftpd/blob/master/primitiveFTPd/src/org/primftpd/filesystem/FsFile.java
@Override
public boolean doesExist() {
boolean exists = file.exists();
if (!exists) {
// file.exists() returns false when we don't have read permission
// try to figure out if it really does not exist
File parentFile = file.getParentFile();
File[] children = parentFile.listFiles();
if (children != null) {
for (File child : children) {
if (file.equals(child)) {
exists = true;
break;
}
}
}
}
return exists;
}
} }
static class SimplePasswordAuthenticator implements PasswordAuthenticator { static class SimplePasswordAuthenticator implements PasswordAuthenticator {