resolve merge conflicts

Author: csath

android/src/main/java/com/csath/RNConfigReaderModule.java

@@ -1,7 +1,14 @@
 
 package com.csath;
 
-import java.lang.reflect.*;
+import android.content.Context;
+import android.content.res.Resources;
+import android.util.Log;
+
+import java.lang.ClassNotFoundException;
+import java.lang.IllegalAccessException;
+import java.lang.reflect.Field;
+
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
@@ -13,14 +20,8 @@
 import java.util.HashMap;
 
 public class RNConfigReaderModule extends ReactContextBaseJavaModule {
-
-  private final ReactApplicationContext reactContext;
-  private final Class buildConfigClass;
-
-  public RNConfigReaderModule(ReactApplicationContext reactContext, Class buildConfigClass) {
+  public RNConfigReaderModule(ReactApplicationContext reactContext) {
     super(reactContext);
-    this.reactContext = reactContext;
-    this.buildConfigClass = buildConfigClass;
   }
 
   @Override
@@ -31,20 +32,28 @@ public String getName() {
   @Override
   public Map<String, Object> getConstants() {
       final Map<String, Object> constants = new HashMap<>();
-      Field[] fields = this.buildConfigClass.getDeclaredFields();
-      for (Field f : fields) {
-          if (Modifier.isStatic(f.getModifiers())) {
-              Object value = null;
-              try{
-                  value = f.get(null);
-              }
-              catch(Exception e){
-
-              }
-              finally {
-                  constants.put(f.getName(), value);
-              }
-          } 
+      try {
+        Context context = getReactApplicationContext();
+        int resId = context.getResources().getIdentifier("rn_config_reader_custom_package", "string", context.getPackageName());
+        String className;
+        try {
+          className = context.getString(resId);
+        } catch (Resources.NotFoundException e) {
+          className = getReactApplicationContext().getApplicationContext().getPackageName();
+        }
+        Class clazz = Class.forName(className + ".BuildConfig");
+        Field[] fields = clazz.getDeclaredFields();
+        for(Field f: fields) {
+          try {
+            constants.put(f.getName(), f.get(null));
+          }
+          catch (IllegalAccessException e) {
+            Log.d("ReactNative", "RNConfigReader: Could not access BuildConfig field " + f.getName());
+          }
+        }
+      }
+      catch (ClassNotFoundException e) {
+        Log.d("ReactNative", "RNConfigReader: Could not find BuildConfig class");
       }
       return constants;
   }

android/src/main/java/com/csath/RNConfigReaderPackage.java

@@ -12,14 +12,9 @@
 import com.facebook.react.bridge.JavaScriptModule;
 
 public class RNConfigReaderPackage implements ReactPackage {
-    private final Class buildConfigclass;
-
-    public RNConfigReaderPackage(Class buildConfigclass) {
-        this.buildConfigclass = buildConfigclass;
-    }
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
-      return Arrays.<NativeModule>asList(new RNConfigReaderModule(reactContext, this.buildConfigclass));
+      return Arrays.<NativeModule>asList(new RNConfigReaderModule(reactContext));
     }
 
     // Deprecated from RN 0.47