aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2016-12-07 22:30:19 +0900
committerKazuki Yamaguchi <k@rhe.jp>2016-12-07 22:30:19 +0900
commitd3159a97f5527ce58a58686c3575fa03d4e26db4 (patch)
tree6f26e5fe269e6f3ecb9e22dcbe2575f974056920
parentdac257ac3f5541d968e735968670eb46a813cf72 (diff)
downloadSmileEssence-d3159a97f5527ce58a58686c3575fa03d4e26db4.tar.gz
unconfigurable unfav notify
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/twitter/UserStreamListener.java3
-rw-r--r--app/src/main/res/values/keys.xml1
-rw-r--r--app/src/main/res/values/strings.xml3
-rw-r--r--app/src/main/res/xml/setting.xml6
4 files changed, 1 insertions, 12 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/twitter/UserStreamListener.java b/app/src/main/java/net/lacolaco/smileessence/twitter/UserStreamListener.java
index ff3657e6..25d13195 100644
--- a/app/src/main/java/net/lacolaco/smileessence/twitter/UserStreamListener.java
+++ b/app/src/main/java/net/lacolaco/smileessence/twitter/UserStreamListener.java
@@ -145,8 +145,7 @@ public class UserStreamListener implements twitter4j.UserStreamListener, Connect
public void onUnfavorite(twitter4j.User source, twitter4j.User target, twitter4j.Status unfavoritedStatus) {
Tweet tweet = Tweet.fromTwitter(unfavoritedStatus, account.getUserId());
tweet.removeFavoriter(source.getId());
- boolean unfavNoticeEnabled = UserPreferenceHelper.getInstance().get(R.string.key_setting_notify_on_unfavorited, true);
- if (unfavNoticeEnabled && User.fromTwitter(target) == account.getUser()) {
+ if (User.fromTwitter(target) == account.getUser()) {
addToHistory(new EventViewModel(EventViewModel.EnumEvent.UNFAVORITED, User.fromTwitter(source), tweet));
}
}
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index 3daa9609..47f88924 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -27,7 +27,6 @@
<string name="key_test_preference">testPreference</string>
<string name="key_setting_text_size">textSize</string>
<string name="key_setting_accounts">manageAccounts</string>
- <string name="key_setting_notify_on_unfavorited">unfavNotify</string>
<string name="key_setting_show_confirm_dialog">confirm</string>
<string name="key_setting_theme">theme</string>
<string name="key_setting_application_information">appInfo</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a99468b4..b2a74e0f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -68,9 +68,6 @@
<string name="setting_safe_mode_summary_off">No confirmation</string>
<string name="setting_resize_post_image">Resize image</string>
<string name="setting_resize_post_image_summary">Compress large image for tweet</string>
- <string name="setting_notify_on_unfavorited_title">On unfavorited</string>
- <string name="setting_notify_on_unfavorited_summary_on">Notify</string>
- <string name="setting_notify_on_unfavorited_summary_off">No Notice</string>
<string name="setting_category_about_title">About</string>
<string name="setting_accounts_title">Manage accounts</string>
<string name="setting_category_accounts_title">Accounts</string>
diff --git a/app/src/main/res/xml/setting.xml b/app/src/main/res/xml/setting.xml
index fd8843dd..ff564f85 100644
--- a/app/src/main/res/xml/setting.xml
+++ b/app/src/main/res/xml/setting.xml
@@ -63,12 +63,6 @@
android:key="@string/key_setting_resize_post_image"
android:summary="@string/setting_resize_post_image_summary"
android:title="@string/setting_resize_post_image" />
- <SwitchPreference
- android:defaultValue="false"
- android:key="@string/key_setting_notify_on_unfavorited"
- android:summaryOff="@string/setting_notify_on_unfavorited_summary_off"
- android:summaryOn="@string/setting_notify_on_unfavorited_summary_on"
- android:title="@string/setting_notify_on_unfavorited_title" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/setting_category_about_title">
<Preference