diff --git a/Clover/app/src/main/java/org/floens/chan/core/model/Board.java b/Clover/app/src/main/java/org/floens/chan/core/model/Board.java index 4b5219fb..a7736c37 100644 --- a/Clover/app/src/main/java/org/floens/chan/core/model/Board.java +++ b/Clover/app/src/main/java/org/floens/chan/core/model/Board.java @@ -58,10 +58,10 @@ public class Board { public boolean workSafe = false; @DatabaseField - public int perPage = -1; + public int perPage = 15; @DatabaseField - public int pages = -1; + public int pages = 10; @DatabaseField public int maxFileSize = -1; @@ -79,17 +79,19 @@ public class Board { public int imageLimit = -1; @DatabaseField - public int cooldownThreads = -1; + public int cooldownThreads = 0; @DatabaseField - public int cooldownReplies = -1; + public int cooldownReplies = 0; @DatabaseField - public int cooldownImages = -1; + public int cooldownImages = 0; + // unused, to be removed @DatabaseField public int cooldownRepliesIntra = -1; + // unused, to be removed @DatabaseField public int cooldownImagesIntra = -1; @@ -122,10 +124,7 @@ public class Board { public String description; public boolean finish() { - if (TextUtils.isEmpty(name) || TextUtils.isEmpty(code) || perPage < 0 || pages < 0) - return false; - - if (cooldownThreads < 0 || cooldownReplies < 0 || cooldownImages < 0 || cooldownRepliesIntra < 0 || cooldownImagesIntra < 0) { + if (TextUtils.isEmpty(name) || TextUtils.isEmpty(code) || perPage < 0 || pages < 0) { return false; } @@ -136,6 +135,4 @@ public class Board { public String toString() { return name; } - - } diff --git a/Clover/app/src/main/java/org/floens/chan/core/net/BoardsRequest.java b/Clover/app/src/main/java/org/floens/chan/core/net/BoardsRequest.java index c44df9cb..0d615084 100644 --- a/Clover/app/src/main/java/org/floens/chan/core/net/BoardsRequest.java +++ b/Clover/app/src/main/java/org/floens/chan/core/net/BoardsRequest.java @@ -127,12 +127,6 @@ public class BoardsRequest extends JsonReaderRequest> { case "images": board.cooldownImages = reader.nextInt(); break; - case "replies_intra": - board.cooldownRepliesIntra = reader.nextInt(); - break; - case "images_intra": - board.cooldownImagesIntra = reader.nextInt(); - break; default: reader.skipValue(); break;