From c24cd790ad218ad651eec5ae3168b2808ce5226d Mon Sep 17 00:00:00 2001 From: Francesco Andreuzzi <andreuzzi.francesco@gmail.com> Date: Mon, 6 Jun 2016 20:41:18 +0200 Subject: [PATCH] Contact permission not necessary --- .../java/ohi/andre/consolelauncher/commands/raw/call.java | 7 +++++++ .../ohi/andre/consolelauncher/commands/raw/contacts.java | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/app/src/main/java/ohi/andre/consolelauncher/commands/raw/call.java b/app/src/main/java/ohi/andre/consolelauncher/commands/raw/call.java index c4b6b6a..39b6039 100755 --- a/app/src/main/java/ohi/andre/consolelauncher/commands/raw/call.java +++ b/app/src/main/java/ohi/andre/consolelauncher/commands/raw/call.java @@ -1,7 +1,10 @@ package ohi.andre.consolelauncher.commands.raw; +import android.Manifest; import android.content.Intent; +import android.content.pm.PackageManager; import android.net.Uri; +import android.support.v4.content.ContextCompat; import ohi.andre.consolelauncher.R; import ohi.andre.consolelauncher.commands.CommandAbstraction; @@ -11,6 +14,10 @@ public class call implements CommandAbstraction { @Override public String exec(ExecInfo info) { + if (ContextCompat.checkSelfPermission(info.context, Manifest.permission.READ_CONTACTS) != PackageManager.PERMISSION_GRANTED) { + return info.res.getString(R.string.output_nopermissions); + } + String number = info.get(String.class, 0); Uri uri = Uri.parse("tel:" + number); Intent intent = new Intent(Intent.ACTION_CALL, uri); diff --git a/app/src/main/java/ohi/andre/consolelauncher/commands/raw/contacts.java b/app/src/main/java/ohi/andre/consolelauncher/commands/raw/contacts.java index fd22747..aceef23 100755 --- a/app/src/main/java/ohi/andre/consolelauncher/commands/raw/contacts.java +++ b/app/src/main/java/ohi/andre/consolelauncher/commands/raw/contacts.java @@ -1,5 +1,9 @@ package ohi.andre.consolelauncher.commands.raw; +import android.Manifest; +import android.content.pm.PackageManager; +import android.support.v4.content.ContextCompat; + import java.util.List; import ohi.andre.consolelauncher.R; @@ -11,6 +15,10 @@ public class contacts implements CommandAbstraction { @Override public String exec(ExecInfo info) { + if (ContextCompat.checkSelfPermission(info.context, Manifest.permission.READ_CONTACTS) != PackageManager.PERMISSION_GRANTED) { + return info.res.getString(R.string.output_nopermissions); + } + List<String> contacts = info.contacts.listNamesAndNumbers(); Tuils.addPrefix(contacts, " "); Tuils.insertHeaders(contacts, false); -- GitLab