|
@@ -157,7 +157,7 @@ public class CopyAndUploadContentUrisTask extends AsyncTask<Object, Void, Result
|
|
DocumentsContract.Document.COLUMN_LAST_MODIFIED));
|
|
DocumentsContract.Document.COLUMN_LAST_MODIFIED));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
fullTempPath = FileStorageUtils.getTemporalPath(account.name) + currentRemotePath;
|
|
fullTempPath = FileStorageUtils.getTemporalPath(account.name) + currentRemotePath;
|
|
inputStream = leakedContentResolver.openInputStream(currentUri);
|
|
inputStream = leakedContentResolver.openInputStream(currentUri);
|
|
File cacheFile = new File(fullTempPath);
|
|
File cacheFile = new File(fullTempPath);
|
|
@@ -173,20 +173,19 @@ public class CopyAndUploadContentUrisTask extends AsyncTask<Object, Void, Result
|
|
while ((count = inputStream.read(buffer)) > 0) {
|
|
while ((count = inputStream.read(buffer)) > 0) {
|
|
outputStream.write(buffer, 0, count);
|
|
outputStream.write(buffer, 0, count);
|
|
}
|
|
}
|
|
-
|
|
|
|
- try {
|
|
|
|
- if(lastModified != 0 ){
|
|
|
|
-
|
|
|
|
- if(!cacheFile.setLastModified(lastModified)){
|
|
|
|
|
|
+
|
|
|
|
+ if (lastModified != 0) {
|
|
|
|
+ try {
|
|
|
|
+ if (!cacheFile.setLastModified(lastModified)) {
|
|
Log_OC.w(TAG, "Could not change mtime of cacheFile");
|
|
Log_OC.w(TAG, "Could not change mtime of cacheFile");
|
|
}
|
|
}
|
|
|
|
+ } catch (SecurityException e) {
|
|
|
|
+ Log_OC.e(TAG, "Not enough permissions to change mtime of cacheFile", e);
|
|
|
|
+ } catch (IllegalArgumentException e) {
|
|
|
|
+ Log_OC.e(TAG, "Could not change mtime of cacheFile, mtime is negativ: "+lastModified, e);
|
|
}
|
|
}
|
|
- }catch (SecurityException e) {
|
|
|
|
- Log_OC.e(TAG, "Not enough permissions to change mtime of cacheFile", e);
|
|
|
|
- }catch (IllegalArgumentException e) {
|
|
|
|
- Log_OC.e(TAG, "Could not change mtime of cacheFile, mtime is negativ: "+lastModified, e);
|
|
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
requestUpload(
|
|
requestUpload(
|
|
account,
|
|
account,
|
|
fullTempPath,
|
|
fullTempPath,
|