From d316fac5a10af035a9b79d25a2609b3581df2ee2 Mon Sep 17 00:00:00 2001 From: Jeremie Date: Wed, 19 Apr 2017 13:31:16 +0200 Subject: [PATCH 1/6] Fix for APK install on Android 24 Added an exception to handle APKs differently if the android version is 6 --- .../github/pwlin/cordova/plugins/fileopener2/FileOpener2.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/io/github/pwlin/cordova/plugins/fileopener2/FileOpener2.java b/src/android/io/github/pwlin/cordova/plugins/fileopener2/FileOpener2.java index fba645f..08667aa 100644 --- a/src/android/io/github/pwlin/cordova/plugins/fileopener2/FileOpener2.java +++ b/src/android/io/github/pwlin/cordova/plugins/fileopener2/FileOpener2.java @@ -98,7 +98,7 @@ public class FileOpener2 extends CordovaPlugin { try { Uri path = Uri.fromFile(file); Intent intent = new Intent(Intent.ACTION_VIEW); - if(Build.VERSION.SDK_INT >= 23){ + if(Build.VERSION.SDK_INT >= 23 && !(contentType.equals("application/vnd.android.package-archive") && Build.VERSION.SDK_INT == 24)){ Context context = cordova.getActivity().getApplicationContext(); path = FileProvider.getUriForFile(context, cordova.getActivity().getPackageName() + ".opener.provider", file); From ed429e58015b2ff677d219987a8283396c75e028 Mon Sep 17 00:00:00 2001 From: Jeremie Date: Wed, 19 Apr 2017 13:37:44 +0200 Subject: [PATCH 2/6] Update FileOpener2.java --- .../github/pwlin/cordova/plugins/fileopener2/FileOpener2.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/io/github/pwlin/cordova/plugins/fileopener2/FileOpener2.java b/src/android/io/github/pwlin/cordova/plugins/fileopener2/FileOpener2.java index 08667aa..ad57708 100644 --- a/src/android/io/github/pwlin/cordova/plugins/fileopener2/FileOpener2.java +++ b/src/android/io/github/pwlin/cordova/plugins/fileopener2/FileOpener2.java @@ -98,7 +98,7 @@ public class FileOpener2 extends CordovaPlugin { try { Uri path = Uri.fromFile(file); Intent intent = new Intent(Intent.ACTION_VIEW); - if(Build.VERSION.SDK_INT >= 23 && !(contentType.equals("application/vnd.android.package-archive") && Build.VERSION.SDK_INT == 24)){ + if(Build.VERSION.SDK_INT >= 23 && !(contentType.equals("application/vnd.android.package-archive") && Build.VERSION.SDK_INT == 23)){ Context context = cordova.getActivity().getApplicationContext(); path = FileProvider.getUriForFile(context, cordova.getActivity().getPackageName() + ".opener.provider", file); From 5dc3e217e01daf8e55304e79b12d985aed113d7b Mon Sep 17 00:00:00 2001 From: Jeremie Date: Wed, 19 Apr 2017 13:39:50 +0200 Subject: [PATCH 3/6] Update FileOpener2.java --- .../github/pwlin/cordova/plugins/fileopener2/FileOpener2.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/io/github/pwlin/cordova/plugins/fileopener2/FileOpener2.java b/src/android/io/github/pwlin/cordova/plugins/fileopener2/FileOpener2.java index ad57708..a85a87b 100644 --- a/src/android/io/github/pwlin/cordova/plugins/fileopener2/FileOpener2.java +++ b/src/android/io/github/pwlin/cordova/plugins/fileopener2/FileOpener2.java @@ -98,7 +98,7 @@ public class FileOpener2 extends CordovaPlugin { try { Uri path = Uri.fromFile(file); Intent intent = new Intent(Intent.ACTION_VIEW); - if(Build.VERSION.SDK_INT >= 23 && !(contentType.equals("application/vnd.android.package-archive") && Build.VERSION.SDK_INT == 23)){ + if(Build.VERSION.SDK_INT >= 23 && !(contentType.equals("application/vnd.android.package-archive"))){ Context context = cordova.getActivity().getApplicationContext(); path = FileProvider.getUriForFile(context, cordova.getActivity().getPackageName() + ".opener.provider", file); From 06671fbdcebc9730ab333cc76e61660f5064005a Mon Sep 17 00:00:00 2001 From: Jeremie Date: Wed, 19 Apr 2017 13:56:54 +0200 Subject: [PATCH 4/6] Update FileOpener2.java --- .../github/pwlin/cordova/plugins/fileopener2/FileOpener2.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/io/github/pwlin/cordova/plugins/fileopener2/FileOpener2.java b/src/android/io/github/pwlin/cordova/plugins/fileopener2/FileOpener2.java index a85a87b..ad57708 100644 --- a/src/android/io/github/pwlin/cordova/plugins/fileopener2/FileOpener2.java +++ b/src/android/io/github/pwlin/cordova/plugins/fileopener2/FileOpener2.java @@ -98,7 +98,7 @@ public class FileOpener2 extends CordovaPlugin { try { Uri path = Uri.fromFile(file); Intent intent = new Intent(Intent.ACTION_VIEW); - if(Build.VERSION.SDK_INT >= 23 && !(contentType.equals("application/vnd.android.package-archive"))){ + if(Build.VERSION.SDK_INT >= 23 && !(contentType.equals("application/vnd.android.package-archive") && Build.VERSION.SDK_INT == 23)){ Context context = cordova.getActivity().getApplicationContext(); path = FileProvider.getUriForFile(context, cordova.getActivity().getPackageName() + ".opener.provider", file); From 8a553db96cfdde8eb9a42b05413a7014374ef779 Mon Sep 17 00:00:00 2001 From: Jeremie Date: Wed, 19 Apr 2017 14:14:47 +0200 Subject: [PATCH 5/6] Update FileOpener2.java --- .../github/pwlin/cordova/plugins/fileopener2/FileOpener2.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/io/github/pwlin/cordova/plugins/fileopener2/FileOpener2.java b/src/android/io/github/pwlin/cordova/plugins/fileopener2/FileOpener2.java index ad57708..a85a87b 100644 --- a/src/android/io/github/pwlin/cordova/plugins/fileopener2/FileOpener2.java +++ b/src/android/io/github/pwlin/cordova/plugins/fileopener2/FileOpener2.java @@ -98,7 +98,7 @@ public class FileOpener2 extends CordovaPlugin { try { Uri path = Uri.fromFile(file); Intent intent = new Intent(Intent.ACTION_VIEW); - if(Build.VERSION.SDK_INT >= 23 && !(contentType.equals("application/vnd.android.package-archive") && Build.VERSION.SDK_INT == 23)){ + if(Build.VERSION.SDK_INT >= 23 && !(contentType.equals("application/vnd.android.package-archive"))){ Context context = cordova.getActivity().getApplicationContext(); path = FileProvider.getUriForFile(context, cordova.getActivity().getPackageName() + ".opener.provider", file); From 8be87033989a1c04861011f36ff6e9d6b39ac00c Mon Sep 17 00:00:00 2001 From: Jeremie Date: Wed, 19 Apr 2017 14:28:51 +0200 Subject: [PATCH 6/6] Removed unused parentheses --- .../github/pwlin/cordova/plugins/fileopener2/FileOpener2.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/io/github/pwlin/cordova/plugins/fileopener2/FileOpener2.java b/src/android/io/github/pwlin/cordova/plugins/fileopener2/FileOpener2.java index a85a87b..61908c7 100644 --- a/src/android/io/github/pwlin/cordova/plugins/fileopener2/FileOpener2.java +++ b/src/android/io/github/pwlin/cordova/plugins/fileopener2/FileOpener2.java @@ -98,7 +98,7 @@ public class FileOpener2 extends CordovaPlugin { try { Uri path = Uri.fromFile(file); Intent intent = new Intent(Intent.ACTION_VIEW); - if(Build.VERSION.SDK_INT >= 23 && !(contentType.equals("application/vnd.android.package-archive"))){ + if(Build.VERSION.SDK_INT >= 23 && !contentType.equals("application/vnd.android.package-archive")){ Context context = cordova.getActivity().getApplicationContext(); path = FileProvider.getUriForFile(context, cordova.getActivity().getPackageName() + ".opener.provider", file);