Push scores even if it's lower than best score, because best score of…

… the day. Use apply on sharedprefs, optimization.
ajrulez · Mar 6, 2015 · 634b57c · 634b57c
1 parent 9a77f24
commit 634b57c
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/BaseGameUtils/src/main/java/com/google/example/games/basegameutils/GameHelper.java b/BaseGameUtils/src/main/java/com/google/example/games/basegameutils/GameHelper.java
@@ -773,7 +773,7 @@ int incrementSignInCancellations() {
         SharedPreferences.Editor editor = mAppContext.getSharedPreferences(
                 GAMEHELPER_SHARED_PREFS, Context.MODE_PRIVATE).edit();
         editor.putInt(KEY_SIGN_IN_CANCELLATIONS, cancellations + 1);
-        editor.commit();
+        editor.apply();
         return cancellations + 1;
     }
 
@@ -783,7 +783,7 @@ void resetSignInCancellations() {
         SharedPreferences.Editor editor = mAppContext.getSharedPreferences(
                 GAMEHELPER_SHARED_PREFS, Context.MODE_PRIVATE).edit();
         editor.putInt(KEY_SIGN_IN_CANCELLATIONS, 0);
-        editor.commit();
+        editor.apply();
     }
 
     /** Handles a connection failure. */

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "chrisjluc.onesearch"
         minSdkVersion 14
         targetSdkVersion 21
-        versionCode 7
-        versionName "1.0.2.1"
+        versionCode 8
+        versionName "1.0.3"
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/chrisjluc/onesearch/base/BaseGooglePlayServicesActivity.java b/app/src/main/java/chrisjluc/onesearch/base/BaseGooglePlayServicesActivity.java
@@ -50,7 +50,7 @@ public void onConnectionFailed(ConnectionResult connectionResult) {
 
             mResolvingConnectionFailure = BaseGameUtils.resolveConnectionFailure(this,
                     mGoogleApiClient, connectionResult,
-                    RC_SIGN_IN, "Failed to sign in");
+                    RC_SIGN_IN, getString(R.string.sign_in_failed));
         }
     }
 
@@ -91,7 +91,7 @@ public void onConnected(Bundle bundle) {
         if (isFirstTime) {
             SharedPreferences.Editor editor = getSharedPreferences(BGP_PREF_MAME, MODE_PRIVATE).edit();
             editor.putBoolean(FIRST_CONNECT, false);
-            editor.commit();
+            editor.apply();
 
             // Push high scores
             prefs = getSharedPreferences(ResultsActivity.PREF_NAME, MODE_PRIVATE);
@@ -130,7 +130,7 @@ public void onResult(final Leaderboards.LoadPlayerScoreResult scoreResult) {
                     if (score > currentScore) {
                         SharedPreferences.Editor editor = getSharedPreferences(ResultsActivity.PREF_NAME, MODE_PRIVATE).edit();
                         editor.putInt(ResultsActivity.SCORE_PREFIX + gameDifficulty, score);
-                        editor.commit();
+                        editor.apply();
                     }
                 }
             }

diff --git a/app/src/main/java/chrisjluc/onesearch/ui/MenuActivity.java b/app/src/main/java/chrisjluc/onesearch/ui/MenuActivity.java
@@ -32,7 +32,7 @@ protected void onCreate(Bundle savedInstanceState) {
         if (isFirstTime) {
             SharedPreferences.Editor editor = getSharedPreferences(MENU_PREF_NAME, MODE_PRIVATE).edit();
             editor.putBoolean(FIRST_TIME, false);
-            editor.commit();
+            editor.apply();
 
             Intent i = new Intent(getApplicationContext(), SplashActivity.class);
             startActivity(i);

diff --git a/app/src/main/java/chrisjluc/onesearch/ui/ResultsActivity.java b/app/src/main/java/chrisjluc/onesearch/ui/ResultsActivity.java
@@ -72,7 +72,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 int numRounds = prefs.getInt(COMPLETED_ROUND_PREFIX + mGameMode.getDifficulty(), 0);
                 SharedPreferences.Editor editor = getSharedPreferences(PREF_NAME, MODE_PRIVATE).edit();
                 editor.putInt(COMPLETED_ROUND_PREFIX + mGameMode.getDifficulty(), ++numRounds);
-                editor.commit();
+                editor.apply();
             }
 
             updateSavedScoreAndRenderViews();
@@ -91,7 +91,7 @@ private void updateSavedScoreAndRenderViews() {
             if (mScore > bestScore) {
                 SharedPreferences.Editor editor = getSharedPreferences(PREF_NAME, MODE_PRIVATE).edit();
                 editor.putInt(SCORE_PREFIX + mGameMode.getDifficulty(), mScore);
-                editor.commit();
+                editor.apply();
 
                 findViewById(R.id.tvBestScoreResultNotify).setVisibility(View.VISIBLE);
                 Animation anim = new AlphaAnimation(1.0f, 0.0f);
@@ -108,7 +108,7 @@ private void updateSavedScoreAndRenderViews() {
     }
 
     private void updateLeaderboard() {
-        if (mGoogleApiClient != null && mGoogleApiClient.isConnected() && mScore > mPreviousBestScore) {
+        if (mGoogleApiClient != null && mGoogleApiClient.isConnected()) {
             Games.Leaderboards.submitScore(mGoogleApiClient, mLeaderboardId, mScore);
         }
     }
@@ -146,7 +146,7 @@ private void updateAchievements() {
         if (score > highestScore) {
             SharedPreferences.Editor editor = getSharedPreferences(PREF_NAME, MODE_PRIVATE).edit();
             editor.putInt(HIGHEST_SCORE_FOR_ACHIEVEMENT_PREFIX + mGameMode.getDifficulty(), score);
-            editor.commit();
+            editor.apply();
         }
     }
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="sign_in_failed">Failed to sign in</string>
+    <string name="sign_in_failed">There was an issue with sign in, please try again later.</string>
     <string name="app_name">Onesearch</string>
     <string name="title_activity_results">Results</string>
     <string name="title_activity_menu">menu</string>