diff options
8 files changed, 5 insertions, 34 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/entity/User.java b/app/src/main/java/net/lacolaco/smileessence/entity/User.java index d03c67c7..b6bce4c6 100644 --- a/app/src/main/java/net/lacolaco/smileessence/entity/User.java +++ b/app/src/main/java/net/lacolaco/smileessence/entity/User.java @@ -61,7 +61,7 @@ public class User extends UIObservable { if (isProtected() != user.isProtected() || getScreenName() == null || !getScreenName().equals(user.getScreenName()) || getName() == null || !getName().equals(user.getName()) || - getProfileImageUrl() == null || !getProfileImageUrl().equals(user.getProfileImageURLHttps())) { + profileImageUrl == null || !profileImageUrl.equals(user.getProfileImageURLHttps())) { isProtected = user.isProtected(); if (user.getScreenName() != null) screenName = user.getScreenName(); @@ -119,16 +119,12 @@ public class User extends UIObservable { return name; } - public String getProfileImageUrl() { - return profileImageUrl; - } - public String getProfileImageUrlOriginal() { return getProfileImageUrlWithSuffix(""); } private String getProfileImageUrlWithSuffix(String suffix) { - String original = getProfileImageUrl(); + String original = profileImageUrl; if (original != null) { String url = original.substring(0, original.lastIndexOf("_")) + suffix; int extIndex = original.lastIndexOf("."); diff --git a/app/src/main/java/net/lacolaco/smileessence/viewmodel/EventViewModel.java b/app/src/main/java/net/lacolaco/smileessence/viewmodel/EventViewModel.java index b6c18d6c..ffdaaa36 100644 --- a/app/src/main/java/net/lacolaco/smileessence/viewmodel/EventViewModel.java +++ b/app/src/main/java/net/lacolaco/smileessence/viewmodel/EventViewModel.java @@ -105,12 +105,7 @@ public class EventViewModel implements IViewModel { private void updateViewUser(View convertedView) { NetworkImageView icon = (NetworkImageView) convertedView.findViewById(R.id.imageview_status_icon); - String iconUrl; - if (UserPreferenceHelper.getInstance().get(R.string.key_setting_original_icon, false)) { - iconUrl = source.getProfileImageUrlOriginal(); - } else { - iconUrl = source.getProfileImageUrl(); - } + String iconUrl= source.getProfileImageUrlOriginal(); ImageCache.getInstance().setImageToView(iconUrl, icon); TextView header = (TextView) convertedView.findViewById(R.id.textview_status_header); diff --git a/app/src/main/java/net/lacolaco/smileessence/viewmodel/MessageViewModel.java b/app/src/main/java/net/lacolaco/smileessence/viewmodel/MessageViewModel.java index 11793ecf..bbc9f51b 100644 --- a/app/src/main/java/net/lacolaco/smileessence/viewmodel/MessageViewModel.java +++ b/app/src/main/java/net/lacolaco/smileessence/viewmodel/MessageViewModel.java @@ -131,12 +131,7 @@ public class MessageViewModel implements IViewModel, IdObject { int textSize = UserPreferenceHelper.getInstance().getTextSize(); NetworkImageView icon = (NetworkImageView) convertedView.findViewById(R.id.imageview_status_icon); - String iconUrl; - if (UserPreferenceHelper.getInstance().get(R.string.key_setting_original_icon, false)) { - iconUrl = directMessage.getSender().getProfileImageUrlOriginal(); - } else { - iconUrl = directMessage.getSender().getProfileImageUrl(); - } + String iconUrl= directMessage.getSender().getProfileImageUrlOriginal(); ImageCache.getInstance().setImageToView(iconUrl, icon); icon.setOnClickListener(v -> { UserDetailDialogFragment dialogFragment = new UserDetailDialogFragment(); 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 625349b9..9320a4bd 100644 --- a/app/src/main/java/net/lacolaco/smileessence/viewmodel/StatusViewModel.java +++ b/app/src/main/java/net/lacolaco/smileessence/viewmodel/StatusViewModel.java @@ -136,12 +136,7 @@ public class StatusViewModel implements IViewModel, IdObject { int textSize = UserPreferenceHelper.getInstance().getTextSize(); NetworkImageView icon = (NetworkImageView) convertedView.findViewById(R.id.imageview_status_icon); - String iconUrl; - if (UserPreferenceHelper.getInstance().get(R.string.key_setting_original_icon, false)) { - iconUrl = tweet.getOriginalTweet().getUser().getProfileImageUrlOriginal(); - } else { - iconUrl = tweet.getOriginalTweet().getUser().getProfileImageUrl(); - } + String iconUrl = tweet.getOriginalTweet().getUser().getProfileImageUrlOriginal(); ImageCache.getInstance().setImageToView(iconUrl, icon); icon.setOnClickListener(v -> onIconClick(activity)); diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ac236d04..603cfce4 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -68,8 +68,6 @@ <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_original_icon">オリジナルのアイコンを使用する</string> - <string name="setting_original_icon_summary">_normal サフィックスのつかない元画像を使用する</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 c9dedfdf..ec2d21f7 100644 --- a/app/src/main/res/values/keys.xml +++ b/app/src/main/res/values/keys.xml @@ -35,7 +35,6 @@ <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_original_icon">useOriginalIcon</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 526b8f34..c96bcf59 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -66,8 +66,6 @@ <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_original_icon">Use original size profile image</string> - <string name="setting_original_icon_summary">Use original ones rather than "_normal" images</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 7e6c12c7..ca7f6113 100644 --- a/app/src/main/res/xml/setting.xml +++ b/app/src/main/res/xml/setting.xml @@ -59,11 +59,6 @@ android:key="@string/key_setting_extend_status_url" android:summary="@string/setting_extend_status_url_summary" android:title="@string/setting_extend_status_url" /> - <SwitchPreference - android:defaultValue="false" - android:key="@string/key_setting_original_icon" - android:summary="@string/setting_original_icon_summary" - android:title="@string/setting_original_icon" /> </PreferenceCategory> <PreferenceCategory android:title="@string/setting_category_system_title"> <SwitchPreference |