Merge pull request #226 from douglasjunior/patch-3

Make 'com.google.android.gms:play-services-gcm' optional.
react-native-device-info · Oct 20, 2017 · 8a351c9 · 8a351c9
2 parents 3ff4845 + 7377c83
commit 8a351c9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/RNDeviceInfo/RNDeviceInfo.m b/RNDeviceInfo/RNDeviceInfo.m
@@ -18,6 +18,8 @@ @implementation RNDeviceInfo
 
 @synthesize isEmulator;
 
+@synthesize isEmulator;
+
 RCT_EXPORT_MODULE()
 
 + (BOOL)requiresMainQueueSetup

diff --git a/android/src/main/java/com/learnium/RNDeviceInfo/RNDeviceModule.java b/android/src/main/java/com/learnium/RNDeviceInfo/RNDeviceModule.java
@@ -15,8 +15,6 @@
 import android.telephony.TelephonyManager;
 import android.text.format.Formatter;
 
-import com.google.android.gms.iid.InstanceID;
-
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
@@ -141,7 +139,13 @@ public void getMacAddress(Promise p) {
       e.printStackTrace();
     }
 
-    constants.put("instanceId", InstanceID.getInstance(this.reactContext).getId());
+    try {
+      if (Class.forName("com.google.android.gms.iid.InstanceID") != null) {
+        constants.put("instanceId", com.google.android.gms.iid.InstanceID.getInstance(this.reactContext).getId());
+      }
+    } catch (ClassNotFoundException e) {
+      constants.put("instanceId", "N/A: Add com.google.android.gms:play-services-gcm to your project.");
+    }
     constants.put("serialNumber", Build.SERIAL);
     constants.put("deviceName", deviceName);
     constants.put("systemName", "Android");