joel/privacy-friendly-sudoku-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Adjust GameInfoContainer and GameActivity so that importing a sudoku containing an invalid fixed value (e.g. a 9x9 sudoku containing an 'A' as a fixed value) no longer causes an exception.

Browse source
This commit is contained in:
uykek 2020-06-13 15:56:37 +02:00
parent 80fa401666
commit a8629fc75c
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/org/secuso/privacyfriendlysudoku/controller/helper/GameInfoContainer.java
View file

@ -104,6 +104,11 @@ public class GameInfoContainer {
fixedValues = new int[s.length()];
for(int i = 0; i < s.length(); i++) {
fixedValues[i] = Symbol.getValue(Symbol.SaveFormat, String.valueOf(s.charAt(i)))+1;
if (gameType != GameType.Unspecified && gameType != null) {
if (fixedValues[i] < 0 || fixedValues[i] > gameType.getSize()) {
throw new IllegalArgumentException("Fixed values must each be smaller than " + gameType.getSize() + ".");
}
}
}
}

2
app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java
View file

@ -125,8 +125,8 @@ public class GameActivity extends BaseActivity implements NavigationView.OnNavig
GameType.Unspecified, new int [boardSize], new int [boardSize], new boolean [boardSize][sectionSize]);
try {
container.parseFixedValues(input);
container.parseGameType("Default_" + sectionSize + "x" + sectionSize);
container.parseFixedValues(input);
difficultyCheck = new QQWing(container.getGameType(), GameDifficulty.Unspecified);
difficultyCheck.setRecordHistory(true);