Skip to content

Fixing #2860 - potential NPEs when updating a post object #2878

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxme merged 3 commits into from
Jun 19, 2015
Merged

Fixing #2860 - potential NPEs when updating a post object #2878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05b4271
Fixing potential NPEs when updating a post object.
tonyr59h Jun 17, 2015
7337e29
Simplifying utility method
tonyr59h Jun 17, 2015
0dce1a2
Updating EditTextUtils.getText method instead of creating new one.
tonyr59h Jun 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostSettingsFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,27 +425,27 @@ public void updatePostSettings() {
return;
}

String password = (mPasswordEditText.getText() != null) ? mPasswordEditText.getText().toString() : "";
String pubDate = (mPubDateText.getText() != null) ? mPubDateText.getText().toString() : "";
String excerpt = (mExcerptEditText.getText() != null) ? mExcerptEditText.getText().toString() : "";
String password = EditTextUtils.getText(mPasswordEditText);
String pubDate = EditTextUtils.getText(mPubDateText);
String excerpt = EditTextUtils.getText(mExcerptEditText);

long pubDateTimestamp = 0;
if (mIsCustomPubDate && pubDate.equals(getResources().getText(R.string.immediately)) && !mPost.isLocalDraft()) {
if (mIsCustomPubDate && pubDate.equals(getText(R.string.immediately)) && !mPost.isLocalDraft()) {
Date d = new Date();
pubDateTimestamp = d.getTime();
} else if (!pubDate.equals(getResources().getText(R.string.immediately))) {
} else if (!pubDate.equals(getText(R.string.immediately))) {
if (mIsCustomPubDate)
pubDateTimestamp = mCustomPubDate;
else if (mPost.getDate_created_gmt() > 0)
pubDateTimestamp = mPost.getDate_created_gmt();
} else if (pubDate.equals(getResources().getText(R.string.immediately)) && mPost.isLocalDraft()) {
} else if (pubDate.equals(getText(R.string.immediately)) && mPost.isLocalDraft()) {
mPost.setDate_created_gmt(0);
mPost.setDateCreated(0);
}

String tags = "", postFormat = "";
if (!mPost.isPage()) {
tags = (mTagsEditText.getText() != null) ? mTagsEditText.getText().toString() : "";
tags = EditTextUtils.getText(mTagsEditText);

// post format
if (mPostFormats != null && mPostFormatSpinner != null &&
Expand All @@ -454,7 +454,12 @@ else if (mPost.getDate_created_gmt() > 0)
}
}

String status = getPostStatusForSpinnerPosition(mStatusSpinner.getSelectedItemPosition());
String status;
if (mStatusSpinner != null) {
status = getPostStatusForSpinnerPosition(mStatusSpinner.getSelectedItemPosition());
} else {
status = mPost.getPostStatus();
}

// We want to flag this post as having changed statuses from draft to published so that we
// properly track stats we care about for when users first publish posts.
Expand Down
10 changes: 4 additions & 6 deletions libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/EditTextUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import android.text.TextUtils;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import android.widget.TextView;

/**
* EditText utils
Expand All @@ -14,13 +15,10 @@ private EditTextUtils() {
}

/**
* returns text string from passed EditText
* returns non-null text string from passed TextView
*/
public static String getText(EditText edit) {
if (edit.getText() == null) {
return "";
}
return edit.getText().toString();
public static String getText(TextView textView) {
return (textView != null) ? textView.getText().toString() : "";
}

/**
Expand Down