nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "[Rlog79a] Disallow empty feedback messages"

main
Kurt Partridge 2013-02-01 17:15:06 +00:00 committed by Android (Google) Code Review
parent 0cafd6580c d3f718fccd
commit ceffa0bec9
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java/res/values/research_strings.xml
View File

@ -23,4 +23,7 @@
<string name="research_splash_content" translatable="false"></string>
<string name="research_account_type" translatable="false"></string>
<string name="research_allowed_account_domain" translatable="false"></string>
<!-- Message informing the user that the feedback string must not be empty [CHAR LIMIT=100] -->
<!-- TODO: remove translatable=false attribute once text is stable -->
<string name="research_feedback_empty_feedback_error_message" translatable="false">The feedback field must not be empty.</string>
</resources>

20
java/src/com/android/inputmethod/research/FeedbackFragment.java
View File

@ -20,6 +20,7 @@ import android.app.Activity;
import android.app.Fragment;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@ -28,6 +29,7 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.Toast;
import com.android.inputmethod.latin.R;
@ -96,12 +98,18 @@ public class FeedbackFragment extends Fragment implements OnClickListener {
} else if (view == mSendButton) {
final Editable editable = mEditText.getText();
final String feedbackContents = editable.toString();
final boolean isIncludingAccountName = isIncludingAccountName();
researchLogger.sendFeedback(feedbackContents,
false /* isIncludingHistory */, isIncludingAccountName, hasUserRecording());
getActivity().finish();
researchLogger.setFeedbackDialogBundle(null);
researchLogger.onLeavingSendFeedbackDialog();
if (TextUtils.isEmpty(feedbackContents)) {
Toast.makeText(getActivity(),
R.string.research_feedback_empty_feedback_error_message,
Toast.LENGTH_LONG).show();
} else {
final boolean isIncludingAccountName = isIncludingAccountName();
researchLogger.sendFeedback(feedbackContents,
false /* isIncludingHistory */, isIncludingAccountName, hasUserRecording());
getActivity().finish();
researchLogger.setFeedbackDialogBundle(null);
researchLogger.onLeavingSendFeedbackDialog();
}
} else if (view == mCancelButton) {
Log.d(TAG, "Finishing");
getActivity().finish();