remove dependency of androidx in storage-android

Author: jwfing

android-sdk/storage-android/src/main/java/cn/leancloud/LCManifestUtils.java

@@ -5,8 +5,8 @@
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ServiceInfo;
-import androidx.core.app.ActivityCompat;
 
+import cn.leancloud.util.AndroidUtil;
 import cn.leancloud.utils.LogUtil;
 import cn.leancloud.utils.StringUtil;
 
@@ -28,7 +28,7 @@ public class LCManifestUtils {
    */
   public static boolean checkPermission(Context context, String permission) {
     boolean hasPermission =
-        (PackageManager.PERMISSION_GRANTED == ActivityCompat.checkSelfPermission(context, permission));
+        (PackageManager.PERMISSION_GRANTED == AndroidUtil.checkPermission(context, permission));
     if (!hasPermission) {
       printErrorLog("permission " + permission + " is missing!");
     }

android-sdk/storage-android/src/main/java/cn/leancloud/network/AndroidNetworkingDetector.java

@@ -1,15 +1,13 @@
 package cn.leancloud.network;
 
 import android.Manifest;
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.os.Build;
-import androidx.core.app.ActivityCompat;
 
 import cn.leancloud.LCLogger;
+import cn.leancloud.util.AndroidUtil;
 import cn.leancloud.utils.LogUtil;
 
 /**
@@ -25,10 +23,10 @@ public AndroidNetworkingDetector(Context context) {
   }
 
   //@RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
-  @TargetApi(Build.VERSION_CODES.N)
+//  @TargetApi(Build.VERSION_CODES.N)
   public boolean isConnected() {
     try {
-      int hasPermission = ActivityCompat.checkSelfPermission(this.context, Manifest.permission.ACCESS_NETWORK_STATE);
+      int hasPermission = AndroidUtil.checkPermission(this.context, Manifest.permission.ACCESS_NETWORK_STATE);
       if (PackageManager.PERMISSION_GRANTED != hasPermission) {
         LOGGER.w("android.Manifest.permission.ACCESS_NETWORK_STATE is not granted.");
       } else {
@@ -44,10 +42,10 @@ public boolean isConnected() {
     return false;
   }
 
-  @TargetApi(Build.VERSION_CODES.N)
+//  @TargetApi(Build.VERSION_CODES.N)
   public NetworkingDetector.NetworkType getNetworkType() {
     NetworkType result = NetworkType.None;
-    int hasPermission = ActivityCompat.checkSelfPermission(this.context, Manifest.permission.ACCESS_NETWORK_STATE);
+    int hasPermission = AndroidUtil.checkPermission(this.context, Manifest.permission.ACCESS_NETWORK_STATE);
     if (PackageManager.PERMISSION_GRANTED != hasPermission) {
       LOGGER.w("android.Manifest.permission.ACCESS_NETWORK_STATE is not granted.");
     } else {

android-sdk/storage-android/src/main/java/cn/leancloud/util/AndroidUtil.java

@@ -1,6 +1,9 @@
 package cn.leancloud.util;
 
+import android.content.Context;
+import android.content.pm.PackageManager;
 import android.os.Looper;
+import android.os.Process;
 
 /**
  * Created by fengjunwen on 2018/8/11.
@@ -10,4 +13,11 @@ public class AndroidUtil {
   public static boolean isMainThread() {
     return (Looper.myLooper() == Looper.getMainLooper());
   }
+
+  public static int checkPermission(Context context, String permission) {
+    if (null == context) {
+      return PackageManager.PERMISSION_DENIED;
+    }
+    return context.checkPermission(permission, android.os.Process.myPid(), Process.myUid());
+  }
 }