Skip to content

"Duplicate photo entries" issue resolved #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nikhil6624 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

"Duplicate photo entries" issue resolved #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...slibraryapi/src/main/java/com/google/photos/library/v1/upload/UploadMediaItemRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,13 @@ private Builder() {

public Builder mergeFrom(UploadMediaItemRequest other) {

if (!other.getFileName().isEmpty()) {
if (!other.getFileName().isPresent()) {
fileName = other.fileName;
}
if (!other.getMimeType().isEmpty()) {
if (!other.getMimeType().isPresent()) {
mimeType = other.mimeType;
}
if (!other.getUploadUrl().isEmpty()) {
if (!other.getUploadUrl().isPresent()) {
uploadUrl = other.uploadUrl;
}
chunkSize = other.getChunkSize();
Expand Down
2 changes: 1 addition & 1 deletion sample/src/main/java/com/google/photos/library/sample/demos/upload/tasks/ByteUploadTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public ByteUploadResult call() {
// Upload the bytes and capture the response from the API.
UploadMediaItemResponse uploadResponse = photosLibraryClient.uploadMediaItem(uploadRequest);

if (uploadResponse.getUploadToken().isPresent() && uploadResponse.getError().isEmpty()) {
if (uploadResponse.getUploadToken().isPresent() && uploadResponse.getError().isPresent()) {
// The upload was successful, because an upload token is present and there was no error.
final String uploadToken = uploadResponse.getUploadToken().get();
return ByteUploadResult.createSuccessResult(fileToUpload, uploadToken);
Expand Down