Skip to content

Commit 29c3d84

Browse files
committed
Add null checks for PostModel in editPostOrPageForResult methods
Prevents crashes when PostModel is null (e.g., when mPostStore.getPostByLocalPostId returns null for non-existent posts) by showing a user-friendly error message instead. Changes: - Add null check and error toast in both editPostOrPageForResult variants - Prevents crashes from calling post.getId() or post.isPage() on null objects
1 parent 2edf28c commit 29c3d84

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,7 +1041,12 @@ public static void addNewPostForResult(
10411041
activity.startActivityForResult(intent, RequestCodes.EDIT_POST);
10421042
}
10431043

1044-
public static void editPostOrPageForResult(Activity activity, @NonNull SiteModel site, PostModel post) {
1044+
public static void editPostOrPageForResult(Activity activity, @NonNull SiteModel site, @Nullable PostModel post) {
1045+
if (post == null) {
1046+
ToastUtils.showToast(activity, R.string.post_not_found, ToastUtils.Duration.SHORT);
1047+
return;
1048+
}
1049+
10451050
EditorLauncherParams params = new EditorLauncherParams.Builder(site)
10461051
.postLocalId(post.getId())
10471052
.loadAutoSaveRevision(false)
@@ -1051,8 +1056,13 @@ public static void editPostOrPageForResult(Activity activity, @NonNull SiteModel
10511056
activity.startActivityForResult(editorIntent, RequestCodes.EDIT_POST);
10521057
}
10531058

1054-
public static void editPostOrPageForResult(Activity activity, @NonNull SiteModel site, PostModel post,
1059+
public static void editPostOrPageForResult(Activity activity, @NonNull SiteModel site, @Nullable PostModel post,
10551060
boolean loadAutoSaveRevision) {
1061+
if (post == null) {
1062+
ToastUtils.showToast(activity, R.string.post_not_found, ToastUtils.Duration.SHORT);
1063+
return;
1064+
}
1065+
10561066
EditorLauncherParams params = new EditorLauncherParams.Builder(site)
10571067
.postLocalId(post.getId())
10581068
.loadAutoSaveRevision(loadAutoSaveRevision)

0 commit comments

Comments
 (0)