Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 655DD18FA6 for ; Mon, 19 Oct 2015 17:32:08 +0000 (UTC) Received: (qmail 86504 invoked by uid 500); 19 Oct 2015 17:32:08 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 86382 invoked by uid 500); 19 Oct 2015 17:32:08 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 85677 invoked by uid 99); 19 Oct 2015 17:32:07 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Oct 2015 17:32:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E2D54E048E; Mon, 19 Oct 2015 17:32:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bowserj@apache.org To: commits@cordova.apache.org Date: Mon, 19 Oct 2015 17:32:14 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [09/10] android commit: You can't easily abstract out this variable because this can crash Cordova due to the plugin design. You can't easily abstract out this variable because this can crash Cordova due to the plugin design. Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/4db1fecb Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/4db1fecb Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/4db1fecb Branch: refs/heads/master Commit: 4db1fecba887defbf7228edd7e4f2ab85d0d34bb Parents: 013ad94 Author: Joe Bowser Authored: Tue Oct 6 12:57:01 2015 -0700 Committer: Joe Bowser Committed: Mon Oct 19 10:31:56 2015 -0700 ---------------------------------------------------------------------- framework/src/org/apache/cordova/CordovaPlugin.java | 14 -------------- 1 file changed, 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/4db1fecb/framework/src/org/apache/cordova/CordovaPlugin.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/CordovaPlugin.java b/framework/src/org/apache/cordova/CordovaPlugin.java index 9f211ff..4627ebb 100644 --- a/framework/src/org/apache/cordova/CordovaPlugin.java +++ b/framework/src/org/apache/cordova/CordovaPlugin.java @@ -42,7 +42,6 @@ public class CordovaPlugin { public CordovaInterface cordova; protected CordovaPreferences preferences; private String serviceName; - protected String [] permissions; /** * Call this after constructing to initialize the plugin. @@ -372,7 +371,6 @@ public class CordovaPlugin { */ public void requestPermissions(int requestCode) { - cordova.requestPermissions(this, requestCode, permissions); } /* @@ -383,18 +381,6 @@ public class CordovaPlugin { */ public boolean hasPermisssion() { - if(Build.VERSION.SDK_INT < Build.VERSION_CODES.M) - { - return true; - } - for(String p : permissions) - { - if(PackageManager.PERMISSION_DENIED == cordova.getActivity().checkSelfPermission(p)) - { - return false; - } - } - return true; } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org