refs #43 don't try to delete locked file

Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
nextcloud · Jan 6, 2021 · 5c234c2 · 5c234c2
1 parent 58f32d9
commit 5c234c2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/lib/Service/GoogleDriveAPIService.php b/lib/Service/GoogleDriveAPIService.php
@@ -350,9 +350,6 @@ private function getFile(string $accessToken, string $userId, array $fileItem, a
 					}
 				} catch (\OCP\Lock\LockedException $e) {
 					$this->logger->warning('Google Drive error downloading file ' . $fileItem['name'] . ' : Impossible to unlock file', ['app' => $this->appName]);
-					if ($savedFile->isDeletable()) {
-						$savedFile->delete();
-					}
 					return null;
 				}
 				$res = $this->googleApiService->simpleDownload($accessToken, $userId, $fileUrl, $resource);
@@ -421,9 +418,6 @@ private function getFile(string $accessToken, string $userId, array $fileItem, a
 					}
 				} catch (\OCP\Lock\LockedException $e) {
 					$this->logger->warning('Google Drive error downloading file ' . $fileItem['name'] . ' : Impossible to unlock file', ['app' => $this->appName]);
-					if ($savedFile->isDeletable()) {
-						$savedFile->delete();
-					}
 					return null;
 				}
 				$res = $this->googleApiService->simpleDownload($accessToken, $userId, $fileUrl, $resource, $params);

diff --git a/lib/Service/GooglePhotosAPIService.php b/lib/Service/GooglePhotosAPIService.php
@@ -373,9 +373,6 @@ private function getPhoto(string $accessToken, string $userId, array $photo, Nod
 				}
 			} catch (\OCP\Lock\LockedException $e) {
 				$this->logger->warning('Google API error downloading photo ' . $photoName . ' : Impossible to unlock file', ['app' => $this->appName]);
-				if ($savedFile->isDeletable()) {
-					$savedFile->delete();
-				}
 				return null;
 			}
 			$res = $this->googleApiService->simpleDownload($accessToken, $userId, $photoUrl, $resource);