常に埋め込みツイートを表示

5 files changed, 1 insertions, 11 deletions

diff --git a/app/src/main/java/net/lacolaco/smileessence/viewmodel/StatusViewModel.java b/app/src/main/java/net/lacolaco/smileessence/viewmodel/StatusViewModel.java
index 9320a4bd..64f20567 100644
--- a/app/src/main/java/net/lacolaco/smileessence/viewmodel/StatusViewModel.java
+++ b/app/src/main/java/net/lacolaco/smileessence/viewmodel/StatusViewModel.java
@@ -57,7 +57,7 @@ public class StatusViewModel implements IViewModel, IdObject {
     // --------------------------- CONSTRUCTORS ---------------------------
 
     public StatusViewModel(Tweet tw) {
-        this(tw, UserPreferenceHelper.getInstance().get(R.string.key_setting_extend_status_url, true));
+        this(tw, true);
     }
 
     public StatusViewModel(Tweet tw, boolean expand) {
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 603cfce4..d8d26266 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -66,8 +66,6 @@
     <string name="setting_theme_title">テーマ</string>
     <string name="setting_theme_dialog_title">テーマを選択</string>
     <string name="setting_read_morse">モールスの解読</string>
-    <string name="setting_extend_status_url">ツイートURLの展開</string>
-    <string name="setting_extend_status_url_summary">開発中につき不安定</string>
     <string name="setting_category_system_title">システム設定</string>
     <string name="setting_safe_mode_title">セーフモード</string>
     <string name="setting_safe_mode_summary_on">確認ダイアログを表示する</string>
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index ec2d21f7..183b0f71 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -34,7 +34,6 @@
     <string name="key_setting_theme">theme</string>
     <string name="key_setting_application_information">appInfo</string>
     <string name="key_setting_licenses">licenseNotice</string>
-    <string name="key_setting_extend_status_url">extendStatusURL</string>
     <string name="key_setting_resize_post_image">resizePostImage</string>
     <string name="key_last_used_search_query">lastUsedSearchQuery</string>
     <string name="key_last_used_account_id">lastUsedAccountId</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c96bcf59..0d533890 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -64,8 +64,6 @@
     <string name="setting_theme_title">Theme</string>
     <string name="setting_theme_dialog_title">Choose theme</string>
     <string name="setting_read_morse">Enable morse</string>
-    <string name="setting_extend_status_url">Extend status url</string>
-    <string name="setting_extend_status_url_summary">Unstable</string>
     <string name="setting_category_system_title">System Setting</string>
     <string name="setting_safe_mode_title">Safe mode</string>
     <string name="setting_safe_mode_summary_on">Show confirm dialog</string>
diff --git a/app/src/main/res/xml/setting.xml b/app/src/main/res/xml/setting.xml
index ca7f6113..c7a2ee39 100644
--- a/app/src/main/res/xml/setting.xml
+++ b/app/src/main/res/xml/setting.xml
@@ -54,11 +54,6 @@
             android:defaultValue="true"
             android:key="@string/key_setting_read_morse"
             android:title="@string/setting_read_morse" />
-        <SwitchPreference
-                android:defaultValue="true"
-                android:key="@string/key_setting_extend_status_url"
-                android:summary="@string/setting_extend_status_url_summary"
-                android:title="@string/setting_extend_status_url" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/setting_category_system_title">
         <SwitchPreference