mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 13:45:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

if nextPageURL is empty/null do not load any more items, otherwise you get the first items again

Browse source 
if pageURL is null (when manually refreshing), then clear list
This commit is contained in:
tobiaskaminsky 2018-01-04 16:17:49 +01:00 committed by tobiasKaminsky
parent 7541e41634
commit 110d4ae49b
No known key found for this signature in database
GPG key ID: 0E00D4D47D0C5AF7
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/com/owncloud/android/ui/activity/ActivitiesListActivity.java
View file

@ -215,7 +215,8 @@ public class ActivitiesListActivity extends FileActivity implements ActivityList
int firstVisibleItemIndex = layoutManager.findFirstVisibleItemPosition();
// synchronize loading state when item count changes
if (!isLoadingActivities && (totalItemCount - visibleItemCount) <= (firstVisibleItemIndex + 5)) {
if (!isLoadingActivities && (totalItemCount - visibleItemCount) <= (firstVisibleItemIndex + 5)
&& nextPageUrl != null && !nextPageUrl.isEmpty()) {
// Almost reached the end, continue to load new activities
fetchAndSetData(nextPageUrl);
}
@ -254,7 +255,6 @@ public class ActivitiesListActivity extends FileActivity implements ActivityList
Log_OC.d(TAG, "BEFORE getRemoteActivitiesOperation.execute");
final RemoteOperationResult result = getRemoteNotificationOperation.execute(ownCloudClient);
//result.get
if (result.isSuccess() && result.getData() != null) {
final ArrayList<Object> data = result.getData();
@ -262,7 +262,7 @@ public class ActivitiesListActivity extends FileActivity implements ActivityList
nextPageUrl = (String) data.get(1);
runOnUiThread(() -> {
populateList(activities, ownCloudClient);
populateList(activities, ownCloudClient, pageUrl == null);
if (activities.size() > 0) {
swipeEmptyListRefreshLayout.setVisibility(View.GONE);
swipeListRefreshLayout.setVisibility(View.VISIBLE);
@ -314,8 +314,8 @@ public class ActivitiesListActivity extends FileActivity implements ActivityList
});
}
private void populateList(List<Object> activities, OwnCloudClient mClient) {
adapter.setActivityItems(activities, mClient);
private void populateList(List<Object> activities, OwnCloudClient mClient, boolean clear) {
adapter.setActivityItems(activities, mClient, clear);
}
@Override

19
src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java
View file

@ -97,9 +97,14 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
px = getThumbnailDimension();
}
public void setActivityItems(List<Object> activityItems, OwnCloudClient client) {
public void setActivityItems(List<Object> activityItems, OwnCloudClient client, boolean clear) {
this.mClient = client;
String sTime = "";
if (clear) {
mValues.clear();
}
for (Object o : activityItems) {
Activity activity = (Activity) o;
String time;
@ -368,11 +373,11 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
private ActivityViewHolder(View itemView) {
super(itemView);
activityIcon = (ImageView) itemView.findViewById(R.id.activity_icon);
subject = (TextView) itemView.findViewById(R.id.activity_subject);
message = (TextView) itemView.findViewById(R.id.activity_message);
dateTime = (TextView) itemView.findViewById(R.id.activity_datetime);
list = (GridLayout) itemView.findViewById(R.id.list);
activityIcon = itemView.findViewById(R.id.activity_icon);
subject = itemView.findViewById(R.id.activity_subject);
message = itemView.findViewById(R.id.activity_message);
dateTime = itemView.findViewById(R.id.activity_datetime);
list = itemView.findViewById(R.id.list);
}
}
@ -382,7 +387,7 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
private ActivityViewHeaderHolder(View itemView) {
super(itemView);
title = (TextView) itemView.findViewById(R.id.title_header);
title = itemView.findViewById(R.id.title_header);
}
}