Merge pull request #1480 from nextcloud/fixEmptyMessageOnRefresh

resolves #1477 properly showing empty message after refresh when all …

src/main/java/com/owncloud/android/ui/activity/ActivitiesListActivity.java

@@ -222,12 +222,14 @@ public class ActivitiesListActivity extends FileActivity implements ActivityList
                         runOnUiThread(new Runnable() {
                             @Override
                             public void run() {
+                                populateList(activities, ownCloudClient);
                                 if (activities.size() > 0) {
-                                    populateList(activities, ownCloudClient);
                                     swipeEmptyListRefreshLayout.setVisibility(View.GONE);
                                     swipeListRefreshLayout.setVisibility(View.VISIBLE);
                                 } else {
                                     setEmptyContent(noResultsHeadline, noResultsMessage);
+                                    swipeListRefreshLayout.setVisibility(View.GONE);
+                                    swipeEmptyListRefreshLayout.setVisibility(View.VISIBLE);
                                 }
                             }
                         });

src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java

@@ -213,12 +213,14 @@ public class NotificationsActivity extends FileActivity {
                         runOnUiThread(new Runnable() {
                             @Override
                             public void run() {
+                                populateList(notifications);
                                 if (notifications.size() > 0) {
-                                    populateList(notifications);
                                     swipeEmptyListRefreshLayout.setVisibility(View.GONE);
                                     swipeListRefreshLayout.setVisibility(View.VISIBLE);
                                 } else {
                                     setEmptyContent(noResultsHeadline, noResultsMessage);
+                                    swipeListRefreshLayout.setVisibility(View.GONE);
+                                    swipeEmptyListRefreshLayout.setVisibility(View.VISIBLE);
                                 }
                             }
                         });