Eliminate rare corner cases which could result in errornous counter updates

Author: Hisanobu Tomari

src/com/example/javabutton/MainActivity.java

@@ -49,7 +49,6 @@ public class MainActivity extends Activity implements SensorEventListener, OnSha
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-
 		random=new java.util.Random();
 
         javaPool=new SoundPool(maxJavaSounds,AudioManager.STREAM_MUSIC,0);
@@ -63,9 +62,7 @@ protected void onCreate(Bundle savedInstanceState) {
         accelerometer= sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
 
 		PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
-		SharedPreferences shrPrefs=PreferenceManager.getDefaultSharedPreferences(this);
-		shrPrefs.registerOnSharedPreferenceChangeListener(this);
-    }
+	}
 
     private void loadPreferences(SharedPreferences shrPrefs) {
     	float density=getResources().getDisplayMetrics().density;
@@ -96,25 +93,25 @@ private void loadPreferences(SharedPreferences shrPrefs) {
 
 		enableLucky=shrPrefs.getBoolean("pref_lucky_enable", false);
 		enableShakeModulation=shrPrefs.getBoolean("pref_shakeJava_modulation_enable", true);
-		
-		resetCounters();
 	}
 	private void resetCounters() {
 		counterPress=0l;
 		counterDJ=0l;
 		counterShake=0l;
 		counterVoice=0l;
 	}
-    @Override
-    protected void onResume() {
-        super.onResume();
-        sensorManager.registerListener(this, accelerometer, SensorManager.SENSOR_STATUS_ACCURACY_LOW);
+	@Override
+	protected void onResume() {
+		super.onResume();
+		resetCounters();
+		sensorManager.registerListener(this, accelerometer, SensorManager.SENSOR_STATUS_ACCURACY_LOW);
 		loadPreferences(PreferenceManager.getDefaultSharedPreferences(this));
-    }
+		PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(this);
+	}
 
-    @Override
-    protected void onPause() {
-        sensorManager.unregisterListener(this);
+	@Override
+	protected void onPause() {
+		sensorManager.unregisterListener(this);
 		PreferenceManager.getDefaultSharedPreferences(this).unregisterOnSharedPreferenceChangeListener(this);
 		saveCounters();
 		super.onPause();