+ * in {@link com.joker.api.support.manufacturer.XIAOMI} or + * {@link com.joker.api.support.manufacturer.OPPO} : + * -> {@link TelephonyManager#getDeviceId()} will be null if deny permission + *
+ * in {@link com.joker.api.support.manufacturer.MEIZU} :
+ * -> {@link TelephonyManager#getSubscriberId()} will be null if deny permission
+ *
+ * @param activity
+ * @return true if success
+ * @throws Exception
+ */
+ @SuppressLint("HardwareIds")
private static boolean checkReadPhoneState(Activity activity) throws Exception {
TelephonyManager service = (TelephonyManager) activity.getSystemService
(TELEPHONY_SERVICE);
- return !TextUtils.isEmpty(service.getDeviceId());
+ if (PermissionsPageManager.isMEIZU()) {
+ return !TextUtils.isEmpty(service.getSubscriberId());
+ } else if (PermissionsPageManager.isXIAOMI() || PermissionsPageManager.isOPPO()) {
+ return !TextUtils.isEmpty(service.getDeviceId());
+ } else {
+ return !TextUtils.isEmpty(service.getDeviceId()) || !TextUtils.isEmpty(service
+ .getSubscriberId());
+ }
}
+ /**
+ * read call log, {@link android.Manifest.permission#READ_CALL_LOG}
+ *
+ * @param activity
+ * @return true if success
+ * @throws Exception
+ */
private static boolean checkReadCallLog(Activity activity) throws Exception {
Cursor cursor = activity.getContentResolver().query(Uri.parse
("content://call_log/calls"), null, null,
null, null);
if (cursor != null) {
- if (PermissionsPageManager.isXiaoMi()) {
+ if (PermissionsPageManager.isUnderMHasPermissionRequestManufacturer() ||
+ PermissionsPageManager.isXIAOMI()) {
if (isNumberIndexInfoIsNull(cursor, cursor.getColumnIndex(CallLog.Calls.NUMBER))) {
cursor.close();
return false;
@@ -244,6 +333,14 @@ private static boolean checkReadCallLog(Activity activity) throws Exception {
}
}
+ /**
+ * write and delete contacts info, {@link android.Manifest.permission#WRITE_CONTACTS}
+ * and we should get read contacts permission first.
+ *
+ * @param activity
+ * @return true if success
+ * @throws Exception
+ */
private static boolean checkWriteContacts(Activity activity) throws Exception {
if (checkReadContacts(activity)) {
// write some info
@@ -279,11 +376,19 @@ private static boolean checkWriteContacts(Activity activity) throws Exception {
}
}
+ /**
+ * read contacts, {@link android.Manifest.permission#READ_CONTACTS}
+ *
+ * @param activity
+ * @return true if success
+ * @throws Exception
+ */
private static boolean checkReadContacts(Activity activity) throws Exception {
Cursor cursor = activity.getContentResolver().query(ContactsContract.CommonDataKinds.Phone
.CONTENT_URI, null, null, null, null);
if (cursor != null) {
- if (PermissionsPageManager.isXiaoMi()) {
+ if (PermissionsPageManager.isUnderMHasPermissionRequestManufacturer() ||
+ PermissionsPageManager.isXIAOMI()) {
if (isNumberIndexInfoIsNull(cursor, cursor.getColumnIndex(ContactsContract.CommonDataKinds
.Phone.NUMBER))) {
cursor.close();
@@ -298,7 +403,7 @@ private static boolean checkReadContacts(Activity activity) throws Exception {
}
/**
- * in XIAOMI
+ * in {@link com.joker.api.support.manufacturer.XIAOMI}
* 1.denied {@link android.Manifest.permission#READ_CONTACTS} permission
* ---->cursor.getCount == 0
* 2.granted {@link android.Manifest.permission#READ_CONTACTS} permission
diff --git a/permissions4m-api/src/main/java/com/joker/api/apply/util/AudioRecordManager.java b/permissions4m-api/src/main/java/com/joker/api/apply/util/AudioRecordManager.java
index bf4a8d9..e8093a5 100644
--- a/permissions4m-api/src/main/java/com/joker/api/apply/util/AudioRecordManager.java
+++ b/permissions4m-api/src/main/java/com/joker/api/apply/util/AudioRecordManager.java
@@ -15,13 +15,14 @@
public class AudioRecordManager {
private static AudioRecordManager mInstance;
+ public File file;
private AudioRecord mRecorder;
private DataOutputStream dos;
private Thread recordThread;
private boolean isStart = false;
private int bufferSize;
/**
- * 录音线程
+ * record thread
*/
Runnable recordRunnable = new Runnable() {
@Override
@@ -29,16 +30,14 @@ public void run() {
try {
android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_URGENT_AUDIO);
int bytesRecord;
- //int bufferSize = 320;
byte[] tempBuffer = new byte[bufferSize];
- if (mRecorder.getState() != AudioRecord.STATE_INITIALIZED) {
- stopRecord();
- return;
- }
+// if (mRecorder.getState() != AudioRecord.STATE_INITIALIZED) {
+// stopRecord();
+// return;
+// }
mRecorder.startRecording();
- //writeToFileHead();
while (isStart) {
- if (null != mRecorder) {
+ if (mRecorder != null) {
bytesRecord = mRecorder.read(tempBuffer, 0, bufferSize);
if (bytesRecord == AudioRecord.ERROR_INVALID_OPERATION || bytesRecord ==
AudioRecord.ERROR_BAD_VALUE) {
@@ -57,7 +56,7 @@ public void run() {
}
};
- private String path;
+ private long length;
public AudioRecordManager() {
bufferSize = AudioRecord.getMinBufferSize(8000, AudioFormat.CHANNEL_IN_MONO, AudioFormat
@@ -66,33 +65,22 @@ public AudioRecordManager() {
AudioFormat.ENCODING_PCM_16BIT, bufferSize * 2);
}
- /**
- * 获取单例引用
- *
- * @return
- */
- public static AudioRecordManager getInstance() {
- if (mInstance == null) {
- synchronized (AudioRecordManager.class) {
- if (mInstance == null) {
- mInstance = new AudioRecordManager();
- }
- }
- }
- return mInstance;
+
+ public boolean getSuccess() {
+ return length > 0;
}
/**
- * 销毁线程方法
+ * destroy record thread
*/
private void destroyThread() {
try {
isStart = false;
- if (null != recordThread && Thread.State.RUNNABLE == recordThread.getState()) {
+ if (recordThread != null && recordThread.getState() != Thread.State.TERMINATED) {
try {
- Thread.sleep(500);
recordThread.interrupt();
} catch (Exception e) {
+ e.printStackTrace();
recordThread = null;
}
}
@@ -105,10 +93,9 @@ private void destroyThread() {
}
/**
- * 启动录音线程
+ * start record thread
*/
private void startThread() {
- destroyThread();
isStart = true;
if (recordThread == null) {
recordThread = new Thread(recordRunnable);
@@ -117,35 +104,37 @@ private void startThread() {
}
/**
- * 保存文件
+ * save file
*
- * @param path
* @throws IOException
*/
private void setPath(String path) throws IOException {
- this.path = path;
- File file = new File(path);
- if (file.exists()) {
- file.delete();
- }
+ file = new File(path);
+ deleteFile();
file.createNewFile();
dos = new DataOutputStream(new FileOutputStream(file, true));
}
/**
- * 启动录音
+ * start record
*
* @param path
+ * @throws IOException
*/
- public void startRecord(String path) throws IOException {
+ public void startRecord(String path) throws IOException, InterruptedException {
setPath(path);
startThread();
}
/**
- * 停止录音
+ * stop record
+ *
+ * @throws IOException
+ * @throws InterruptedException
*/
- public void stopRecord() throws IOException {
+ public void stopRecord() throws IOException, InterruptedException {
+ // specially for OPPO、XIAOMI、MEIZU、HUAWEI and so on
+ Thread.sleep(250);
destroyThread();
if (mRecorder != null) {
if (mRecorder.getState() == AudioRecord.STATE_INITIALIZED) {
@@ -159,10 +148,11 @@ public void stopRecord() throws IOException {
dos.flush();
dos.close();
}
+ length = file.length();
+ deleteFile();
}
- public void deleteFile() {
- File file = new File(path);
+ private void deleteFile() {
if (file.exists()) {
file.delete();
}
diff --git a/permissions4m-api/src/main/java/com/joker/api/support/PermissionsPageManager.java b/permissions4m-api/src/main/java/com/joker/api/support/PermissionsPageManager.java
index afadd33..cc93089 100644
--- a/permissions4m-api/src/main/java/com/joker/api/support/PermissionsPageManager.java
+++ b/permissions4m-api/src/main/java/com/joker/api/support/PermissionsPageManager.java
@@ -21,11 +21,11 @@ public class PermissionsPageManager {
/**
* Build.MANUFACTURER
*/
- private static final String MANUFACTURER_HUAWEI = "HUAWEI"; // 华为
- private static final String MANUFACTURER_XIAOMI = "XIAOMI"; // 小米
- private static final String MANUFACTURER_OPPO = "OPPO"; // oppo
- private static final String MANUFACTURER_VIVO = "vivo"; // vivo
- private static final String MANUFACTURER_MEIZU = "meizu"; // meizu
+ private static final String MANUFACTURER_HUAWEI = "HUAWEI";
+ private static final String MANUFACTURER_XIAOMI = "XIAOMI";
+ private static final String MANUFACTURER_OPPO = "OPPO";
+ private static final String MANUFACTURER_VIVO = "vivo";
+ private static final String MANUFACTURER_MEIZU = "meizu";
private static final String manufacturer = Build.MANUFACTURER;
public static String getManufacturer() {
@@ -59,12 +59,21 @@ public static Intent getSettingIntent(Activity activity) {
return new Protogenesis(activity).settingIntent();
}
- /**
- * whether is xiaomi
- *
- * @return true if it is
- */
- public static boolean isXiaoMi() {
+ public static boolean isXIAOMI() {
return getManufacturer().equalsIgnoreCase(MANUFACTURER_XIAOMI);
}
+
+ public static boolean isOPPO() {
+ return getManufacturer().equalsIgnoreCase(MANUFACTURER_OPPO);
+ }
+
+ public static boolean isMEIZU() {
+ return getManufacturer().equalsIgnoreCase(MANUFACTURER_MEIZU);
+ }
+
+ public static boolean isUnderMHasPermissionRequestManufacturer() {
+ return (getManufacturer().equalsIgnoreCase(MANUFACTURER_MEIZU) || getManufacturer()
+ .equalsIgnoreCase(MANUFACTURER_XIAOMI)) && Build.VERSION.SDK_INT >= Build.VERSION_CODES
+ .LOLLIPOP && Build.VERSION.SDK_INT < Build.VERSION_CODES.M;
+ }
}
diff --git a/permissions4m-api/src/main/java/com/joker/api/wrapper/AbstractWrapper.java b/permissions4m-api/src/main/java/com/joker/api/wrapper/AbstractWrapper.java
index 5c8ae24..bb29ada 100644
--- a/permissions4m-api/src/main/java/com/joker/api/wrapper/AbstractWrapper.java
+++ b/permissions4m-api/src/main/java/com/joker/api/wrapper/AbstractWrapper.java
@@ -1,10 +1,16 @@
package com.joker.api.wrapper;
import android.app.Activity;
+import android.content.pm.PackageManager;
import android.os.Build;
+import android.support.v4.content.ContextCompat;
import com.joker.api.Permissions4M;
import com.joker.api.PermissionsProxy;
+import com.joker.api.apply.ForceApplyPermissions;
+import com.joker.api.apply.NormalApplyPermissions;
+import com.joker.api.apply.PermissionsChecker;
+import com.joker.api.support.PermissionsPageManager;
import java.lang.ref.WeakReference;
import java.util.HashMap;
@@ -19,6 +25,7 @@ public abstract class AbstractWrapper implements Wrapper {
@Permissions4M.PageType
private static final int DEFAULT_PAGE_TYPE = Permissions4M.PageType.ANDROID_SETTING_PAGE;
private static final int DEFAULT_REQUEST_CODE = -1;
+ private static final boolean DEFAULT_IS_FORCE = true;
private static Map
+ * 2.it's not the {@link PermissionsPageManager#isUnderMHasPermissionRequestManufacturer()}, and
+ * Version Code is bigger than {@link android.os.Build.VERSION_CODES#M}
+ *
+ * 3.under {@link android.os.Build.VERSION_CODES#M}, and it's
+ * {@link PermissionsPageManager#isUnderMHasPermissionRequestManufacturer()}
+ */
+ @SuppressWarnings("unchecked")
+ private void requestPermissionWithAnnotation() {
+ PermissionsProxy proxy = getProxy(getContext().getClass().getName());
+
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M && !PermissionsPageManager
+ .isUnderMHasPermissionRequestManufacturer()) {
+ proxy.granted(getContext(), getRequestCode());
+ } else if (!PermissionsPageManager.isUnderMHasPermissionRequestManufacturer()) {
+ String permission = getPermission();
+ if (ContextCompat.checkSelfPermission(getActivity(), permission) != PackageManager
+ .PERMISSION_GRANTED) {
+ tryRequestWithAnnotation();
+ } else {
+ mayGrantedWithAnnotation();
+ }
+ } else {
+ if (PermissionsChecker.isPermissionGranted(getActivity(), getPermission())) {
+ proxy.granted(getContext(), getRequestCode());
+ } else {
+ ForceApplyPermissions.deniedOnResultWithAnnotationForUnderMManufacturer(this);
+ }
+ }
+ }
+
+ private void mayGrantedWithAnnotation() {
+ if (isRequestForce()) {
+ ForceApplyPermissions.grantedOnResultWithAnnotation(this);
+ } else {
+ NormalApplyPermissions.grantedWithAnnotation(this);
+ }
+ }
+
+ /**
+ * 1.under {@link android.os.Build.VERSION_CODES#M}, and it's not the
+ * {@link PermissionsPageManager#isUnderMHasPermissionRequestManufacturer()} manufacturer (those are
+ * some manufacturers that has permission manage under M)
+ *
+ * 2.it's not the {@link PermissionsPageManager#isUnderMHasPermissionRequestManufacturer()}, and
+ * Version Code is bigger than {@link android.os.Build.VERSION_CODES#M}
+ *
+ * 3.under {@link android.os.Build.VERSION_CODES#M}, and it's
+ * {@link PermissionsPageManager#isUnderMHasPermissionRequestManufacturer()}
+ */
+ private void requestPermissionWithListener() {
+ PermissionRequestListener listener = getPermissionRequestListener();
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M && !PermissionsPageManager
+ .isUnderMHasPermissionRequestManufacturer()) {
+ if (listener != null) {
+ listener.permissionGranted();
+ }
+ } else if (!PermissionsPageManager.isUnderMHasPermissionRequestManufacturer()) {
+ String permission = getPermission();
+ if (ContextCompat.checkSelfPermission(getActivity(), permission) != PackageManager
+ .PERMISSION_GRANTED) {
+ tryRequestWithListener();
+ } else {
+ mayGrantedWithListener();
+ }
} else {
- getProxy(object.getClass().getName()).startSyncRequestPermissionsMethod(object);
+ if (PermissionsChecker.isPermissionGranted(getActivity(), getPermission())) {
+ if (listener != null) {
+ listener.permissionGranted();
+ }
+ } else {
+ ForceApplyPermissions.deniedOnResultWithListenerForUnderMManufacturer(this);
+ }
+ }
+ }
+
+ private void mayGrantedWithListener() {
+ if (isRequestForce()) {
+ ForceApplyPermissions.grantedOnResultWithListener(this);
+ } else {
+ NormalApplyPermissions.grantedWithListener(this);
}
}
- abstract void requestPermissionWithAnnotation();
+ /**
+ * request in second request, should use original request with no callback.
+ */
+ abstract void originalRequest();
+
+ /**
+ * use annotation request
+ */
+ abstract void tryRequestWithAnnotation();
- abstract void requestPermissionWithListener();
+ /**
+ * use listener request
+ */
+ abstract void tryRequestWithListener();
public static class Key {
private int requestCode;
diff --git a/permissions4m-api/src/main/java/com/joker/api/wrapper/ActivityWrapper.java b/permissions4m-api/src/main/java/com/joker/api/wrapper/ActivityWrapper.java
index 38ca80a..ba8899f 100644
--- a/permissions4m-api/src/main/java/com/joker/api/wrapper/ActivityWrapper.java
+++ b/permissions4m-api/src/main/java/com/joker/api/wrapper/ActivityWrapper.java
@@ -1,14 +1,8 @@
package com.joker.api.wrapper;
+import android.annotation.SuppressLint;
import android.app.Activity;
-import android.content.pm.PackageManager;
-import android.os.Build;
import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-
-import com.joker.api.PermissionsProxy;
-import com.joker.api.apply.ForceApplyPermissions;
-import com.joker.api.apply.NormalApplyPermissions;
/**
* Created by joker on 2017/8/5.
@@ -32,44 +26,13 @@ public void requestSync() {
}
@Override
- void normalRequest() {
- activity.requestPermissions(new String[]{getPermission()}, getRequestCode());
- }
-
- @SuppressWarnings("unchecked")
- @Override
- void requestPermissionWithAnnotation() {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
- getProxy(getContext().getClass().getName()).granted(activity, getRequestCode());
- } else {
- String permission = getPermission();
- if (ContextCompat.checkSelfPermission(activity, permission) != PackageManager
- .PERMISSION_GRANTED) {
- tryRequestWithAnnotation();
- } else {
- // force
- mayGrantedWithAnnotation();
- }
- }
- }
-
- @Override
- void requestPermissionWithListener() {
- String permission = getPermission();
- int requestCode = getRequestCode();
-
- // denied
- if (ContextCompat.checkSelfPermission(activity, permission) != PackageManager
- .PERMISSION_GRANTED) {
- tryRequestWithListener(permission, requestCode);
- } else {
- // may granted
- mayGrantedWithListener();
- }
+ void originalRequest() {
+ ActivityCompat.requestPermissions(getActivity(), new String[]{getPermission()}, getRequestCode());
}
@SuppressWarnings("unchecked")
- private void tryRequestWithAnnotation() {
+ @SuppressLint("NewApi")
+ void tryRequestWithAnnotation() {
if ((getActivity()).shouldShowRequestPermissionRationale(getPermission())) {
if (!getProxy(getContext().getClass().getName()).customRationale(getActivity(),
getRequestCode())) {
@@ -84,31 +47,14 @@ private void tryRequestWithAnnotation() {
}
@SuppressWarnings("unchecked")
- private void mayGrantedWithAnnotation() {
- if (isRequestForce()) {
- // ensure granted
- ForceApplyPermissions.grantedOnResultWithAnnotation(this);
- } else {
- NormalApplyPermissions.grantedWithAnnotation(this);
- }
- }
-
- private void tryRequestWithListener(String permission, int requestCode) {
- if (ActivityCompat.shouldShowRequestPermissionRationale(activity, permission)) {
+ void tryRequestWithListener() {
+ if (ActivityCompat.shouldShowRequestPermissionRationale(activity, getPermission())) {
PermissionRequestListener requestListener = getPermissionRequestListener();
if (requestListener != null) {
requestListener.permissionRationale();
}
}
- ActivityCompat.requestPermissions(activity, new String[]{permission}, requestCode);
- }
-
- private void mayGrantedWithListener() {
- if (isRequestForce()) {
- ForceApplyPermissions.grantedOnResultWithListener(this);
- } else {
- NormalApplyPermissions.grantedWithListener(this);
- }
+ ActivityCompat.requestPermissions(activity, new String[]{getPermission()}, getRequestCode());
}
@Override
diff --git a/permissions4m-api/src/main/java/com/joker/api/wrapper/FragmentBaseWrapper.java b/permissions4m-api/src/main/java/com/joker/api/wrapper/FragmentBaseWrapper.java
index 3649794..acf86f7 100644
--- a/permissions4m-api/src/main/java/com/joker/api/wrapper/FragmentBaseWrapper.java
+++ b/permissions4m-api/src/main/java/com/joker/api/wrapper/FragmentBaseWrapper.java
@@ -1,11 +1,6 @@
package com.joker.api.wrapper;
-import android.content.pm.PackageManager;
-import android.os.Build;
-import android.support.v4.content.ContextCompat;
-
-import com.joker.api.apply.ForceApplyPermissions;
-import com.joker.api.apply.NormalApplyPermissions;
+import android.annotation.SuppressLint;
/**
* Created by joker on 2017/8/17.
@@ -16,59 +11,14 @@ public FragmentBaseWrapper() {
}
- @Override
- void requestPermissionWithAnnotation() {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
- if (getPermissionRequestListener() != null) {
- getPermissionRequestListener().permissionGranted();
- }
- } else {
- // Fragment、SupportFragment
- fragmentRequestWithAnnotation();
- }
- }
-
- @Override
- void requestPermissionWithListener() {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
- if (getPermissionRequestListener() != null) {
- getPermissionRequestListener().permissionGranted();
- }
- } else {
- // Fragment、SupportFragment
- fragmentRequestWithListener();
- }
- }
-
@SuppressWarnings("unchecked")
- private void fragmentRequestWithAnnotation() {
- String permission = getPermission();
- if (ContextCompat.checkSelfPermission(getActivity(), permission) != PackageManager
- .PERMISSION_GRANTED) {
- tryRequestWithAnnotation();
- } else {
- // may granted
- mayGrantedWithAnnotation();
- }
- }
-
- private void fragmentRequestWithListener() {
- String permission = getPermission();
- if (ContextCompat.checkSelfPermission(getActivity(), permission) != PackageManager
- .PERMISSION_GRANTED) {
- tryRequestWithListener();
- } else {
- // may granted
- mayGrantedWithListener();
- }
- }
-
- @SuppressWarnings("unchecked")
- private void tryRequestWithAnnotation() {
+ @SuppressLint("NewApi")
+ void tryRequestWithAnnotation() {
if (getContext() instanceof android.support.v4.app.Fragment) {
if (((android.support.v4.app.Fragment) getContext()).shouldShowRequestPermissionRationale
(getPermission())) {
- if (!getProxy(getContext().getClass().getName()).customRationale(getContext(), getRequestCode())) {
+ if (!getProxy(getContext().getClass().getName()).customRationale(getContext(),
+ getRequestCode())) {
getProxy(getContext().getClass().getName()).rationale(getContext(), getRequestCode());
((android.support.v4.app.Fragment) getContext()).requestPermissions(new
String[]{getPermission()}, getRequestCode());
@@ -80,7 +30,8 @@ private void tryRequestWithAnnotation() {
} else {
if (((android.app.Fragment) getContext()).shouldShowRequestPermissionRationale
(getPermission())) {
- if (!getProxy(getContext().getClass().getName()).customRationale(getContext(), getRequestCode())) {
+ if (!getProxy(getContext().getClass().getName()).customRationale(getContext(),
+ getRequestCode())) {
getProxy(getContext().getClass().getName()).rationale(getContext(), getRequestCode());
((android.app.Fragment) getContext()).requestPermissions(new String[]{getPermission()
}, getRequestCode());
@@ -92,15 +43,8 @@ private void tryRequestWithAnnotation() {
}
}
- private void mayGrantedWithListener() {
- if (isRequestForce()) {
- ForceApplyPermissions.grantedOnResultWithListener(this);
- } else {
- NormalApplyPermissions.grantedWithListener(this);
- }
- }
-
- private void tryRequestWithListener() {
+ @SuppressLint("NewApi")
+ void tryRequestWithListener() {
if (getContext() instanceof android.app.Fragment) {
if (((android.app.Fragment) getContext()).shouldShowRequestPermissionRationale(getPermission
())) {
@@ -124,17 +68,9 @@ private void tryRequestWithListener() {
}
}
- @SuppressWarnings("unchecked")
- private void mayGrantedWithAnnotation() {
- if (isRequestForce()) {
- ForceApplyPermissions.grantedOnResultWithAnnotation(this);
- } else {
- NormalApplyPermissions.grantedWithAnnotation(this);
- }
- }
-
@Override
- void normalRequest() {
+ @SuppressLint("NewApi")
+ void originalRequest() {
if (getContext() instanceof android.app.Fragment) {
((android.app.Fragment) getContext()).requestPermissions(new String[]{getPermission()},
getRequestCode());