Skip to content
This repository was archived by the owner on Jul 9, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
46d39d4
Added upload media callback
marecar3 Dec 28, 2018
e5cfcea
Implemented upload media callback
marecar3 Dec 28, 2018
3662004
Received from JS and Pass to JS upload media data
marecar3 Dec 28, 2018
4efd0df
Update gutenberg submodule to hash of branch rnmobile/upload_media_file
marecar3 Dec 28, 2018
bcbff88
Updated gutenberg submodule
marecar3 Dec 28, 2018
d39d564
Updated gutenberg submodule
marecar3 Dec 28, 2018
027b8a2
Update gutenberg submodule
marecar3 Dec 28, 2018
f273943
Rename media upload methods for better understanding
marecar3 Dec 28, 2018
db115ac
Make verb used in callback methods to be a conjugation in the past tense
marecar3 Jan 16, 2019
943f102
Merge branch 'develop' into feature/upload_media_file_android
marecar3 Jan 16, 2019
35175ec
Updated gutenberg submodule
marecar3 Jan 16, 2019
d5db40b
Rename callback methods to follow naming convention
marecar3 Jan 16, 2019
f85d5ae
Update gutenberg submodule
marecar3 Jan 16, 2019
1ee0844
Merge branch 'develop' into feature/upload_media_file_android
marecar3 Jan 16, 2019
f89ba03
Implement stub for media upload delegate.
SergioEstevao Jan 16, 2019
d6e892a
Merge branch 'feature/upload_media_file_android' into feature/upload_…
SergioEstevao Jan 16, 2019
2ec8679
Update bridge methods to new naming convention.
SergioEstevao Jan 16, 2019
463e586
Show image picker to allow local selection of media.
SergioEstevao Jan 16, 2019
9ece9fb
Updated gutenberg submodule
marecar3 Jan 16, 2019
0b433ea
Updated gutenberg submodule
marecar3 Jan 16, 2019
419e4f5
Implement fake media upload logic.
SergioEstevao Jan 16, 2019
00a1a23
Refactor media pick and upload code to use coordinator class.
SergioEstevao Jan 16, 2019
a6a0efd
Revert media upload event to be non dynamic
marecar3 Jan 17, 2019
b3f7ddd
Update gutenberg submodule
marecar3 Jan 17, 2019
b738714
Merge branch 'feature/upload_media_file_android' into feature/upload_…
SergioEstevao Jan 17, 2019
d5b398c
Use standard event name.
SergioEstevao Jan 17, 2019
f08f3f8
Updated gutenberg submodule
marecar3 Jan 17, 2019
3f79a9f
Merge branch 'feature/upload_media_file_android' into feature/upload_…
SergioEstevao Jan 17, 2019
1232c82
Generate and send an unique mediaID for each upload.
SergioEstevao Jan 17, 2019
5468ecb
Wrap RNGutenbergBridge calls inside react-native-gutenberg-bridge module
marecar3 Jan 17, 2019
05157ad
Merge branch 'feature/upload_media_file_android' into feature/upload_…
SergioEstevao Jan 17, 2019
4f2818a
Updated gutenberg submodule
marecar3 Jan 17, 2019
5387177
Merge branch 'feature/upload_media_file_android' into feature/upload_…
SergioEstevao Jan 17, 2019
9bbb628
Merge branch 'develop' into feature/upload_media_file_android
marecar3 Jan 18, 2019
6f2319a
Merge branch 'feature/upload_media_file_android' into feature/upload_…
SergioEstevao Jan 18, 2019
15dfe2b
Updated gutenberg submodule
marecar3 Jan 18, 2019
b5a1633
Update gutenberg submodule
marecar3 Jan 18, 2019
808fe23
Merge pull request #478 from wordpress-mobile/feature/upload_media_fi…
SergioEstevao Jan 18, 2019
f17e9e1
Updated gutenberg submodule
marecar3 Jan 21, 2019
86e5d47
Merge branch 'feature/upload_media_file_android' of https://github.co…
marecar3 Jan 21, 2019
9b51e40
Merge branch 'develop' into feature/upload_media_file_android
marecar3 Jan 21, 2019
0c4400c
Send server media id to GB RN.
SergioEstevao Jan 22, 2019
ca9a34a
Update bundle.
SergioEstevao Jan 22, 2019
75ebc78
Allow set of media id for media library selections.
SergioEstevao Jan 22, 2019
573fe20
Update bundle.
SergioEstevao Jan 22, 2019
b179fe9
Convert the server media ID to an Int.
SergioEstevao Jan 22, 2019
ba2be02
Updated gutenberg submodule
marecar3 Jan 22, 2019
6e88ca7
Update android bridge to send serverID parameter on upload event.
SergioEstevao Jan 22, 2019
9fe355a
Merge branch 'feature/upload_media_file_android' into feature/upload_…
SergioEstevao Jan 22, 2019
336d1c2
changed mediaId from String to int to match media handling in Gutenbe…
mzorz Jan 23, 2019
544f68e
Merge pull request #485 from wordpress-mobile/feature/upload_media_fi…
SergioEstevao Jan 23, 2019
383becc
Implemented the callbacks for uploading the image when photo is captu…
marecar3 Jan 23, 2019
c97235c
Updated gutenberg submodule
marecar3 Jan 23, 2019
734e45d
Merge branch 'feature/upload_media_file_android' into fix/media-id-in…
mzorz Jan 23, 2019
eff0a03
Change media id to use a int value.
SergioEstevao Jan 23, 2019
c3acfac
Merge branch 'feature/upload_media_file_android' into feature/upload_…
SergioEstevao Jan 23, 2019
2d9b63d
Merge pull request #487 from wordpress-mobile/fix/media-id-int-android
mzorz Jan 23, 2019
8e017cf
Merge pull request #488 from wordpress-mobile/feature/upload_media_fi…
SergioEstevao Jan 23, 2019
acf51c2
Updated gutenberg submodule
marecar3 Jan 23, 2019
c937727
Merge branch 'develop' into feature/upload_media_file_android
marecar3 Jan 23, 2019
439d15d
Updated gutenberg submodule
marecar3 Jan 23, 2019
538b38b
Removed unused code
marecar3 Jan 23, 2019
0634f19
Merge branch 'feature/upload_media_file_android' into feature/upload_…
marecar3 Jan 23, 2019
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
5a06827
Merge pull request #491 from wordpress-mobile/fix/upload_media_file_m…
mzorz Jan 23, 2019
59eeb71
Merge branch 'feature/upload_media_file_android' into feature/upload_…
marecar3 Jan 23, 2019
37ebf30
Allow selection of media images from camera.
SergioEstevao Jan 24, 2019
f8806fb
Add info.plist properties describing the need for media access.
SergioEstevao Jan 24, 2019
067a751
Update to latest version in Gutenberg.
SergioEstevao Jan 24, 2019
73cf794
Merge branch 'develop' into feature/upload_captured_photo_android
SergioEstevao Jan 24, 2019
833ccf0
Merge branch 'feature/upload_captured_photo_android' into feature/upl…
SergioEstevao Jan 24, 2019
b2b7e4b
Merge pull request #494 from wordpress-mobile/feature/upload_captured…
SergioEstevao Jan 24, 2019
6e3c8e1
Merge branch 'develop' into feature/upload_media_file_android
SergioEstevao Jan 25, 2019
ed088c6
Merge branch 'feature/upload_media_file_android' into feature/upload_…
SergioEstevao Jan 25, 2019
90a6581
Updated gutenberg submodule
marecar3 Jan 25, 2019
6793341
Merge branch 'feature/upload_media_file_android' into feature/upload_…
marecar3 Jan 25, 2019
db1694d
Update gutenberg submodule
marecar3 Jan 25, 2019
b1672c0
Merge pull request #492 from wordpress-mobile/feature/upload_captured…
SergioEstevao Jan 25, 2019
224ff28
Merge branch 'develop' into feature/upload_media_file_android
SergioEstevao Jan 25, 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
1,783 changes: 900 additions & 883 deletions bundle/android/App.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/App.js.map

Large diffs are not rendered by default.

1,795 changes: 906 additions & 889 deletions bundle/ios/App.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/App.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion gutenberg
Submodule gutenberg updated 34 files
+2 −1 gutenberg.php
+3 −0 lib/load.php
+1 −0 packages/block-library/src/editor.scss
+129 −34 packages/block-library/src/image/edit.native.js
+2 −0 packages/block-library/src/index.js
+169 −0 packages/block-library/src/rss/edit.js
+6 −0 packages/block-library/src/rss/editor.scss
+33 −0 packages/block-library/src/rss/index.js
+137 −0 packages/block-library/src/rss/index.php
+35 −0 packages/block-library/src/rss/style.scss
+1 −0 packages/block-library/src/style.scss
+1 −0 packages/components/src/index.native.js
+13 −0 packages/components/src/spinner/index.native.js
+7 −6 packages/editor/src/components/block-actions/index.js
+3 −2 packages/editor/src/components/block-draggable/index.js
+7 −4 packages/editor/src/components/block-drop-zone/index.js
+1 −0 packages/editor/src/components/block-list-appender/index.js
+22 −18 packages/editor/src/components/block-list/block.js
+0 −1 packages/editor/src/components/block-list/index.js
+4 −5 packages/editor/src/components/block-list/insertion-point.js
+1 −1 packages/editor/src/components/default-block-appender/index.js
+3 −0 packages/editor/src/components/default-block-appender/test/__snapshots__/index.js.snap
+4 −15 packages/editor/src/components/inserter/index.js
+50 −7 packages/editor/src/components/inserter/menu.js
+7 −3 packages/editor/src/components/media-placeholder/index.native.js
+4 −1 packages/editor/src/components/media-placeholder/styles.native.scss
+4 −0 packages/scripts/CHANGELOG.md
+1 −0 packages/scripts/config/.eslintrc.js
+1 −0 packages/scripts/scripts/check-licenses.js
+4 −1 packages/scripts/scripts/lint-js.js
+1 −0 test/integration/full-content/fixtures/core__rss.html
+10 −0 test/integration/full-content/fixtures/core__rss.json
+26 −0 test/integration/full-content/fixtures/core__rss.parsed.json
+1 −0 test/integration/full-content/fixtures/core__rss.serialized.html
4 changes: 4 additions & 0 deletions ios/gutenberg.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
F1EE6F7921E7F0A500241744 /* NotoSerif-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F1EE6F7521E7F0A500241744 /* NotoSerif-Regular.ttf */; };
F1EE6F7A21E7F0A500241744 /* NotoSerif-Italic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F1EE6F7621E7F0A500241744 /* NotoSerif-Italic.ttf */; };
F1EE6F7B21E7F0A500241744 /* NotoSerif-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F1EE6F7721E7F0A500241744 /* NotoSerif-Bold.ttf */; };
FF9A6F4121FA8E2500D36D14 /* MediaPickAndUploadCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF9A6F1621FA8E2500D36D14 /* MediaPickAndUploadCoordinator.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -432,6 +433,7 @@
F1EE6F7621E7F0A500241744 /* NotoSerif-Italic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NotoSerif-Italic.ttf"; sourceTree = "<group>"; };
F1EE6F7721E7F0A500241744 /* NotoSerif-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NotoSerif-Bold.ttf"; sourceTree = "<group>"; };
F619623252704B46A619C33C /* RNTAztecView.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNTAztecView.xcodeproj; path = "../react-native-aztec/ios/RNTAztecView.xcodeproj"; sourceTree = "<group>"; };
FF9A6F1621FA8E2500D36D14 /* MediaPickAndUploadCoordinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MediaPickAndUploadCoordinator.swift; path = gutenberg/MediaPickAndUploadCoordinator.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -582,6 +584,7 @@
F15198372100DC3C000F6E97 /* gutenberg-Bridging-Header.h */,
F15198392100DC3D000F6E97 /* AppDelegate.swift */,
7EC7328E21907E3F00FED2E6 /* GutenbergViewController.swift */,
FF9A6F1621FA8E2500D36D14 /* MediaPickAndUploadCoordinator.swift */,
F151983A2100DC3D000F6E97 /* MediaProvider.swift */,
13B07FB51A68108700A75B9A /* Images.xcassets */,
13B07FB61A68108700A75B9A /* Info.plist */,
Expand Down Expand Up @@ -1365,6 +1368,7 @@
buildActionMask = 2147483647;
files = (
F151983C2100DC3D000F6E97 /* AppDelegate.swift in Sources */,
FF9A6F4121FA8E2500D36D14 /* MediaPickAndUploadCoordinator.swift in Sources */,
F151983D2100DC3D000F6E97 /* MediaProvider.swift in Sources */,
7EC7328F21907E3F00FED2E6 /* GutenbergViewController.swift in Sources */,
);
Expand Down
22 changes: 20 additions & 2 deletions ios/gutenberg/GutenbergViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ class GutenbergViewController: UIViewController {

fileprivate lazy var gutenberg = Gutenberg(dataSource: self)
fileprivate var htmlMode = false

fileprivate var mediaPickAndUploadCoordinator: MediaPickAndUploadCoordinator?

override func loadView() {
view = gutenberg.rootView
}
Expand All @@ -29,6 +30,7 @@ class GutenbergViewController: UIViewController {
}

extension GutenbergViewController: GutenbergBridgeDelegate {

func gutenbergDidLoad() {

}
Expand All @@ -42,7 +44,23 @@ extension GutenbergViewController: GutenbergBridgeDelegate {

func gutenbergDidRequestMediaPicker(with callback: @escaping MediaPickerDidPickMediaCallback) {
print("Gutenberg did request media picker, passing a sample url in callback")
callback("https://cldup.com/cXyG__fTLN.jpg")
callback(1, "https://cldup.com/cXyG__fTLN.jpg")
}

func gutenbergDidRequestMediaFromDevicePicker(with callback: @escaping MediaPickerDidPickMediaCallback) {
print("Gutenberg did request a device media picker, opening the device picker")
mediaPickAndUploadCoordinator = MediaPickAndUploadCoordinator(presenter: self, gutenberg: gutenberg, mediaCallback: callback, finishCallback: {
self.mediaPickAndUploadCoordinator = nil
} )
mediaPickAndUploadCoordinator?.pickAndUpload(from: .savedPhotosAlbum)
}

func gutenbergDidRequestMediaFromCameraPicker(with callback: @escaping MediaPickerDidPickMediaCallback) {
print("Gutenberg did request a device media picker, opening the camera picker")
mediaPickAndUploadCoordinator = MediaPickAndUploadCoordinator(presenter: self, gutenberg: gutenberg, mediaCallback: callback, finishCallback: {
self.mediaPickAndUploadCoordinator = nil
} )
mediaPickAndUploadCoordinator?.pickAndUpload(from: .camera)
}
}

Expand Down
12 changes: 11 additions & 1 deletion ios/gutenberg/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,17 @@
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>NSLocationWhenInUseUsageDescription</key>
<string></string>
<string>The app would like to add your location to posts on sites where you have enabled geotagging.</string>
<key>NSCameraUsageDescription</key>
<string>To take photos or videos to use in your posts.</string>
<key>NSLocationUsageDescription</key>
<string>The app would like to add your location to posts on sites where you have enabled geotagging.</string>
<key>NSMicrophoneUsageDescription</key>
<string>Enable microphone access to record sound in your videos.</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>To add photos or videos to your posts.</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>To add photos or videos to your posts.</string>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSExceptionDomains</key>
Expand Down
83 changes: 83 additions & 0 deletions ios/gutenberg/MediaPickAndUploadCoordinator.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@

import Foundation
import UIKit
import RNReactNativeGutenbergBridge

class MediaPickAndUploadCoordinator: NSObject, UIImagePickerControllerDelegate, UINavigationControllerDelegate {

private let presenter: UIViewController
private let mediaCallback: MediaPickerDidPickMediaCallback
private let gutenberg: Gutenberg

init(presenter: UIViewController,
gutenberg: Gutenberg,
mediaCallback: @escaping MediaPickerDidPickMediaCallback,
finishCallback: @escaping () -> Void) {
self.presenter = presenter
self.gutenberg = gutenberg
self.mediaCallback = mediaCallback
}

func pickAndUpload(from source: UIImagePickerController.SourceType) {
guard UIImagePickerController.isSourceTypeAvailable(source) else {
// Camera not available, bound to happen in the simulator
mediaCallback(nil, nil)
return
}
let pickerController = UIImagePickerController()
pickerController.sourceType = source
pickerController.delegate = self
presenter.show(pickerController, sender: nil)
}

func imagePickerControllerDidCancel(_ picker: UIImagePickerController) {
presenter.dismiss(animated: true, completion: nil)
mediaCallback(nil, nil)
}

func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [String : Any]) {
presenter.dismiss(animated: true, completion: nil)
let mediaID = UUID().uuidString
let url = URL(fileURLWithPath: NSTemporaryDirectory() + mediaID + ".jpg")
guard
let image = info[UIImagePickerControllerOriginalImage] as? UIImage,
let data = UIImageJPEGRepresentation(image, 1.0)
else {
return
}
do {
try data.write(to: url)
mediaCallback(mediaID.hashValue, url.absoluteString)
let progress = Progress(parent: nil, userInfo: [ProgressUserInfoKey.mediaID: mediaID, ProgressUserInfoKey.mediaURL: url])
progress.totalUnitCount = 100

Timer.scheduledTimer(timeInterval: 0.1, target: self, selector: #selector(timerFireMethod(_:)), userInfo: progress, repeats: true)
} catch {
mediaCallback(nil, nil)
}
}

@objc func timerFireMethod(_ timer: Timer) {
guard let progress = timer.userInfo as? Progress,
let mediaID = progress.userInfo[.mediaID] as? String,
let mediaURL = progress.userInfo[.mediaURL] as? URL
//let otherURL = URL(string: "https://cldup.com/cXyG__fTLN.jpg")
else {
timer.invalidate()
return
}
progress.completedUnitCount += 1

if progress.fractionCompleted < 1 {
gutenberg.mediaUploadUpdate(id: mediaID.hashValue, state: .uploading, progress: Float(progress.fractionCompleted), url: nil, serverID: nil)
} else if progress.fractionCompleted >= 1 {
timer.invalidate()
gutenberg.mediaUploadUpdate(id: mediaID.hashValue, state: .succeeded, progress: 1, url: mediaURL, serverID: 124)
}
}
}

extension ProgressUserInfoKey {
static let mediaID = ProgressUserInfoKey("mediaID")
static let mediaURL = ProgressUserInfoKey("mediaURL")
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,16 @@ interface MediaSelectedCallback {
void onMediaSelected(String mediaUrl);
}

void onMediaLibraryPress(MediaSelectedCallback mediaSelectedCallback);
interface MediaUploadCallback {
void onUploadMediaFileSelected(int mediaId, String mediaUri);
void onMediaFileUploadProgress(int mediaId, float progress);
void onMediaFileUploadSucceeded(int mediaId, String mediaUrl, int serverId);
void onMediaFileUploadFailed(int mediaId);
}

void onMediaLibraryPressed(MediaSelectedCallback mediaSelectedCallback);

void onUploadMediaPressed(MediaUploadCallback mediaUploadCallback);

void onCapturePhotoPressed(MediaUploadCallback mediaUploadCallback);
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,22 @@ public class RNReactNativeGutenbergBridgeModule extends ReactContextBaseJavaModu
private static final String EVENT_NAME_REQUEST_GET_HTML = "requestGetHtml";
private static final String EVENT_NAME_UPDATE_HTML = "updateHtml";
private static final String EVENT_NAME_UPDATE_TITLE = "setTitle";
private static final String EVENT_NAME_MEDIA_UPLOAD = "mediaUpload";

private static final String MAP_KEY_UPDATE_HTML = "html";
private static final String MAP_KEY_UPDATE_TITLE = "title";
private static final String MAP_KEY_MEDIA_FILE_UPLOAD_STATE = "state";
private static final String MAP_KEY_MEDIA_FILE_UPLOAD_MEDIA_ID = "mediaId";
private static final String MAP_KEY_MEDIA_FILE_UPLOAD_MEDIA_URL = "mediaUrl";
private static final String MAP_KEY_MEDIA_FILE_UPLOAD_MEDIA_PROGRESS = "progress";
private static final String MAP_KEY_MEDIA_FILE_UPLOAD_MEDIA_SERVER_ID = "mediaServerId";

private static final int MEDIA_UPLOAD_STATE_UPLOADING = 1;
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 @@ -61,14 +74,80 @@ public void provideToNative_Html(String html, String title, boolean changed) {
}

@ReactMethod
public void onMediaLibraryPress(final Callback onMediaSelected) {
mGutenbergBridgeJS2Parent.onMediaLibraryPress(new MediaSelectedCallback() {
public void onMediaLibraryPressed(final Callback onMediaSelected) {
mGutenbergBridgeJS2Parent.onMediaLibraryPressed(new MediaSelectedCallback() {
@Override public void onMediaSelected(String mediaUrl) {
onMediaSelected.invoke(mediaUrl);
}
});
}

@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);
}

@Override
public void onMediaFileUploadFailed(int mediaId) {
setMediaFileUploadDataInJS(MEDIA_UPLOAD_STATE_FAILED, mediaId, null, 0 );
}
});
}

@ReactMethod
public void onCapturePhotoPressed(final Callback onUploadMediaSelected) {
mGutenbergBridgeJS2Parent.onCapturePhotoPressed(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);
}

@Override
public void onMediaFileUploadFailed(int mediaId) {
setMediaFileUploadDataInJS(MEDIA_UPLOAD_STATE_FAILED, mediaId, null, 0);
}
});
}

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 != MEDIA_SERVER_ID_UNKNOWN) {
writableMap.putInt(MAP_KEY_MEDIA_FILE_UPLOAD_MEDIA_SERVER_ID, mediaServerId);
}
emitToJS(EVENT_NAME_MEDIA_UPLOAD, writableMap);
}

public void toggleEditorMode() {
emitToJS("toggleHTMLMode", null);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.wordpress.mobile.ReactNativeAztec.ReactAztecPackage;
import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent;
import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent.MediaSelectedCallback;
import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent.MediaUploadCallback;
import org.wordpress.mobile.ReactNativeGutenbergBridge.RNReactNativeGutenbergBridgePackage;

import java.util.Arrays;
Expand All @@ -35,6 +36,7 @@ public class WPAndroidGlueCode {
private ReactContext mReactContext;
private RNReactNativeGutenbergBridgePackage mRnReactNativeGutenbergBridgePackage;
private MediaSelectedCallback mPendingMediaSelectedCallback;
private MediaUploadCallback mPendingMediaUploadCallback;

private String mContentHtml = "";
private String mTitle = "";
Expand Down Expand Up @@ -63,7 +65,9 @@ public boolean isContentChanged() {
}

public interface OnMediaLibraryButtonListener {
void onMediaLibraryButtonClick();
void onMediaLibraryButtonClicked();
void onUploadMediaButtonClicked();
void onCapturePhotoButtonClicked();
}

protected List<ReactPackage> getPackages(final OnMediaLibraryButtonListener onMediaLibraryButtonListener) {
Expand All @@ -78,9 +82,21 @@ public void responseHtml(String title, String html, boolean changed) {
mGetContentCountDownLatch.countDown();
}

@Override public void onMediaLibraryPress(MediaSelectedCallback mediaSelectedCallback) {
@Override public void onMediaLibraryPressed(MediaSelectedCallback mediaSelectedCallback) {
mPendingMediaSelectedCallback = mediaSelectedCallback;
onMediaLibraryButtonListener.onMediaLibraryButtonClick();
onMediaLibraryButtonListener.onMediaLibraryButtonClicked();
}

@Override
public void onUploadMediaPressed(MediaUploadCallback mediaUploadCallback) {
mPendingMediaUploadCallback = mediaUploadCallback;
onMediaLibraryButtonListener.onUploadMediaButtonClicked();
}

@Override
public void onCapturePhotoPressed(MediaUploadCallback mediaUploadCallback) {
mPendingMediaUploadCallback = mediaUploadCallback;
onMediaLibraryButtonListener.onCapturePhotoButtonClicked();
}
});
return Arrays.asList(
Expand Down Expand Up @@ -275,5 +291,35 @@ public void appendMediaFile(final String mediaUrl) {
public void toggleEditorMode() {
mRnReactNativeGutenbergBridgePackage.getRNReactNativeGutenbergBridgeModule().toggleEditorMode();
}

public void appendUploadMediaFile(final int mediaId, final String mediaUri) {
if (isMediaUploadCallbackRegistered()) {
mPendingMediaUploadCallback.onUploadMediaFileSelected(mediaId, mediaUri);
}
}

public void mediaFileUploadProgress(final int mediaId, final float progress) {
if (isMediaUploadCallbackRegistered()) {
mPendingMediaUploadCallback.onMediaFileUploadProgress(mediaId, progress);
}
}

public void mediaFileUploadFailed(final int mediaId) {
if (isMediaUploadCallbackRegistered()) {
mPendingMediaUploadCallback.onMediaFileUploadFailed(mediaId);
mPendingMediaUploadCallback = null;
}
}

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

private boolean isMediaUploadCallbackRegistered() {
return mPendingMediaUploadCallback != null;
}
}

Loading