From b9de7a621fe786429970bb83e25b478c71ec363d Mon Sep 17 00:00:00 2001 From: Mariotaku Lee Date: Fri, 17 Mar 2017 07:39:30 +0800 Subject: [PATCH] added notifications_enabled for cached friendships --- .../library/twitter/model/Relationship.java | 4 -- .../twidere/model/ParcelableRelationship.java | 3 + .../twidere/provider/TwidereDataStore.java | 11 ++-- .../org/mariotaku/bitpay/model/BuyerInfo.java | 59 +++++++++++++++++++ .../java/org/mariotaku/twidere/Constants.java | 2 +- .../util/ParcelableRelationshipUtils.java | 1 + 6 files changed, 70 insertions(+), 10 deletions(-) create mode 100644 twidere/src/main/java/org/mariotaku/bitpay/model/BuyerInfo.java diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Relationship.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Relationship.java index 45bed7f99..4ece9e6dd 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Relationship.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Relationship.java @@ -45,10 +45,6 @@ public class Relationship extends TwitterResponseObject implements TwitterRespon return object.target.followedBy; } - public boolean isSourceNotificationsEnabled() { - return object.source.notificationsEnabled; - } - public boolean isSourceMutingTarget() { return object.source.muting; } diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableRelationship.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableRelationship.java index a7d371915..ea61c50d6 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableRelationship.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableRelationship.java @@ -63,6 +63,9 @@ public class ParcelableRelationship implements Parcelable { @CursorField(CachedRelationships.RETWEET_ENABLED) public boolean retweet_enabled; + @CursorField(CachedRelationships.NOTIFICATIONS_ENABLED) + public boolean notifications_enabled; + @CursorField(value = CachedRelationships._ID, excludeWrite = true, type = TwidereDataStore.TYPE_PRIMARY_KEY) public long _id; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/provider/TwidereDataStore.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/provider/TwidereDataStore.java index a494b4390..333c8f989 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/provider/TwidereDataStore.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/provider/TwidereDataStore.java @@ -32,6 +32,8 @@ import org.mariotaku.twidere.model.FiltersSubscriptionTableInfo; import org.mariotaku.twidere.model.ParcelableActivityTableInfo; import org.mariotaku.twidere.model.ParcelableMessageConversationTableInfo; import org.mariotaku.twidere.model.ParcelableMessageTableInfo; +import org.mariotaku.twidere.model.ParcelableRelationship; +import org.mariotaku.twidere.model.ParcelableRelationshipTableInfo; import org.mariotaku.twidere.model.ParcelableStatusTableInfo; import org.mariotaku.twidere.model.ParcelableTrendTableInfo; import org.mariotaku.twidere.model.ParcelableUserTableInfo; @@ -853,12 +855,11 @@ public interface TwidereDataStore { String RETWEET_ENABLED = "retweet_enabled"; - String[] COLUMNS = {_ID, ACCOUNT_KEY, USER_KEY, FOLLOWING, FOLLOWED_BY, BLOCKING, - BLOCKED_BY, MUTING, RETWEET_ENABLED}; + String NOTIFICATIONS_ENABLED = "notifications_enabled"; - String[] TYPES = {TYPE_PRIMARY_KEY, TYPE_TEXT_NOT_NULL, TYPE_TEXT_NOT_NULL, - TYPE_BOOLEAN_DEFAULT_FALSE, TYPE_BOOLEAN_DEFAULT_FALSE, TYPE_BOOLEAN_DEFAULT_FALSE, - TYPE_BOOLEAN_DEFAULT_FALSE, TYPE_BOOLEAN_DEFAULT_FALSE, TYPE_BOOLEAN_DEFAULT_TRUE}; + String[] COLUMNS = ParcelableRelationshipTableInfo.COLUMNS; + + String[] TYPES = ParcelableRelationshipTableInfo.TYPES; } diff --git a/twidere/src/main/java/org/mariotaku/bitpay/model/BuyerInfo.java b/twidere/src/main/java/org/mariotaku/bitpay/model/BuyerInfo.java new file mode 100644 index 000000000..ed424affd --- /dev/null +++ b/twidere/src/main/java/org/mariotaku/bitpay/model/BuyerInfo.java @@ -0,0 +1,59 @@ +package org.mariotaku.bitpay.model; + +import com.bluelinelabs.logansquare.annotation.JsonField; +import com.bluelinelabs.logansquare.annotation.JsonObject; + +/** + * Created by Mariotaku on 2017/3/16. + */ +@JsonObject +public class BuyerInfo { + @JsonField(name = "name") + String name; + @JsonField(name = "address1") + String address1; + @JsonField(name = "address2") + String address2; + @JsonField(name = "locality") + String locality; + @JsonField(name = "region") + String region; + @JsonField(name = "postalCode") + String postalCode; + @JsonField(name = "email") + String email; + @JsonField(name = "phone") + String phone; + + public String getName() { + return name; + } + + public String getAddress1() { + return address1; + } + + public String getAddress2() { + return address2; + } + + public String getLocality() { + return locality; + } + + public String getRegion() { + return region; + } + + public String getPostalCode() { + return postalCode; + } + + public String getEmail() { + return email; + } + + public String getPhone() { + return phone; + } +} diff --git a/twidere/src/main/java/org/mariotaku/twidere/Constants.java b/twidere/src/main/java/org/mariotaku/twidere/Constants.java index e391b8d8a..af6cc4ae8 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/Constants.java +++ b/twidere/src/main/java/org/mariotaku/twidere/Constants.java @@ -34,7 +34,7 @@ import static org.mariotaku.twidere.annotation.PreferenceType.STRING; public interface Constants extends TwidereConstants { String DATABASES_NAME = "twidere.sqlite"; - int DATABASES_VERSION = 180; + int DATABASES_VERSION = 181; int EXTRA_FEATURES_NOTICE_VERSION = 0; diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/util/ParcelableRelationshipUtils.java b/twidere/src/main/java/org/mariotaku/twidere/model/util/ParcelableRelationshipUtils.java index 492570f79..c7f2f7d30 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/util/ParcelableRelationshipUtils.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/util/ParcelableRelationshipUtils.java @@ -26,6 +26,7 @@ public class ParcelableRelationshipUtils { obj.blocked_by = relationship.isSourceBlockedByTarget(); obj.muting = relationship.isSourceMutingTarget(); obj.retweet_enabled = relationship.isSourceWantRetweetsFromTarget(); + obj.notifications_enabled = relationship.isSourceNotificationsEnabledForTarget(); obj.can_dm = relationship.canSourceDMTarget(); } obj.filtering = filtering;