diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-11-23 14:46:52 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-11-23 14:46:52 +0100 |
| commit | 1ece2e3350a5f11abf07269d7a609aa6d85f631c (patch) | |
| tree | 0534eefb447cc2c2ef524db37cd5055924477667 /src | |
| parent | 50c2c3b2d97ec169dc1979e42a6d1eaec69fc628 (diff) | |
show only file size if http upload is available
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/EditAccountActivity.java | 2 | ||||
| -rw-r--r-- | src/main/res/values-de/strings.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values-ru/strings.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 1 |
4 files changed, 1 insertions, 4 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java index 8e82f7520..edaf29608 100644 --- a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java +++ b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java @@ -1046,7 +1046,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat if (getHttpUploadMaxFileSize().equals("0")) { this.binding.serverInfoHttpUpload.setText(R.string.server_info_available); } else { - this.binding.serverInfoHttpUpload.setText(getString(R.string.server_info_available_with, getHttpUploadMaxFileSize())); + this.binding.serverInfoHttpUpload.setText(getHttpUploadMaxFileSize()); } } else if (features.p1S3FileTransfer()) { this.binding.serverInfoHttpUploadDescription.setText(R.string.p1_s3_filetransfer); diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index e871df164..d29077753 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -836,7 +836,6 @@ <string name="remote_server_timeout">Timeout des Remote-Servers</string> <string name="already_drafting_message">Du bist bereits dabei, eine Nachricht zu entwerfen.</string> <string name="bad_key_for_encryption">Ungültiger Schlüssel für die Verschlüsselung.</string> - <string name="server_info_available_with">ja, %s</string> <string name="delete_message_dialog">Nachricht löschen</string> <string name="delete_message_dialog_msg">Bist du sicher, dass du diese Nachricht löschen möchtest?\n\n<b>Achtung:</b> Dies wird keine Kopien dieser Nachricht löschen, die auf anderen Geräten oder Servern gespeichert sind.</string> <string name="feature_not_implemented">Funktion ist nicht implementiert</string> diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 196ae0d5d..f4703e8bb 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -326,5 +326,4 @@ <string name="delete_file_dialog">Удалить файл</string> <string name="cancelled">отменён</string> <string name="bad_key_for_encryption">Неправильный ключ для шифрования.</string> - <string name="server_info_available_with">да, %s</string> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 427739015..8e8d26713 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -836,7 +836,6 @@ <string name="remote_server_timeout">Remote server timeout</string> <string name="already_drafting_message">You are already drafting a message.</string> <string name="bad_key_for_encryption">Bad key for encryption.</string> - <string name="server_info_available_with">yes, %s</string> <string name="delete_message_dialog">Delete message</string> <string name="delete_message_dialog_msg">Are you sure you want to delete this message?\n\n<b>Warning:</b> This will not delete copies of this message that are stored on other devices or servers.</string> <string name="feature_not_implemented">Feature not implemented</string> |