diff --git a/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java b/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java index c747aa323831..860e6e865a35 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java @@ -92,6 +92,7 @@ import org.wordpress.android.ui.plugins.PluginDetailActivity; import org.wordpress.android.ui.plugins.PluginUtils; import org.wordpress.android.ui.posts.EditPostActivity; +import org.wordpress.android.ui.posts.EditPostActivityConstants; import org.wordpress.android.ui.posts.JetpackSecuritySettingsActivity; import org.wordpress.android.ui.posts.PostListType; import org.wordpress.android.ui.posts.PostUtils; @@ -438,7 +439,7 @@ public static void openEditorForSiteInNewStack(Context context, @NonNull SiteMod Intent editorIntent = new Intent(context, EditPostActivity.class); editorIntent.putExtra(WordPress.SITE, site); - editorIntent.putExtra(EditPostActivity.EXTRA_IS_PAGE, false); + editorIntent.putExtra(EditPostActivityConstants.EXTRA_IS_PAGE, false); taskStackBuilder.addNextIntent(mainActivityIntent); taskStackBuilder.addNextIntent(editorIntent); @@ -452,8 +453,8 @@ public static void openEditorForPostInNewStack(Context context, @NonNull SiteMod Intent editorIntent = new Intent(context, EditPostActivity.class); editorIntent.putExtra(WordPress.SITE, site); - editorIntent.putExtra(EditPostActivity.EXTRA_POST_LOCAL_ID, localPostId); - editorIntent.putExtra(EditPostActivity.EXTRA_IS_PAGE, false); + editorIntent.putExtra(EditPostActivityConstants.EXTRA_POST_LOCAL_ID, localPostId); + editorIntent.putExtra(EditPostActivityConstants.EXTRA_IS_PAGE, false); taskStackBuilder.addNextIntent(mainActivityIntent); taskStackBuilder.addNextIntent(editorIntent); @@ -493,11 +494,11 @@ public static void openEditorForReblog( ); Intent editorIntent = new Intent(activity, EditPostActivity.class); - editorIntent.putExtra(EditPostActivity.EXTRA_REBLOG_POST_TITLE, post.getTitle()); - editorIntent.putExtra(EditPostActivity.EXTRA_REBLOG_POST_QUOTE, post.getExcerpt()); - editorIntent.putExtra(EditPostActivity.EXTRA_REBLOG_POST_IMAGE, post.getFeaturedImage()); - editorIntent.putExtra(EditPostActivity.EXTRA_REBLOG_POST_CITATION, post.getUrl()); - editorIntent.setAction(EditPostActivity.ACTION_REBLOG); + editorIntent.putExtra(EditPostActivityConstants.EXTRA_REBLOG_POST_TITLE, post.getTitle()); + editorIntent.putExtra(EditPostActivityConstants.EXTRA_REBLOG_POST_QUOTE, post.getExcerpt()); + editorIntent.putExtra(EditPostActivityConstants.EXTRA_REBLOG_POST_IMAGE, post.getFeaturedImage()); + editorIntent.putExtra(EditPostActivityConstants.EXTRA_REBLOG_POST_CITATION, post.getUrl()); + editorIntent.setAction(EditPostActivityConstants.ACTION_REBLOG); addNewPostForResult(editorIntent, activity, site, false, reblogSource, -1, null); } @@ -1019,11 +1020,11 @@ public static void addNewPostForResult( } intent.putExtra(WordPress.SITE, site); - intent.putExtra(EditPostActivity.EXTRA_IS_PAGE, false); - intent.putExtra(EditPostActivity.EXTRA_IS_PROMO, isPromo); + intent.putExtra(EditPostActivityConstants.EXTRA_IS_PAGE, false); + intent.putExtra(EditPostActivityConstants.EXTRA_IS_PROMO, isPromo); intent.putExtra(AnalyticsUtils.EXTRA_CREATION_SOURCE_DETAIL, source); - intent.putExtra(EditPostActivity.EXTRA_PROMPT_ID, promptId); - intent.putExtra(EditPostActivity.EXTRA_ENTRY_POINT, entryPoint); + intent.putExtra(EditPostActivityConstants.EXTRA_PROMPT_ID, promptId); + intent.putExtra(EditPostActivityConstants.EXTRA_ENTRY_POINT, entryPoint); activity.startActivityForResult(intent, RequestCodes.EDIT_POST); } @@ -1147,8 +1148,8 @@ public static void editPostOrPageForResult(Intent intent, Activity activity, Sit // PostModel objects can be quite large, since content field is not size restricted, // in order to avoid issues like TransactionTooLargeException it's better to pass the id of the post. // However, we still want to keep passing the SiteModel to avoid confusion around local & remote ids. - intent.putExtra(EditPostActivity.EXTRA_POST_LOCAL_ID, postLocalId); - intent.putExtra(EditPostActivity.EXTRA_LOAD_AUTO_SAVE_REVISION, loadAutoSaveRevision); + intent.putExtra(EditPostActivityConstants.EXTRA_POST_LOCAL_ID, postLocalId); + intent.putExtra(EditPostActivityConstants.EXTRA_LOAD_AUTO_SAVE_REVISION, loadAutoSaveRevision); activity.startActivityForResult(intent, RequestCodes.EDIT_POST); } @@ -1167,16 +1168,16 @@ public static void editPageForResult(Intent intent, @NonNull Fragment fragment, public static void editLandingPageForResult(@NonNull Fragment fragment, @NonNull SiteModel site, int homeLocalId, boolean isNewSite) { Intent intent = new Intent(fragment.getContext(), EditPostActivity.class); - intent.putExtra(EditPostActivity.EXTRA_IS_LANDING_EDITOR, true); - intent.putExtra(EditPostActivity.EXTRA_IS_LANDING_EDITOR_OPENED_FOR_NEW_SITE, isNewSite); + intent.putExtra(EditPostActivityConstants.EXTRA_IS_LANDING_EDITOR, true); + intent.putExtra(EditPostActivityConstants.EXTRA_IS_LANDING_EDITOR_OPENED_FOR_NEW_SITE, isNewSite); editPageForResult(intent, fragment, site, homeLocalId, false, RequestCodes.EDIT_LANDING_PAGE); } public static void editPageForResult(Intent intent, @NonNull Fragment fragment, @NonNull SiteModel site, int pageLocalId, boolean loadAutoSaveRevision, int requestCode) { intent.putExtra(WordPress.SITE, site); - intent.putExtra(EditPostActivity.EXTRA_POST_LOCAL_ID, pageLocalId); - intent.putExtra(EditPostActivity.EXTRA_LOAD_AUTO_SAVE_REVISION, loadAutoSaveRevision); + intent.putExtra(EditPostActivityConstants.EXTRA_POST_LOCAL_ID, pageLocalId); + intent.putExtra(EditPostActivityConstants.EXTRA_LOAD_AUTO_SAVE_REVISION, loadAutoSaveRevision); fragment.startActivityForResult(intent, requestCode); } @@ -1190,11 +1191,11 @@ public static void addNewPageForResult( ) { Intent intent = new Intent(activity, EditPostActivity.class); intent.putExtra(WordPress.SITE, site); - intent.putExtra(EditPostActivity.EXTRA_IS_PAGE, true); - intent.putExtra(EditPostActivity.EXTRA_IS_PROMO, false); - intent.putExtra(EditPostActivity.EXTRA_PAGE_TITLE, title); - intent.putExtra(EditPostActivity.EXTRA_PAGE_CONTENT, content); - intent.putExtra(EditPostActivity.EXTRA_PAGE_TEMPLATE, template); + intent.putExtra(EditPostActivityConstants.EXTRA_IS_PAGE, true); + intent.putExtra(EditPostActivityConstants.EXTRA_IS_PROMO, false); + intent.putExtra(EditPostActivityConstants.EXTRA_PAGE_TITLE, title); + intent.putExtra(EditPostActivityConstants.EXTRA_PAGE_CONTENT, content); + intent.putExtra(EditPostActivityConstants.EXTRA_PAGE_TEMPLATE, template); intent.putExtra(AnalyticsUtils.EXTRA_CREATION_SOURCE_DETAIL, source); activity.startActivityForResult(intent, RequestCodes.EDIT_POST); } @@ -1208,11 +1209,11 @@ public static void addNewPageForResult( @NonNull PagePostCreationSourcesDetail source) { Intent intent = new Intent(fragment.getContext(), EditPostActivity.class); intent.putExtra(WordPress.SITE, site); - intent.putExtra(EditPostActivity.EXTRA_IS_PAGE, true); - intent.putExtra(EditPostActivity.EXTRA_IS_PROMO, false); - intent.putExtra(EditPostActivity.EXTRA_PAGE_TITLE, title); - intent.putExtra(EditPostActivity.EXTRA_PAGE_CONTENT, content); - intent.putExtra(EditPostActivity.EXTRA_PAGE_TEMPLATE, template); + intent.putExtra(EditPostActivityConstants.EXTRA_IS_PAGE, true); + intent.putExtra(EditPostActivityConstants.EXTRA_IS_PROMO, false); + intent.putExtra(EditPostActivityConstants.EXTRA_PAGE_TITLE, title); + intent.putExtra(EditPostActivityConstants.EXTRA_PAGE_CONTENT, content); + intent.putExtra(EditPostActivityConstants.EXTRA_PAGE_TEMPLATE, template); intent.putExtra(AnalyticsUtils.EXTRA_CREATION_SOURCE_DETAIL, source); fragment.startActivityForResult(intent, RequestCodes.EDIT_POST); } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/AddQuickPressShortcutActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/AddQuickPressShortcutActivity.java index f25fecd8c170..dcaa0d31f6d5 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/AddQuickPressShortcutActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/AddQuickPressShortcutActivity.java @@ -35,6 +35,7 @@ import org.wordpress.android.fluxc.store.SiteStore; import org.wordpress.android.fluxc.tools.FluxCImageLoader; import org.wordpress.android.ui.posts.EditPostActivity; +import org.wordpress.android.ui.posts.EditPostActivityConstants; import org.wordpress.android.util.SiteUtils; import org.wordpress.android.util.ToastUtils; @@ -142,8 +143,8 @@ public void onClick(DialogInterface dialog, int which) { shortcutIntent.setAction(Intent.ACTION_MAIN); shortcutIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); shortcutIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); - shortcutIntent.putExtra(EditPostActivity.EXTRA_QUICKPRESS_BLOG_ID, siteIds[position]); - shortcutIntent.putExtra(EditPostActivity.EXTRA_IS_QUICKPRESS, true); + shortcutIntent.putExtra(EditPostActivityConstants.EXTRA_QUICKPRESS_BLOG_ID, siteIds[position]); + shortcutIntent.putExtra(EditPostActivityConstants.EXTRA_IS_QUICKPRESS, true); String shortcutName = quickPressShortcutName.getText().toString(); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java index b2a55812a397..417dfaf25b38 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java @@ -118,6 +118,7 @@ import org.wordpress.android.ui.posts.BasicFragmentDialog.BasicDialogNegativeClickInterface; import org.wordpress.android.ui.posts.BasicFragmentDialog.BasicDialogPositiveClickInterface; import org.wordpress.android.ui.posts.EditPostActivity; +import org.wordpress.android.ui.posts.EditPostActivityConstants; import org.wordpress.android.ui.posts.PostUtils.EntryPoint; import org.wordpress.android.ui.posts.QuickStartPromptDialogFragment.QuickStartPromptClickInterface; import org.wordpress.android.ui.prefs.AppPrefs; @@ -1353,13 +1354,13 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { if (resultCode != Activity.RESULT_OK || data == null || isFinishing()) { return; } - int localId = data.getIntExtra(EditPostActivity.EXTRA_POST_LOCAL_ID, 0); + int localId = data.getIntExtra(EditPostActivityConstants.EXTRA_POST_LOCAL_ID, 0); final SiteModel site = (SiteModel) data.getSerializableExtra(WordPress.SITE); final PostModel post = mPostStore.getPostByLocalPostId(localId); if (EditPostActivity.checkToRestart(data)) { ActivityLauncher.editPostOrPageForResult(data, WPMainActivity.this, site, - data.getIntExtra(EditPostActivity.EXTRA_POST_LOCAL_ID, 0)); + data.getIntExtra(EditPostActivityConstants.EXTRA_POST_LOCAL_ID, 0)); // a restart will happen so, no need to continue here break; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteFragment.kt index d6f4d88ee399..ed8f46b9fed8 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteFragment.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteFragment.kt @@ -49,7 +49,7 @@ import org.wordpress.android.ui.pages.SnackbarMessageHolder import org.wordpress.android.ui.photopicker.MediaPickerConstants import org.wordpress.android.ui.photopicker.MediaPickerLauncher import org.wordpress.android.ui.posts.BasicDialogViewModel -import org.wordpress.android.ui.posts.EditPostActivity +import org.wordpress.android.ui.posts.EditPostActivityConstants import org.wordpress.android.ui.posts.PostListType import org.wordpress.android.ui.posts.PostUtils import org.wordpress.android.ui.posts.QuickStartPromptDialogFragment @@ -297,7 +297,7 @@ class MySiteFragment : Fragment(R.layout.my_site_fragment), viewModel.checkAndStartQuickStart( data.getBooleanExtra(SitePickerActivity.KEY_SITE_TITLE_TASK_COMPLETED, false), isNewSite = data.getBooleanExtra( - EditPostActivity.EXTRA_IS_LANDING_EDITOR_OPENED_FOR_NEW_SITE, false + EditPostActivityConstants.EXTRA_IS_LANDING_EDITOR_OPENED_FOR_NEW_SITE, false ) ) } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt index bec83c8dd6be..d0d346a99fe7 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt @@ -46,6 +46,7 @@ import org.wordpress.android.ui.jetpackoverlay.JetpackFeatureRemovalPhaseHelper import org.wordpress.android.ui.mlp.ModalLayoutPickerFragment import org.wordpress.android.ui.mlp.ModalLayoutPickerFragment.Companion.MODAL_LAYOUT_PICKER_TAG import org.wordpress.android.ui.posts.EditPostActivity +import org.wordpress.android.ui.posts.EditPostActivityConstants import org.wordpress.android.ui.posts.PostListAction.PreviewPost import org.wordpress.android.ui.posts.PreviewStateHelper import org.wordpress.android.ui.posts.ProgressDialogHelper @@ -176,7 +177,7 @@ class PagesFragment : Fragment(R.layout.pages_fragment), ScrollableViewInitializ data, this@PagesFragment, viewModel.site, - data.getIntExtra(EditPostActivity.EXTRA_POST_LOCAL_ID, 0), + data.getIntExtra(EditPostActivityConstants.EXTRA_POST_LOCAL_ID, 0), false ) @@ -184,7 +185,7 @@ class PagesFragment : Fragment(R.layout.pages_fragment), ScrollableViewInitializ return } // we need to work with local ids, since local drafts don't have remote ids - val localPageId = data.getIntExtra(EditPostActivity.EXTRA_POST_LOCAL_ID, -1) + val localPageId = data.getIntExtra(EditPostActivityConstants.EXTRA_POST_LOCAL_ID, -1) if (localPageId != -1) { viewModel.onPageEditFinished(localPageId, data) } 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 d739a18b867b..81623b8f49c6 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 @@ -71,13 +71,13 @@ import org.wordpress.android.editor.EditorMediaUtils; import org.wordpress.android.editor.EditorThemeUpdateListener; import org.wordpress.android.editor.ExceptionLogger; -import org.wordpress.android.editor.gutenberg.GutenbergNetworkConnectionListener; -import org.wordpress.android.editor.savedinstance.SavedInstanceDatabase; import org.wordpress.android.editor.gutenberg.DialogVisibility; import org.wordpress.android.editor.gutenberg.GutenbergEditorFragment; +import org.wordpress.android.editor.gutenberg.GutenbergNetworkConnectionListener; import org.wordpress.android.editor.gutenberg.GutenbergPropsBuilder; import org.wordpress.android.editor.gutenberg.GutenbergWebViewAuthorizationData; import org.wordpress.android.editor.gutenberg.StorySaveMediaListener; +import org.wordpress.android.editor.savedinstance.SavedInstanceDatabase; import org.wordpress.android.fluxc.Dispatcher; import org.wordpress.android.fluxc.action.AccountAction; import org.wordpress.android.fluxc.generated.AccountActionBuilder; @@ -260,6 +260,43 @@ import static org.wordpress.android.editor.gutenberg.GutenbergEditorFragment.MEDIA_ID_NO_FEATURED_IMAGE_SET; import static org.wordpress.android.imageeditor.preview.PreviewImageFragment.PREVIEW_IMAGE_REDUCED_SIZE_FACTOR; import static org.wordpress.android.ui.history.HistoryDetailContainerFragment.KEY_REVISION; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.ACTION_REBLOG; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.EXTRA_ENTRY_POINT; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.EXTRA_HAS_CHANGES; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.EXTRA_HAS_FAILED_MEDIA; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.EXTRA_INSERT_MEDIA; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.EXTRA_IS_LANDING_EDITOR; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.EXTRA_IS_NEW_POST; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.EXTRA_IS_PAGE; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.EXTRA_IS_QUICKPRESS; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.EXTRA_LOAD_AUTO_SAVE_REVISION; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.EXTRA_PAGE_CONTENT; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.EXTRA_PAGE_TEMPLATE; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.EXTRA_PAGE_TITLE; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.EXTRA_POST_LOCAL_ID; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.EXTRA_POST_REMOTE_ID; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.EXTRA_PROMPT_ID; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.EXTRA_QUICKPRESS_BLOG_ID; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.EXTRA_REBLOG_POST_CITATION; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.EXTRA_REBLOG_POST_IMAGE; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.EXTRA_REBLOG_POST_QUOTE; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.EXTRA_REBLOG_POST_TITLE; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.EXTRA_RESTART_EDITOR; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.EXTRA_UPLOAD_NOT_STARTED; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.STATE_KEY_DROPPED_MEDIA_URIS; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.STATE_KEY_EDITOR_FRAGMENT; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.STATE_KEY_GUTENBERG_IS_SHOWN; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.STATE_KEY_HTML_MODE_ON; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.STATE_KEY_IS_NEW_POST; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.STATE_KEY_IS_PHOTO_PICKER_VISIBLE; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.STATE_KEY_MEDIA_CAPTURE_PATH; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.STATE_KEY_POST_LOADING_STATE; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.STATE_KEY_POST_LOCAL_ID; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.STATE_KEY_POST_REMOTE_ID; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.STATE_KEY_REDO; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.STATE_KEY_REVISION; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.STATE_KEY_UNDO; +import static org.wordpress.android.ui.stories.StoryComposerActivity.STATE_KEY_EDITOR_SESSION_DATA; public class EditPostActivity extends LocaleAwareActivity implements EditorFragmentActivity, @@ -280,46 +317,6 @@ public class EditPostActivity extends LocaleAwareActivity implements PrivateAtCookieProgressDialogOnDismissListener, ExceptionLogger, SiteSettingsInterface.SiteSettingsListener { - public static final String ACTION_REBLOG = "reblogAction"; - public static final String EXTRA_POST_LOCAL_ID = "postModelLocalId"; - public static final String EXTRA_LOAD_AUTO_SAVE_REVISION = "loadAutosaveRevision"; - public static final String EXTRA_POST_REMOTE_ID = "postModelRemoteId"; - public static final String EXTRA_IS_PAGE = "isPage"; - public static final String EXTRA_IS_PROMO = "isPromo"; - public static final String EXTRA_IS_QUICKPRESS = "isQuickPress"; - public static final String EXTRA_IS_LANDING_EDITOR = "isLandingEditor"; - public static final String EXTRA_IS_LANDING_EDITOR_OPENED_FOR_NEW_SITE = "isLandingEditorOpenedForNewSite"; - public static final String EXTRA_QUICKPRESS_BLOG_ID = "quickPressBlogId"; - public static final String EXTRA_UPLOAD_NOT_STARTED = "savedAsLocalDraft"; - public static final String EXTRA_HAS_FAILED_MEDIA = "hasFailedMedia"; - public static final String EXTRA_HAS_CHANGES = "hasChanges"; - public static final String EXTRA_RESTART_EDITOR = "isSwitchingEditors"; - public static final String EXTRA_INSERT_MEDIA = "insertMedia"; - public static final String EXTRA_IS_NEW_POST = "isNewPost"; - public static final String EXTRA_REBLOG_POST_TITLE = "reblogPostTitle"; - public static final String EXTRA_REBLOG_POST_IMAGE = "reblogPostImage"; - public static final String EXTRA_REBLOG_POST_QUOTE = "reblogPostQuote"; - public static final String EXTRA_REBLOG_POST_CITATION = "reblogPostCitation"; - public static final String EXTRA_PAGE_TITLE = "pageTitle"; - public static final String EXTRA_PAGE_CONTENT = "pageContent"; - public static final String EXTRA_PAGE_TEMPLATE = "pageTemplate"; - public static final String EXTRA_PROMPT_ID = "extraPromptId"; - public static final String EXTRA_ENTRY_POINT = "extraEntryPoint"; - private static final String STATE_KEY_EDITOR_FRAGMENT = "editorFragment"; - private static final String STATE_KEY_DROPPED_MEDIA_URIS = "stateKeyDroppedMediaUri"; - private static final String STATE_KEY_POST_LOCAL_ID = "stateKeyPostModelLocalId"; - private static final String STATE_KEY_POST_REMOTE_ID = "stateKeyPostModelRemoteId"; - private static final String STATE_KEY_POST_LOADING_STATE = "stateKeyPostLoadingState"; - private static final String STATE_KEY_IS_NEW_POST = "stateKeyIsNewPost"; - private static final String STATE_KEY_IS_PHOTO_PICKER_VISIBLE = "stateKeyPhotoPickerVisible"; - private static final String STATE_KEY_HTML_MODE_ON = "stateKeyHtmlModeOn"; - private static final String STATE_KEY_REVISION = "stateKeyRevision"; - private static final String STATE_KEY_EDITOR_SESSION_DATA = "stateKeyEditorSessionData"; - private static final String STATE_KEY_GUTENBERG_IS_SHOWN = "stateKeyGutenbergIsShown"; - private static final String STATE_KEY_MEDIA_CAPTURE_PATH = "stateKeyMediaCapturePath"; - private static final String STATE_KEY_UNDO = "stateKeyUndo"; - private static final String STATE_KEY_REDO = "stateKeyRedo"; - private static final int PAGE_CONTENT = 0; private static final int PAGE_SETTINGS = 1; private static final int PAGE_PUBLISH_SETTINGS = 2; @@ -452,8 +449,8 @@ enum RestartEditorOptions { private ActivityResultLauncher mEditShareMessageActivityResultLauncher; public static boolean checkToRestart(@NonNull Intent data) { - return data.hasExtra(EditPostActivity.EXTRA_RESTART_EDITOR) - && RestartEditorOptions.valueOf(data.getStringExtra(EditPostActivity.EXTRA_RESTART_EDITOR)) + return data.hasExtra(EXTRA_RESTART_EDITOR) + && RestartEditorOptions.valueOf(data.getStringExtra(EXTRA_RESTART_EDITOR)) != RestartEditorOptions.NO_RESTART; } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivityConstants.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivityConstants.kt new file mode 100644 index 000000000000..7fe36f345e5a --- /dev/null +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivityConstants.kt @@ -0,0 +1,43 @@ +package org.wordpress.android.ui.posts + +object EditPostActivityConstants{ + const val ACTION_REBLOG = "reblogAction" + const val EXTRA_POST_LOCAL_ID = "postModelLocalId" + const val EXTRA_LOAD_AUTO_SAVE_REVISION = "loadAutosaveRevision" + const val EXTRA_POST_REMOTE_ID = "postModelRemoteId" + const val EXTRA_IS_PAGE = "isPage" + const val EXTRA_IS_PROMO = "isPromo" + const val EXTRA_IS_QUICKPRESS = "isQuickPress" + const val EXTRA_IS_LANDING_EDITOR = "isLandingEditor" + const val EXTRA_IS_LANDING_EDITOR_OPENED_FOR_NEW_SITE = "isLandingEditorOpenedForNewSite" + const val EXTRA_QUICKPRESS_BLOG_ID = "quickPressBlogId" + const val EXTRA_UPLOAD_NOT_STARTED = "savedAsLocalDraft" + const val EXTRA_HAS_FAILED_MEDIA = "hasFailedMedia" + const val EXTRA_HAS_CHANGES = "hasChanges" + const val EXTRA_RESTART_EDITOR = "isSwitchingEditors" + const val EXTRA_INSERT_MEDIA = "insertMedia" + const val EXTRA_IS_NEW_POST = "isNewPost" + const val EXTRA_REBLOG_POST_TITLE = "reblogPostTitle" + const val EXTRA_REBLOG_POST_IMAGE = "reblogPostImage" + const val EXTRA_REBLOG_POST_QUOTE = "reblogPostQuote" + const val EXTRA_REBLOG_POST_CITATION = "reblogPostCitation" + const val EXTRA_PAGE_TITLE = "pageTitle" + const val EXTRA_PAGE_CONTENT = "pageContent" + const val EXTRA_PAGE_TEMPLATE = "pageTemplate" + const val EXTRA_PROMPT_ID = "extraPromptId" + const val EXTRA_ENTRY_POINT = "extraEntryPoint" + const val STATE_KEY_EDITOR_FRAGMENT = "editorFragment" + const val STATE_KEY_DROPPED_MEDIA_URIS = "stateKeyDroppedMediaUri" + const val STATE_KEY_POST_LOCAL_ID = "stateKeyPostModelLocalId" + const val STATE_KEY_POST_REMOTE_ID = "stateKeyPostModelRemoteId" + const val STATE_KEY_POST_LOADING_STATE = "stateKeyPostLoadingState" + const val STATE_KEY_IS_NEW_POST = "stateKeyIsNewPost" + const val STATE_KEY_IS_PHOTO_PICKER_VISIBLE = "stateKeyPhotoPickerVisible" + const val STATE_KEY_HTML_MODE_ON = "stateKeyHtmlModeOn" + const val STATE_KEY_REVISION = "stateKeyRevision" + const val STATE_KEY_EDITOR_SESSION_DATA = "stateKeyEditorSessionData" + const val STATE_KEY_GUTENBERG_IS_SHOWN = "stateKeyGutenbergIsShown" + const val STATE_KEY_MEDIA_CAPTURE_PATH = "stateKeyMediaCapturePath" + const val STATE_KEY_UNDO = "stateKeyUndo" + const val STATE_KEY_REDO = "stateKeyRedo" +} diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostSettingsFragment.java index 674824926f62..002ba168190d 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostSettingsFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostSettingsFragment.java @@ -91,7 +91,6 @@ import static android.app.Activity.RESULT_OK; import static org.wordpress.android.ui.pages.PagesActivityKt.EXTRA_PAGE_PARENT_ID_KEY; -import static org.wordpress.android.ui.posts.EditPostActivity.EXTRA_POST_LOCAL_ID; import static org.wordpress.android.ui.posts.SelectCategoriesActivity.KEY_SELECTED_CATEGORY_IDS; public class EditPostSettingsFragment extends Fragment { @@ -659,7 +658,7 @@ private void showCategoriesActivity() { } Intent categoriesIntent = new Intent(requireActivity(), SelectCategoriesActivity.class); categoriesIntent.putExtra(WordPress.SITE, getSite()); - categoriesIntent.putExtra(EXTRA_POST_LOCAL_ID, getEditPostRepository().getId()); + categoriesIntent.putExtra(EditPostActivityConstants.EXTRA_POST_LOCAL_ID, getEditPostRepository().getId()); startActivityForResult(categoriesIntent, ACTIVITY_REQUEST_CODE_SELECT_CATEGORIES); } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostActionHandler.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostActionHandler.kt index 3027f6a20bbc..2835aae9db5f 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostActionHandler.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostActionHandler.kt @@ -35,22 +35,22 @@ import org.wordpress.android.widgets.PostListButtonType import org.wordpress.android.widgets.PostListButtonType.BUTTON_CANCEL_PENDING_AUTO_UPLOAD import org.wordpress.android.widgets.PostListButtonType.BUTTON_COMMENTS import org.wordpress.android.widgets.PostListButtonType.BUTTON_COPY -import org.wordpress.android.widgets.PostListButtonType.BUTTON_SHARE import org.wordpress.android.widgets.PostListButtonType.BUTTON_DELETE import org.wordpress.android.widgets.PostListButtonType.BUTTON_DELETE_PERMANENTLY import org.wordpress.android.widgets.PostListButtonType.BUTTON_EDIT import org.wordpress.android.widgets.PostListButtonType.BUTTON_MORE import org.wordpress.android.widgets.PostListButtonType.BUTTON_MOVE_TO_DRAFT import org.wordpress.android.widgets.PostListButtonType.BUTTON_PREVIEW +import org.wordpress.android.widgets.PostListButtonType.BUTTON_PROMOTE_WITH_BLAZE import org.wordpress.android.widgets.PostListButtonType.BUTTON_PUBLISH import org.wordpress.android.widgets.PostListButtonType.BUTTON_RETRY +import org.wordpress.android.widgets.PostListButtonType.BUTTON_SHARE import org.wordpress.android.widgets.PostListButtonType.BUTTON_SHOW_MOVE_TRASHED_POST_TO_DRAFT_DIALOG import org.wordpress.android.widgets.PostListButtonType.BUTTON_STATS import org.wordpress.android.widgets.PostListButtonType.BUTTON_SUBMIT import org.wordpress.android.widgets.PostListButtonType.BUTTON_SYNC import org.wordpress.android.widgets.PostListButtonType.BUTTON_TRASH import org.wordpress.android.widgets.PostListButtonType.BUTTON_VIEW -import org.wordpress.android.widgets.PostListButtonType.BUTTON_PROMOTE_WITH_BLAZE /** * This is a temporary class to make the PostListViewModel more manageable. Please feel free to refactor it any way @@ -158,7 +158,7 @@ class PostActionHandler( } fun handleEditPostResult(data: Intent?) { - val localPostId = data?.getIntExtra(EditPostActivity.EXTRA_POST_LOCAL_ID, 0) + val localPostId = data?.getIntExtra(EditPostActivityConstants.EXTRA_POST_LOCAL_ID, 0) if (localPostId == null || localPostId == 0) { return } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt index 2bc02b8388b7..ec0afbb051f7 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt @@ -406,8 +406,8 @@ class PostListMainViewModel @Inject constructor( } private fun switchToDraftTabIfNeeded(data: Intent?) { - if (data != null && data.getBooleanExtra(EditPostActivity.EXTRA_IS_NEW_POST, false) && - data.getBooleanExtra(EditPostActivity.EXTRA_HAS_CHANGES, false) + if (data != null && data.getBooleanExtra(EditPostActivityConstants.EXTRA_IS_NEW_POST, false) && + data.getBooleanExtra(EditPostActivityConstants.EXTRA_HAS_CHANGES, false) ) { _selectTab.value = POST_LIST_PAGES.indexOf(DRAFTS) } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostsListActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostsListActivity.kt index 482047fd2220..9f088c9d695d 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostsListActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostsListActivity.kt @@ -461,7 +461,7 @@ class PostsListActivity : LocaleAwareActivity(), if (data != null && EditPostActivity.checkToRestart(data)) { ActivityLauncher.editPostOrPageForResult( data, this, site, - data.getIntExtra(EditPostActivity.EXTRA_POST_LOCAL_ID, 0) + data.getIntExtra(EditPostActivityConstants.EXTRA_POST_LOCAL_ID, 0) ) // a restart will happen so, no need to continue here diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/SelectCategoriesActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/SelectCategoriesActivity.java index ac390560e6cc..b0b15b3cb746 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/SelectCategoriesActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/SelectCategoriesActivity.java @@ -49,7 +49,7 @@ import javax.inject.Inject; -import static org.wordpress.android.ui.posts.EditPostActivity.EXTRA_POST_LOCAL_ID; +import static org.wordpress.android.ui.posts.EditPostActivityConstants.EXTRA_POST_LOCAL_ID; import static org.wordpress.android.util.WPSwipeToRefreshHelper.buildSwipeToRefreshHelper; public class SelectCategoriesActivity extends LocaleAwareActivity { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListActivity.java index e408b0b92e88..0dae81b0e252 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListActivity.java @@ -38,6 +38,7 @@ import org.wordpress.android.ui.RequestCodes; import org.wordpress.android.ui.mysite.SelectedSiteRepository; import org.wordpress.android.ui.posts.EditPostActivity; +import org.wordpress.android.ui.posts.EditPostActivityConstants; import org.wordpress.android.ui.reader.ReaderTypes.ReaderPostListType; import org.wordpress.android.ui.reader.tracker.ReaderTracker; import org.wordpress.android.ui.uploads.UploadActionUseCase; @@ -316,13 +317,13 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { break; case RequestCodes.EDIT_POST: if (resultCode == Activity.RESULT_OK && data != null && !isFinishing()) { - int localId = data.getIntExtra(EditPostActivity.EXTRA_POST_LOCAL_ID, 0); + int localId = data.getIntExtra(EditPostActivityConstants.EXTRA_POST_LOCAL_ID, 0); final SiteModel site = (SiteModel) data.getSerializableExtra(WordPress.SITE); final PostModel post = mPostStore.getPostByLocalPostId(localId); if (EditPostActivity.checkToRestart(data)) { ActivityLauncher.editPostOrPageForResult(data, ReaderPostListActivity.this, site, - data.getIntExtra(EditPostActivity.EXTRA_POST_LOCAL_ID, 0)); + data.getIntExtra(EditPostActivityConstants.EXTRA_POST_LOCAL_ID, 0)); // a restart will happen so, no need to continue here return; } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostPagerActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostPagerActivity.java index 37393d502cfe..9f7f2de1c01c 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostPagerActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostPagerActivity.java @@ -54,6 +54,7 @@ import org.wordpress.android.ui.main.WPMainActivity; import org.wordpress.android.ui.mysite.SelectedSiteRepository; import org.wordpress.android.ui.posts.EditPostActivity; +import org.wordpress.android.ui.posts.EditPostActivityConstants; import org.wordpress.android.ui.prefs.AppPrefs; import org.wordpress.android.ui.reader.ReaderTypes.ReaderPostListType; import org.wordpress.android.ui.reader.actions.ReaderActions; @@ -96,11 +97,11 @@ import javax.inject.Inject; -import dagger.hilt.android.AndroidEntryPoint; - import static org.wordpress.android.ui.main.WPMainActivity.ARG_OPEN_PAGE; import static org.wordpress.android.ui.main.WPMainActivity.ARG_READER; +import dagger.hilt.android.AndroidEntryPoint; + /* * shows reader post detail fragments in a ViewPager - primarily used for easy swiping between * posts with a specific tag or in a specific blog, but can also be used to show a single @@ -1075,13 +1076,13 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { if (resultCode != Activity.RESULT_OK || data == null || isFinishing()) { return; } - int localId = data.getIntExtra(EditPostActivity.EXTRA_POST_LOCAL_ID, 0); + int localId = data.getIntExtra(EditPostActivityConstants.EXTRA_POST_LOCAL_ID, 0); final SiteModel site = (SiteModel) data.getSerializableExtra(WordPress.SITE); final PostModel post = mPostStore.getPostByLocalPostId(localId); if (EditPostActivity.checkToRestart(data)) { ActivityLauncher.editPostOrPageForResult(data, ReaderPostPagerActivity.this, site, - data.getIntExtra(EditPostActivity.EXTRA_POST_LOCAL_ID, 0)); + data.getIntExtra(EditPostActivityConstants.EXTRA_POST_LOCAL_ID, 0)); // a restart will happen so, no need to continue here break; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadNotifier.java b/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadNotifier.java index ca6d44d4494a..347d2576f90d 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadNotifier.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadNotifier.java @@ -28,6 +28,7 @@ import org.wordpress.android.ui.notifications.SystemNotificationsTracker; import org.wordpress.android.ui.pages.PagesActivity; import org.wordpress.android.ui.posts.EditPostActivity; +import org.wordpress.android.ui.posts.EditPostActivityConstants; import org.wordpress.android.ui.posts.PostUtils; import org.wordpress.android.ui.posts.PostsListActivity; import org.wordpress.android.ui.posts.PostsListActivityKt; @@ -444,8 +445,8 @@ void updateNotificationSuccessForMedia(@NonNull List mediaList, @Non writePostIntent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); writePostIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); writePostIntent.putExtra(WordPress.SITE, site); - writePostIntent.putExtra(EditPostActivity.EXTRA_IS_PAGE, false); - writePostIntent.putExtra(EditPostActivity.EXTRA_INSERT_MEDIA, mediaToIncludeInPost); + writePostIntent.putExtra(EditPostActivityConstants.EXTRA_IS_PAGE, false); + writePostIntent.putExtra(EditPostActivityConstants.EXTRA_INSERT_MEDIA, mediaToIncludeInPost); writePostIntent.setAction(String.valueOf(notificationId)); PendingIntent actionPendingIntent = diff --git a/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadUtils.java b/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadUtils.java index 9745d1ac441f..42993a53818b 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadUtils.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadUtils.java @@ -30,6 +30,7 @@ import org.wordpress.android.fluxc.utils.MimeTypes; import org.wordpress.android.ui.ActivityLauncher; import org.wordpress.android.ui.posts.EditPostActivity; +import org.wordpress.android.ui.posts.EditPostActivityConstants; import org.wordpress.android.ui.posts.PostUtils; import org.wordpress.android.ui.prefs.AppPrefs; import org.wordpress.android.ui.uploads.UploadActionUseCase.UploadAction; @@ -194,13 +195,13 @@ public static void handleEditPostModelResultSnackbars(@NonNull final Activity ac SnackbarSequencer sequencer, View.OnClickListener publishPostListener, @Nullable OnPublishingCallback onPublishingCallback) { - boolean hasChanges = data.getBooleanExtra(EditPostActivity.EXTRA_HAS_CHANGES, false); + boolean hasChanges = data.getBooleanExtra(EditPostActivityConstants.EXTRA_HAS_CHANGES, false); if (!hasChanges) { // if there are no changes, we don't need to do anything return; } - boolean uploadNotStarted = data.getBooleanExtra(EditPostActivity.EXTRA_UPLOAD_NOT_STARTED, false); + boolean uploadNotStarted = data.getBooleanExtra(EditPostActivityConstants.EXTRA_UPLOAD_NOT_STARTED, false); if (uploadNotStarted && !NetworkUtils.isNetworkAvailable(activity)) { // The network is not available, we can enqueue a request to upload local changes later UploadWorkerKt.enqueueUploadWorkRequestForSite(site); @@ -214,16 +215,16 @@ public static void handleEditPostModelResultSnackbars(@NonNull final Activity ac return; } - boolean hasFailedMedia = data.getBooleanExtra(EditPostActivity.EXTRA_HAS_FAILED_MEDIA, false); + boolean hasFailedMedia = data.getBooleanExtra(EditPostActivityConstants.EXTRA_HAS_FAILED_MEDIA, false); if (hasFailedMedia) { showSnackbar(snackbarAttachView, post.isPage() ? R.string.editor_page_saved_locally_failed_media : R.string.editor_post_saved_locally_failed_media, R.string.button_edit, - new View.OnClickListener() { - @Override - public void onClick(View v) { - ActivityLauncher.editPostOrPageForResult(activity, site, post); - } - }, sequencer); + new View.OnClickListener() { + @Override + public void onClick(View v) { + ActivityLauncher.editPostOrPageForResult(activity, site, post); + } + }, sequencer); return; } @@ -265,16 +266,16 @@ public void onClick(View v) { // if the post is publishable, we offer the PUBLISH button if (uploadNotStarted) { showSnackbarSuccessAction(snackbarAttachView, R.string.editor_draft_saved_locally, - R.string.button_publish, - publishPostListener, sequencer); + R.string.button_publish, + publishPostListener, sequencer); } else { if (UploadService.hasPendingOrInProgressMediaUploadsForPost(post) || UploadService.isPostUploadingOrQueued(post)) { showSnackbar(snackbarAttachView, R.string.editor_uploading_draft, sequencer); } else { showSnackbarSuccessAction(snackbarAttachView, R.string.editor_draft_saved_online, - R.string.button_publish, - publishPostListener, sequencer); + R.string.button_publish, + publishPostListener, sequencer); } } } else { @@ -285,7 +286,7 @@ public void onClick(View v) { showSnackbar(snackbarAttachView, post.isPage() ? R.string.editor_page_saved_locally : R.string.editor_post_saved_locally, R.string.button_publish, - publishPostListener, sequencer); + publishPostListener, sequencer); } else { if (UploadService.hasPendingOrInProgressMediaUploadsForPost(post) || UploadService.isPostUploadingOrQueued(post)) { @@ -294,26 +295,26 @@ public void onClick(View v) { } else { showSnackbarSuccessAction(snackbarAttachView, post.isPage() ? R.string.editor_page_saved_online : R.string.editor_post_saved_online, - R.string.button_publish, - publishPostListener, sequencer); + R.string.button_publish, + publishPostListener, sequencer); } } } } public static void showSnackbarError(View view, String message, int buttonTitleRes, - OnClickListener onClickListener, SnackbarSequencer sequencer) { + OnClickListener onClickListener, SnackbarSequencer sequencer) { sequencer.enqueue( new SnackbarItem( new Info( - view, - new UiStringText(message), - K_SNACKBAR_WAIT_TIME_MS, - true + view, + new UiStringText(message), + K_SNACKBAR_WAIT_TIME_MS, + true ), new Action( - new UiStringRes(buttonTitleRes), - onClickListener + new UiStringRes(buttonTitleRes), + onClickListener ), null, null @@ -608,8 +609,9 @@ public void onClick(View view) { writePostIntent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); writePostIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); writePostIntent.putExtra(WordPress.SITE, site); - writePostIntent.putExtra(EditPostActivity.EXTRA_IS_PAGE, false); - writePostIntent.putExtra(EditPostActivity.EXTRA_INSERT_MEDIA, mediaListToInsertInPost); + writePostIntent.putExtra(EditPostActivityConstants.EXTRA_IS_PAGE, false); + writePostIntent.putExtra(EditPostActivityConstants.EXTRA_INSERT_MEDIA, + mediaListToInsertInPost); activity.startActivity(writePostIntent); } }, sequencer); diff --git a/WordPress/src/main/java/org/wordpress/android/util/analytics/AnalyticsUtils.java b/WordPress/src/main/java/org/wordpress/android/util/analytics/AnalyticsUtils.java index 573a62e7c7b8..915207a14dac 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/analytics/AnalyticsUtils.java +++ b/WordPress/src/main/java/org/wordpress/android/util/analytics/AnalyticsUtils.java @@ -32,6 +32,7 @@ import org.wordpress.android.models.ReaderPost; import org.wordpress.android.ui.PagePostCreationSourcesDetail; import org.wordpress.android.ui.posts.EditPostActivity; +import org.wordpress.android.ui.posts.EditPostActivityConstants; import org.wordpress.android.ui.posts.PostUtils; import org.wordpress.android.util.AppLog; import org.wordpress.android.util.FluxCUtils; @@ -48,7 +49,6 @@ import java.util.Map; import static org.wordpress.android.ui.PagePostCreationSourcesDetail.CREATED_POST_SOURCE_DETAIL_KEY; -import static org.wordpress.android.ui.posts.EditPostActivity.EXTRA_IS_QUICKPRESS; public class AnalyticsUtils { private static final String BLOG_ID_KEY = "blog_id"; @@ -110,7 +110,7 @@ public static void trackEditorCreatedPost(String action, Intent intent, SiteMode // Post created from the media library normalizedSourceName = "media-library"; } - if (intent != null && intent.hasExtra(EXTRA_IS_QUICKPRESS)) { + if (intent != null && intent.hasExtra(EditPostActivityConstants.EXTRA_IS_QUICKPRESS)) { // Quick press normalizedSourceName = "quick-press"; }