Skip to content

Media upload progress reattach android #505

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 5 commits into from
Jan 28, 2019
Merged

Media upload progress reattach android #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1ab3561
introducing the onImageQueryReattach interface to keep track of uploa…
mzorz Jan 25, 2019
8074891
added OnReattachQueryListener to bring up the latest upload progress …
mzorz Jan 25, 2019
8f8d935
Merge branch 'develop' into media_upload_progress_reattach_android
mzorz Jan 25, 2019
0b2c271
updated gutenbeg hash
mzorz Jan 28, 2019
2a7b013
updated gb hash
mzorz Jan 28, 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 5 files
+131 −34 packages/block-library/src/image/edit.native.js
+1 −0 packages/components/src/index.native.js
+13 −0 packages/components/src/spinner/index.native.js
+7 −3 packages/editor/src/components/media-placeholder/index.native.js
+4 −1 packages/editor/src/components/media-placeholder/styles.native.scss
2 changes: 2 additions & 0 deletions ...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 @@ -19,4 +19,6 @@ interface MediaUploadCallback {
void onUploadMediaPressed(MediaUploadCallback mediaUploadCallback);

void onCapturePhotoPressed(MediaUploadCallback mediaUploadCallback);

void onImageQueryReattach(MediaUploadCallback mediaUploadCallback);
}
39 changes: 14 additions & 25 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 @@ -83,36 +83,25 @@ public void onMediaLibraryPressed(final Callback onMediaSelected) {
}

@ReactMethod
public void onUploadMediaPressed(final Callback onUploadMediaSelected) {
mGutenbergBridgeJS2Parent.onUploadMediaPressed(new GutenbergBridgeJS2Parent.MediaUploadCallback() {
@Override
public void onUploadMediaFileSelected(int mediaId, String mediaUri) {
onUploadMediaSelected.invoke(mediaId, mediaUri, 0);
}

@Override
public void onMediaFileUploadProgress(int mediaId, float progress) {
setMediaFileUploadDataInJS(MEDIA_UPLOAD_STATE_UPLOADING, mediaId, null, progress);
}

@Override
public void onMediaFileUploadSucceeded(int mediaId, String mediaUrl, int mediaServerId) {
setMediaFileUploadDataInJS(MEDIA_UPLOAD_STATE_SUCCEEDED, mediaId, mediaUrl, 1, mediaServerId);
}
public void onImageQueryReattach(final Callback onImageQueryReattached) {
mGutenbergBridgeJS2Parent.onImageQueryReattach(getNewUploadMediaCallback(onImageQueryReattached));
}

@Override
public void onMediaFileUploadFailed(int mediaId) {
setMediaFileUploadDataInJS(MEDIA_UPLOAD_STATE_FAILED, mediaId, null, 0 );
}
});
@ReactMethod
public void onUploadMediaPressed(final Callback onUploadMediaSelected) {
mGutenbergBridgeJS2Parent.onUploadMediaPressed(getNewUploadMediaCallback(onUploadMediaSelected));
}

@ReactMethod
public void onCapturePhotoPressed(final Callback onUploadMediaSelected) {
mGutenbergBridgeJS2Parent.onCapturePhotoPressed(new GutenbergBridgeJS2Parent.MediaUploadCallback() {
public void onCapturePhotoPressed(final Callback onPhotoCaptured) {
mGutenbergBridgeJS2Parent.onCapturePhotoPressed(getNewUploadMediaCallback(onPhotoCaptured));
}

private GutenbergBridgeJS2Parent.MediaUploadCallback getNewUploadMediaCallback(final Callback jsCallback) {
return new GutenbergBridgeJS2Parent.MediaUploadCallback() {
@Override
public void onUploadMediaFileSelected(int mediaId, String mediaUri) {
onUploadMediaSelected.invoke(mediaId, mediaUri, 0);
jsCallback.invoke(mediaId, mediaUri, 0);
}

@Override
Expand All @@ -129,7 +118,7 @@ public void onMediaFileUploadSucceeded(int mediaId, String mediaUrl, int mediaSe
public void onMediaFileUploadFailed(int mediaId) {
setMediaFileUploadDataInJS(MEDIA_UPLOAD_STATE_FAILED, mediaId, null, 0);
}
});
};
}

private void setMediaFileUploadDataInJS(int state, int mediaId, String mediaUrl, float progress) {
Expand Down
15 changes: 13 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 @@ -72,7 +72,12 @@ public interface OnMediaLibraryButtonListener {
void onCapturePhotoButtonClicked();
}

protected List<ReactPackage> getPackages(final OnMediaLibraryButtonListener onMediaLibraryButtonListener) {
public interface OnReattachQueryListener {
void onQueryCurrentProgressForUploadingMedia();
}

protected List<ReactPackage> getPackages(final OnMediaLibraryButtonListener onMediaLibraryButtonListener,
final OnReattachQueryListener onReattachQueryListener) {
mRnReactNativeGutenbergBridgePackage = new RNReactNativeGutenbergBridgePackage(new GutenbergBridgeJS2Parent() {
@Override
public void responseHtml(String title, String html, boolean changed) {
Expand Down Expand Up @@ -100,6 +105,11 @@ public void onCapturePhotoPressed(MediaUploadCallback mediaUploadCallback) {
mPendingMediaUploadCallback = mediaUploadCallback;
onMediaLibraryButtonListener.onCapturePhotoButtonClicked();
}

@Override public void onImageQueryReattach(MediaUploadCallback mediaUploadCallback) {
mPendingMediaUploadCallback = mediaUploadCallback;
onReattachQueryListener.onQueryCurrentProgressForUploadingMedia();
}
});
return Arrays.asList(
new MainReactPackage(),
Expand All @@ -111,6 +121,7 @@ public void onCapturePhotoPressed(MediaUploadCallback mediaUploadCallback) {

public void onCreateView(View reactRootView, boolean htmlModeEnabled,
OnMediaLibraryButtonListener onMediaLibraryButtonListener,
OnReattachQueryListener onReattachQueryListener,
Application application, boolean isDebug, boolean buildGutenbergFromSource,
boolean isNewPost) {
mReactRootView = (ReactRootView) reactRootView;
Expand All @@ -119,7 +130,7 @@ public void onCreateView(View reactRootView, boolean htmlModeEnabled,
ReactInstanceManager.builder()
.setApplication(application)
.setJSMainModulePath("index")
.addPackages(getPackages(onMediaLibraryButtonListener))
.addPackages(getPackages(onMediaLibraryButtonListener, onReattachQueryListener))
.setUseDeveloperSupport(isDebug)
.setInitialLifecycleState(LifecycleState.RESUMED);
if (!buildGutenbergFromSource) {
Expand Down
4 changes: 4 additions & 0 deletions react-native-gutenberg-bridge/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,8 @@ export function onCapturePhotoPressed( callback ) {
return RNReactNativeGutenbergBridge.onCapturePhotoPressed( callback );
}

export function onImageQueryReattach( callback ) {
Copy link
Contributor

@SergioEstevao SergioEstevao Jan 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we send up what is the ID of the media we want to reattach?

Copy link
Contributor Author

@mzorz mzorz Jan 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not necessary to be passed here at all, as all we need to do is to tell the parent app which the new callback is so it can be set in this line here.
Later the events are being broadcasted and there we tell the listeners which progress is being made for which mediaId.

return RNReactNativeGutenbergBridge.onImageQueryReattach( callback );
}

export default RNReactNativeGutenbergBridge;