mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-24 06:05:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2651 from nextcloud/resultOnStoppedAsync

Browse source 
Do not process result of async task if activity is stopped
This commit is contained in:
Mario Đanić 2018-06-05 07:53:09 +02:00 committed by GitHub
commit f123c269f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/com/owncloud/android/ui/activities/ActivitiesActivity.java
View file

@ -318,4 +318,11 @@ public class ActivitiesActivity extends FileActivity implements ActivityListInte
swipeListRefreshLayout.post(() -> swipeListRefreshLayout.setRefreshing(isActive));
}
@Override
protected void onStop() {
super.onStop();
mActionListener.stopLoadingActivity();
}
}

2
src/main/java/com/owncloud/android/ui/activities/ActivitiesContract.java
View file

@ -40,5 +40,7 @@ public interface ActivitiesContract {
interface ActionListener {
void loadActivities(String pageUrl);
void openActivity(String fileUrl, BaseActivity baseActivity, boolean isSharingSupported);
void stopLoadingActivity();
}
}

19
src/main/java/com/owncloud/android/ui/activities/ActivitiesPresenter.java
View file

@ -35,6 +35,7 @@ public class ActivitiesPresenter implements ActivitiesContract.ActionListener {
private final ActivitiesContract.View activitiesView;
private final ActivitiesRepository activitiesRepository;
private final FilesRepository filesRepository;
private boolean activityStopped = false;
ActivitiesPresenter(@NonNull ActivitiesRepository activitiesRepository,
@ -52,14 +53,19 @@ public class ActivitiesPresenter implements ActivitiesContract.ActionListener {
@Override
public void onActivitiesLoaded(List<Object> activities, OwnCloudClient client,
String nextPageUrl) {
activitiesView.setProgressIndicatorState(false);
activitiesView.showActivities(activities, client, nextPageUrl);
if (!activityStopped) {
activitiesView.setProgressIndicatorState(false);
activitiesView.showActivities(activities, client, nextPageUrl);
}
}
@Override
public void onActivitiesLoadedError(String error) {
activitiesView.setProgressIndicatorState(false);
activitiesView.showActivitiesLoadError(error);
if (!activityStopped) {
activitiesView.setProgressIndicatorState(false);
activitiesView.showActivitiesLoadError(error);
}
}
});
}
@ -86,4 +92,9 @@ public class ActivitiesPresenter implements ActivitiesContract.ActionListener {
}
});
}
@Override
public void stopLoadingActivity() {
activityStopped = true;
}
}