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 f8aad8dead32..1eaea21f3802 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java @@ -52,6 +52,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.EditPostBaseActivity; import org.wordpress.android.ui.posts.PostPreviewActivity; import org.wordpress.android.ui.posts.PostsListActivity; import org.wordpress.android.ui.prefs.AccountSettingsActivity; @@ -571,14 +572,14 @@ public static void viewPostPreviewForResult(Activity activity, SiteModel site, P } Intent intent = new Intent(activity, PostPreviewActivity.class); - intent.putExtra(EditPostActivity.EXTRA_POST_LOCAL_ID, post.getId()); + intent.putExtra(EditPostBaseActivity.EXTRA_POST_LOCAL_ID, post.getId()); intent.putExtra(WordPress.SITE, site); activity.startActivityForResult(intent, RequestCodes.PREVIEW_POST); } public static void viewPagePreview(@NonNull Fragment fragment, @NonNull PageModel page) { Intent intent = new Intent(fragment.getContext(), PostPreviewActivity.class); - intent.putExtra(EditPostActivity.EXTRA_POST_LOCAL_ID, page.getPageId()); + intent.putExtra(EditPostBaseActivity.EXTRA_POST_LOCAL_ID, page.getPageId()); intent.putExtra(WordPress.SITE, page.getSite()); fragment.startActivity(intent); } @@ -590,8 +591,8 @@ public static void addNewPostForResult(Activity activity, SiteModel site, boolea Intent intent = new Intent(activity, EditPostActivity.class); intent.putExtra(WordPress.SITE, site); - intent.putExtra(EditPostActivity.EXTRA_IS_PAGE, false); - intent.putExtra(EditPostActivity.EXTRA_IS_PROMO, isPromo); + intent.putExtra(EditPostBaseActivity.EXTRA_IS_PAGE, false); + intent.putExtra(EditPostBaseActivity.EXTRA_IS_PROMO, isPromo); activity.startActivityForResult(intent, RequestCodes.EDIT_POST); } @@ -605,22 +606,22 @@ public static void editPostOrPageForResult(Activity activity, SiteModel site, Po // 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, post.getId()); + intent.putExtra(EditPostBaseActivity.EXTRA_POST_LOCAL_ID, post.getId()); activity.startActivityForResult(intent, RequestCodes.EDIT_POST); } public static void editPageForResult(@NonNull Fragment fragment, @NonNull PageModel page) { Intent intent = new Intent(fragment.getContext(), EditPostActivity.class); intent.putExtra(WordPress.SITE, page.getSite()); - intent.putExtra(EditPostActivity.EXTRA_POST_LOCAL_ID, page.getPageId()); + intent.putExtra(EditPostBaseActivity.EXTRA_POST_LOCAL_ID, page.getPageId()); fragment.startActivityForResult(intent, RequestCodes.EDIT_POST); } public static void addNewPageForResult(@NonNull Fragment fragment, @NonNull SiteModel site) { 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(EditPostBaseActivity.EXTRA_IS_PAGE, true); + intent.putExtra(EditPostBaseActivity.EXTRA_IS_PROMO, false); 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 7aa98e5b2038..50415e079d53 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.EditPostBaseActivity; import org.wordpress.android.util.LocaleManager; import org.wordpress.android.util.SiteUtils; import org.wordpress.android.util.ToastUtils; @@ -140,8 +141,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(EditPostBaseActivity.EXTRA_QUICKPRESS_BLOG_ID, siteIds[position]); + shortcutIntent.putExtra(EditPostBaseActivity.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 4dbc6a6e3331..c3ba7236c9c2 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 @@ -70,7 +70,7 @@ import org.wordpress.android.ui.notifications.utils.PendingDraftsNotificationsUtils; 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.EditPostBaseActivity; import org.wordpress.android.ui.posts.PromoDialog; import org.wordpress.android.ui.posts.PromoDialog.PromoDialogClickInterface; import org.wordpress.android.ui.prefs.AppPrefs; @@ -686,7 +686,7 @@ 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(EditPostBaseActivity.EXTRA_POST_LOCAL_ID, 0); final SiteModel site = getSelectedSite(); final PostModel post = mPostStore.getPostByLocalPostId(localId); if (site != null && post != null) { 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 50f247af289f..3a490ab268b0 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 @@ -36,7 +36,7 @@ import org.wordpress.android.ui.RequestCodes import org.wordpress.android.ui.WPWebViewActivity import org.wordpress.android.ui.pages.PageItem.Page import org.wordpress.android.ui.posts.BasicFragmentDialog -import org.wordpress.android.ui.posts.EditPostActivity +import org.wordpress.android.ui.posts.EditPostBaseActivity import org.wordpress.android.ui.posts.GutenbergWarningFragmentDialog.GutenbergWarningDialogClickInterface import org.wordpress.android.ui.posts.PostUtils import org.wordpress.android.ui.prefs.AppPrefs @@ -90,7 +90,7 @@ class PagesFragment : Fragment(), GutenbergWarningDialogClickInterface { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { if (requestCode == RequestCodes.EDIT_POST && resultCode == Activity.RESULT_OK && data != null) { - val pageId = data.getLongExtra(EditPostActivity.EXTRA_POST_REMOTE_ID, -1) + val pageId = data.getLongExtra(EditPostBaseActivity.EXTRA_POST_REMOTE_ID, -1) if (pageId != -1L) { onPageEditFinished(pageId) } 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 03a1ced55fdb..0b91a26207c3 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 @@ -207,11 +207,6 @@ public class EditPostActivity extends EditPostBaseActivity implements private AztecImageLoader mAztecImageLoader; - enum AddExistingdMediaSource { - WP_MEDIA_LIBRARY, - STOCK_PHOTO_LIBRARY - } - private Handler mHandler; private int mDebounceCounter = 0; private boolean mShowAztecEditor; @@ -2082,7 +2077,7 @@ private int getMaximumThumbnailWidthForEditor() { return mMaxThumbWidth; } - private boolean addExistingMediaToEditor(@NonNull AddExistingdMediaSource source, long mediaId) { + private boolean addExistingMediaToEditor(@NonNull AddExistingMediaSource source, long mediaId) { MediaModel media = mMediaStore.getSiteMediaWithId(mSite, mediaId); if (media == null) { AppLog.w(T.MEDIA, "Cannot add null media to post"); @@ -2270,7 +2265,7 @@ private void prepareMediaPost() { long[] idsArray = getIntent().getLongArrayExtra(NEW_MEDIA_POST_EXTRA_IDS); ArrayList idsList = ListUtils.fromLongArray(idsArray); for (Long id : idsList) { - addExistingMediaToEditor(AddExistingdMediaSource.WP_MEDIA_LIBRARY, id); + addExistingMediaToEditor(AddExistingMediaSource.WP_MEDIA_LIBRARY, id); } savePostAsync(null); } @@ -2471,7 +2466,7 @@ private void trackAddMediaFromDeviceEvents(boolean isNew, boolean isVideo, Uri u * @param source where the media is being added from * @param media media being added */ - private void trackAddMediaEvent(@NonNull AddExistingdMediaSource source, @NonNull MediaModel media) { + private void trackAddMediaEvent(@NonNull AddExistingMediaSource source, @NonNull MediaModel media) { switch (source) { case WP_MEDIA_LIBRARY: if (media.isVideo()) { @@ -2787,7 +2782,7 @@ public void done() { long[] mediaIds = data.getLongArrayExtra(StockMediaPickerActivity.KEY_UPLOADED_MEDIA_IDS); for (long id : mediaIds) { - addExistingMediaToEditor(AddExistingdMediaSource.STOCK_PHOTO_LIBRARY, id); + addExistingMediaToEditor(AddExistingMediaSource.STOCK_PHOTO_LIBRARY, id); } savePostAsync(null); } @@ -2909,7 +2904,7 @@ private void handleMediaPickerResult(Intent data) { showInsertMediaDialog(ids); } else { for (Long id : ids) { - addExistingMediaToEditor(AddExistingdMediaSource.WP_MEDIA_LIBRARY, id); + addExistingMediaToEditor(AddExistingMediaSource.WP_MEDIA_LIBRARY, id); } savePostAsync(null); } @@ -2932,7 +2927,7 @@ public void onCompleted(@NonNull InsertMediaDialog dialog) { break; case INDIVIDUALLY: for (Long id : mediaIds) { - addExistingMediaToEditor(AddExistingdMediaSource.WP_MEDIA_LIBRARY, id); + addExistingMediaToEditor(AddExistingMediaSource.WP_MEDIA_LIBRARY, id); } savePostAsync(null); break; @@ -3374,7 +3369,7 @@ public void onEditorFragmentInitialized() { shouldFinishInit = false; mMediaInsertedOnCreation = true; for (MediaModel media : mediaList) { - addExistingMediaToEditor(AddExistingdMediaSource.WP_MEDIA_LIBRARY, media.getMediaId()); + addExistingMediaToEditor(AddExistingMediaSource.WP_MEDIA_LIBRARY, media.getMediaId()); } savePostAsync(new AfterSavePostListener() { @Override diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostBaseActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostBaseActivity.java index 346a1d073ed9..4a0add1372af 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostBaseActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostBaseActivity.java @@ -42,7 +42,7 @@ public abstract class EditPostBaseActivity extends AppCompatActivity { protected static final int CHANGE_SAVE_DELAY = 500; public static final int MAX_UNSAVED_POSTS = 50; - protected enum AddExistingdMediaSource { + protected enum AddExistingMediaSource { WP_MEDIA_LIBRARY, STOCK_PHOTO_LIBRARY } 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 c2ae2d68b212..3c4b4221e50d 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 @@ -85,7 +85,7 @@ import javax.inject.Inject; import static android.app.Activity.RESULT_OK; -import static org.wordpress.android.ui.posts.EditPostActivity.EXTRA_POST_LOCAL_ID; +import static org.wordpress.android.ui.posts.EditPostBaseActivity.EXTRA_POST_LOCAL_ID; import static org.wordpress.android.ui.posts.SelectCategoriesActivity.KEY_SELECTED_CATEGORY_IDS; public class EditPostSettingsFragment extends Fragment { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostPreviewActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostPreviewActivity.java index 645552a0db20..964c656d2004 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostPreviewActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostPreviewActivity.java @@ -56,7 +56,7 @@ import de.greenrobot.event.EventBus; -import static org.wordpress.android.ui.posts.EditPostActivity.EXTRA_POST_LOCAL_ID; +import static org.wordpress.android.ui.posts.EditPostBaseActivity.EXTRA_POST_LOCAL_ID; public class PostPreviewActivity extends AppCompatActivity implements BasicFragmentDialog.BasicDialogNegativeClickInterface, diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostPreviewFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostPreviewFragment.java index b49959ed34bf..d4bd3cd171bb 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostPreviewFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostPreviewFragment.java @@ -22,7 +22,7 @@ import javax.inject.Inject; -import static org.wordpress.android.ui.posts.EditPostActivity.EXTRA_POST_LOCAL_ID; +import static org.wordpress.android.ui.posts.EditPostBaseActivity.EXTRA_POST_LOCAL_ID; public class PostPreviewFragment extends Fragment { private SiteModel mSite; 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 803e1e2b1a3f..b1ef561a533d 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 @@ -45,7 +45,7 @@ import javax.inject.Inject; -import static org.wordpress.android.ui.posts.EditPostActivity.EXTRA_POST_LOCAL_ID; +import static org.wordpress.android.ui.posts.EditPostBaseActivity.EXTRA_POST_LOCAL_ID; import static org.wordpress.android.util.WPSwipeToRefreshHelper.buildSwipeToRefreshHelper; public class SelectCategoriesActivity extends AppCompatActivity { 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 26949c5c8594..7405d3de4c3d 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 @@ -22,6 +22,7 @@ import org.wordpress.android.ui.notifications.ShareAndDismissNotificationReceiver; import org.wordpress.android.ui.pages.PagesActivity; import org.wordpress.android.ui.posts.EditPostActivity; +import org.wordpress.android.ui.posts.EditPostBaseActivity; import org.wordpress.android.ui.posts.PostUtils; import org.wordpress.android.ui.posts.PostsListActivity; import org.wordpress.android.ui.prefs.AppPrefs; @@ -411,8 +412,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(EditPostBaseActivity.EXTRA_IS_PAGE, false); + writePostIntent.putExtra(EditPostBaseActivity.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 845513dd1417..c8bf1104df6a 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 @@ -21,6 +21,7 @@ import org.wordpress.android.fluxc.store.UploadStore.UploadError; import org.wordpress.android.ui.ActivityLauncher; import org.wordpress.android.ui.posts.EditPostActivity; +import org.wordpress.android.ui.posts.EditPostBaseActivity; import org.wordpress.android.ui.posts.PostUtils; import org.wordpress.android.ui.prefs.AppPrefs; import org.wordpress.android.util.AccessibilityUtils; @@ -101,13 +102,13 @@ public static void handleEditPostResultSnackbars(@NonNull final Activity activit @NonNull final PostModel post, @NonNull final SiteModel site, View.OnClickListener publishPostListener) { - boolean hasChanges = data.getBooleanExtra(EditPostActivity.EXTRA_HAS_CHANGES, false); + boolean hasChanges = data.getBooleanExtra(EditPostBaseActivity.EXTRA_HAS_CHANGES, false); if (!hasChanges) { // if there are no changes, we don't need to do anything return; } - boolean savedLocally = data.getBooleanExtra(EditPostActivity.EXTRA_SAVED_AS_LOCAL_DRAFT, false); + boolean savedLocally = data.getBooleanExtra(EditPostBaseActivity.EXTRA_SAVED_AS_LOCAL_DRAFT, false); if (savedLocally && !NetworkUtils.isNetworkAvailable(activity)) { // The network is not available, we can't do anything ToastUtils.showToast(activity, R.string.error_publish_no_network, @@ -115,7 +116,7 @@ public static void handleEditPostResultSnackbars(@NonNull final Activity activit return; } - boolean hasFailedMedia = data.getBooleanExtra(EditPostActivity.EXTRA_HAS_FAILED_MEDIA, false); + boolean hasFailedMedia = data.getBooleanExtra(EditPostBaseActivity.EXTRA_HAS_FAILED_MEDIA, false); if (hasFailedMedia) { showSnackbar(snackbarAttachView, R.string.editor_post_saved_locally_failed_media, R.string.button_edit, new View.OnClickListener() { @@ -395,8 +396,8 @@ 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(EditPostBaseActivity.EXTRA_IS_PAGE, false); + writePostIntent.putExtra(EditPostBaseActivity.EXTRA_INSERT_MEDIA, mediaListToInsertInPost); activity.startActivity(writePostIntent); } }); diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListViewModel.kt index 20b7a783f6b3..7ba03eb18068 100644 --- a/WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListViewModel.kt @@ -44,7 +44,7 @@ import org.wordpress.android.fluxc.store.PostStore.RemotePostPayload import org.wordpress.android.fluxc.store.UploadStore import org.wordpress.android.ui.notifications.utils.PendingDraftsNotificationsUtils import org.wordpress.android.ui.pages.SnackbarMessageHolder -import org.wordpress.android.ui.posts.EditPostActivity +import org.wordpress.android.ui.posts.EditPostBaseActivity import org.wordpress.android.ui.posts.PostAdapterItem import org.wordpress.android.ui.posts.PostAdapterItemData import org.wordpress.android.ui.posts.PostAdapterItemUploadStatus @@ -244,7 +244,7 @@ class PostListViewModel @Inject constructor( } fun handleEditPostResult(data: Intent?) { - val localPostId = data?.getIntExtra(EditPostActivity.EXTRA_POST_LOCAL_ID, 0) + val localPostId = data?.getIntExtra(EditPostBaseActivity.EXTRA_POST_LOCAL_ID, 0) if (localPostId == null || localPostId == 0) { return }