-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Squashed 'libs/editor/' changes from ce4343d..6647346
6647346 Merge pull request #267 from wordpress-mobile/issue/261-image-settings-nav 8b0ee06 Added featured image to state of image settings dialog, which is checked when attempting to exit without saving 47b7874 Error handling for retrieving featured image from JSON meta data e963027 Merge branch 'develop' into issue/261-image-settings-nav ca9c4ed Merge pull request #266 from wordpress-mobile/sync-featured-wpandroid fd6901d Merge branch 'develop' into sync-featured-wpandroid 156dbf0 Make travis use the latest platform-tools 021b485 Fixed onMediaUploadSucceeded implementation in the example activity c3b2934 Updated travis build tools to 23.0.2 888b271 Update gradle and build tools versions for example app 6917b66 Merge branch 'feature/visual-editor' into feature/editor-featured-images 8507915 Merge branch 'develop' into feature/visual-editor 91effe7 Removed unused 'Include image in post content' checkbox from image settings 3192b38 Updating gradle plugin to 1.5.0 and support/build tools to latest for sub projects 92683c0 Show a 'Changes saved' toast when saving and exiting the image settings dialog f5c2f13 Fixed a capitalization issue when setting the alignment spinner value 396ffcd Return to the editor when the back button is pressed within the image settings fragment d5d4c91 Fixed a capitalization issue with image alignment meta values 9fd836c Show a confirmation dialog when closing the image settings fragment with unsaved changes ec7e853 Use a callback instead of a getter to notify the host activity when the featured image changes 13b5f5a Add the remote media id to image tags when inserting from media gallery 04f9cf9 Hide the featured image checkbox if feature images aren't supported b8c8ba2 Updated Editor example project with changes to onMediaUploadProgress b3031d6 Fixed a crash issue in the image settings dialog fragment b44742e Converted featured id handling methods to be part of EditorFragmentAbstract 9d4facf Added support for getting and setting the featured image id to the editor fragments 10cc6f0 Don't clear all class data in ZSSEditor.markImageUploadDone 0a6722b Add the remote image ID to the image tag when an image upload completes 6d1c12d Added support for setting/unsetting an image as featured to the image settings dialog 2c1c98e Modified onMediaTapped to pass the image meta data as a JSONObject 477e0c9 Merge pull request #262 from wordpress-mobile/issue/233-media-sharing 7e6ee2d Fixed a potential NPE in getTitle() and getContent() 10cdca9 Queue media insertions that arrive before the DOM has loaded, and execute them later e69588f Fixed a broken test and an issue with the editor demo activity 862972f Implemented missing method in EditorFragmentAbstractTest 580c259 Added some empty string checking when retrieving failed media ids from the ZSSEditor 06c3f3a Adjusted the pattern used by the ZSSEditor to find images that are uploading 383840a Disable editor format bar buttons when post/page contains failed uploads 4ac4dfb Updated EditorFragment to handle exiting the editor with media uploads in progress more gracefully 8c34a40 Added a 'delete' flag to onMediaUploadCancelClicked 49a69f5 Fixed a bug where the media upload progress bar wouldn't display due to a localization issue 32b2696 Visual editor lib version bump bda0e0f Updated image settings dialog to always clear the custom ActionBar view 438916b Merge commit '7b6a9d464896683ba4aef6f4dccc9021641e5d71' into develop 14f89b2 Updating build tools to 23.0.1 f378f6e Merge branch 'release/4.4' into develop de1085d use default AppCompat theme on EditLink and AddCategory dialog 7bae170 set targetSdkVersion to 23 and clean up lib dependencies 1624a01 migrate from mavenCentral to jcenter (which is now the default for Android Studio) f55a91e upgrade subtrees to latest android tools e0a098f update to gradle plugin 1.3.1 and gradle 2.6 62e18f1 Merge branch 'develop' into feature/update-to-gradle-2.4 d2e000e upgrade to gradle 2.5 and gradle plugin 1.3.0 git-subtree-dir: libs/editor git-subtree-split: 664734643e6728e2dca9859bdf5e5b940db92491
- Loading branch information
Showing
17 changed files
with
334 additions
and
71 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
WordPressEditor/src/main/java/org/wordpress/android/editor/EditorMediaUploadListener.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
package org.wordpress.android.editor; | ||
|
||
public interface EditorMediaUploadListener { | ||
void onMediaUploadSucceeded(String localId, String remoteUrl); | ||
void onMediaUploadSucceeded(String localId, String remoteId, String remoteUrl); | ||
void onMediaUploadProgress(String localId, float progress); | ||
void onMediaUploadFailed(String localId); | ||
} |
Oops, something went wrong.