Merge pull request phonegap#1000 from aetchegoyen/master

Compatibility with phonegap 2.0 (js and java) (Cordova) and previuos versions (in JS file)

Android/AccountList/AccountList.java

@@ -7,6 +7,7 @@
 import android.accounts.Account;
 import android.accounts.AccountManager;
 
+import org.apache.cordova.DroidGap;
 import org.apache.cordova.api.Plugin;
 import org.apache.cordova.api.PluginResult;
 
@@ -18,7 +19,7 @@ public PluginResult execute(String action, JSONArray args, String callbackId) {
 		try {
 			JSONObject obj = args.getJSONObject(0);
 
-			AccountManager am = AccountManager.get(this.ctx.getContext());
+			AccountManager am = AccountManager.get(cordova.getActivity());
 
 			Account[] accounts;
 			if (obj.has("type"))

Android/AccountList/accountlist.js

@@ -1,13 +1,23 @@
-var AccountList = function() {};
-
-AccountList.prototype.get = function(params, success, fail) {
-	return PhoneGap.exec( function(args) {
-		success(args);
-	}, function(args) {
-		fail(args);
-	}, 'AccountList', '', [params]);
-};
+var AccountList = function(gap) {
 
-PhoneGap.addConstructor(function() {
-	PhoneGap.addPlugin('AccountList', new AccountList());
-});
+	AccountList.prototype.get = function(params, success, fail) {
+		return gap.exec( function(args) {
+			success(args);
+		}, function(args) {
+			fail(args);
+		}, 'AccountList', '', [params]);
+	};
+
+	gap.addConstructor(function () {
+		if (gap.addPlugin) {
+	            gap.addPlugin("AccountList", new AccountList());
+	        } else {
+	            if (!window.plugins) {
+	                window.plugins = {};
+	            }
+
+	            window.plugins.ccountList = new AccountList();
+	        }
+	});
+
+})(window.cordova || window.Cordova || window.PhoneGap);