Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Prepares muting notifications parameter

This commit is contained in:
stom79 2017-12-17 11:10:49 +01:00
parent f29bd29007
commit ded7cdb51f
4 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/fr/gouv/etalab/mastodon/client/API.java
View File

@ -1800,6 +1800,11 @@ public class API {
relationship.setFollowed_by(Boolean.valueOf(resobj.get("followed_by").toString()));
relationship.setBlocking(Boolean.valueOf(resobj.get("blocking").toString()));
relationship.setMuting(Boolean.valueOf(resobj.get("muting").toString()));
try {
relationship.setMuting_notifications(Boolean.valueOf(resobj.get("muting_notifications").toString()));
}catch (Exception ignored){
relationship.setMuting_notifications(true);
}
relationship.setRequested(Boolean.valueOf(resobj.get("requested").toString()));
} catch (JSONException e) {
setDefaultError();

10
app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Account.java
View File

@ -61,7 +61,7 @@ public class Account implements Parcelable {
private followAction followType = followAction.NOTHING;
private boolean isMakingAction = false;
private Account moved_to_account;
private boolean muting_notifications;
public followAction getFollowType() {
return followType;
@ -87,6 +87,14 @@ public class Account implements Parcelable {
this.moved_to_account = moved_to_account;
}
public boolean isMuting_notifications() {
return muting_notifications;
}
public void setMuting_notifications(boolean muting_notifications) {
this.muting_notifications = muting_notifications;
}
public enum followAction{
FOLLOW,
NOT_FOLLOW,

9
app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Relationship.java
View File

@ -27,6 +27,7 @@ public class Relationship {
private boolean blocking;
private boolean muting;
private boolean requested;
private boolean muting_notifications;
public String getId() {
return id;
@ -75,4 +76,12 @@ public class Relationship {
public void setRequested(boolean requested) {
this.requested = requested;
}
public boolean isMuting_notifications() {
return muting_notifications;
}
public void setMuting_notifications(boolean muting_notifications) {
this.muting_notifications = muting_notifications;
}
}

7
app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayAccountsFragment.java
View File

@ -201,7 +201,7 @@ public class DisplayAccountsFragment extends Fragment implements OnRetrieveAccou
}
swipeRefreshLayout.setRefreshing(false);
firstLoad = false;
if( type != RetrieveAccountsAsyncTask.Type.BLOCKED && type != RetrieveAccountsAsyncTask.Type.MUTED)
if( type != RetrieveAccountsAsyncTask.Type.BLOCKED )
new RetrieveManyRelationshipsAsyncTask(context, accounts,DisplayAccountsFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
@ -224,6 +224,7 @@ public class DisplayAccountsFragment extends Fragment implements OnRetrieveAccou
account.setFollowType(Account.followAction.NOTHING);
continue;
}
account.setMuting_notifications(relationship.isMuting_notifications());
if( account.getId().equals(relationship.getId())){
if( relationship.isFollowing())
account.setFollowType(Account.followAction.FOLLOW);
@ -231,9 +232,9 @@ public class DisplayAccountsFragment extends Fragment implements OnRetrieveAccou
account.setFollowType(Account.followAction.NOT_FOLLOW);
if(relationship.isBlocking())
account.setFollowType(Account.followAction.BLOCK);
else if(relationship.isMuting())
else if(relationship.isMuting()) {
account.setFollowType(Account.followAction.MUTE);
else if(relationship.isRequested())
}else if(relationship.isRequested())
account.setFollowType(Account.followAction.REQUEST_SENT);
break;
}