Merge pull request #280 from odemolliens/master

Check bluetooth permission before we start to get device bluetooth name
react-native-device-info · Jan 30, 2018 · f9a9652 · f9a9652
2 parents 275c64b + fcc08e3
commit f9a9652
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/android/src/main/java/com/learnium/RNDeviceInfo/RNDeviceModule.java b/android/src/main/java/com/learnium/RNDeviceInfo/RNDeviceModule.java
@@ -147,15 +147,21 @@ public String getCarrier() {
 
     String deviceName = "Unknown";
 
-    try {
-      BluetoothAdapter myDevice = BluetoothAdapter.getDefaultAdapter();
-      if(myDevice!=null){
-        deviceName = myDevice.getName();
+    String permission = "android.permission.BLUETOOTH";
+    int res = this.reactContext.checkCallingOrSelfPermission(permission);
+    if (res == PackageManager.PERMISSION_GRANTED) {
+      try {
+        BluetoothAdapter myDevice = BluetoothAdapter.getDefaultAdapter();
+        if (myDevice != null) {
+          deviceName = myDevice.getName();
+        }
+      } catch (Exception e) {
+        e.printStackTrace();
       }
-    } catch(Exception e) {
-      e.printStackTrace();
     }
 
+
+
     try {
       if (Class.forName("com.google.android.gms.iid.InstanceID") != null) {
         constants.put("instanceId", com.google.android.gms.iid.InstanceID.getInstance(this.reactContext).getId());