diff options
| author | Christian S <christian@pix-art.de> | 2016-03-05 10:42:44 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-03-05 10:42:44 +0100 |
| commit | 7412b0634fb62d9cf045c9e6d70c25cffaae57d0 (patch) | |
| tree | facedfe6508757ee0cce561f1eea140bab3567dc /src/main/java/eu/siacs/conversations/utils | |
| parent | 251c27328b7812f6f01a4c8f7215fdd51af84b7e (diff) | |
| parent | 8339ebf3dc0c0f27e6fc1bfdc1af574ec6cd82c9 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/utils/UIHelper.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java index 5e8af085c..8cae81171 100644 --- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java @@ -187,10 +187,13 @@ public class UIHelper { UIHelper.getMessageDisplayName(message) + " "), false); } else if (GeoHelper.isGeoUri(message.getBody())) { if (message.getStatus() == Message.STATUS_RECEIVED) { - return new Pair<>(context.getString(R.string.received_location),true); + return new Pair<>(context.getString(R.string.received_location), true); } else { return new Pair<>(context.getString(R.string.location), true); } + } else if (message.treatAsDownloadable() == Message.Decision.MUST) { + return new Pair<>(context.getString(R.string.x_file_offered_for_download, + getFileDescriptionString(context,message)),true); } else{ return new Pair<>(message.getBody().trim(), false); } |