~singpolyma/cheogram-android

149a6716b8a5d4afe61e8a9c257a0d551a6d0e3d — iNPUTmice 9 years ago 6756386
proper desc for offering and sending images in conversations overview
M src/main/java/eu/siacs/conversations/utils/UIHelper.java => src/main/java/eu/siacs/conversations/utils/UIHelper.java +8 -0
@@ 129,6 129,14 @@ public class UIHelper {
					return new Pair<>(context.getString(R.string.file_deleted),true);
				case Downloadable.STATUS_FAILED:
					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:
					return new Pair<>("",false);
			}

M src/main/res/values/strings.xml => src/main/res/values/strings.xml +2 -0
@@ 443,4 443,6 @@
	<string name="disable_foreground_service">Disable foreground service</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="sending_x_file">Sending %s</string>
    <string name="offering_x_file">Offering %s</string>
</resources>