am ceffa0be: Merge "[Rlog79a] Disallow empty feedback messages"
# Via Android (Google) Code Review (1) and Kurt Partridge (1) * commit 'ceffa0bec97f3b819dbd4eb37f53b6eac3db2b07': [Rlog79a] Disallow empty feedback messagesmain
commit
99ed4f1076
|
@ -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,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();
|
||||
|
|
Loading…
Reference in New Issue