Catch ActivityNotFound exception to prevent crashes

playgameservices · Nov 6, 2019 · c7d4eda · c7d4eda
1 parent 873b57b
commit c7d4eda
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 7 deletions.
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.");
+        }
+    }
+}