Skip to content

Update caseNameToSubsetId to allow more subsets #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
neftalito wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update caseNameToSubsetId to allow more subsets #186

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions app/src/main/java/com/aricneto/twistytimer/utils/AlgUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,29 @@ private static List<String> getSubsetCases() {
* Converts a case name to its specific id reference in the reference_states.xml file
* @return
*/
public static int caseNameToSubsetId(String subset, String name) {
switch (subset) {
case "PLL":
return getSubsetCases().indexOf(name);
case "OLL":
return Integer.valueOf(name.substring(4)) - 1;
public static int caseNameToSubsetId(String subset, String name){
//Do query
Cursor cursor = TwistyTimer.getReadableDB().query(
DatabaseHandler.TABLE_ALGS,
new String[] {DatabaseHandler.KEY_NAME},
DatabaseHandler.KEY_SUBSET + " = ? ",
new String[] {subset},
null,
null,
null,
null
);

//Iterate over results to get the alg id. Had to do this because using the id from database does not work as reference_states uses other indexes
while(cursor.moveToNext()) {
String currentName = cursor.getString(cursor.getColumnIndex(DatabaseHandler.KEY_NAME));

if (currentName.equals(name)) {
break;
}
}
return 0;

return cursor.getInt(cursor.getColumnIndex(DatabaseHandler.KEY_NAME));
}

/**
Expand Down