thedevstack/PiratX-Archive
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

show only file size if http upload is available

Browse source
This commit is contained in:
Christian Schneppe 2018-11-23 14:46:52 +01:00
parent 50c2c3b2d9
commit 1ece2e3350
4 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
View file

@ -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);

1
src/main/res/values-de/strings.xml
View file

@ -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>

1
src/main/res/values-ru/strings.xml
View file

@ -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>

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

@ -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>