From 6a2c1a0dd55e69996926b0ed0624fedf94068167 Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Sat, 13 Feb 2016 21:03:35 +0100
Subject: Unused preference 'picture_compression'. This feature is configured
 in our variant via 'resize_picture'

---
 .../siacs/conversations/services/XmppConnectionService.java  |  4 ----
 src/main/res/values-bg/strings.xml                           |  2 --
 src/main/res/values-cs/strings.xml                           |  2 --
 src/main/res/values-de/strings.xml                           |  2 --
 src/main/res/values-es/strings.xml                           |  2 --
 src/main/res/values-eu/strings.xml                           |  2 --
 src/main/res/values-fr/strings.xml                           |  2 --
 src/main/res/values-it/strings.xml                           |  2 --
 src/main/res/values-ja/strings.xml                           |  2 --
 src/main/res/values-nb-rNO/strings.xml                       |  2 --
 src/main/res/values-nl/strings.xml                           |  2 --
 src/main/res/values-ro-rRO/strings.xml                       |  2 --
 src/main/res/values-ru/strings.xml                           |  1 -
 src/main/res/values-sr/strings.xml                           |  2 --
 src/main/res/values-sv/strings.xml                           |  2 --
 src/main/res/values-tr-rTR/strings.xml                       |  2 --
 src/main/res/values-zh-rCN/strings.xml                       |  2 --
 src/main/res/values/arrays.xml                               | 12 ------------
 src/main/res/values/strings.xml                              |  2 --
 src/main/res/xml/preferences.xml                             |  7 -------
 20 files changed, 56 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 319ebbbe..fd22b55c 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -548,10 +548,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		return getPreferences().getBoolean("away_when_screen_off", false);
 	}
 
-	private String getCompressPicturesPreference() {
-		return getPreferences().getString("picture_compression", "auto");
-	}
-
 	private int getTargetPresence() {
 		if (xaOnSilentMode() && isPhoneSilenced()) {
 			return Presences.XA;
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index fa76b1ae..4cde101f 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -536,8 +536,6 @@
   <string name="notify_only_when_highlighted">Известяване само на осветените</string>
   <string name="notify_never">Известията са изключени</string>
   <string name="notify_paused">Известията са спрени временно</string>
-  <string name="pref_picture_compression">Компресиране на снимките</string>
-  <string name="pref_picture_compression_summary">Преоразмеряване и компресиране на снимките</string>
   <string name="always">Винаги</string>
   <string name="automatically">Автоматично</string>
   <string name="battery_optimizations_enabled">Оптимизациите за използв. на батерията са вкл.</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 71187de4..d3ad3b2c 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -539,8 +539,6 @@
   <string name="notify_only_when_highlighted">Upozorňovat pouze pokud zvýrazněno</string>
   <string name="notify_never">Upozornění vypnuta</string>
   <string name="notify_paused">Upozornění pozastavena</string>
-  <string name="pref_picture_compression">Komprimovat obrázky</string>
-  <string name="pref_picture_compression_summary">Upravené a komprimované obrázky</string>
   <string name="always">Vždy</string>
   <string name="automatically">Automaticky</string>
   <string name="battery_optimizations_enabled">Povolena optimalizace využití baterie</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 3d8a3595..c9762030 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -598,8 +598,6 @@
   <string name="notify_only_when_highlighted">Nur benachrichtigen, wenn ich angesprochen werde</string>
   <string name="notify_never">Benachrichtigungen deaktiviert</string>
   <string name="notify_paused">Benachrichtigungen pausiert</string>
-  <string name="pref_picture_compression">Bilder komprimieren</string>
-  <string name="pref_picture_compression_summary">Bildgröße anpassen und komprimieren</string>
   <string name="always">Immer</string>
   <string name="automatically">Automatisch</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 818ba863..d60a26b2 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -536,8 +536,6 @@
   <string name="notify_only_when_highlighted">Notificar solo cuando se recibe un mensjae resaltado</string>
   <string name="notify_never">Notificaciones deshabilitadas</string>
   <string name="notify_paused">Notificaciones pausadas</string>
-  <string name="pref_picture_compression">Comprimir imagenes</string>
-  <string name="pref_picture_compression_summary">Redimiensionar y comprimir imágenes</string>
   <string name="always">Siempre</string>
   <string name="automatically">Automáticamente</string>
   <string name="battery_optimizations_enabled">Optimizaciones de uso de batería habilitadas</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 30209248..8e0270db 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -536,8 +536,6 @@
   <string name="notify_only_when_highlighted">Jakinarazi nabarmentzerakoan soilik</string>
   <string name="notify_never">Jakinarazpenak ezgaituta</string>
   <string name="notify_paused">Jakinarazpenak gelditu dira</string>
-  <string name="pref_picture_compression">Irudiak konprimitu</string>
-  <string name="pref_picture_compression_summary">Irudiak konprimitu eta neurria aldatu</string>
   <string name="always">Beti</string>
   <string name="automatically">Automatikoki</string>
   <string name="battery_optimizations_enabled">Bateriaren optimizazioak gaituta</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 49a968d4..805b8a8c 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -536,8 +536,6 @@
   <string name="notify_only_when_highlighted">Notifier uniquement quand surligné</string>
   <string name="notify_never">Notifications désactivées</string>
   <string name="notify_paused">Notifications en pause</string>
-  <string name="pref_picture_compression">Compresser images</string>
-  <string name="pref_picture_compression_summary">Redimensionner et compresser les images</string>
   <string name="always">Toujours</string>
   <string name="automatically">Automatiquement</string>
   <string name="battery_optimizations_enabled">Optimisations de batterie activées</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index f1a32b3e..9bd78d0d 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -536,8 +536,6 @@
   <string name="notify_only_when_highlighted">Notifica solo quando evidenziato</string>
   <string name="notify_never">Notifiche disabilitate</string>
   <string name="notify_paused">Notifiche in pausa</string>
-  <string name="pref_picture_compression">Comprimi immagini</string>
-  <string name="pref_picture_compression_summary">Ridimensiona e comprimi le immagini</string>
   <string name="always">Sempre</string>
   <string name="automatically">Automaticamente</string>
   <string name="battery_optimizations_enabled">Ottimizzazioni batteria abilitate</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 5935f90b..fe5232c9 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -533,8 +533,6 @@
   <string name="notify_only_when_highlighted">ハイライトされたときにのみ通知</string>
   <string name="notify_never">通知は無効</string>
   <string name="notify_paused">通知は一時停止</string>
-  <string name="pref_picture_compression">写真を圧縮</string>
-  <string name="pref_picture_compression_summary">写真をサイズ変更や圧縮します</string>
   <string name="always">常に</string>
   <string name="automatically">自動</string>
   <string name="battery_optimizations_enabled">バッテリー最適化が有効</string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index ef9df663..5d0cd818 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -536,8 +536,6 @@
   <string name="notify_only_when_highlighted">Varsle bare når fremhevet</string>
   <string name="notify_never">Varslinger deaktivert</string>
   <string name="notify_paused">Varslinger pauset</string>
-  <string name="pref_picture_compression">Komprimer bilder</string>
-  <string name="pref_picture_compression_summary">Komprimer og juster bildestørrelser</string>
   <string name="always">Alltid</string>
   <string name="automatically">Automatisk</string>
   <string name="battery_optimizations_enabled">Batterioptimaliseringer aktivert</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 3baf2036..37dbfb57 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -536,8 +536,6 @@
   <string name="notify_only_when_highlighted">Melding enkel wanneer vermeld</string>
   <string name="notify_never">Meldingen uitgeschakeld</string>
   <string name="notify_paused">Meldingen gepauzeerd</string>
-  <string name="pref_picture_compression">Afbeeldingen comprimeren</string>
-  <string name="pref_picture_compression_summary">Afbeeldingen verkleinen en comprimeren</string>
   <string name="always">Altijd</string>
   <string name="automatically">Automatisch</string>
   <string name="battery_optimizations_enabled">Batterij-optimalisaties ingeschakeld</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 3486e09f..c78fc00e 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -540,8 +540,6 @@ Emitent</string>
   <string name="notify_only_when_highlighted">Notifica numai la evidentiere</string>
   <string name="notify_never">Notificari dezactivate</string>
   <string name="notify_paused">Notificari suspendate</string>
-  <string name="pref_picture_compression">Comprima imaginile</string>
-  <string name="pref_picture_compression_summary">Redimensioneaza si comprima imaginile</string>
   <string name="always">Mereu</string>
   <string name="automatically">Automat</string>
   <string name="battery_optimizations_enabled">Optimizare baterie activata</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index ec507f41..fb539f6a 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -532,7 +532,6 @@
   <string name="notify_on_all_messages">Уведомлять о всех сообщениях</string>
   <string name="notify_never">Уведомления запрещены</string>
   <string name="notify_paused">Уведомления приостановлены</string>
-  <string name="pref_picture_compression">Сжать изображения</string>
   <string name="always">Всегда</string>
   <string name="automatically">Автоматически</string>
   <string name="battery_optimizations_enabled">Оптимизации энергопотребления разрешены</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index f70106c0..0d107d88 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -539,8 +539,6 @@
   <string name="notify_only_when_highlighted">Обавештења само за означене поруке</string>
   <string name="notify_never">Обавештења искључена</string>
   <string name="notify_paused">Обавештења паузирана</string>
-  <string name="pref_picture_compression">Компресуј слике</string>
-  <string name="pref_picture_compression_summary">Промена величине и компресије слике</string>
   <string name="always">увек</string>
   <string name="automatically">аутоматски</string>
   <string name="battery_optimizations_enabled">Оптимизација батерије је укључена</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 2b5ea08b..837b193a 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -536,8 +536,6 @@
   <string name="notify_only_when_highlighted">Notifiera endast vid highlight</string>
   <string name="notify_never">Notifieringar deaktiverade</string>
   <string name="notify_paused">Notifieringar pausade</string>
-  <string name="pref_picture_compression">Komprimera bilder</string>
-  <string name="pref_picture_compression_summary">Storleksjustera och komprimera bilder</string>
   <string name="always">Alltid</string>
   <string name="automatically">Automatiskt</string>
   <string name="battery_optimizations_enabled">Batterioptimeringar aktiverade</string>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index 5ee66685..ba38cde5 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -533,8 +533,6 @@
   <string name="notify_only_when_highlighted">Sadece işaretliyse uyar</string>
   <string name="notify_never">Uyarılar devre dışı</string>
   <string name="notify_paused">Uyarılar geçici olarak durduruldu</string>
-  <string name="pref_picture_compression">Resimleri sıkıştır</string>
-  <string name="pref_picture_compression_summary">Resimleri yeniden boyutlandır ve sıkıştır</string>
   <string name="always">Her zaman</string>
   <string name="automatically">Otomatik olarak</string>
   <string name="battery_optimizations_enabled">Pil optimizasyonu devrede</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 06d1926f..fe209a23 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -533,8 +533,6 @@
   <string name="notify_only_when_highlighted">仅当高亮时显示通知</string>
   <string name="notify_never">禁用通知</string>
   <string name="notify_paused">暂停通知</string>
-  <string name="pref_picture_compression">压缩图片</string>
-  <string name="pref_picture_compression_summary">缩小并压缩图片</string>
   <string name="always">总是</string>
   <string name="automatically">自动</string>
   <string name="battery_optimizations_enabled">启用节电模式</string>
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index be52464a..24f8790c 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -79,16 +79,4 @@
         <item>ALWAYS</item>
         <item>NEVER</item>
     </string-array>
-
-	<string-array name="picture_compression_values">
-		<item>never</item>
-		<item>auto</item>
-		<item>always</item>
-	</string-array>
-
-	<string-array name="picture_compression_entries">
-		<item>@string/never</item>
-		<item>@string/automatically</item>
-		<item>@string/always</item>
-	</string-array>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 522459e3..4caf0572 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -638,8 +638,6 @@
 	<string name="notify_only_when_highlighted">Notify only when highlighted</string>
 	<string name="notify_never">Notifications disabled</string>
 	<string name="notify_paused">Notifications paused</string>
-	<string name="pref_picture_compression">Compress Pictures</string>
-	<string name="pref_picture_compression_summary">Resize and compressed pictures</string>
 	<string name="always">Always</string>
 	<string name="automatically">Automatically</string>
 	<string name="battery_optimizations_enabled">Battery optimizations enabled</string>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index dbe063b8..dd8e1f78 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -16,13 +16,6 @@
             android:key="resource"
             android:summary="@string/pref_xmpp_resource_summary"
             android:title="@string/pref_xmpp_resource"/>
-        <ListPreference
-            android:defaultValue="auto"
-            android:entries="@array/picture_compression_entries"
-            android:entryValues="@array/picture_compression_values"
-            android:key="picture_compression"
-            android:summary="@string/pref_picture_compression_summary"
-            android:title="@string/pref_picture_compression"/>
         <ListPreference
             android:defaultValue="2"
             android:entries="@array/confirm_strings"
-- 
cgit v1.2.3