updated sdks, added --variables

README.md

@@ -12,8 +12,6 @@ SDK documentation and integration guides for IOS and Android:
 http://support.hockeyapp.net/kb/client-integration-ios-mac-os-x/hockeyapp-for-ios  
 http://support.hockeyapp.net/kb/client-integration-android-other-platforms/hockeyapp-for-android-sdk  
 
-TODO - update plugin to latest SDK versions 
-
 ## Installation
 
 #### Automatic Installation using PhoneGap/Cordova CLI (iOS and Android)
@@ -24,17 +22,5 @@ TODO - update plugin to latest SDK versions
 
 2. Install this plugin using PhoneGap/Cordova cli:
 
-        cordova plugin add https://github.com/wnyc/cordova-plugin-hockeyapp.git
-
-3. For iOS, modify HockeyAppPlugin.m, replacing with your configuration setting:
-
-        NSString * hockeyAppKey = @"__HOCKEY_APP_KEY__";
-
-   For Android, modify HockeyAppPlugin.java, replacing with your configuration setting:
-
-        String hockeyAppId="__HOCKEY_APP_KEY__";
-
-   Todo: better way to turn update check on/off (Android only) than having build script comment out code between __HOCKEY_APP_UPDATE_ACTIVE_START__ and __HOCKEY_APP_UPDATE_ACTIVE_END__ in HockeyAppPlugin.java 
-
-   Todo: pull GA key from configuration setting
+        cordova plugin add https://github.com/wnyc/cordova-plugin-hockeyapp.git --variable IOS_API_KEY="YOUR_IOS_APP_API_KEY" --variable ANDROID_API_KEY="YOUR_ANDROID_APP_API_KEY" --variable IS_STORE=true
 

plugin.xml

@@ -16,6 +16,8 @@
 
     <!-- android -->
     <platform name="android">
+        <preference name="ANDROID_API_KEY"/>
+
         <config-file target="res/xml/config.xml" parent="/*">
             <feature name="HockeyAppPlugin" >
                 <param name="android-package" value="org.nypr.cordova.hockeyappplugin.HockeyAppPlugin"/>
@@ -32,30 +34,38 @@
         <config-file target="AndroidManifest.xml" parent="/manifest/application">
           <activity android:name="net.hockeyapp.android.UpdateActivity" />
         </config-file>
+        <config-file target="AndroidManifest.xml" parent="application">
+          <meta-data android:name="hockey_app_api_key" android:value="$ANDROID_API_KEY"/>
+        </config-file>
 
         <source-file src="src/android/HockeyAppPlugin.java" target-dir="src/org/nypr/cordova/hockeyappplugin/" />
-        <source-file src="src/android/HockeySDK-3.0.2.jar" target-dir="libs" />
+        <source-file src="src/android/HockeySDK-3.6.2.jar" target-dir="libs" />
     </platform>
 
     <!-- ios -->
     <platform name="ios">
+        <preference name="IOS_API_KEY"/>
+
         <config-file target="config.xml" parent="/*">
             <feature name="HockeyAppPlugin">
                 <param name="ios-package" value="HockeyAppPlugin" />
                 <param name="onload" value="true" />
             </feature>
         </config-file>
+
+        <config-file target="*-Info.plist" parent="HockeyAppApiKey">
+            <string>$IOS_API_KEY</string>
+        </config-file>
 
         <dependency id="org.nypr.cordova.nslogger-cocoalumberjack-connector-plugin" url="https://github.com/wnyc/cordova-plugin-nslogger-cocoalumberjack-connector.git"  />
 
         <header-file src="src/ios/HockeyAppPlugin.h" />
-
         <source-file src="src/ios/HockeyAppPlugin.m" />
 
-        <resource-file src="src/ios/HockeySDK.embeddedframework/Resources/HockeySDKResources.bundle" />
-        <resource-file src="src/ios/HockeySDK.embeddedframework/Resources/HockeySDK.xcconfig" />
+        <resource-file src="src/ios/HockeySDK.framework/Resources/HockeySDKResources.bundle" />
 
-        <framework src="src/ios/HockeySDK.embeddedframework/HockeySDK.framework" custom="true"/>
+        <framework src="libc++.tbd" />
+        <framework src="src/ios/HockeySDK.framework" custom="true"/>
         <framework src="AssetsLibrary.framework" />
         <framework src="CoreText.framework" />
         <framework src="CoreGraphics.framework" />
@@ -66,6 +76,5 @@
         <framework src="Security.framework" />
         <framework src="SystemConfiguration.framework" />
         <framework src="UIKit.framework" />
-        <framework src="QuickLook.framework" />
     </platform>
 </plugin>

src/android/HockeyAppPlugin.java

@@ -13,15 +13,31 @@
 import java.lang.RuntimeException;
 import java.lang.Runnable;
 import java.lang.Thread;
+import java.lang.Exception;
 
 import android.util.Log;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
 
 public class HockeyAppPlugin extends CordovaPlugin {
 	protected static final String LOG_TAG = "HockeyAppPlugin";
+  protected String hockeyAppId;
+  protected Boolean isStore = false;
 
 	@Override
 	public void initialize(CordovaInterface cordova, CordovaWebView webView) {
 		super.initialize(cordova, webView);
+
+    try{
+      Context context = cordova.getActivity().getApplicationContext();
+      ApplicationInfo ai = context.getPackageManager().getApplicationInfo(context.getPackageName(), PackageManager.GET_META_DATA);
+
+      hockeyAppId = ai.metaData.getString("hockey_app_api_key");
+    } catch (Exception e) {
+      Log.e(LOG_TAG, "Unexpected error while reading application info.", e);
+		}
+
 	  _checkForCrashes();
 	  _checkForUpdates();
 		Log.d(LOG_TAG, "HockeyApp Plugin initialized");
@@ -66,20 +82,17 @@ public void onReset() {
 
 	protected void _checkForCrashes() {
 		Log.d(LOG_TAG, "HockeyApp Plugin checking for crashes");
-		String hockeyAppId="__HOCKEY_APP_KEY__"; // replaced by build script. better to pull from a a config file?
 		if(hockeyAppId!=null && !hockeyAppId.equals("") && !hockeyAppId.contains("HOCKEY_APP_KEY")){
 			CrashManager.register(cordova.getActivity(), hockeyAppId);
 		}
 	}
 
 	protected void _checkForUpdates() {
-		// Remove this for store builds!
-		//__HOCKEY_APP_UPDATE_ACTIVE_START__
-		Log.d(LOG_TAG, "HockeyApp Plugin checking for updates");
-		String hockeyAppId="__HOCKEY_APP_KEY__";
-		if(hockeyAppId!=null && !hockeyAppId.equals("") && !hockeyAppId.contains("HOCKEY_APP_KEY")){		
-			UpdateManager.register(cordova.getActivity(), hockeyAppId);
+		if(isStore == false){
+      Log.d(LOG_TAG, "HockeyApp Plugin checking for updates");
+      if(hockeyAppId!=null && !hockeyAppId.equals("") && !hockeyAppId.contains("HOCKEY_APP_KEY")){		
+        UpdateManager.register(cordova.getActivity(), hockeyAppId);
+      }
 		}
-		//__HOCKEY_APP_UPDATE_ACTIVE_END__
 	}
 }

src/ios/HockeyAppPlugin.m

@@ -22,7 +22,9 @@ @implementation HockeyAppPlugin
 #pragma mark Initialization
 
 - (void)pluginInitialize {
-    NSString * hockeyAppKey = @"__HOCKEY_APP_KEY__";
+    NSDictionary *infoPlist = [[NSBundle mainBundle] infoDictionary];
+    NSString * hockeyAppKey = [infoPlist objectForKey:@"HockeyAppApiKey"];
+
     if( hockeyAppKey!=nil && [hockeyAppKey isEqualToString:@""]==NO && [hockeyAppKey rangeOfString:@"HOCKEY_APP_KEY"].location == NSNotFound ){
 
         // initialize before HockeySDK, so the delegate can access the file logger