Repository: cordova-plugin-contacts Updated Branches: refs/heads/master e2ece8db8 -> 80864f452
Refactored ContactManager after feedback Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/commit/80864f45 Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/tree/80864f45 Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/diff/80864f45 Branch: refs/heads/master Commit: 80864f452fd4514bd43575fa6fb5e8ea54f8fc2a Parents: c7ae850 Author: Joe Bowser <[email protected]> Authored: Wed Sep 30 12:43:30 2015 -0700 Committer: Joe Bowser <[email protected]> Committed: Wed Oct 28 10:38:11 2015 -0700 ---------------------------------------------------------------------- src/android/ContactManager.java | 44 +++++++----------------------------- 1 file changed, 8 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/blob/80864f45/src/android/ContactManager.java ---------------------------------------------------------------------- diff --git a/src/android/ContactManager.java b/src/android/ContactManager.java index 2a326dd..86034c2 100644 --- a/src/android/ContactManager.java +++ b/src/android/ContactManager.java @@ -62,55 +62,27 @@ public class ContactManager extends CordovaPlugin { public static final int SAVE_REQ_CODE = 1; public static final int REMOVE_REQ_CODE = 2; + public static final String READ = Manifest.permission.READ_CONTACTS; + public static final String WRITE = Manifest.permission.WRITE_CONTACTS; + /** * Constructor. */ public ContactManager() { - permissions = new String[2]; - permissions[0] = Manifest.permission.READ_CONTACTS; - permissions[1] = Manifest.permission.WRITE_CONTACTS; - } - public String [] requestPermissions() - { - return permissions; } - protected int checkReadPermission() - { - if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) - { - return cordova.getActivity().checkSelfPermission(Manifest.permission.READ_CONTACTS); - } - else - { - return PackageManager.PERMISSION_GRANTED; - } - } - protected void getReadPermission(int requestCode) { - cordova.requestPermission(this, requestCode, Manifest.permission.READ_CONTACTS); + cordova.requestPermission(this, requestCode, READ); } - protected int checkWritePermission() - { - if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) - { - return cordova.getActivity().checkSelfPermission(Manifest.permission.WRITE_CONTACTS); - } - else - { - return PackageManager.PERMISSION_GRANTED; - } - } - protected void getWritePermission(int requestCode) { - cordova.requestPermission(this, requestCode, Manifest.permission.WRITE_CONTACTS); + cordova.requestPermission(this, requestCode, WRITE); } @@ -145,7 +117,7 @@ public class ContactManager extends CordovaPlugin { } if (action.equals("search")) { - if(checkReadPermission() != PackageManager.PERMISSION_DENIED) { + if(cordova.hasPermission(READ)) { search(executeArgs); } else @@ -154,7 +126,7 @@ public class ContactManager extends CordovaPlugin { } } else if (action.equals("save")) { - if(checkWritePermission() != PackageManager.PERMISSION_DENIED) + if(cordova.hasPermission(WRITE)) { save(executeArgs); } @@ -164,7 +136,7 @@ public class ContactManager extends CordovaPlugin { } } else if (action.equals("remove")) { - if(checkWritePermission() != PackageManager.PERMISSION_DENIED) + if(cordova.hasPermission(WRITE)) { remove(executeArgs); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
