From 41f36bd816b642c48473c5ba786c065bf81a549a Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Mon, 9 Sep 2019 21:38:37 +0200
Subject: add 1080p as video resolution and set default to 720p

---
 .../de/pixart/messenger/services/XmppConnectionService.java  | 12 ++++++++----
 src/main/res/values-ar/strings.xml                           |  3 ---
 src/main/res/values-bg/strings.xml                           |  3 ---
 src/main/res/values-ca/strings.xml                           |  4 +---
 src/main/res/values-ceb/strings.xml                          |  3 ---
 src/main/res/values-de/strings.xml                           |  3 ---
 src/main/res/values-es/strings.xml                           |  3 ---
 src/main/res/values-fil/strings.xml                          |  3 ---
 src/main/res/values-fr/strings.xml                           |  3 ---
 src/main/res/values-id/strings.xml                           |  3 ---
 src/main/res/values-it/strings.xml                           |  4 +---
 src/main/res/values-nl/strings.xml                           |  3 ---
 src/main/res/values-pl/strings.xml                           |  4 +---
 src/main/res/values-ru/strings.xml                           |  3 ---
 src/main/res/values-tr/strings.xml                           |  3 ---
 src/main/res/values-zh/strings.xml                           |  3 ---
 src/main/res/values/arrays.xml                               |  2 ++
 src/main/res/values/strings.xml                              |  7 ++++---
 18 files changed, 17 insertions(+), 52 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index f7b874606..58822c5ce 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -1022,21 +1022,25 @@ public class XmppConnectionService extends Service {
 
     public int getCompressVideoResolutionPreference() {
         switch (getPreferences().getString("video_compression", getResources().getString(R.string.video_compression))) {
-            case "low":
+            case "verylow":
                 return 144;
-            case "mid":
+            case "low":
                 return 360;
-            case "high":
+            case "mid":
                 return 720;
+            case "high":
+                return 1080;
             case "uncompressed":
                 return 0;
             default:
-                return 360;
+                return 720;
         }
     }
 
     public int getCompressVideoBitratePreference() {
         switch (getPreferences().getString("video_compression", getResources().getString(R.string.video_compression))) {
+            case "verylow":
+                return 100000;
             case "low":
                 return 100000;
             case "mid":
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 51ff53197..7bdaa5260 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -330,9 +330,6 @@
     <string name="pref_picture_quality_summary">تغيير الحجم وضغط الصور</string>
     <string name="pref_video_quality">جودة الفيديو</string>
     <string name="pref_video_quality_summary">تغيير الحجم وضغط الفيديوهات</string>
-    <string name="video_low">ضعيفة (144p)</string>
-    <string name="video_mid">متوسطة (360p)</string>
-    <string name="video_high">عالية (720p)</string>
     <string name="video_original">أصلية (غير مضغوطة)</string>
     <string name="always">دائما</string>
     <string name="battery_optimizations_enabled">تم تشغيل تحسينات البطارية</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 3cd03a3c5..5993c05d1 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -484,9 +484,6 @@
     <string name="pref_picture_quality_summary">Уголемеване, намалеване и компресиране на снимки</string>
     <string name="pref_video_quality">Видео качество</string>
     <string name="pref_video_quality_summary">Уголемеване, намалеване и компресиране на видео</string>
-    <string name="video_low">ниско (144p)</string>
-    <string name="video_mid">средно (360p)</string>
-    <string name="video_high">високo (720p)</string>
     <string name="video_original">оригинал (некомпресиран)</string>
     <string name="always">Винаги</string>
     <string name="battery_optimizations_enabled">Оптимизациите на батерията са активирани</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index bf9d277a4..0529eb3ea 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -489,9 +489,7 @@
     <string name="pref_picture_quality_summary">Redimensionar i comprimir les imatges</string>
     <string name="pref_video_quality">Qualitat de vídeo </string>
     <string name="pref_video_quality_summary">Redimensionar i comprimir els vídeos</string>
-    <string name="video_low">abaix (144p)</string>
-    <string name="video_mid"> mig (360p)</string>
-    <string name="video_high">alt (720p)</string>
+
     <string name="video_original">original (sense comprimir)</string>
     <string name="always">Sempre</string>
     <string name="battery_optimizations_enabled">Optimitzacions d\'ús de batería habil·litades</string>
diff --git a/src/main/res/values-ceb/strings.xml b/src/main/res/values-ceb/strings.xml
index a1e9a7ba8..9845fd8d4 100644
--- a/src/main/res/values-ceb/strings.xml
+++ b/src/main/res/values-ceb/strings.xml
@@ -413,9 +413,6 @@
     <string name="notify_only_when_highlighted">Pahibal-a kung ge-hisgutan</string>
     <string name="notify_never">Mga pahibalo kay baldado</string>
     <string name="notify_paused">Mga pahibalo kay gipa ungot</string>
-    <string name="video_low">ubos (144p)</string>
-    <string name="video_mid">tunga (360p)</string>
-    <string name="video_high">taas (720p)</string>
     <string name="always">Permenti</string>
     <string name="battery_optimizations_enabled">Kinahanglan ang mga optimization sa baterya</string>
     <string name="battery_optimizations_enabled_explained">Ang imung device kay nagbuhat ug bug-at nga battery para optimization sa Pix-Art Messenger nga pwedi sa rason nga maka dugay sa mga pahibalo o bisag mga mensahe nga nawa.\nKani kay ge recomend mga dili na.</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 59991ba9b..9ff9b331b 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -489,9 +489,6 @@
     <string name="pref_picture_quality_summary">Bildgröße anpassen und komprimieren</string>
     <string name="pref_video_quality">Videoqualität</string>
     <string name="pref_video_quality_summary">Videogröße anpassen und komprimieren</string>
-    <string name="video_low">niedrig (144p)</string>
-    <string name="video_mid">mittelmäßig (360p)</string>
-    <string name="video_high">hoch (720p)</string>
     <string name="video_original">original (unkomprimiert)</string>
     <string name="always">Immer</string>
     <string name="battery_optimizations_enabled">Batterieoptimierung aktiv</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index d914fee52..723ed77c9 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -489,9 +489,6 @@
     <string name="pref_picture_quality_summary">Redimensionar y comprimir las imágenes</string>
     <string name="pref_video_quality">Calidad de vídeo</string>
     <string name="pref_video_quality_summary">Redimensionar y comprimir los vídeos</string>
-    <string name="video_low">bajo (144p)</string>
-    <string name="video_mid">medio (360p)</string>
-    <string name="video_high">alto (720p)</string>
     <string name="video_original">original (sin comprimir)</string>
     <string name="always">Siempre</string>
     <string name="battery_optimizations_enabled">Optimizaciones de uso de batería habilitadas</string>
diff --git a/src/main/res/values-fil/strings.xml b/src/main/res/values-fil/strings.xml
index 2d4e451ec..ea4f38d87 100644
--- a/src/main/res/values-fil/strings.xml
+++ b/src/main/res/values-fil/strings.xml
@@ -441,9 +441,6 @@
     <string name="notify_only_when_highlighted">I-notify lamang kapag nabanggit</string>
     <string name="notify_never">Hindi pinagana ang mga notification</string>
     <string name="notify_paused">Ang mga notification ay naka-pause</string>
-    <string name="video_low">mababa (144p)</string>
-    <string name="video_mid">gitna (360p)</string>
-    <string name="video_high">mataas (720p)</string>
     <string name="always">Laging</string>
     <string name="battery_optimizations_enabled">Pinagana ang mga pag-optimize ng baterya</string>
     <string name="battery_optimizations_enabled_explained">Ang iyong aparato ay gumagawa ng ilang mabigat na pag-optimize ng baterya sa Pix-Art Messenger na maaaring humantong sa mga naantalang abiso o kahit na pagkawala ng mensahe. \nIto ay inirerekomenda upang huwag paganahin ang mga iyon.</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 0b5f5638b..0c7d0d696 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -482,9 +482,6 @@
     <string name="pref_picture_quality_summary">Redimensionner et compresser les images</string>
     <string name="pref_video_quality">Qualité de la vidéo</string>
     <string name="pref_video_quality_summary">Redimensionner et compresser les vidéos</string>
-    <string name="video_low">basse (144p)</string>
-    <string name="video_mid">moyenne (360p)</string>
-    <string name="video_high">haute (720p)</string>
     <string name="video_original">original (non compressé)</string>
     <string name="always">Toujours</string>
     <string name="battery_optimizations_enabled">Optimisations de batterie activées</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 0f46c264a..bc71081e8 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -439,9 +439,6 @@
     <string name="notify_only_when_highlighted">Pemberitahuan hanya bila disebutkan</string>
     <string name="notify_never">Pemberitahuan tidak diaktifkan</string>
     <string name="notify_paused">Pemberitahuan dijeda</string>
-    <string name="video_low">rendah (144p)</string>
-    <string name="video_mid">menengah (360p)</string>
-    <string name="video_high">tinggi (720p)</string>
     <string name="always">Selalu</string>
     <string name="battery_optimizations_enabled">Optimalisasi baterai diaktifkan</string>
     <string name="battery_optimizations_enabled_explained">Perangkat anda melakukan beberapa pengoptimalan baterai pada Pix-Art Messenger yang mungkin menyebabkan pemberitahuan tertunda atau bahkan kehilangan pesan.\nDianjurkan untuk tidak mengaktifkannya.</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index b59114e08..a69362d64 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -489,9 +489,7 @@
     <string name="pref_picture_quality_summary">Rimpicciolisci e comprimi immagini</string>
     <string name="pref_video_quality">Qualità video</string>
     <string name="pref_video_quality_summary">Rimpicciolisci e comprimi video</string>
-    <string name="video_low">bassa (144p)</string>
-    <string name="video_mid">media (360p)</string>
-    <string name="video_high">alta (720p)</string>
+
     <string name="video_original">originale (non compresso)</string>
     <string name="always">Sempre</string>
     <string name="battery_optimizations_enabled">Ottimizzazioni batteria abilitate</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index ddd82cdf3..81244b012 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -451,9 +451,6 @@
     <string name="pref_picture_quality">Afbeeldingskwaliteit</string>
     <string name="pref_picture_quality_summary">Afbeeldingen verkleinen en comprimeren</string>
     <string name="pref_video_quality">Videokwaliteit</string>
-    <string name="video_low">Laag (144p)</string>
-    <string name="video_mid">Gemiddeld (360p)</string>
-    <string name="video_high">Hoog (720p)</string>
     <string name="video_original">Origineel (zonder compressie)</string>
     <string name="always">Altijd</string>
     <string name="battery_optimizations_enabled">Batterij-optimalisaties ingeschakeld</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index ad8b43714..c2aea5a9a 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -491,9 +491,7 @@ Nie spowoduje to usunięcia kopii wiadomości przechowywanych na innych urządze
     <string name="pref_picture_quality_summary">Skompresuj i zmień rozmiar zdjęcia</string>
     <string name="pref_video_quality">Jakoś wideo</string>
     <string name="pref_video_quality_summary">Skompresuj i zmień rozmiar wideo</string>
-    <string name="video_low">niski (144p)</string>
-    <string name="video_mid">średnie (360p)</string>
-    <string name="video_high">wysokie (720p)</string>
+
     <string name="video_original">oryginał (nieskompresowane)</string>
     <string name="always">Zawsze</string>
     <string name="battery_optimizations_enabled">Optymalizacje zużycia baterii włączone</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 136a398ec..fb6b233a5 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -483,9 +483,6 @@
     <string name="pref_picture_quality_summary">Изменять размер и сжимать изображения</string>
     <string name="pref_video_quality">Качество видео</string>
     <string name="pref_video_quality_summary">Изменять размер и сжимать видео</string>
-    <string name="video_low">низкое (144p)</string>
-    <string name="video_mid">среднее (360p)</string>
-    <string name="video_high">высокое (720p)</string>
     <string name="video_original">оригинальное (без сжатия)</string>
     <string name="always">Всегда</string>
     <string name="battery_optimizations_enabled">Включена оптимизация энергопотребления</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 55a84e5db..d513c610b 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -441,9 +441,6 @@
     <string name="notify_only_when_highlighted">Yalnızca bahsedildiğinde bildir</string>
     <string name="notify_never">Bildirimler devre dışı</string>
     <string name="notify_paused">Bildirimler duraklatıldı</string>
-    <string name="video_low">düşük (144p)</string>
-    <string name="video_mid">orta (360p)</string>
-    <string name="video_high">yüksek (720p)</string>
     <string name="always">Her zaman</string>
     <string name="battery_optimizations_enabled">Pil optimizasyonları etkin</string>
     <string name="battery_optimizations_enabled_explained">Cihazınız, Pix-Art Messenger\'da, bildirimleri gecikmeli hatta mesaj kaybına yol açabilecek bazı ağır pil optimizasyonları yapıyor. \n Bunları devre dışı bırakmanız önerilir.</string>
diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 6ceb080ec..4bd713193 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -487,9 +487,6 @@
     <string name="pref_picture_quality_summary">调整尺寸和压缩图片</string>
     <string name="pref_video_quality">视频画质</string>
     <string name="pref_video_quality_summary">调整尺寸和压缩视频</string>
-    <string name="video_low">低(144p)</string>
-    <string name="video_mid">标准(360p)</string>
-    <string name="video_high">高 (720p)</string>
     <string name="video_original">原文件(未压缩)</string>
     <string name="always">总是</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index de2e0355c..9d587fd86 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -69,6 +69,7 @@
     </string-array>
 
     <string-array name="video_compression_values">
+        <item>verylow</item>
         <item>low</item>
         <item>mid</item>
         <item>high</item>
@@ -76,6 +77,7 @@
     </string-array>
 
     <string-array name="video_compression_entries">
+        <item>@string/video_very_low</item>
         <item>@string/video_low</item>
         <item>@string/video_mid</item>
         <item>@string/video_high</item>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 6a70c8cd4..d90b862e8 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -490,9 +490,10 @@
     <string name="pref_picture_quality_summary">Resize and compress pictures</string>
     <string name="pref_video_quality">Video quality</string>
     <string name="pref_video_quality_summary">Resize and compress videos</string>
-    <string name="video_low">low (144p)</string>
-    <string name="video_mid">middle (360p)</string>
-    <string name="video_high">high (720p)</string>
+    <string name="video_very_low">very low (144p)</string>
+    <string name="video_low">low (360p)</string>
+    <string name="video_mid">middle (720p)</string>
+    <string name="video_high">high (1080p)</string>
     <string name="video_original">original (uncompressed)</string>
     <string name="always">Always</string>
     <string name="battery_optimizations_enabled">Battery optimizations enabled</string>
-- 
cgit v1.2.3