From c9e3eb11b886f782236549e97ed15a3aacf56fc7 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Thu, 7 Nov 2019 11:30:48 +0100 Subject: [PATCH] show stock options only for wp.com or jetpack sites (#10745) --- .../android/ui/posts/EditPostActivity.java | 7 ++++++- .../android/editor/GutenbergEditorFragment.java | 14 ++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) 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 714d30dc7742..3b170912d729 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 @@ -2158,7 +2158,12 @@ public Fragment getItem(int position) { setGutenbergEnabledIfNeeded(); String languageString = LocaleManager.getLanguage(EditPostActivity.this); String wpcomLocaleSlug = languageString.replace("_", "-").toLowerCase(Locale.ENGLISH); - return GutenbergEditorFragment.newInstance("", "", mIsNewPost, wpcomLocaleSlug); + boolean supportsStockPhotos = mSite.isUsingWpComRestApi(); + return GutenbergEditorFragment.newInstance("", + "", + mIsNewPost, + wpcomLocaleSlug, + supportsStockPhotos); } else { // If gutenberg editor is not selected, default to Aztec. return AztecEditorFragment.newInstance("", "", AppPrefs.isAztecEditorToolbarExpanded()); 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 ae96e12bc5b4..1932aa5b14ea 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 @@ -64,6 +64,7 @@ public class GutenbergEditorFragment extends EditorFragmentAbstract implements private static final String KEY_EDITOR_DID_MOUNT = "KEY_EDITOR_DID_MOUNT"; private static final String ARG_IS_NEW_POST = "param_is_new_post"; private static final String ARG_LOCALE_SLUG = "param_locale_slug"; + private static final String ARG_SUPPORT_STOCK_PHOTOS = "param_support_stock_photos"; private static final int CAPTURE_PHOTO_PERMISSION_REQUEST_CODE = 101; private static final int CAPTURE_VIDEO_PERMISSION_REQUEST_CODE = 102; @@ -94,13 +95,15 @@ public class GutenbergEditorFragment extends EditorFragmentAbstract implements public static GutenbergEditorFragment newInstance(String title, String content, boolean isNewPost, - String localeSlug) { + String localeSlug, + boolean supportStockPhotos) { GutenbergEditorFragment fragment = new GutenbergEditorFragment(); Bundle args = new Bundle(); args.putString(ARG_PARAM_TITLE, title); args.putString(ARG_PARAM_CONTENT, content); args.putBoolean(ARG_IS_NEW_POST, isNewPost); args.putString(ARG_LOCALE_SLUG, localeSlug); + args.putBoolean(ARG_SUPPORT_STOCK_PHOTOS, supportStockPhotos); fragment.setArguments(args); return fragment; } @@ -361,10 +364,13 @@ public void run() { private ArrayList initOtherMediaImageOptions() { ArrayList otherMediaOptions = new ArrayList<>(); - String packageName = getActivity().getApplication().getPackageName(); - int stockMediaResourceId = getResources().getIdentifier("photo_picker_stock_media", "string", packageName); + boolean supportStockPhotos = getArguments().getBoolean(ARG_SUPPORT_STOCK_PHOTOS); + if (supportStockPhotos) { + String packageName = getActivity().getApplication().getPackageName(); + int stockMediaResourceId = getResources().getIdentifier("photo_picker_stock_media", "string", packageName); - otherMediaOptions.add(new MediaOption(MEDIA_SOURCE_STOCK_MEDIA, getString(stockMediaResourceId))); + otherMediaOptions.add(new MediaOption(MEDIA_SOURCE_STOCK_MEDIA, getString(stockMediaResourceId))); + } return otherMediaOptions; }