cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alsoro...@apache.org
Subject cordova-plugin-inappbrowser git commit: CB-12010 (android) Catch FileUriExposedException
Date Mon, 17 Oct 2016 10:06:48 GMT
Repository: cordova-plugin-inappbrowser
Updated Branches:
  refs/heads/master 32253b96a -> ab696f6eb


CB-12010 (android) Catch FileUriExposedException


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/ab696f6e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/ab696f6e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/ab696f6e

Branch: refs/heads/master
Commit: ab696f6ebd64b93ae46aac9816562ce194e32607
Parents: 32253b9
Author: Alexander Sorokin <alexander.sorokin@akvelon.com>
Authored: Thu Oct 13 13:29:23 2016 +0300
Committer: Alexander Sorokin <alexander.sorokin@akvelon.com>
Committed: Mon Oct 17 13:06:28 2016 +0300

----------------------------------------------------------------------
 src/android/InAppBrowser.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/ab696f6e/src/android/InAppBrowser.java
----------------------------------------------------------------------
diff --git a/src/android/InAppBrowser.java b/src/android/InAppBrowser.java
index f0de875..3253d92 100644
--- a/src/android/InAppBrowser.java
+++ b/src/android/InAppBrowser.java
@@ -383,7 +383,8 @@ public class InAppBrowser extends CordovaPlugin {
             intent.putExtra(Browser.EXTRA_APPLICATION_ID, cordova.getActivity().getPackageName());
             this.cordova.getActivity().startActivity(intent);
             return "";
-        } catch (android.content.ActivityNotFoundException e) {
+        // not catching FileUriExposedException explicitly because buildtools<24 doesn't
know about it
+        } catch (java.lang.RuntimeException e) {
             LOG.d(LOG_TAG, "InAppBrowser: Error loading url "+url+":"+ e.toString());
             return e.toString();
         }
@@ -524,7 +525,7 @@ public class InAppBrowser extends CordovaPlugin {
                 hadwareBackButton = hardwareBack.booleanValue();
             } else {
                 hadwareBackButton = DEFAULT_HARDWARE_BACK;
-            }            
+            }
             Boolean mediaPlayback = features.get(MEDIA_PLAYBACK_REQUIRES_USER_ACTION);
             if (mediaPlayback != null) {
                 mediaPlaybackRequiresUserGesture = mediaPlayback.booleanValue();


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message