Rename ApiKey resource identifiers to avoid collisions with other plu…

…gins

* api_key is too generic and has high probability to collide
* [Android] installing with plugman's --link option makes all projects leak their keys into the same source file. It's better to add the key in strings.xml

plugin.xml

@@ -46,23 +46,21 @@
     <framework src="SystemConfiguration.framework" />
     <framework src="MobileCoreServices.framework" />
 
-    <config-file target="*-Info.plist" parent="ApiUser">
+    <config-file target="*-Info.plist" parent="SendGridApiUser">
         <string>$API_USER</string>
     </config-file>
 
-    <config-file target="*-Info.plist" parent="ApiKey">
+    <config-file target="*-Info.plist" parent="SendGridApiKey">
         <string>$API_KEY</string>
     </config-file>
 
   </platform>
 
   	<platform name="android">
 
-		<source-file src="src/android/res/values/sendgrid.xml" target-dir="res/values" />
-
-        <config-file target="res/values/sendgrid.xml" parent="/*">
-            <string name="api_user">$API_USER</string>
-            <string name="api_key">$API_KEY</string>
+        <config-file target="res/values/strings.xml" parent="/*">
+            <string name="sendgrid_api_user">$API_USER</string>
+            <string name="sendgrid_api_key">$API_KEY</string>
         </config-file>
 
 		<config-file target="res/xml/config.xml" parent="/*">

src/android/SendGridPlugin.java

@@ -32,10 +32,10 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
 
     private void send(final CallbackContext callbackContext, final JSONObject jsonObject) throws JSONException, IOException {
 
-      int appResId = cordova.getActivity().getResources().getIdentifier("api_user", "string", cordova.getActivity().getPackageName());
+      int appResId = cordova.getActivity().getResources().getIdentifier("sendgrid_api_user", "string", cordova.getActivity().getPackageName());
       String apiUser = cordova.getActivity().getString(appResId);
 
-      appResId = cordova.getActivity().getResources().getIdentifier("api_key", "string", cordova.getActivity().getPackageName());
+      appResId = cordova.getActivity().getResources().getIdentifier("sendgrid_api_key", "string", cordova.getActivity().getPackageName());
 
       String apiKey = cordova.getActivity().getString(appResId);
 

src/ios/CDVSendGrid.m

@@ -14,8 +14,8 @@ - (void)sendWithWeb:(CDVInvokedUrlCommand*)command
     NSDictionary* body = [command.arguments objectAtIndex:0];
 
     if (body != nil) {
-        NSString *apiUser = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"ApiUser"];
-        NSString *apiKey = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"ApiKey"];
+        NSString *apiUser = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"SendGridApiUser"];
+        NSString *apiKey = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"SendGridApiKey"];
 
         SendGrid *sendGrid = [SendGrid apiUser:apiUser apiKey:apiKey];