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

Fixes issue #41 - Range refresh wrong item count

This commit is contained in:
stom79 2017-11-15 18:38:53 +01:00
parent 742e6d2cd2
commit 733937c6f8
3 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveMissingFeedsAsyncTask.java
View File

@ -49,30 +49,21 @@ public class RetrieveMissingFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
@Override
protected Void doInBackground(Void... params) {
int loopInc = 0;
API api = new API(this.contextReference.get());
List<fr.gouv.etalab.mastodon.client.Entities.Status> tempStatus;
APIResponse apiResponse = null;
while (loopInc < 10){
if( type == RetrieveFeedsAsyncTask.Type.HOME)
apiResponse = api.getHomeTimelineSinceId(since_id, 80);
else if( type == RetrieveFeedsAsyncTask.Type.LOCAL)
apiResponse = api.getPublicTimelineSinceId(true, since_id, 80);
else if( type == RetrieveFeedsAsyncTask.Type.PUBLIC)
apiResponse = api.getPublicTimelineSinceId(false, since_id, 80);
if (apiResponse == null)
break;
String max_id = apiResponse.getMax_id();
since_id = apiResponse.getSince_id();
if( type == RetrieveFeedsAsyncTask.Type.HOME)
apiResponse = api.getHomeTimeline(since_id);
else if( type == RetrieveFeedsAsyncTask.Type.LOCAL)
apiResponse = api.getPublicTimelineSinceId(true, since_id);
else if( type == RetrieveFeedsAsyncTask.Type.PUBLIC)
apiResponse = api.getPublicTimelineSinceId(false, since_id);
if (apiResponse != null) {
tempStatus = apiResponse.getStatuses();
if( statuses != null && tempStatus != null)
if( tempStatus != null)
statuses.addAll(0, tempStatus);
loopInc++;
if( tempStatus == null || max_id == null || max_id.equals(since_id) || tempStatus.size() == 0)
break;
}
if( type == RetrieveFeedsAsyncTask.Type.HOME && statuses != null && statuses.size() > 0) {
if (type == RetrieveFeedsAsyncTask.Type.HOME && statuses.size() > 0) {
MainActivity.lastHomeId = statuses.get(0).getId();
}
return null;

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

@ -595,6 +595,16 @@ public class API {
return getPublicTimeline(local, max_id, null, tootPerPage);
}
/**
* Retrieves public timeline for the account since an Id value *synchronously*
* @param local boolean only local timeline
* @param since_id String id since
* @return APIResponse
*/
public APIResponse getPublicTimelineSinceId(boolean local, String since_id) {
return getPublicTimeline(local, null, since_id, tootPerPage);
}
/**
* Retrieves public timeline for the account since an Id value *synchronously*

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

@ -490,7 +490,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
MainActivity.countNewStatus++;
}
}
statusListAdapter.notifyItemRangeInserted(0, inserted - 1);
statusListAdapter.notifyItemRangeInserted(0, inserted);
try {
if( type == RetrieveFeedsAsyncTask.Type.HOME)
((MainActivity) context).updateHomeCounter();