From 575d48a9ba248c14a0c848a17501f2bfb6e73056 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Fri, 28 Dec 2018 14:18:11 +0100 Subject: [PATCH 01/18] Propagate add photo clicked action Pass upload media file callback data --- .../android/ui/posts/EditPostActivity.java | 5 +++++ .../android/editor/EditorFragmentAbstract.java | 1 + .../android/editor/GutenbergEditorFragment.java | 16 +++++++++++++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java index 35593d3ab0c7..054fcb7d1323 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java @@ -3181,6 +3181,11 @@ public void onAddMediaClicked() { } } + @Override + public void onAddPhotoClicked() { + onPhotoPickerIconClicked(PhotoPickerIcon.ANDROID_CHOOSE_PHOTO); + } + @Override public void onMediaDropped(final ArrayList mediaUris) { mDroppedMediaUris = mediaUris; diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java index 21b1d899c6a3..09c1265d10e8 100644 --- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java +++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java @@ -179,6 +179,7 @@ public interface EditorFragmentListener { void onEditorFragmentInitialized(); void onSettingsClicked(); void onAddMediaClicked(); + void onAddPhotoClicked(); boolean onMediaRetryClicked(String mediaId); void onMediaUploadCancelClicked(String mediaId); void onMediaDeleted(String mediaId); diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java index 215e7899491e..ece07a41c88b 100644 --- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java +++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java @@ -20,6 +20,7 @@ import android.view.ViewGroup; import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; +import android.webkit.URLUtil; import com.android.volley.toolbox.ImageLoader; @@ -111,6 +112,11 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa @Override public void onMediaLibraryButtonClick() { onToolbarMediaButtonClicked(); } + + @Override + public void onUploadMediaButtonClick() { + mEditorFragmentListener.onAddPhotoClicked(); + } }, getActivity().getApplication(), BuildConfig.DEBUG, @@ -444,7 +450,11 @@ public void appendMediaFile(final MediaFile mediaFile, final String mediaUrl, Im return; } - mWPAndroidGlueCode.appendMediaFile(mediaUrl); + if (URLUtil.isNetworkUrl(mediaUrl)) { + mWPAndroidGlueCode.appendMediaFile(mediaUrl); + } else { + mWPAndroidGlueCode.selectMediaFile( String.valueOf(mediaFile.getId()), "file://"+ mediaUrl); + } } @Override @@ -496,19 +506,23 @@ public void onMediaUploadRetry(String localId, MediaType mediaType) { @Override public void onMediaUploadSucceeded(final String localMediaId, final MediaFile mediaFile) { + mWPAndroidGlueCode.mediaFileUploadSucceeded(localMediaId, mediaFile.getFileURL()); } @Override public void onMediaUploadProgress(final String localMediaId, final float progress) { + mWPAndroidGlueCode.mediaFileUpload(localMediaId, progress); } @Override public void onMediaUploadFailed(final String localMediaId, final MediaType mediaType, final String errorMessage) { + mWPAndroidGlueCode.mediaFileUploadFailed(localMediaId); } @Override public void onGalleryMediaUploadSucceeded(final long galleryId, long remoteMediaId, int remaining) { + } @Override From 6b9c9318d07903579009ccf3919417ddac13aaf6 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Fri, 28 Dec 2018 14:24:20 +0100 Subject: [PATCH 02/18] Update gutenber-mobile submodule hash to branch feature/upload_media_file_android --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 11aa98f76d54..3662004efd36 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 11aa98f76d5450d7a8d231d97f4d2ee3eb9ed98f +Subproject commit 3662004efd367ec73e3bb53f6fe3b461735d05e5 From ec91a4d9121f55af76784a29b3e0e58087523580 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Fri, 28 Dec 2018 14:42:47 +0100 Subject: [PATCH 03/18] Update gutenberg-mobile submodule hash --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 3662004efd36..4efd0dfecdbc 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 3662004efd367ec73e3bb53f6fe3b461735d05e5 +Subproject commit 4efd0dfecdbc42f6a06734d65cc392faa84f7710 From c2bd36660c9b27f0a59ce9f176e9c86cf7755d6c Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Fri, 28 Dec 2018 15:34:21 +0100 Subject: [PATCH 04/18] Removed extra empty line --- .../org/wordpress/android/editor/GutenbergEditorFragment.java | 1 - 1 file changed, 1 deletion(-) diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java index ece07a41c88b..69636b2ee142 100644 --- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java +++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java @@ -522,7 +522,6 @@ public void onMediaUploadFailed(final String localMediaId, final MediaType @Override public void onGalleryMediaUploadSucceeded(final long galleryId, long remoteMediaId, int remaining) { - } @Override From 548e6c9da3ef4f3bbaaafde6da5f85cd189221fa Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Fri, 28 Dec 2018 15:54:00 +0100 Subject: [PATCH 05/18] Fixed checkstyle tests --- .../org/wordpress/android/editor/GutenbergEditorFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java index 69636b2ee142..79ee5b57640c 100644 --- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java +++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java @@ -453,7 +453,7 @@ public void appendMediaFile(final MediaFile mediaFile, final String mediaUrl, Im if (URLUtil.isNetworkUrl(mediaUrl)) { mWPAndroidGlueCode.appendMediaFile(mediaUrl); } else { - mWPAndroidGlueCode.selectMediaFile( String.valueOf(mediaFile.getId()), "file://"+ mediaUrl); + mWPAndroidGlueCode.selectMediaFile(String.valueOf(mediaFile.getId()), "file://" + mediaUrl); } } From 36b8eaf3ff724f904acd052bd32ebcc3dabd39fb Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Fri, 28 Dec 2018 17:15:57 +0100 Subject: [PATCH 06/18] Updated gutenberg submodule --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 4efd0dfecdbc..bcbff88f5678 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 4efd0dfecdbc42f6a06734d65cc392faa84f7710 +Subproject commit bcbff88f5678faf714ff8d76ffb0bacec2dd577f From c450b92060fd553b358df09d8e7787a85fe4bf3a Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Fri, 28 Dec 2018 17:16:17 +0100 Subject: [PATCH 07/18] Updated gutenberg submodule --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index bcbff88f5678..d39d5649fe64 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit bcbff88f5678faf714ff8d76ffb0bacec2dd577f +Subproject commit d39d5649fe6407f77c198c8bb826d80e2b33ac54 From a57e0b46a3f43d2833fe36f9bc7f654cde9a99e8 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Fri, 28 Dec 2018 17:31:28 +0100 Subject: [PATCH 08/18] Update gutenberg-mobile submodule --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index d39d5649fe64..f27394363f0d 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit d39d5649fe6407f77c198c8bb826d80e2b33ac54 +Subproject commit f27394363f0dc822f1db3c82e61b167e28261677 From da94295ae06a9d4327246dbf8cf11514197e6eea Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Fri, 28 Dec 2018 17:32:09 +0100 Subject: [PATCH 09/18] User renamed android glue methods --- .../org/wordpress/android/editor/GutenbergEditorFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java index 79ee5b57640c..910b0341f7c2 100644 --- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java +++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java @@ -453,7 +453,7 @@ public void appendMediaFile(final MediaFile mediaFile, final String mediaUrl, Im if (URLUtil.isNetworkUrl(mediaUrl)) { mWPAndroidGlueCode.appendMediaFile(mediaUrl); } else { - mWPAndroidGlueCode.selectMediaFile(String.valueOf(mediaFile.getId()), "file://" + mediaUrl); + mWPAndroidGlueCode.appendUploadMediaFile(String.valueOf(mediaFile.getId()), "file://" + mediaUrl); } } @@ -511,7 +511,7 @@ public void onMediaUploadSucceeded(final String localMediaId, final MediaFile me @Override public void onMediaUploadProgress(final String localMediaId, final float progress) { - mWPAndroidGlueCode.mediaFileUpload(localMediaId, progress); + mWPAndroidGlueCode.mediaFileUploadProgress(localMediaId, progress); } @Override From ecb68ef1141164937326c459e9d9c19530152b68 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Wed, 16 Jan 2019 12:08:00 +0100 Subject: [PATCH 10/18] Make verb used in callback methods to be a conjugation in the past tense --- .../org/wordpress/android/editor/GutenbergEditorFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java index 910b0341f7c2..43c9d3cebd40 100644 --- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java +++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java @@ -109,12 +109,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa view.findViewById(R.id.gutenberg), mHtmlModeEnabled, new OnMediaLibraryButtonListener() { - @Override public void onMediaLibraryButtonClick() { + @Override public void onMediaLibraryButtonClicked() { onToolbarMediaButtonClicked(); } @Override - public void onUploadMediaButtonClick() { + public void onUploadMediaButtonClicked() { mEditorFragmentListener.onAddPhotoClicked(); } }, From e7bdda1c23f1e5765bbc2843431d571fa65b747f Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Wed, 16 Jan 2019 12:11:31 +0100 Subject: [PATCH 11/18] Updated gutenberg mobile submodule --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index f27394363f0d..db115acfc495 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit f27394363f0dc822f1db3c82e61b167e28261677 +Subproject commit db115acfc495c6e7fe724935185bb0b9fc9232a0 From 0070fc26d5cf8c95c0f4920b17335dce63107102 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Wed, 16 Jan 2019 12:22:14 +0100 Subject: [PATCH 12/18] Updated gutenberg mobile submodule --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index db115acfc495..35175ec1c1c9 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit db115acfc495c6e7fe724935185bb0b9fc9232a0 +Subproject commit 35175ec1c1c9d799f15d7ce5172992caa15e7abe From 4132004098f42be43705e025879649df6866a27a Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Wed, 16 Jan 2019 17:24:18 +0100 Subject: [PATCH 13/18] Updated gutenberg mobile submodule --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 1ee0844e6bd0..0b433ea5af0f 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 1ee0844e6bd036525dcef9b822850048517a4181 +Subproject commit 0b433ea5af0f3dc6d683467d2060a5ad71b3b82d From a82541ace0180a20aa752c6d588c87bc7b6ea836 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Thu, 17 Jan 2019 12:06:04 +0100 Subject: [PATCH 14/18] Update gutenberg mobile submodule --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 0b433ea5af0f..b3f7ddd1deb3 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 0b433ea5af0f3dc6d683467d2060a5ad71b3b82d +Subproject commit b3f7ddd1deb31ae519f27ecffd3bebd6e3a3e292 From ec0ff7060dd22a4cea1e9a088c6c765b4afe5c57 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Thu, 17 Jan 2019 15:03:02 +0100 Subject: [PATCH 15/18] Update gutenberg mobile submodule --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index b3f7ddd1deb3..f08f3f8bed23 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit b3f7ddd1deb31ae519f27ecffd3bebd6e3a3e292 +Subproject commit f08f3f8bed2354fad614eed5a368f1ec0da3ecdb From 3a1033059bb8303c832276b28dd1bf83a1dea2d0 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Thu, 17 Jan 2019 17:56:12 +0100 Subject: [PATCH 16/18] Update gutenberg mobile submodule --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index f08f3f8bed23..5468ecb7596d 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit f08f3f8bed2354fad614eed5a368f1ec0da3ecdb +Subproject commit 5468ecb7596d19a01af20e81fca7114e5709c229 From 4f3dbe3d2fd193a9cd26809cb96bec7ab9f2ccdf Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Thu, 17 Jan 2019 18:06:44 +0100 Subject: [PATCH 17/18] Updated gutenberg mobile submodule --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 5468ecb7596d..4f2818a96b20 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 5468ecb7596d19a01af20e81fca7114e5709c229 +Subproject commit 4f2818a96b2083b6e9a568c9c7d0e80489427015 From 2caa09b46b7e68f82e74277159821c8c9c67d154 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Fri, 18 Jan 2019 13:02:41 +0100 Subject: [PATCH 18/18] Updated gutenberg mobile submodule --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 4f2818a96b20..15dfe2b88593 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 4f2818a96b2083b6e9a568c9c7d0e80489427015 +Subproject commit 15dfe2b88593e93765401ef0ac314e4842431fe6