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

Remove some features - 3

This commit is contained in:
stom79 2018-09-09 14:32:34 +02:00
parent ce8d14a941
commit d0a17f8cbe
6 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2026,7 +2026,6 @@ public class API {
status.setVisibility(resobj.get("visibility").toString());
status.setLanguage(resobj.get("language").toString());
status.setUrl(resobj.get("url").toString());
status.setReplies(null);
//TODO: replace by the value
status.setApplication(new Application());

4
app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
View File

@ -961,10 +961,10 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
}
if( isCompactMode){
if( ((status.getReblog() == null && status.getReplies_count() == 1) || (status.getReblog() != null && status.getReblog().getReplies_count() == 1)))
holder.status_reply.setText(String.valueOf( status.getReblog() != null? status.getReblog().getReplies_count():status.getReblog().getReplies_count()));
holder.status_reply.setText(String.valueOf( status.getReblog() != null? status.getReblog().getReplies_count():status.getReplies_count()));
}else {
if( status.getReplies_count() > 0 || (status.getReblog() != null && status.getReblog().getReplies_count() > 0 ) )
holder.status_reply.setText(String.valueOf( status.getReblog() != null? status.getReblog().getReplies_count():status.getReblog().getReplies_count()));
holder.status_reply.setText(String.valueOf( status.getReblog() != null? status.getReblog().getReplies_count():status.getReplies_count()));
}
boolean isOwner = status.getAccount().getId().equals(userId);

3
app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
View File

@ -395,7 +395,6 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
if( !statuses.contains(status)){
//Update the id of the last toot retrieved
MainActivity.lastHomeId = status.getId();
status.setReplies(new ArrayList<Status>());
statuses.add(0, status);
if (!status.getAccount().getId().equals(userId))
MainActivity.countNewStatus++;
@ -407,7 +406,6 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
} else if (type == RetrieveFeedsAsyncTask.Type.PUBLIC || type == RetrieveFeedsAsyncTask.Type.LOCAL) {
status.setReplies(new ArrayList<Status>());
status.setNew(false);
statuses.add(0, status);
int firstVisibleItem = mLayoutManager.findFirstVisibleItemPosition();
@ -589,7 +587,6 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
if (type == RetrieveFeedsAsyncTask.Type.HOME)
statuses.get(i).setNew(true);
inserted++;
statuses.get(i).setReplies(new ArrayList<Status>());
this.statuses.add(0, statuses.get(i));
if (type == RetrieveFeedsAsyncTask.Type.HOME && !statuses.get(i).getAccount().getId().equals(userId))
MainActivity.countNewStatus++;

1
app/src/main/java/fr/gouv/etalab/mastodon/services/LiveNotificationService.java
View File

@ -512,7 +512,6 @@ public class LiveNotificationService extends Service {
}
}else if ( event == Helper.EventStreaming.UPDATE){
status = API.parseStatuses(getApplicationContext(), response);
status.setReplies(new ArrayList<Status>());
status.setNew(true);
b.putParcelable("data", status);
}else if( event == Helper.EventStreaming.DELETE){

1
app/src/main/java/fr/gouv/etalab/mastodon/services/StreamingFederatedTimelineService.java
View File

@ -156,7 +156,6 @@ public class StreamingFederatedTimelineService extends IntentService {
Status status ;
Bundle b = new Bundle();
status = API.parseStatuses(getApplicationContext(), response);
status.setReplies(new ArrayList<Status>());
status.setNew(true);
b.putParcelable("data", status);
if( account != null)

1
app/src/main/java/fr/gouv/etalab/mastodon/services/StreamingLocalTimelineService.java
View File

@ -155,7 +155,6 @@ public class StreamingLocalTimelineService extends IntentService {
Status status ;
Bundle b = new Bundle();
status = API.parseStatuses(getApplicationContext(), response);
status.setReplies(new ArrayList<Status>());
status.setNew(true);
b.putParcelable("data", status);
if( account != null)