mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 05:35:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7649 from nextcloud/ezaquarii/fix-upload-via-share-make-mtime-read-optional

Browse source 
Fix upload by sharing link with defensive check during mtime read
This commit is contained in:
Tobias Kaminsky 2020-12-18 08:19:51 +01:00 committed by GitHub
commit 69af47857b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/com/owncloud/android/ui/asynctasks/CopyAndUploadContentUrisTask.java
View file

@ -152,9 +152,11 @@ public class CopyAndUploadContentUrisTask extends AsyncTask<Object, Void, Result
null,
null)) {
if (cursor != null && cursor.moveToFirst()) {
lastModified = cursor.getLong(
cursor.getColumnIndexOrThrow(
DocumentsContract.Document.COLUMN_LAST_MODIFIED));
// this check prevents a crash when last modification time is not available on certain phones
int columnIndex = cursor.getColumnIndex(DocumentsContract.Document.COLUMN_LAST_MODIFIED);
if (columnIndex >= 0) {
lastModified = cursor.getLong(columnIndex);
}
}
}
@ -173,7 +175,7 @@ public class CopyAndUploadContentUrisTask extends AsyncTask<Object, Void, Result
while ((count = inputStream.read(buffer)) > 0) {
outputStream.write(buffer, 0, count);
}
if (lastModified != 0) {
try {
if (!cacheFile.setLastModified(lastModified)) {