Daniel Gultsch created
src/main/java/eu/siacs/conversations/Config.java | 1
src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java | 4
src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java | 2
src/main/res/values-ar/strings.xml | 1
src/main/res/values-de/strings.xml | 1
src/main/res/values-el/strings.xml | 1
src/main/res/values-es/strings.xml | 1
src/main/res/values-eu/strings.xml | 1
src/main/res/values-fr/strings.xml | 1
src/main/res/values-gl/strings.xml | 1
src/main/res/values-hu/strings.xml | 1
src/main/res/values-it/strings.xml | 1
src/main/res/values-nl/strings.xml | 1
src/main/res/values-pl/strings.xml | 8
src/main/res/values-pt-rBR/strings.xml | 1
src/main/res/values-ro-rRO/strings.xml | 7
src/main/res/values-uk/strings.xml | 1
src/main/res/values-zh-rCN/strings.xml | 1
18 files changed, 17 insertions(+), 18 deletions(-)
@@ -100,6 +100,7 @@ public final class Config {
public static final boolean REMOVE_BROKEN_DEVICES = false;
public static final boolean OMEMO_PADDING = false;
public static final boolean PUT_AUTH_TAG_INTO_KEY = true;
+ public static final boolean TWELVE_BYTE_IV = false;
public static final boolean USE_BOOKMARKS2 = false;
@@ -165,8 +165,8 @@ public class XmppAxolotlMessage {
}
private static byte[] generateIv() {
- SecureRandom random = new SecureRandom();
- byte[] iv = new byte[16];
+ final SecureRandom random = new SecureRandom();
+ byte[] iv = new byte[Config.TWELVE_BYTE_IV ? 12 : 16];
random.nextBytes(iv);
return iv;
}
@@ -109,7 +109,7 @@ public class HttpUploadConnection implements Transferable {
if (Config.ENCRYPT_ON_HTTP_UPLOADED
|| message.getEncryption() == Message.ENCRYPTION_AXOLOTL
|| message.getEncryption() == Message.ENCRYPTION_OTR) {
- this.key = new byte[48];
+ this.key = new byte[Config.TWELVE_BYTE_IV ? 44 : 48];
mXmppConnectionService.getRNG().nextBytes(this.key);
this.file.setKeyAndIv(this.key);
}
@@ -657,7 +657,6 @@
<string name="pref_more_notification_settings_summary">الأهمية ، الصوت ، الإهتزاز</string>
<string name="video_compression_channel_name">ضغط الفيديو</string>
<string name="view_media">اعرض الوسائط</string>
- <string name="view_users">اعرض المشارِكين</string>
<string name="group_chat_members">المشارِكون</string>
<string name="pref_video_compression">جودة الفيديو</string>
<string name="video_360p">متوسط (360ب)</string>
@@ -751,7 +751,6 @@
<string name="pref_more_notification_settings_summary">Wichtigkeit, Klang, Vibrationen</string>
<string name="video_compression_channel_name">Video komprimieren</string>
<string name="view_media">Medien anzeigen</string>
- <string name="view_users">Teilnehmer anzeigen</string>
<string name="group_chat_members">Teilnehmer</string>
<string name="media_browser">Medienbrowser</string>
<string name="security_violation_not_attaching_file">Datei wurde aufgrund von Sicherheitsverletzungen ausgelassen.</string>
@@ -747,7 +747,6 @@
<string name="pref_more_notification_settings_summary">Σημασία, Ήχος, Δόνηση</string>
<string name="video_compression_channel_name">Συμπίεση βίντεο</string>
<string name="view_media">Εμφάνιση μέσου</string>
- <string name="view_users">Εμφάνιση συμμετεχόντων</string>
<string name="group_chat_members">Συμμετέχοντες</string>
<string name="media_browser">Περιηγητης μέσων</string>
<string name="security_violation_not_attaching_file">Το αρχείο παραλείπεται λόγω παραβίασης ασφάλειας.</string>
@@ -751,7 +751,6 @@
<string name="pref_more_notification_settings_summary">Importancia, Sonido, Vibración</string>
<string name="video_compression_channel_name">Compresión de video</string>
<string name="view_media">Ver galería</string>
- <string name="view_users">Ver participantes</string>
<string name="group_chat_members">Participantes</string>
<string name="media_browser">Galería</string>
<string name="security_violation_not_attaching_file">Fichero omitido por violación de seguridad</string>
@@ -746,7 +746,6 @@
<string name="pref_more_notification_settings_summary">Garrantzia, soinua, dardara</string>
<string name="video_compression_channel_name">Bideoen konprimatzea</string>
<string name="view_media">Ikusi multimedia</string>
- <string name="view_users">Parte-hartzaileak ikusi</string>
<string name="group_chat_members">Parte-hartzaileak</string>
<string name="media_browser">Multimedia nabigatzailea</string>
<string name="security_violation_not_attaching_file">Fitxategia alde batera utzita segurtasun hauste bategatik.</string>
@@ -749,7 +749,6 @@
<string name="pref_more_notification_settings_summary">Importance, son, vibration</string>
<string name="video_compression_channel_name">Compression vidéo</string>
<string name="view_media">Voir les média</string>
- <string name="view_users">Voir les participants</string>
<string name="group_chat_members">Participants</string>
<string name="media_browser">Navigateur de média</string>
<string name="security_violation_not_attaching_file">Fichier omis en raison d\'une violation de la sécurité.</string>
@@ -751,7 +751,6 @@
<string name="pref_more_notification_settings_summary">Importancia, Son, Vibrar</string>
<string name="video_compression_channel_name">Compresión de vídeo</string>
<string name="view_media">Ver medios</string>
- <string name="view_users">Ver participantes</string>
<string name="group_chat_members">Participantes</string>
<string name="media_browser">Navegador de medios</string>
<string name="security_violation_not_attaching_file">Ficheiro omitido debido a transgresión da seguridade.</string>
@@ -751,7 +751,6 @@
<string name="pref_more_notification_settings_summary">Fontosság, hang, rezgés</string>
<string name="video_compression_channel_name">Videó tömörítése</string>
<string name="view_media">Média megtekintése</string>
- <string name="view_users">Résztvevők megtekintése</string>
<string name="group_chat_members">Résztvevők</string>
<string name="media_browser">Médiaböngésző</string>
<string name="security_violation_not_attaching_file">A fájl ki lett hagyva a biztonság megsértése miatt.</string>
@@ -751,7 +751,6 @@
<string name="pref_more_notification_settings_summary">Importanza, suono, vibrazione</string>
<string name="video_compression_channel_name">Compressione video</string>
<string name="view_media">Vedi i media</string>
- <string name="view_users">Vedi i partecipanti</string>
<string name="group_chat_members">Partecipanti</string>
<string name="media_browser">Browser multimediale</string>
<string name="security_violation_not_attaching_file">File omesso per violazione di sicurezza.</string>
@@ -748,7 +748,6 @@
<string name="pref_more_notification_settings_summary">Belang, geluid, trillen</string>
<string name="video_compression_channel_name">Videocompressie</string>
<string name="view_media">Media bekijken</string>
- <string name="view_users">Deelnemers bekijken</string>
<string name="group_chat_members">Deelnemers</string>
<string name="media_browser">Mediabrowser</string>
<string name="security_violation_not_attaching_file">Bestand weggelaten wegens beveiligingsovertreding.</string>
@@ -769,7 +769,6 @@ Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale moż
<string name="pref_more_notification_settings_summary">Ważność, Dźwięk, Wibracja</string>
<string name="video_compression_channel_name">Kompresja wideo</string>
<string name="view_media">Pokaż media</string>
- <string name="view_users">Pokaż członków</string>
<string name="group_chat_members">Uczestnicy</string>
<string name="media_browser">Przeglądarka mediów</string>
<string name="security_violation_not_attaching_file">Plik pominięty w związku z naruszeniem bezpieczeństwa.</string>
@@ -898,4 +897,11 @@ Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale moż
<string name="pref_channel_discovery">Metoda odkrywania kanałów</string>
<string name="backup">Kopia zapasowa</string>
<string name="category_about">O aplikacji</string>
+ <plurals name="view_users">
+ <item quantity="one">Pokaż %1$d uczestnika</item>
+ <item quantity="few">Pokaż %1$d uczestników</item>
+ <item quantity="many">Pokaż %1$d uczestników</item>
+ <item quantity="other">Pokaż %1$d uczestników</item>
+ </plurals>
+ <string name="openstreetmap_credit">© autorzy <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> </string>
</resources>
@@ -751,7 +751,6 @@
<string name="pref_more_notification_settings_summary">Importância, som, vibração.</string>
<string name="video_compression_channel_name">Compressão de vídeo</string>
<string name="view_media">Ver mídia</string>
- <string name="view_users">Ver participantes</string>
<string name="group_chat_members">Participantes</string>
<string name="media_browser">Navegador de mídia</string>
<string name="security_violation_not_attaching_file">Arquivo omitido devido a violação de segurança</string>
@@ -761,7 +761,6 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
<string name="pref_more_notification_settings_summary">Importanță, sunete, vibrații</string>
<string name="video_compression_channel_name">Compresie video</string>
<string name="view_media">Vizualizare fișiere media</string>
- <string name="view_users">Arată participanții</string>
<string name="group_chat_members">Participanți</string>
<string name="media_browser">Vizualizare fișiere media</string>
<string name="security_violation_not_attaching_file">Fișier omis ca urmare a unei probleme de securitate.</string>
@@ -890,4 +889,10 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
<string name="pref_channel_discovery">Metoda de descoperire a canalelor</string>
<string name="backup">Copie de siguranță</string>
<string name="category_about">Despre</string>
+ <plurals name="view_users">
+ <item quantity="one">Arată %1$d participant</item>
+ <item quantity="few">Arată %1$d participanți</item>
+ <item quantity="other">Arată %1$d de participanți</item>
+ </plurals>
+ <string name="openstreetmap_credit">© Colaboratorii <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a></string>
</resources>
@@ -761,7 +761,6 @@
<string name="pref_more_notification_settings_summary">Важливість, звук, вібрація</string>
<string name="video_compression_channel_name">Стиснення відео</string>
<string name="view_media">Перегляд медіа</string>
- <string name="view_users">Переглянути учасників</string>
<string name="group_chat_members">Учасники</string>
<string name="media_browser">Переглядач медіа</string>
<string name="security_violation_not_attaching_file">Файл пропущено через порушення безпеки.</string>
@@ -740,7 +740,6 @@
<string name="pref_more_notification_settings_summary">重要性，声音，振动</string>
<string name="video_compression_channel_name">视频压缩</string>
<string name="view_media">查看媒体文件</string>
- <string name="view_users">查看成员</string>
<string name="group_chat_members">成员</string>
<string name="media_browser">媒体浏览器</string>
<string name="security_violation_not_attaching_file">文件由于违反安全策略而被删除。</string>