feat(filog): handle exception error to the bluetooth

Signed-off-by: Ivan Del Pino <idelpino@teclib.com>
glpi-project · Oct 1, 2018 · c13f173 · c13f173
1 parent 7446242
commit c13f173
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/inventory/src/main/java/org/flyve/inventory/CommonErrorType.java b/inventory/src/main/java/org/flyve/inventory/CommonErrorType.java
@@ -22,4 +22,8 @@ public class CommonErrorType {
     public static final int BIOS_SYSTEM_SERIAL = 208;
     public static final int BIOS_SERIAL_PRIVATE = 209;
     public static final int BIOS_CPU_SERIAL = 210;
-}
+
+    /* Bluetooth */
+    public static final int BLUETOOTH_HARDWARE_ADDRESS = 201;
+    public static final int BLUETOOTH_NAME = 202;
+}
diff --git a/inventory/src/main/java/org/flyve/inventory/categories/Bluetooth.java b/inventory/src/main/java/org/flyve/inventory/categories/Bluetooth.java
@@ -31,6 +31,7 @@
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
 
+import org.flyve.inventory.CommonErrorType;
 import org.flyve.inventory.FILog;
 
 /**
@@ -50,8 +51,9 @@ public class Bluetooth extends Categories {
 	 */
     private static final long serialVersionUID = 3252750764653173048L;
     private BluetoothAdapter adapter;
+    private final Context context;
 
-   /**
+    /**
      * Indicates whether some other object is "equal to" this one
      * @param Object obj the reference object with which to compare
      * @return boolean true if the object is the same as the one given in argument
@@ -84,6 +86,8 @@ public int hashCode() {
     public Bluetooth(Context xCtx) {
         super(xCtx);
 
+        context = xCtx;
+
         adapter = BluetoothAdapter.getDefaultAdapter();
 
         if(adapter != null) {
@@ -107,15 +111,27 @@ public Bluetooth(Context xCtx) {
      * @return string with the hardware address
      */
     public String getHardwareAddress() {
-        return adapter.getAddress();
+        String address = "N/A";
+        try {
+            address = adapter.getAddress();
+        } catch (Exception ex) {
+            FILog.e(FILog.getMessage(context, CommonErrorType.BLUETOOTH_HARDWARE_ADDRESS, ex.getMessage()));
+        }
+        return address;
     }
 
     /**
      * Get the adapter name
      * @return string the name of the adapter
      */
     public String getName() {
-        return adapter.getName();
+        String name = "N/A";
+        try {
+            name = adapter.getName();
+        } catch (Exception ex) {
+            FILog.e(FILog.getMessage(context, CommonErrorType.BLUETOOTH_NAME, ex.getMessage()));
+        }
+        return name;
     }
 
 }