Merge pull request #2579 from nextcloud/activities-cleanup

Housekeeping of Activities Presenter and associated repository classes.

src/main/java/com/owncloud/android/ui/activities/ActivitiesPresenter.java

@@ -1,20 +1,20 @@
 /**
- *   Nextcloud Android client application
+ * Nextcloud Android client application
  *
- *   Copyright (C) 2018 Edvard Holst
+ * Copyright (C) 2018 Edvard Holst
  *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- *   License as published by the Free Software Foundation; either
- *   version 3 of the License, or any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
  *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
  *
- *   You should have received a copy of the GNU Affero General Public
- *   License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package com.owncloud.android.ui.activities;
@@ -37,9 +37,9 @@ public class ActivitiesPresenter implements ActivitiesContract.ActionListener {
     private final FilesRepository filesRepository;
 
 
-    public ActivitiesPresenter(@NonNull ActivitiesRepository activitiesRepository,
-                               @NonNull FilesRepository filesRepository,
-                               @NonNull ActivitiesContract.View activitiesView) {
+    ActivitiesPresenter(@NonNull ActivitiesRepository activitiesRepository,
+                        @NonNull FilesRepository filesRepository,
+                        @NonNull ActivitiesContract.View activitiesView) {
         this.activitiesRepository = activitiesRepository;
         this.activitiesView = activitiesView;
         this.filesRepository = filesRepository;
@@ -51,7 +51,7 @@ public class ActivitiesPresenter implements ActivitiesContract.ActionListener {
         activitiesRepository.getActivities(pageUrl, new ActivitiesRepository.LoadActivitiesCallback() {
             @Override
             public void onActivitiesLoaded(List<Object> activities, OwnCloudClient client,
-                                          String nextPageUrl) {
+                                           String nextPageUrl) {
                 activitiesView.setProgressIndicatorState(false);
                 activitiesView.showActivities(activities, client, nextPageUrl);
             }
@@ -62,8 +62,6 @@ public class ActivitiesPresenter implements ActivitiesContract.ActionListener {
                 activitiesView.showActivitiesLoadError(error);
             }
         });
-
-
     }
 
     @Override
@@ -88,5 +86,4 @@ public class ActivitiesPresenter implements ActivitiesContract.ActionListener {
                     }
                 });
     }
-
-}
+}

src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesServiceApiImpl.java

@@ -25,6 +25,7 @@ import android.content.Context;
 import android.os.AsyncTask;
 
 import com.owncloud.android.MainApp;
+import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.OwnCloudClient;
@@ -55,7 +56,6 @@ public class ActivitiesServiceApiImpl implements ActivitiesServiceApi {
         private final ActivitiesServiceCallback<List<Object>> callback;
         private List<Object> activities;
         private String pageUrl;
-        private String noResultsMessage = "no results";
         private String errorMessage;
         private OwnCloudClient ownCloudClient;
 
@@ -68,8 +68,8 @@ public class ActivitiesServiceApiImpl implements ActivitiesServiceApi {
 
         @Override
         protected Boolean doInBackground(Void... voids) {
-            final Account currentAccount = AccountUtils.getCurrentOwnCloudAccount(MainApp.getAppContext());
             final Context context = MainApp.getAppContext();
+            final Account currentAccount = AccountUtils.getCurrentOwnCloudAccount(context);
             OwnCloudAccount ocAccount;
             try {
                 ocAccount = new OwnCloudAccount(currentAccount, context);
@@ -95,7 +95,7 @@ public class ActivitiesServiceApiImpl implements ActivitiesServiceApi {
                     // show error
                     errorMessage = result.getLogMessage();
                     if (result.getHttpCode() == 304) {
-                        errorMessage = noResultsMessage;
+                        errorMessage = context.getString(R.string.file_list_empty_headline_server_search);
                     }
                     return false;