Skip to content

Fix/upload media file media id #491

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
mzorz merged 2 commits into from
Jan 23, 2019
Merged

Fix/upload media file media id #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e606797
added helper method to avoid setting serverMediaId to zero everywhere…
mzorz Jan 23, 2019
1e70d98
passing serverMediaId in onMediaFileUploadSucceeded so it can be prop…
mzorz Jan 23, 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
8 changes: 7 additions & 1 deletion ...a/org/wordpress/mobile/ReactNativeGutenbergBridge/RNReactNativeGutenbergBridgeModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ public class RNReactNativeGutenbergBridgeModule extends ReactContextBaseJavaModu
private static final int MEDIA_UPLOAD_STATE_SUCCEEDED = 2;
private static final int MEDIA_UPLOAD_STATE_FAILED = 3;

private static final int MEDIA_SERVER_ID_UNKNOWN = 0;


public RNReactNativeGutenbergBridgeModule(ReactApplicationContext reactContext,
GutenbergBridgeJS2Parent gutenbergBridgeJS2Parent) {
Expand Down Expand Up @@ -97,13 +99,17 @@ public void onMediaFileUploadFailed(int mediaId) {
});
}

private void setMediaFileUploadDataInJS(int state, int mediaId, String mediaUrl, float progress) {
setMediaFileUploadDataInJS(state, mediaId, mediaUrl, progress, MEDIA_SERVER_ID_UNKNOWN);
}

private void setMediaFileUploadDataInJS(int state, int mediaId, String mediaUrl, float progress, int mediaServerId) {
WritableMap writableMap = new WritableNativeMap();
writableMap.putInt(MAP_KEY_MEDIA_FILE_UPLOAD_STATE, state);
writableMap.putInt(MAP_KEY_MEDIA_FILE_UPLOAD_MEDIA_ID, mediaId);
writableMap.putString(MAP_KEY_MEDIA_FILE_UPLOAD_MEDIA_URL, mediaUrl);
writableMap.putDouble(MAP_KEY_MEDIA_FILE_UPLOAD_MEDIA_PROGRESS, progress);
if ( mediaServerId > 0 ) {
if (mediaServerId != MEDIA_SERVER_ID_UNKNOWN) {
writableMap.putInt(MAP_KEY_MEDIA_FILE_UPLOAD_MEDIA_SERVER_ID, mediaServerId);
}
emitToJS(EVENT_NAME_MEDIA_UPLOAD, writableMap);
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 @@ -258,9 +258,9 @@ public void mediaFileUploadFailed(final int mediaId) {
}
}

public void mediaFileUploadSucceeded(final int mediaId, final String mediaUrl) {
public void mediaFileUploadSucceeded(final int mediaId, final String mediaUrl, final int serverMediaId) {
if (isMediaUploadCallbackRegistered()) {
mPendingMediaUploadCallback.onMediaFileUploadSucceeded(mediaId, mediaUrl);
mPendingMediaUploadCallback.onMediaFileUploadSucceeded(mediaId, mediaUrl, serverMediaId);
mPendingMediaUploadCallback = null;
}
}
Expand Down