diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-03-11 21:34:10 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-03-11 21:34:10 +0100 |
| commit | 864bb77883b2f5d9f9122c102faa4af89d589653 (patch) | |
| tree | c9d7b675da2b5eb38809dabdd599e43ff0acce3b /src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | |
| parent | 8585231be2844ab794cfa63454b1013bae8502f6 (diff) | |
| parent | bfc5000b6aa3d401ad80e04c43a6671aa9c2c619 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts:
src/main/java/eu/siacs/conversations/entities/Message.java
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationFragment.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 369de781..3c45792f 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -637,7 +637,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa } private void copyText(Message message) { - if (activity.copyTextToClipboard(message.getMergedBody(), + if (activity.copyTextToClipboard(message.getBody(), R.string.message_text)) { Toast.makeText(activity, R.string.message_copied_to_clipboard, Toast.LENGTH_SHORT).show(); |