Merge pull request #2779 from ozdemir08/master

Release v10.06
playgameservices · Nov 8, 2019 · 4b93bd5 · 4b93bd5
2 parents 873b57b + 1a1dc88
commit 4b93bd5
Show file tree

Hide file tree

Showing 19 changed files with 40 additions and 12 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,9 +1,13 @@
+Version 0.10.06
+    Bug fixes:
+    * #2776 Crashes due to uninstalled Play Games App.
+    * #2766, #2772 Android SDK path detection in versions older than 2019.x.
+
 Version 0.10.05
     Bug fixes:
     * #2753 VersionHandlerImpl.UpdateVersionedAssets not found.
     * Fixed the issues caused by Nearby and RTMP callbacks not being on the main thread.
     * Fixed detecting AndroidSdkRoot when unity embedded is used.
-
 Version 0.10.04
     Bug fixes:
     * Updated the way of handling requests to prevent them being processed twice.

diff --git a/current-build/GooglePlayGamesPlugin-0.10.05.unitypackage b/current-build/GooglePlayGamesPlugin-0.10.05.unitypackage
diff --git a/current-build/GooglePlayGamesPlugin-0.10.06.unitypackage b/current-build/GooglePlayGamesPlugin-0.10.06.unitypackage
diff --git a/samples/CubicPilot/CubicPilot.unitypackage b/samples/CubicPilot/CubicPilot.unitypackage
diff --git a/samples/Minimal/Minimal.unitypackage b/samples/Minimal/Minimal.unitypackage
diff --git a/samples/NearbyDroids/NearbyDroids.unitypackage b/samples/NearbyDroids/NearbyDroids.unitypackage
diff --git a/samples/QuizRacer/QuizRacer.unitypackage b/samples/QuizRacer/QuizRacer.unitypackage
diff --git a/samples/SmokeTest/SmokeTest.unitypackage b/samples/SmokeTest/SmokeTest.unitypackage
diff --git a/samples/TicTacToe/TicTacToe.unitypackage b/samples/TicTacToe/TicTacToe.unitypackage
diff --git a/source/PluginDev/Assets/GooglePlayGames/PluginVersion.cs b/source/PluginDev/Assets/GooglePlayGames/PluginVersion.cs
@@ -19,8 +19,8 @@ namespace GooglePlayGames
     public class PluginVersion
     {
         // Current Version.
-        public const int VersionInt = 0x01005;
-        public const string VersionString = "0.10.05";
-        public const string VersionKey = "01005";
+        public const int VersionInt = 0x01006;
+        public const string VersionString = "0.10.06";
+        public const string VersionKey = "01006";
     }
 }
diff --git a/...amesPluginSupport/src/main/java/com/google/games/bridge/BaseSelectOpponentsUiRequest.java b/...amesPluginSupport/src/main/java/com/google/games/bridge/BaseSelectOpponentsUiRequest.java
@@ -59,7 +59,7 @@ public void process(final HelperFragment helperFragment) {
                 new OnSuccessListener<Intent>() {
                     @Override
                     public void onSuccess(Intent intent) {
-                        helperFragment.startActivityForResult(intent, HelperFragment.RC_SELECT_OPPONENTS_UI);
+                        Utils.startActivityForResult(helperFragment, intent, HelperFragment.RC_SELECT_OPPONENTS_UI);
                     }
                 })
             .addOnFailureListener(

diff --git a/...PlayGamesPluginSupport/src/main/java/com/google/games/bridge/CaptureOverlayUiRequest.java b/...PlayGamesPluginSupport/src/main/java/com/google/games/bridge/CaptureOverlayUiRequest.java
@@ -25,7 +25,7 @@ public void process(final HelperFragment helperFragment) {
                 new OnSuccessListener<Intent>() {
                     @Override
                     public void onSuccess(Intent intent) {
-                        helperFragment.startActivityForResult(intent, HelperFragment.RC_CAPTURE_OVERLAY_UI);
+                        Utils.startActivityForResult(helperFragment, intent, HelperFragment.RC_CAPTURE_OVERLAY_UI);
                         helperFragment.finishRequest(CaptureOverlayUiRequest.this);
                     }
                 })

diff --git a/...pportLib/PlayGamesPluginSupport/src/main/java/com/google/games/bridge/InboxUiRequest.java b/...pportLib/PlayGamesPluginSupport/src/main/java/com/google/games/bridge/InboxUiRequest.java
@@ -45,7 +45,7 @@ public void process(final HelperFragment helperFragment) {
                 new OnSuccessListener<Intent>() {
                     @Override
                     public void onSuccess(Intent intent) {
-                        helperFragment.startActivityForResult(intent, HelperFragment.RC_INBOX_UI);
+                        Utils.startActivityForResult(helperFragment, intent, HelperFragment.RC_INBOX_UI);
                     }
                 })
             .addOnFailureListener(

diff --git a/...PlayGamesPluginSupport/src/main/java/com/google/games/bridge/SelectSnapshotUiRequest.java b/...PlayGamesPluginSupport/src/main/java/com/google/games/bridge/SelectSnapshotUiRequest.java
@@ -70,7 +70,7 @@ public void process(final HelperFragment helperFragment) {
                 new OnSuccessListener<Intent>() {
                     @Override
                     public void onSuccess(Intent intent) {
-                        helperFragment.startActivityForResult(intent, HelperFragment.RC_SELECT_SNAPSHOT_UI);
+                        Utils.startActivityForResult(helperFragment, intent, HelperFragment.RC_SELECT_SNAPSHOT_UI);
                     }
                 })
             .addOnFailureListener(

diff --git a/...amesPluginSupport/src/main/java/com/google/games/bridge/ShowInvitationInboxUIRequest.java b/...amesPluginSupport/src/main/java/com/google/games/bridge/ShowInvitationInboxUIRequest.java
@@ -51,7 +51,7 @@ public void process(final HelperFragment helperFragment) {
                     new OnSuccessListener<Intent>() {
                         @Override
                         public void onSuccess(Intent intent) {
-                            helperFragment.startActivityForResult(intent, HelperFragment.RC_SHOW_INVITATION_INBOX_UI);
+                            Utils.startActivityForResult(helperFragment, intent, HelperFragment.RC_SHOW_INVITATION_INBOX_UI);
                         }
                     })
             .addOnFailureListener(

diff --git a/...layGamesPluginSupport/src/main/java/com/google/games/bridge/ShowWaitingRoomUiRequest.java b/...layGamesPluginSupport/src/main/java/com/google/games/bridge/ShowWaitingRoomUiRequest.java
@@ -64,7 +64,7 @@ public void process(final HelperFragment helperFragment) {
                     new OnSuccessListener<Intent>() {
                         @Override
                         public void onSuccess(Intent intent) {
-                            helperFragment.startActivityForResult(intent, HelperFragment.RC_SHOW_WAITING_ROOM_UI);
+                            Utils.startActivityForResult(helperFragment, intent, HelperFragment.RC_SHOW_WAITING_ROOM_UI);
                         }
                     })
             .addOnFailureListener(

diff --git a/...portLib/PlayGamesPluginSupport/src/main/java/com/google/games/bridge/SimpleUiRequest.java b/...portLib/PlayGamesPluginSupport/src/main/java/com/google/games/bridge/SimpleUiRequest.java
@@ -33,7 +33,7 @@ public void process(final HelperFragment helperFragment) {
                 new OnSuccessListener<Intent>() {
                     @Override
                     public void onSuccess(Intent intent) {
-                        helperFragment.startActivityForResult(intent, HelperFragment.RC_SIMPLE_UI);
+                        Utils.startActivityForResult(helperFragment, intent, HelperFragment.RC_SIMPLE_UI);
                     }
                 })
             .addOnFailureListener(

diff --git a/source/SupportLib/PlayGamesPluginSupport/src/main/java/com/google/games/bridge/Utils.java b/source/SupportLib/PlayGamesPluginSupport/src/main/java/com/google/games/bridge/Utils.java
@@ -0,0 +1,24 @@
+package com.google.games.bridge;
+
+import android.app.Fragment;
+import android.content.ActivityNotFoundException;
+import android.content.Intent;
+import android.util.Log;
+
+/**
+ * Utility functions
+ */
+public final class Utils {
+
+    private static final String TAG = "Utils";
+
+    private Utils() {}
+
+    public static void startActivityForResult(Fragment fragment, Intent intent, int requestCode) {
+        try {
+            fragment.startActivityForResult(intent, requestCode);
+        } catch (ActivityNotFoundException e) {
+            Log.e(TAG,"Activity not found. Please install Play Games App.");
+        }
+    }
+}
diff --git a/source/build.gradle b/source/build.gradle
@@ -68,7 +68,7 @@ project.ext {
     samplesBuildSrc = file('build/sampleSrc').absolutePath
     exportPath = file('build/plugin.unitypackage').absolutePath
     currentPluginPath = file('../current-build').absolutePath
-    currentPluginVersion = "0.10.05"
+    currentPluginVersion = "0.10.06"
     currentPluginBasename = 'GooglePlayGamesPlugin'
     currentPluginName = "${currentPluginBasename}-${currentPluginVersion}.unitypackage"
     resolverDir = new File('build/jarresolver').absolutePath