Commit 8a351c9a authored by Gant Laborde's avatar Gant Laborde Committed by GitHub

Merge pull request #226 from douglasjunior/patch-3

Make 'com.google.android.gms:play-services-gcm' optional.
parents 3ff48454 7377c83f
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
@synthesize isEmulator; @synthesize isEmulator;
@synthesize isEmulator;
RCT_EXPORT_MODULE() RCT_EXPORT_MODULE()
+ (BOOL)requiresMainQueueSetup + (BOOL)requiresMainQueueSetup
......
...@@ -15,8 +15,6 @@ import android.webkit.WebSettings; ...@@ -15,8 +15,6 @@ import android.webkit.WebSettings;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.format.Formatter; import android.text.format.Formatter;
import com.google.android.gms.iid.InstanceID;
import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContextBaseJavaModule; import com.facebook.react.bridge.ReactContextBaseJavaModule;
import com.facebook.react.bridge.ReactMethod; import com.facebook.react.bridge.ReactMethod;
...@@ -141,7 +139,13 @@ public class RNDeviceModule extends ReactContextBaseJavaModule { ...@@ -141,7 +139,13 @@ public class RNDeviceModule extends ReactContextBaseJavaModule {
e.printStackTrace(); 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("serialNumber", Build.SERIAL);
constants.put("deviceName", deviceName); constants.put("deviceName", deviceName);
constants.put("systemName", "Android"); constants.put("systemName", "Android");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment