From 79d6f57d72ccde93721d26c0e3131b5f9ac66dca Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Wed, 25 Jan 2017 21:47:09 +0100
Subject: delete unused resources

---
 build.gradle                                           |   4 +---
 libs/aspectjrt-1.7.3.jar                               | Bin 117083 -> 0 bytes
 libs/isoparser-1.0.6.jar                               | Bin 830022 -> 0 bytes
 .../drawable-hdpi/ic_play_box_outline_white_24dp.png   | Bin 237 -> 0 bytes
 .../drawable-mdpi/ic_play_box_outline_white_24dp.png   | Bin 155 -> 0 bytes
 .../drawable-xhdpi/ic_play_box_outline_white_24dp.png  | Bin 254 -> 0 bytes
 .../drawable-xxhdpi/ic_play_box_outline_white_24dp.png | Bin 340 -> 0 bytes
 .../ic_play_box_outline_white_24dp.png                 | Bin 464 -> 0 bytes
 src/main/res/values-de/strings.xml                     |   8 --------
 src/main/res/values/arrays.xml                         |  12 ------------
 src/main/res/values/strings.xml                        |   5 -----
 src/main/res/xml/preferences.xml                       |   9 +--------
 12 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 libs/aspectjrt-1.7.3.jar
 delete mode 100644 libs/isoparser-1.0.6.jar
 delete mode 100644 src/main/res/drawable-hdpi/ic_play_box_outline_white_24dp.png
 delete mode 100644 src/main/res/drawable-mdpi/ic_play_box_outline_white_24dp.png
 delete mode 100644 src/main/res/drawable-xhdpi/ic_play_box_outline_white_24dp.png
 delete mode 100644 src/main/res/drawable-xxhdpi/ic_play_box_outline_white_24dp.png
 delete mode 100644 src/main/res/drawable-xxxhdpi/ic_play_box_outline_white_24dp.png

diff --git a/build.gradle b/build.gradle
index ce3dea532..76dc0f322 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,8 +31,6 @@ dependencies {
     compile project(':libs:MemorizingTrustManager')
     compile project(':libs:audiowife')
     compile project(':libs:emojicon')
-    compile files('libs/aspectjrt-1.7.3.jar')
-    compile files('libs/isoparser-1.0.6.jar')
     playstoreCompile 'com.google.android.gms:play-services-gcm:10.0.1'
     compile 'org.sufficientlysecure:openpgp-api:10.0'
     compile 'com.soundcloud.android:android-crop:1.0.1@aar'
@@ -139,7 +137,7 @@ android {
                 signingConfig = signingConfigs.release
                 minifyEnabled true
                 runProguard true
-                proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'),'proguard-rules.pro'
+                proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             }
         }
     }
diff --git a/libs/aspectjrt-1.7.3.jar b/libs/aspectjrt-1.7.3.jar
deleted file mode 100644
index ef9fe4bf7..000000000
Binary files a/libs/aspectjrt-1.7.3.jar and /dev/null differ
diff --git a/libs/isoparser-1.0.6.jar b/libs/isoparser-1.0.6.jar
deleted file mode 100644
index f0142bb37..000000000
Binary files a/libs/isoparser-1.0.6.jar and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_play_box_outline_white_24dp.png b/src/main/res/drawable-hdpi/ic_play_box_outline_white_24dp.png
deleted file mode 100644
index 2aeb9f818..000000000
Binary files a/src/main/res/drawable-hdpi/ic_play_box_outline_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_play_box_outline_white_24dp.png b/src/main/res/drawable-mdpi/ic_play_box_outline_white_24dp.png
deleted file mode 100644
index 28e2f53a7..000000000
Binary files a/src/main/res/drawable-mdpi/ic_play_box_outline_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_play_box_outline_white_24dp.png b/src/main/res/drawable-xhdpi/ic_play_box_outline_white_24dp.png
deleted file mode 100644
index 85f101787..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_play_box_outline_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_play_box_outline_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_play_box_outline_white_24dp.png
deleted file mode 100644
index b4eb3d6bf..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_play_box_outline_white_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_play_box_outline_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_play_box_outline_white_24dp.png
deleted file mode 100644
index 5177d007e..000000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_play_box_outline_white_24dp.png and /dev/null differ
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 691fcd008..f3af24fa5 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -334,9 +334,6 @@
     <string name="regenerate_omemo_key">OMEMO-Fingerabdruck erneuern</string>
     <string name="clear_other_devices">Geräte entfernen</string>
     <string name="clear_other_devices_desc">Alle anderen Geräte aus der OMEMO-Bekanntmachung entfernen? Die Bekanntmachung wird bei der nächsten Verbindung erneuert, möglicherweise werden aber nicht alle Nachrichten empfangen, die in der Zwischenzeit versendet wurden.</string>
-    <string name="purge_key">Fingerabdruck löschen</string>
-    <string name="purge_key_desc_part1">Soll dieser Fingerabdruck gelöscht werden?</string>
-    <string name="purge_key_desc_part2">Dieser Vorgang kann nicht rückgängig gemacht werden und es kann nie wieder eine Verbindung mit diesem Fingerabdruck hergestellt werden.</string>
     <string name="error_no_keys_to_trust_server_error">Für diesen Kontakt sind keine benutzbaren Fingerabdrücke verfügbar.\nNeuen Fingerabdruck vom Server herunterzuladen war nicht erfolgreich. Vielleicht stimmt etwas mit dem Server deines Kontakts nicht.</string>
     <string name="error_no_keys_to_trust">Es sind keine Fingerabdrücke für diesen Kontakt verfügbar. Falls sie gelöscht wurden, müssen diese neu erstellt werden.</string>
     <string name="error_trustkeys_title">Fehler</string>
@@ -621,9 +618,6 @@
     <string name="pref_export_plain_text_logs_summary">Aktiviere den Export von Chats als lesbare Text-Dateien</string>
     <string name="allow">Erlauben</string>
     <string name="attach_choose_video">Video auswählen</string>
-    <string name="compressing_video">Video wird komprimiert, bitte warten…</string>
-    <string name="preparing_video">Video wird für die Übertragung vorbereitet. Bitte warten…</string>
-    <string name="shared_video_with_x">Video mit %s geteilt</string>
     <string name="error_file_corrupt">Die Datei scheint defekt zu sein.</string>
     <string name="me">Ich</string>
     <string name="missing_internet_permission">Fehlende Berechtigung für den Zugriff auf das Internet</string>
@@ -663,8 +657,6 @@
     <string name="copy_fingerprint">Fingerabdruck kopieren</string>
     <string name="device_does_not_support_data_saver">Dein Gerät unterstützt den Datensparmodus für Pix-Art Messenger nicht.</string>
     <string name="error_unable_to_create_temporary_file">Temporäre Datei kann nicht erstellt werden</string>
-    <string name="pref_video_compression">Videos komprimieren</string>
-    <string name="pref_video_compression_summary">Videogröße anpassen und komprimieren</string>
     <string name="this_device_has_been_verified">Dieses Gerät wurde verifiziert</string>
     <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Barcode enthält keine Fingerabdrücke für diese Unterhaltung.</string>
     <string name="blindly_trusted_omemo_keys">Blind vertraute OMEMO-Fingerabdrücke</string>
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index 4c126478e..821fd7068 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -70,18 +70,6 @@
         <item>@string/always</item>
     </string-array>
 
-    <string-array name="video_compression_values">
-        <item>never</item>
-        <item>auto</item>
-        <item>always</item>
-    </string-array>
-
-    <string-array name="video_compression_entries">
-        <item>@string/never</item>
-        <item>@string/automatically</item>
-        <item>@string/always</item>
-    </string-array>
-
     <string-array name="mam_prefs">
         <item>@string/never</item>
         <item>@string/contacts</item>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index f34a17c9d..9b40b97c3 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -583,8 +583,6 @@
     <string name="notify_paused">Notifications paused</string>
     <string name="pref_picture_compression">Compress Pictures</string>
     <string name="pref_picture_compression_summary">Resize and compress pictures</string>
-    <string name="pref_video_compression">Compress Videos</string>
-    <string name="pref_video_compression_summary">Resize and compress Videos</string>
     <string name="always">Always</string>
     <string name="automatically">Automatically</string>
     <string name="battery_optimizations_enabled">Battery optimizations enabled</string>
@@ -676,9 +674,6 @@
     <string name="contact_asks_for_presence_subscription">Contact asks for presence subscription</string>
     <string name="allow">Allow</string>
     <string name="attach_choose_video">Choose video</string>
-    <string name="preparing_video">Prepare video for transmission. Please wait…</string>
-    <string name="compressing_video">Compressing video, please wait…</string>
-    <string name="shared_video_with_x">Shared video with %s</string>
     <string name="no_permission_to_access_x">No permission to access %s</string>
     <string name="remote_server_not_found">Remote server not found</string>
     <string name="error_file_corrupt">This file seems to be corrupt.</string>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 959201f5c..92078afc0 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -115,13 +115,6 @@
             android:key="picture_compression"
             android:summary="@string/pref_picture_compression_summary"
             android:title="@string/pref_picture_compression" />
-        <ListPreference
-            android:defaultValue="auto"
-            android:entries="@array/video_compression_entries"
-            android:entryValues="@array/video_compression_values"
-            android:key="video_compression"
-            android:summary="@string/pref_video_compression_summary"
-            android:title="@string/pref_video_compression" />
     </PreferenceScreen>
     <!--status-->
     <PreferenceScreen
@@ -231,7 +224,7 @@
                 android:defaultValue="true"
                 android:key="btbv"
                 android:title="@string/pref_blind_trust_before_verification"
-                android:summary="@string/pref_blind_trust_before_verification_summary"/>
+                android:summary="@string/pref_blind_trust_before_verification_summary" />
             <CheckBoxPreference
                 android:defaultValue="false"
                 android:key="dont_save_encrypted"
-- 
cgit v1.2.3