narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

proper desc for offering and sending images in conversations overview

Browse source
This commit is contained in:
iNPUTmice 2015-01-18 20:26:22 +01:00
parent 6756386eee
commit 149a6716b8
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/eu/siacs/conversations/utils/UIHelper.java
View file

@ -129,6 +129,14 @@ public class UIHelper {
return new Pair<>(context.getString(R.string.file_deleted),true); return new Pair<>(context.getString(R.string.file_deleted),true);
case Downloadable.STATUS_FAILED: case Downloadable.STATUS_FAILED:
return new Pair<>(context.getString(R.string.file_transmission_failed),true); return new Pair<>(context.getString(R.string.file_transmission_failed),true);
case Downloadable.STATUS_UPLOADING:
if (message.getStatus() == Message.STATUS_OFFERED) {
return new Pair<>(context.getString(R.string.offering_x_file,
getFileDescriptionString(context, message)), true);
} else {
return new Pair<>(context.getString(R.string.sending_x_file,
getFileDescriptionString(context, message)), true);
}
default: default:
return new Pair<>("",false); return new Pair<>("",false);
} }

2
src/main/res/values/strings.xml
View file

@ -443,4 +443,6 @@
<string name="disable_foreground_service">Disable foreground service</string> <string name="disable_foreground_service">Disable foreground service</string>
<string name="touch_to_open_conversations">Touch to open Conversations</string> <string name="touch_to_open_conversations">Touch to open Conversations</string>
<string name="avatar_has_been_published">Avatar has been published!</string> <string name="avatar_has_been_published">Avatar has been published!</string>
<string name="sending_x_file">Sending %s</string>
<string name="offering_x_file">Offering %s</string>
</resources> </resources>