Skip to content

passing mediaId in onMediaSelected #521

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

Merged
marecar3 merged 3 commits into from
Jan 30, 2019
Merged

passing mediaId in onMediaSelected #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae33589
passing mediaId in onMediaSelected
mzorz Jan 29, 2019
2bda140
Merge branch 'develop' into issue/520-media-library-rewire
marecar3 Jan 30, 2019
f1e34e8
Update gutenberg submodule
marecar3 Jan 30, 2019
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 gutenberg
Open in desktop
Submodule gutenberg updated 4 files
+17 −0 docs/designers-developers/developers/accessibility.md
+6 −0 docs/manifest.json
+1 −0 docs/toc.json
+1 −1 packages/block-library/src/embed/util.js
2 changes: 1 addition & 1 deletion ...c/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/GutenbergBridgeJS2Parent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ public interface GutenbergBridgeJS2Parent {
void responseHtml(String title, String html, boolean changed);

interface MediaSelectedCallback {
void onMediaSelected(String mediaUrl);
void onMediaSelected(int mediaId, String mediaUrl);
}

interface MediaUploadCallback {
Expand Down
6 changes: 3 additions & 3 deletions ...a/org/wordpress/mobile/ReactNativeGutenbergBridge/RNReactNativeGutenbergBridgeModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public void provideToNative_Html(String html, String title, boolean changed) {
mGutenbergBridgeJS2Parent.responseHtml(title, html, changed);
}

@ReactMethod

public void requestMediaPickFrom(String mediaSource, final Callback onUploadMediaSelected) {
if (mediaSource.equals(MEDIA_SOURCE_MEDIA_LIBRARY)) {
mGutenbergBridgeJS2Parent.requestMediaPickFromMediaLibrary(getNewMediaSelectedCallback(onUploadMediaSelected));
Expand All @@ -95,8 +95,8 @@ public void mediaUploadSync() {

private MediaSelectedCallback getNewMediaSelectedCallback(final Callback jsCallback) {
return new MediaSelectedCallback() {
@Override public void onMediaSelected(String mediaUrl) {
jsCallback.invoke(mediaUrl);
@Override public void onMediaSelected(int mediaId, String mediaUrl) {
jsCallback.invoke(mediaId, mediaUrl);
}
};
}
Expand Down
4 changes: 2 additions & 2 deletions ...rg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,9 +316,9 @@ public CharSequence getTitle(OnGetContentTimeout onGetContentTimeout) {
return "";
}

public void appendMediaFile(final String mediaUrl) {
public void appendMediaFile(int mediaId, final String mediaUrl) {
if (mPendingMediaSelectedCallback != null) {
mPendingMediaSelectedCallback.onMediaSelected(mediaUrl);
mPendingMediaSelectedCallback.onMediaSelected(mediaId, mediaUrl);
mPendingMediaSelectedCallback = null;
}
}
Expand Down