further findbugs/pmd fixes for new feature (sd card)

This commit is contained in:
AndyScherzinger 2016-11-03 10:47:15 +01:00
parent f5dab28729
commit aa3d3c262c
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
2 changed files with 2 additions and 20 deletions

View file

@ -724,23 +724,6 @@ public class FileDataStorageManager {
Log_OC.e(TAG, e.getMessage(), e);
throw e;
}
} catch (IOException ex) {
ret = false;
} finally {
if (in != null) {
try {
in.close();
} catch (IOException e) {
Log_OC.d(TAG, e.getMessage(), e);
}
}
if (out != null) {
try {
out.close();
} catch (IOException e) {
Log_OC.d(TAG, e.getMessage(), e);
}
}
}
ArrayList<ContentProviderOperation> operations = new ArrayList<>(cursor.getCount());
@ -748,8 +731,7 @@ public class FileDataStorageManager {
do {
ContentValues cv = new ContentValues();
long fileId = cursor.getLong(cursor.getColumnIndex(ProviderTableMeta._ID));
String oldFileStoragePath =
cursor.getString(cursor.getColumnIndex(ProviderTableMeta.FILE_STORAGE_PATH));
String oldFileStoragePath = cursor.getString(cursor.getColumnIndex(ProviderTableMeta.FILE_STORAGE_PATH));
if (oldFileStoragePath.startsWith(srcPath)) {

View file

@ -46,7 +46,7 @@ abstract class AbstractCommandLineStoragePoint extends AbstractStoragePointProvi
return false;
}
return process != null && process.exitValue() == COMMAND_LINE_OK_RETURN_VALUE;
}#
}
String getCommandLineResult() {
StringBuilder s = new StringBuilder();