Updated java RN util classes

* Removed unnecessary lines in settings.gradle file
* Cleaned build.gradle file

Author: mikechoch

android/src/main/java/com/geektime/rnonesignalandroid/RNOneSignal.java

@@ -1,11 +1,9 @@
 package com.geektime.rnonesignalandroid;
 
-import java.util.Collection;
 import java.util.Iterator;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.telecom.Call;
 import android.util.Log;
 import android.content.pm.ApplicationInfo;
 

android/src/main/java/com/geektime/rnonesignalandroid/RNUtils.java

@@ -109,7 +109,7 @@ public static WritableMap jsonToWritableMap(JSONObject jsonObject) {
                 } else if (value instanceof Double || value instanceof Long || value instanceof Float) {
                     String str = String.valueOf(value);
                     writableMap.putDouble(key, Double.parseDouble(str));
-                } else if (value instanceof String || value.getClass().isEnum()) {
+                } else if (value instanceof String) {
                     writableMap.putString(key, value.toString());
                 } else if (value instanceof JSONObject) {
                     writableMap.putMap(key, jsonToWritableMap((JSONObject) value));
@@ -151,12 +151,14 @@ public static WritableArray jsonArrayToWritableArray(JSONArray jsonArray) {
                 } else if (value instanceof Double || value instanceof Long || value instanceof Float) {
                     String str = String.valueOf(value);
                     writableArray.pushDouble(Double.parseDouble(str));
-                } else if (value instanceof String || value.getClass().isEnum()) {
+                } else if (value instanceof String) {
                     writableArray.pushString(value.toString());
                 } else if (value instanceof JSONObject) {
                     writableArray.pushMap(jsonToWritableMap((JSONObject) value));
                 } else if (value instanceof JSONArray) {
                     writableArray.pushArray(jsonArrayToWritableArray((JSONArray) value));
+                } else if (value.getClass().isEnum()) {
+                    writableArray.pushString(value.toString());
                 }
             } catch (JSONException e) {
                 // Do nothing and fail silently

examples/RNOneSignal/android/settings.gradle

@@ -1,5 +1,3 @@
 rootProject.name = 'RNOneSignal'
-include ':react-native-onesignal'
-project(':react-native-onesignal').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-onesignal/android')
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'