fix: games reappearing that recently uploaded after restarting the cl…

…ient fix: timeout bug fix: schedule
sanguine-my-brother · May 7, 2017 · da7aca4 · da7aca4
1 parent 40eed6d
commit da7aca4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/main/java/nl/hyranasoftware/javagmr/controller/GameController.java b/src/main/java/nl/hyranasoftware/javagmr/controller/GameController.java
@@ -187,7 +187,7 @@ private boolean doUpload(InputStream stream, Game game) {
 
             stream.close();
 
-            Unirest.setTimeouts(10000, 15000);
+            Unirest.setTimeouts(10000, 80000);
             String result = Unirest.post(requestUrl)
                     .queryString("authKey", JGMRConfig.getInstance().getAuthCode())
                     .queryString("turnId", game.getCurrentTurn().getTurnId())

diff --git a/src/main/java/nl/hyranasoftware/javagmr/domain/Game.java b/src/main/java/nl/hyranasoftware/javagmr/domain/Game.java
@@ -116,9 +116,9 @@ public boolean equals(Object obj) {
     @Override
     public int compareTo(Game o) {
         if(this.getCurrentTurn().started.isAfter(o.getCurrentTurn().started)){
-            return -1;
+            return 1;
         }
-        return 1;
+        return -1;
     }
 
 

diff --git a/src/main/java/nl/hyranasoftware/javagmr/util/JGMRConfig.java b/src/main/java/nl/hyranasoftware/javagmr/util/JGMRConfig.java
@@ -159,7 +159,7 @@ public boolean didSaveFileChange(SaveFile saveFile) {
         if (saveFile.getSize() > 100 && !saveFiles.isEmpty() && saveFiles.indexOf(saveFile) != -1) {
             SaveFile retrievedFile = saveFiles.get(saveFiles.indexOf(saveFile));
             if (retrievedFile != null) {
- if (saveFile.getSize() > (retrievedFile.getSize() + 30) || saveFile.getSize() > 0 && saveFile.getSize() != 0 || saveFile.getSize() < (retrievedFile.getSize() - 30)) {
+                if (saveFile.getSize() > (retrievedFile.getSize() + 30) || saveFile.getSize() > 0 && saveFile.getSize() != 0 || saveFile.getSize() < (retrievedFile.getSize() - 30)) {
                     if (!retrievedFile.getLastTimeModified().equals(saveFile.getLastTimeModified())) {
                         return true;
                     }
@@ -169,11 +169,10 @@ public boolean didSaveFileChange(SaveFile saveFile) {
 
         return false;
     }
-
     public List<Game> getUploadedGames() {
         return uploadedGames;
     }
-
+    @JsonIgnore
     public void addUploadedGame(Game game) {
         game.setUploaded(DateTime.now());
         this.uploadedGames.add(game);
@@ -184,7 +183,6 @@ public void addUploadedGame(Game game) {
     public void uploadedGameExpired(Game game) {
         this.uploadedGames.remove(game);
     }
-
     public void setUploadedGames(List<Game> uploadedGames) {
         this.uploadedGames = uploadedGames;
     }