garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

use user setting if not under heavy load (#78)

Browse Source
This commit is contained in:
Athou
2013-07-10 09:25:59 +02:00
parent 30e608ffe5
commit 3871af9c7f
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/commafeed/frontend/rest/resources/UserREST.java
View File

@@ -23,6 +23,7 @@ import com.commafeed.backend.model.UserSettings;
import com.commafeed.backend.model.UserSettings.ReadingMode;
import com.commafeed.backend.model.UserSettings.ReadingOrder;
import com.commafeed.backend.model.UserSettings.ViewMode;
import com.commafeed.backend.services.ApplicationSettingsService;
import com.commafeed.backend.services.PasswordEncryptionService;
import com.commafeed.backend.services.UserService;
import com.commafeed.frontend.SecurityCheck;
@@ -60,6 +61,9 @@ public class UserREST extends AbstractResourceREST {
@Inject
CacheService cache;
@Inject
ApplicationSettingsService applicationSettingsService;
@Path("/settings")
@GET
@ApiOperation(value = "Retrieve user settings", notes = "Retrieve user settings", responseClass = "com.commafeed.frontend.model.Settings")
@@ -67,9 +71,11 @@ public class UserREST extends AbstractResourceREST {
Settings s = new Settings();
UserSettings settings = userSettingsDAO.findByUser(getUser());
if (settings != null) {
// force unread for the moment
// s.setReadingMode(settings.getReadingMode().name());
s.setReadingMode(ReadingMode.unread.name());
if (applicationSettingsService.get().isHeavyLoad()) {
s.setReadingMode(ReadingMode.unread.name());
} else {
s.setReadingMode(settings.getReadingMode().name());
}
s.setReadingOrder(settings.getReadingOrder().name());
s.setViewMode(settings.getViewMode().name());