Updating Collect all the stars 2 - per review comments from @samtstern.

claywilkinson · claywilkinson · commit fe5a8a18db27 · 2014-10-02T09:29:53.000-07:00
diff --git a/BasicSamples/CollectAllTheStars2/src/main/java/com/google/example/games/catt2/MainActivity.java b/BasicSamples/CollectAllTheStars2/src/main/java/com/google/example/games/catt2/MainActivity.java
@@ -393,7 +393,7 @@ public void onClick(View view) {
                 updateUi();
                 break;
             case R.id.button_next_world:
-                if (mGoogleApiClient == null || !mGoogleApiClient.isConnected()) {
+                if (isConnected()) {
                     BaseGameUtils.makeSimpleDialog(this, getString(R.string.please_sign_in)).show();
                     return;
                 }
@@ -403,7 +403,7 @@ public void onClick(View view) {
                 }
                 break;
             case R.id.button_prev_world:
-                if (mGoogleApiClient == null || !mGoogleApiClient.isConnected()) {
+                if (isConnected()) {
                     BaseGameUtils.makeSimpleDialog(this, getString(R.string.please_sign_in)).show();
                     return;
                 }
@@ -413,7 +413,7 @@ public void onClick(View view) {
                 }
                 break;
             default:
-                if (mGoogleApiClient == null || !mGoogleApiClient.isConnected()) {
+                if (isConnected()) {
                     BaseGameUtils.makeSimpleDialog(this, getString(R.string.please_sign_in)).show();
                     return;
                 }
@@ -426,6 +426,10 @@ public void onClick(View view) {
         }
     }
 
+    private boolean isConnected() {
+        return mGoogleApiClient == null || !mGoogleApiClient.isConnected();
+    }
+
     /**
      * Gets a screenshot to use with snapshots. Note that in practice you probably do not want to
      * use this approach because tablet screen sizes can become pretty large and because the image
@@ -474,8 +478,7 @@ protected Integer doInBackground(Void... params) {
                 if (snapshotMetadata != null && snapshotMetadata.getUniqueName() != null) {
                     Log.i(TAG, "Opening snapshot by metadata: " + snapshotMetadata);
                     result = Games.Snapshots.open(mGoogleApiClient,snapshotMetadata).await();
-                }
-                else {
+                } else {
                     Log.i(TAG, "Opening snapshot by name: " + currentSaveName);
                     result = Games.Snapshots.open(mGoogleApiClient, currentSaveName, true).await();
                 }
@@ -527,7 +530,7 @@ protected void onPostExecute(Integer status) {
                             Toast.LENGTH_SHORT).show();
                 }
 
-                if (mLoadingDialog != null) {
+                if (mLoadingDialog != null && mLoadingDialog.isShowing()) {
                     mLoadingDialog.dismiss();
                     mLoadingDialog = null;
                 }
@@ -800,7 +803,7 @@ protected Snapshots.LoadSnapshotsResult doInBackground(Void... params) {
                     @Override
                     protected void onPostExecute(Snapshots.LoadSnapshotsResult snapshotResults) {
 
-                        if (mLoadingDialog != null) {
+                        if (mLoadingDialog != null && mLoadingDialog.isShowing()) {
                             mLoadingDialog.dismiss();
                             mLoadingDialog = null;
                         }
diff --git a/BasicSamples/CollectAllTheStars2/src/main/java/com/google/example/games/catt2/SelectSnapshotActivity.java b/BasicSamples/CollectAllTheStars2/src/main/java/com/google/example/games/catt2/SelectSnapshotActivity.java
@@ -94,7 +94,7 @@ public void onItemClick(AdapterView<?> adapterView, View view, int position, lon
         SnapshotMetadata selected = (SnapshotMetadata) adapterView.getItemAtPosition(position);
         Intent intent = new Intent(Intent.ACTION_DEFAULT);
 
-        intent.putExtra(SNAPSHOT_METADATA, ( selected).freeze());
+        intent.putExtra(SNAPSHOT_METADATA, selected.freeze());
 
         if (mConflictId != null) {
             intent.putExtra(CONFLICT_ID, mConflictId);

Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,7 @@ public void onClick(View view) {`
`393`	`393`	`updateUi();`
`394`	`394`	`break;`
`395`	`395`	`case R.id.button_next_world:`
`396`		`- if (mGoogleApiClient == null \|\| !mGoogleApiClient.isConnected()) {`
	`396`	`+ if (isConnected()) {`
`397`	`397`	`BaseGameUtils.makeSimpleDialog(this, getString(R.string.please_sign_in)).show();`
`398`	`398`	`return;`
`399`	`399`	`}`
`@@ -403,7 +403,7 @@ public void onClick(View view) {`
`403`	`403`	`}`
`404`	`404`	`break;`
`405`	`405`	`case R.id.button_prev_world:`
`406`		`- if (mGoogleApiClient == null \|\| !mGoogleApiClient.isConnected()) {`
	`406`	`+ if (isConnected()) {`
`407`	`407`	`BaseGameUtils.makeSimpleDialog(this, getString(R.string.please_sign_in)).show();`
`408`	`408`	`return;`
`409`	`409`	`}`
`@@ -413,7 +413,7 @@ public void onClick(View view) {`
`413`	`413`	`}`
`414`	`414`	`break;`
`415`	`415`	`default:`
`416`		`- if (mGoogleApiClient == null \|\| !mGoogleApiClient.isConnected()) {`
	`416`	`+ if (isConnected()) {`
`417`	`417`	`BaseGameUtils.makeSimpleDialog(this, getString(R.string.please_sign_in)).show();`
`418`	`418`	`return;`
`419`	`419`	`}`
`@@ -426,6 +426,10 @@ public void onClick(View view) {`
`426`	`426`	`}`
`427`	`427`	`}`
`428`	`428`
	`429`	`+ private boolean isConnected() {`
	`430`	`+ return mGoogleApiClient == null \|\| !mGoogleApiClient.isConnected();`
	`431`	`+ }`
	`432`	`+`
`429`	`433`	`/**`
`430`	`434`	`* Gets a screenshot to use with snapshots. Note that in practice you probably do not want to`
`431`	`435`	`* use this approach because tablet screen sizes can become pretty large and because the image`
`@@ -474,8 +478,7 @@ protected Integer doInBackground(Void... params) {`
`474`	`478`	`if (snapshotMetadata != null && snapshotMetadata.getUniqueName() != null) {`
`475`	`479`	`Log.i(TAG, "Opening snapshot by metadata: " + snapshotMetadata);`
`476`	`480`	`result = Games.Snapshots.open(mGoogleApiClient,snapshotMetadata).await();`
`477`		`- }`
`478`		`- else {`
	`481`	`+ } else {`
`479`	`482`	`Log.i(TAG, "Opening snapshot by name: " + currentSaveName);`
`480`	`483`	`result = Games.Snapshots.open(mGoogleApiClient, currentSaveName, true).await();`
`481`	`484`	`}`
`@@ -527,7 +530,7 @@ protected void onPostExecute(Integer status) {`
`527`	`530`	`Toast.LENGTH_SHORT).show();`
`528`	`531`	`}`
`529`	`532`
`530`		`- if (mLoadingDialog != null) {`
	`533`	`+ if (mLoadingDialog != null && mLoadingDialog.isShowing()) {`
`531`	`534`	`mLoadingDialog.dismiss();`
`532`	`535`	`mLoadingDialog = null;`
`533`	`536`	`}`
`@@ -800,7 +803,7 @@ protected Snapshots.LoadSnapshotsResult doInBackground(Void... params) {`
`800`	`803`	`@Override`
`801`	`804`	`protected void onPostExecute(Snapshots.LoadSnapshotsResult snapshotResults) {`
`802`	`805`
`803`		`- if (mLoadingDialog != null) {`
	`806`	`+ if (mLoadingDialog != null && mLoadingDialog.isShowing()) {`
`804`	`807`	`mLoadingDialog.dismiss();`
`805`	`808`	`mLoadingDialog = null;`
`806`	`809`	`}`