Merge branch 'master' of github.com:TwidereProject/Twidere-Android

This commit is contained in:
Mariotaku Lee 2015-11-06 08:36:50 +08:00
commit 984f7b9317
1 changed files with 5 additions and 1 deletions

View File

@ -198,7 +198,11 @@ public class RetweetQuoteDialogFragment extends BaseSupportDialogFragment implem
final AlertDialog alertDialog = (AlertDialog) dialog;
final Button positiveButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
if (positiveButton == null) return;
positiveButton.setText(s.length() > 0 ? R.string.comment : R.string.retweet);
if (s.length() > 0) {
positiveButton.setText(R.string.comment);
} else {
positiveButton.setText(isMyRetweet(status) ? R.string.cancel_retweet : R.string.retweet);
}
final String statusLink = LinkCreator.getTwitterStatusLink(status.user_screen_name, status.id).toString();
final StatusTextCountView textCountView = (StatusTextCountView) alertDialog.findViewById(R.id.comment_text_count);
textCountView.setTextCount(mValidator.getTweetLength(s + " " + statusLink));