"Message on the new line" preference removed. #479

app/src/main/java/com/xabber/android/data/SettingsManager.java

@@ -346,22 +346,6 @@ public class SettingsManager implements OnInitializedListener,
             throw new IllegalStateException();
     }
 
-    public static ChatsDivide chatsDivide() {
-        String value = getString(R.string.chats_divide_key,
-                R.string.chats_divide_default);
-        if (Application.getInstance()
-                .getString(R.string.chats_divide_always_value).equals(value))
-            return ChatsDivide.always;
-        else if (Application.getInstance()
-                .getString(R.string.chats_divide_portrait_value).equals(value))
-            return ChatsDivide.portial;
-        else if (Application.getInstance()
-                .getString(R.string.chats_divide_never_value).equals(value))
-            return ChatsDivide.never;
-        else
-            throw new IllegalStateException();
-    }
-
     public static boolean chatsStateNotification() {
         return getBoolean(R.string.chats_state_notification_key,
                 R.bool.chats_state_notification_default);
@@ -730,25 +714,6 @@ public class SettingsManager implements OnInitializedListener,
         never,
     }
 
-    public enum ChatsDivide {
-
-        /**
-         * Always divide message header from text.
-         */
-        always,
-
-        /**
-         * Only in portial mode.
-         */
-        portial,
-
-        /**
-         * Never.
-         */
-        never
-
-    }
-
     public enum SecurityOtrMode {
 
         /**

app/src/main/res/values-ru/preference_editor.xml

@@ -68,10 +68,6 @@
     <string name="preference_interface">Темы\nНастройки внешнего вида</string>
     <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/preference_editor_02.png -->
     <string name="about_viewer">О программе</string>
-    <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/preference_editor_chat_viewer.png -->
-    <string name="chats_divide">Сообщение с новой строки\nОтображать сообщение с новой строки</string>
-    <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/preference_editor_chat_viewer_new_line.png -->
-    <string name="chats_divide_portrait">В портретном режиме</string>
 
     <string name="chats_show_background">Отображать фон\nОтключение может увеличить производительность</string>
 

app/src/main/res/values/preference_editor.xml

@@ -68,10 +68,6 @@
     <string name="preference_interface">Theme settings\nAppearance settings</string>
     <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/preference_editor_02.png -->
     <string name="about_viewer">About</string>
-    <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/preference_editor_chat_viewer.png -->
-    <string name="chats_divide">Message on the new line\nDisplay a message on a new line</string>
-    <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/preference_editor_chat_viewer_new_line.png -->
-    <string name="chats_divide_portrait">In portrait mode</string>
 
     <string name="chats_show_background">Show background\nDisabling may increase performance</string>
 

app/src/main/res/values/preferences.xml

@@ -268,22 +268,6 @@
     </string-array>
     <string name="chats_font_size_default">@string/chats_font_size_normal_value</string>
 
-    <string name="chats_divide_key">chats_divide</string>
-    <string name="chats_divide_always_value">always</string>
-    <string name="chats_divide_portrait_value">portrait</string>
-    <string name="chats_divide_never_value">never</string>
-    <string-array name="chats_divide_entries">
-        <item>@string/always</item>
-        <item>@string/chats_divide_portrait</item>
-        <item>@string/never</item>
-        </string-array>
-    <string-array name="chats_divide_entryvalues">
-        <item>@string/chats_divide_always_value</item>
-        <item>@string/chats_divide_portrait_value</item>
-        <item>@string/chats_divide_never_value</item>
-    </string-array>
-    <string name="chats_divide_default">@string/chats_divide_portrait_value</string>
-
     <string name="chats_state_notification_key">chats_state_notification</string>
     <bool name="chats_state_notification_default">true</bool>
 

app/src/main/res/xml/preference_chat_global.xml

@@ -39,13 +39,6 @@
         android:key="@string/chats_font_size_key"
         android:title="@string/chats_font_size"
         />
-    <ListPreference
-        android:defaultValue="@string/chats_divide_default"
-        android:entries="@array/chats_divide_entries"
-        android:entryValues="@array/chats_divide_entryvalues"
-        android:key="@string/chats_divide_key"
-        android:title="@string/chats_divide"
-        />
     <CheckBoxPreference
         android:defaultValue="@bool/chats_state_notification_default"
         android:key="@string/chats_state_notification_key"