Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

added notifications_enabled for cached friendships

This commit is contained in:
Mariotaku Lee 2017-03-17 07:39:30 +08:00
parent 7593e56aa3
commit b9de7a621f
No known key found for this signature in database
GPG Key ID: 99505AEA531814F1
6 changed files with 70 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Relationship.java
View File

@ -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;
}

3
twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableRelationship.java
View File

@ -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;

11
twidere.component.common/src/main/java/org/mariotaku/twidere/provider/TwidereDataStore.java
View File

@ -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;
}

59
twidere/src/main/java/org/mariotaku/bitpay/model/BuyerInfo.java Normal file
View File

@ -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;
}
}

2
twidere/src/main/java/org/mariotaku/twidere/Constants.java
View File

@ -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;

1
twidere/src/main/java/org/mariotaku/twidere/model/util/ParcelableRelationshipUtils.java
View File

@ -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;