From 71e0c7ca4cd3bdde823224a9756ea99e7c79e21e Mon Sep 17 00:00:00 2001 From: Ricky Barrette Date: Fri, 14 Jun 2013 15:32:57 -0400 Subject: [PATCH] fixed inital 10s count twice bug --- ExaltedDice/AndroidManifest.xml | 4 ++-- .../TwentyCode/android/ExaltedDice/ExaltedDice.java | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ExaltedDice/AndroidManifest.xml b/ExaltedDice/AndroidManifest.xml index 5948659..17a10a9 100755 --- a/ExaltedDice/AndroidManifest.xml +++ b/ExaltedDice/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="95" + android:versionName="3ca0642" > diff --git a/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/ExaltedDice.java b/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/ExaltedDice.java index 134bba7..1774483 100755 --- a/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/ExaltedDice.java +++ b/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/ExaltedDice.java @@ -2,6 +2,7 @@ package com.TwentyCode.android.ExaltedDice; import java.util.Random; +import android.annotation.SuppressLint; import android.app.ActionBar; import android.app.Activity; import android.app.AlertDialog; @@ -67,6 +68,7 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic * @param id of the roll * @author ricky barrette */ + @SuppressLint("NewApi") private void applyRollPresets(long id) { ContentValues roll = mDb.getGameHistoryInfo(mGameName, (int) (id)); try{ @@ -110,6 +112,7 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic * Initializes native number pickers api > 11 * @author ricky barrette */ + @SuppressLint("NewApi") private void initPickers() { mDPicker = (NumberPicker) findViewById(R.id.d_Picker); mDPicker.setMinValue(0); @@ -163,7 +166,7 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic * * @author ricky barrette 3-27-2010 */ - @Override + @SuppressLint("NewApi") @Override public void onCreate(Bundle savedInstanceState) { Thread.setDefaultUncaughtExceptionHandler(new ExceptionHandler(this)); super.onCreate(savedInstanceState); @@ -303,6 +306,7 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic * resorts application state after rotation * @author ricky barrette */ + @SuppressLint("NewApi") @Override public void onRestoreInstanceState(Bundle savedInstanceState) { super.onRestoreInstanceState(savedInstanceState); @@ -336,6 +340,7 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic * saves application state before rotation * @author ricky barrette */ + @SuppressLint("NewApi") @Override public void onSaveInstanceState(Bundle savedInstanceState) { if(isCompat){ @@ -403,6 +408,7 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic * @param stringExtra * @author ricky barrette */ + @SuppressLint("NewApi") private void setGameMode(String mode) { /* @@ -476,6 +482,7 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic * @return String resultsString * @author ricky barrette */ + @SuppressLint("NewApi") public ContentValues results(int times) { Log.i(TAG, "results()"); ContentValues rolled = new ContentValues(); @@ -522,6 +529,7 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic mRollProgress.setVisibility(View.VISIBLE); new Thread( new Runnable() { + @SuppressLint("NewApi") @Override public void run(){ // vibrate for 50 milliseconds @@ -559,6 +567,7 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic * @return int[] roll * @author ricky barrette */ + @SuppressLint("NewApi") public int[] rollGen(int times) { Log.i(TAG, "rollGen()" + times); int[] roll = new int[times]; @@ -586,7 +595,7 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic for (int i = 0; i < roll.length; i++) { if (roll[i] >= Integer.parseInt(mSettings.getString(Settings.KEY_SUCCESS_AFTER, "7"))) intSuccesses++; - if(mSettings.getBoolean(Settings.KEY_TENS_COUNT_TWICE, true)) + if(mSettings.getBoolean(Settings.KEY_TENS_COUNT_TWICE, false)) if (roll[i] == 10) intSuccesses++; if(mSettings.getBoolean(Settings.KEY_ONES_SUBRACT, false))