From 3d5fb9d9b232c835eb5a562ef6662053c2304600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Latner?= <matyas.latner@nic.cz>
Date: Tue, 16 Aug 2016 14:51:09 +0200
Subject: [PATCH] Victory dialog speed optimization
---
.gitignore | 1 +
.../cz/nic/tablexia/game/AbstractTablexiaGame.java | 2 +-
core/src/cz/nic/tablexia/model/game/GameDAO.java | 12 ++++++------
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/.gitignore b/.gitignore
index d350491b9..f1533f403 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@ android/gen/
*.iml
out/
com_crashlytics_export_strings.xml
+captures
## Eclipse
.classpath
diff --git a/core/src/cz/nic/tablexia/game/AbstractTablexiaGame.java b/core/src/cz/nic/tablexia/game/AbstractTablexiaGame.java
index f6a59ce24..dc33a9488 100644
--- a/core/src/cz/nic/tablexia/game/AbstractTablexiaGame.java
+++ b/core/src/cz/nic/tablexia/game/AbstractTablexiaGame.java
@@ -980,7 +980,7 @@ public abstract class AbstractTablexiaGame<T> extends AbstractTablexiaScreen<T>
);
List<ITrophyDefinition> received = new ArrayList<ITrophyDefinition>();
for (ITrophyDefinition trophy : allTrophies) {
- if ((!hasTrophies.containsKey(trophy) || hasTrophies.get(trophy) == false) && trophy.hasTrophy(getSelectedUser()) == true) {
+ if ((!hasTrophies.containsKey(trophy) || !hasTrophies.get(trophy)) && trophy.hasTrophy(getSelectedUser())) {
Log.debug(this.getClass(), "has new trophy: " + trophy.getTrophyName());
received.add(trophy);
}
diff --git a/core/src/cz/nic/tablexia/model/game/GameDAO.java b/core/src/cz/nic/tablexia/model/game/GameDAO.java
index 28ff7c896..4051ed3f7 100644
--- a/core/src/cz/nic/tablexia/model/game/GameDAO.java
+++ b/core/src/cz/nic/tablexia/model/game/GameDAO.java
@@ -29,8 +29,10 @@ import cz.nic.tablexia.util.Log;
*/
public class GameDAO {
- private static final Object ATOMIC_LOCK = new Object();
- private static final AtomicInteger gameScoreSetCounter = new AtomicInteger(0);
+ private static final Object ATOMIC_LOCK = new Object();
+ private static final String STRING_ONLY_DIGITS_REGEX = "[0-9]+";
+
+ private static final AtomicInteger gameScoreSetCounter = new AtomicInteger(0);
//////////////////////////// Game API
@@ -172,10 +174,8 @@ public class GameDAO {
}
private static Long prepareLong(String longNumber) {
- if (longNumber != null) {
- if (new Scanner(longNumber).hasNextLong()) {
- return Long.valueOf(longNumber);
- }
+ if (longNumber != null && longNumber.matches(STRING_ONLY_DIGITS_REGEX)) {
+ return Long.valueOf(longNumber);
}
return null;
}
--
GitLab