소스 검색

Merge pull request #2002 from nextcloud/NPEonActivityResult

NPE if activity is already closed
Andy Scherzinger 7 년 전
부모
커밋
847fb45ea5
1개의 변경된 파일6개의 추가작업 그리고 2개의 파일을 삭제
  1. 6 2
      src/main/java/com/owncloud/android/ui/activity/ActivitiesListActivity.java

+ 6 - 2
src/main/java/com/owncloud/android/ui/activity/ActivitiesListActivity.java

@@ -307,8 +307,12 @@ public class ActivitiesListActivity extends FileActivity implements ActivityList
 
     private void hideRefreshLayoutLoader() {
         runOnUiThread(() -> {
-            swipeListRefreshLayout.setRefreshing(false);
-            swipeEmptyListRefreshLayout.setRefreshing(false);
+            if (swipeListRefreshLayout != null) {
+                swipeListRefreshLayout.setRefreshing(false);
+            }
+            if (swipeEmptyListRefreshLayout != null) {
+                swipeEmptyListRefreshLayout.setRefreshing(false);
+            }
             isLoadingActivities = false;
             setIndeterminate(isLoadingActivities);
         });