Skip to content
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

Fix local media id collisions #11125

Closed
wants to merge 8 commits into from
Closed

Fix local media id collisions #11125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
39c2d03
Negate local media id over the bridge
mkevins Jan 17, 2020
f16cf87
Update gutenberg-mobile reference
mkevins Jan 17, 2020
80a6d08
Update gutenberg-mobile reference
mkevins Jan 22, 2020
5f8204a
Merge branch 'try/media-upload-completion-processor' into try/media-u…
mkevins Jan 22, 2020
2d5aba5
Update gutenberg-mobile reference
mkevins Feb 20, 2020
526964c
Merge branch 'develop' into try/media-upload-completion-processor-id-…
mkevins Feb 20, 2020
01dadb2
Update gutenberg-mobile reference
mkevins Feb 20, 2020
3201a00
Update gutenberg-mobile reference
mkevins Feb 21, 2020
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
2 changes: 1 addition & 1 deletion ...r/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ public void appendMediaFiles(Map<String, MediaFile> mediaList) {

for (Map.Entry<String, MediaFile> mediaEntry : mediaList.entrySet()) {
int mediaId = isNetworkUrl ? Integer.valueOf(mediaEntry.getValue().getMediaId())
: mediaEntry.getValue().getId();
: -mediaEntry.getValue().getId(); // negate local id here
String url = isNetworkUrl ? mediaEntry.getKey() : "file://" + mediaEntry.getKey();
rnMediaList.add(createRNMediaUsingMimeType(mediaId, url, mediaEntry.getValue().getMimeType()));
}
Expand Down
2 changes: 1 addition & 1 deletion libs/gutenberg-mobile
Open in desktop
Submodule gutenberg-mobile updated 182 files