github/cordova-android
4
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-04-23 00:00:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename to Cordova

Browse Source
This commit is contained in:
macdonst
2012-02-01 20:45:49 -05:00
parent fa4d6d369a
commit 664a061d10
97 changed files with 699 additions and 697 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/src/com/phonegap/AccelListener.java → framework/src/org/apache/cordova/AccelListener.java
+5 -5
View File
@@ -16,17 +16,17 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import java.util.List;
import org.apache.cordova.api.CordovaActivity;
import org.apache.cordova.api.Plugin;
import org.apache.cordova.api.PluginResult;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import com.phonegap.api.PhonegapActivity;
import com.phonegap.api.Plugin;
import com.phonegap.api.PluginResult;
import android.hardware.Sensor;
import android.hardware.SensorEvent;
@@ -72,7 +72,7 @@ public class AccelListener extends Plugin implements SensorEventListener {
*
* @param ctx The context of the main Activity.
*/
public void setContext(PhonegapActivity ctx) {
public void setContext(CordovaActivity ctx) {
super.setContext(ctx);
this.sensorManager = (SensorManager) ctx.getSystemService(Context.SENSOR_SERVICE);
}
framework/src/com/phonegap/App.java → framework/src/org/apache/cordova/App.java
+4 -4
View File
@@ -17,14 +17,14 @@
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import org.apache.cordova.api.LOG;
import org.apache.cordova.api.Plugin;
import org.apache.cordova.api.PluginResult;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import com.phonegap.api.LOG;
import com.phonegap.api.Plugin;
import com.phonegap.api.PluginResult;
import java.util.HashMap;
/**
framework/src/com/phonegap/AudioHandler.java → framework/src/org/apache/cordova/AudioHandler.java
+6 -5
View File
@@ -16,22 +16,23 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import android.content.Context;
import android.media.AudioManager;
import com.phonegap.api.Plugin;
import com.phonegap.api.PluginResult;
import java.util.ArrayList;
import org.apache.cordova.api.LOG;
import org.apache.cordova.api.Plugin;
import org.apache.cordova.api.PluginResult;
import org.json.JSONArray;
import org.json.JSONException;
import com.phonegap.api.LOG;
import java.util.HashMap;
import java.util.Map.Entry;
/**
* This class called by PhonegapActivity to play and record audio.
* This class called by CordovaActivity to play and record audio.
* The file can be local or over a network using http.
*
* Audio formats supported (tested):
framework/src/com/phonegap/AudioPlayer.java → framework/src/org/apache/cordova/AudioPlayer.java
+16 -16
View File
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import android.media.AudioManager;
import android.media.MediaPlayer;
@@ -31,8 +31,8 @@ import java.io.File;
import java.io.IOException;
/**
* This class implements the audio playback and recording capabilities used by PhoneGap.
* It is called by the AudioHandler PhoneGap class.
* This class implements the audio playback and recording capabilities used by Cordova.
* It is called by the AudioHandler Cordova class.
* Only one file can be played or recorded per class instance.
*
* Local audio files must reside in one of two places:
@@ -116,7 +116,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
public void startRecording(String file) {
if (this.mPlayer != null) {
Log.d(LOG_TAG, "AudioPlayer Error: Can't record in play mode.");
this.handler.sendJavascript("PhoneGap.Media.onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERR_ABORTED+");");
this.handler.sendJavascript("Cordova.Media.onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERR_ABORTED+");");
}
// Make sure we're not already recording
@@ -137,11 +137,11 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
} catch (IOException e) {
e.printStackTrace();
}
this.handler.sendJavascript("PhoneGap.Media.onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERR_ABORTED+");");
this.handler.sendJavascript("Cordova.Media.onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERR_ABORTED+");");
}
else {
Log.d(LOG_TAG, "AudioPlayer Error: Already recording.");
this.handler.sendJavascript("PhoneGap.Media.onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERR_ABORTED+");");
this.handler.sendJavascript("Cordova.Media.onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERR_ABORTED+");");
}
}
@@ -183,7 +183,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
public void startPlaying(String file) {
if (this.recorder != null) {
Log.d(LOG_TAG, "AudioPlayer Error: Can't play in record mode.");
this.handler.sendJavascript("PhoneGap.Media.onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERR_ABORTED+");");
this.handler.sendJavascript("Cordova.Media.onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERR_ABORTED+");");
}
// If this is a new request to play audio, or stopped
@@ -228,7 +228,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
}
catch (Exception e) {
e.printStackTrace();
this.handler.sendJavascript("PhoneGap.Media.onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERR_ABORTED+");");
this.handler.sendJavascript("Cordova.Media.onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERR_ABORTED+");");
}
}
@@ -242,7 +242,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
}
else {
Log.d(LOG_TAG, "AudioPlayer Error: startPlaying() called during invalid state: "+this.state);
this.handler.sendJavascript("PhoneGap.Media.onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERR_ABORTED+");");
this.handler.sendJavascript("Cordova.Media.onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERR_ABORTED+");");
}
}
}
@@ -254,7 +254,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
if (this.mPlayer != null) {
this.mPlayer.seekTo(milliseconds);
Log.d(LOG_TAG, "Send a onStatus update for the new seek");
this.handler.sendJavascript("PhoneGap.Media.onStatus('" + this.id + "', "+MEDIA_POSITION+", "+milliseconds/1000.0f+");");
this.handler.sendJavascript("Cordova.Media.onStatus('" + this.id + "', "+MEDIA_POSITION+", "+milliseconds/1000.0f+");");
}
}
@@ -270,7 +270,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
}
else {
Log.d(LOG_TAG, "AudioPlayer Error: pausePlaying() called during invalid state: "+this.state);
this.handler.sendJavascript("PhoneGap.Media.onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERR_NONE_ACTIVE+");");
this.handler.sendJavascript("Cordova.Media.onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERR_NONE_ACTIVE+");");
}
}
@@ -284,7 +284,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
}
else {
Log.d(LOG_TAG, "AudioPlayer Error: stopPlaying() called during invalid state: "+this.state);
this.handler.sendJavascript("PhoneGap.Media.onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERR_NONE_ACTIVE+");");
this.handler.sendJavascript("Cordova.Media.onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERR_NONE_ACTIVE+");");
}
}
@@ -305,7 +305,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
public long getCurrentPosition() {
if ((this.state == MEDIA_RUNNING) || (this.state == MEDIA_PAUSED)) {
int curPos = this.mPlayer.getCurrentPosition();
this.handler.sendJavascript("PhoneGap.Media.onStatus('" + this.id + "', "+MEDIA_POSITION+", "+curPos/1000.0f+");");
this.handler.sendJavascript("Cordova.Media.onStatus('" + this.id + "', "+MEDIA_POSITION+", "+curPos/1000.0f+");");
return curPos;
}
else {
@@ -384,7 +384,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
this.prepareOnly = false;
// Send status notification to JavaScript
this.handler.sendJavascript("PhoneGap.Media.onStatus('" + this.id + "', "+MEDIA_DURATION+","+this.duration+");");
this.handler.sendJavascript("Cordova.Media.onStatus('" + this.id + "', "+MEDIA_DURATION+","+this.duration+");");
}
@@ -413,7 +413,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
this.mPlayer.release();
// Send error notification to JavaScript
this.handler.sendJavascript("PhoneGap.Media.onStatus('" + this.id + "', "+MEDIA_ERROR+", "+arg1+");");
this.handler.sendJavascript("Cordova.Media.onStatus('" + this.id + "', "+MEDIA_ERROR+", "+arg1+");");
return false;
}
@@ -424,7 +424,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
*/
private void setState(int state) {
if (this.state != state) {
this.handler.sendJavascript("PhoneGap.Media.onStatus('" + this.id + "', "+MEDIA_STATE+", "+state+");");
this.handler.sendJavascript("Cordova.Media.onStatus('" + this.id + "', "+MEDIA_STATE+", "+state+");");
}
this.state = state;
framework/src/com/phonegap/AuthenticationToken.java → framework/src/org/apache/cordova/AuthenticationToken.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.phonegap;
package org.apache.cordova;
/**
* The Class AuthenticationToken defines the userName and password to be used for authenticating a web resource
framework/src/com/phonegap/BatteryListener.java → framework/src/org/apache/cordova/BatteryListener.java
+3 -3
View File
@@ -16,14 +16,14 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import org.apache.cordova.api.Plugin;
import org.apache.cordova.api.PluginResult;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import com.phonegap.api.Plugin;
import com.phonegap.api.PluginResult;
import android.content.BroadcastReceiver;
import android.content.Context;
framework/src/com/phonegap/CallbackServer.java → framework/src/org/apache/cordova/CallbackServer.java
+5 -5
View File
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import java.io.BufferedReader;
import java.io.DataOutputStream;
@@ -31,7 +31,7 @@ import java.util.LinkedList;
import android.util.Log;
/**
* This class provides a way for Java to run JavaScript in the web page that has loaded PhoneGap.
* This class provides a way for Java to run JavaScript in the web page that has loaded Cordova.
* The CallbackServer class implements an XHR server and a polling server with a list of JavaScript
* statements that are to be executed on the web page.
*
@@ -107,10 +107,10 @@ public class CallbackServer implements Runnable {
/**
* Init callback server and start XHR if running local app.
*
* If PhoneGap app is loaded from file://, then we can use XHR
* If Cordova app is loaded from file://, then we can use XHR
* otherwise we have to use polling due to cross-domain security restrictions.
*
* @param url The URL of the PhoneGap app being loaded
* @param url The URL of the Cordova app being loaded
*/
public void init(String url) {
//System.out.println("CallbackServer.start("+url+")");
@@ -137,7 +137,7 @@ public class CallbackServer implements Runnable {
/**
* Re-init when loading a new HTML page into webview.
*
* @param url The URL of the PhoneGap app being loaded
* @param url The URL of the Cordova app being loaded
*/
public void reinit(String url) {
this.stopServer();
framework/src/com/phonegap/CameraLauncher.java → framework/src/org/apache/cordova/CameraLauncher.java
+5 -5
View File
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -26,13 +26,13 @@ import java.io.IOException;
import java.io.OutputStream;
import org.apache.commons.codec.binary.Base64;
import org.apache.cordova.api.LOG;
import org.apache.cordova.api.Plugin;
import org.apache.cordova.api.PluginResult;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import com.phonegap.api.Plugin;
import com.phonegap.api.PluginResult;
import com.phonegap.api.LOG;
import android.app.Activity;
import android.content.ContentValues;
@@ -143,7 +143,7 @@ public class CameraLauncher extends Plugin {
/**
* Take a picture with the camera.
* When an image is captured or the camera view is cancelled, the result is returned
* in PhonegapActivity.onActivityResult, which forwards the result to this.onActivityResult.
* in CordovaActivity.onActivityResult, which forwards the result to this.onActivityResult.
*
* The image can either be returned as a base64 string or a URI that points to the file.
* To display base64 string in an img tag, set the source to:
framework/src/com/phonegap/Capture.java → framework/src/org/apache/cordova/Capture.java
+4 -4
View File
@@ -16,12 +16,15 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
import org.apache.cordova.api.LOG;
import org.apache.cordova.api.Plugin;
import org.apache.cordova.api.PluginResult;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -35,9 +38,6 @@ import android.media.MediaPlayer;
import android.net.Uri;
import android.util.Log;
import com.phonegap.api.LOG;
import com.phonegap.api.Plugin;
import com.phonegap.api.PluginResult;
public class Capture extends Plugin {
framework/src/com/phonegap/CompassListener.java → framework/src/org/apache/cordova/CompassListener.java
+5 -5
View File
@@ -16,17 +16,17 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import java.util.List;
import org.apache.cordova.api.CordovaActivity;
import org.apache.cordova.api.Plugin;
import org.apache.cordova.api.PluginResult;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import com.phonegap.api.PhonegapActivity;
import com.phonegap.api.Plugin;
import com.phonegap.api.PluginResult;
import android.hardware.Sensor;
import android.hardware.SensorEvent;
@@ -69,7 +69,7 @@ public class CompassListener extends Plugin implements SensorEventListener {
*
* @param ctx The context of the main Activity.
*/
public void setContext(PhonegapActivity ctx) {
public void setContext(CordovaActivity ctx) {
super.setContext(ctx);
this.sensorManager = (SensorManager) ctx.getSystemService(Context.SENSOR_SERVICE);
}
framework/src/com/phonegap/ContactAccessor.java → framework/src/org/apache/cordova/ContactAccessor.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.phonegap;
package org.apache.cordova;
import java.util.HashMap;
framework/src/com/phonegap/ContactAccessorSdk5.java → framework/src/org/apache/cordova/ContactAccessorSdk5.java
+1 -1
View File
@@ -17,7 +17,7 @@
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import java.io.ByteArrayOutputStream;
import java.io.FileInputStream;
framework/src/com/phonegap/ContactManager.java → framework/src/org/apache/cordova/ContactManager.java
+4 -4
View File
@@ -16,13 +16,13 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import org.apache.cordova.api.Plugin;
import org.apache.cordova.api.PluginResult;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import com.phonegap.api.Plugin;
import com.phonegap.api.PluginResult;
import android.util.Log;
public class ContactManager extends Plugin {
@@ -59,7 +59,7 @@ public class ContactManager extends Plugin {
/**
* Check to see if we are on an Android 1.X device. If we are return an error as we
* do not support this as of PhoneGap 1.0.
* do not support this as of Cordova 1.0.
*/
if (android.os.Build.VERSION.RELEASE.startsWith("1.")) {
JSONObject res = null;
framework/src/com/phonegap/CordovaChromeClient.java → framework/src/org/apache/cordova/CordovaChromeClient.java
+4 -4
View File
@@ -16,11 +16,11 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import org.apache.cordova.api.LOG;
import org.json.JSONArray;
import org.json.JSONException;
import com.phonegap.api.LOG;
import android.app.AlertDialog;
import android.content.Context;
@@ -42,7 +42,7 @@ import android.widget.EditText;
public class CordovaChromeClient extends WebChromeClient {
private String TAG = "PhoneGapLog";
private String TAG = "CordovaLog";
private long MAX_QUOTA = 100 * 1024 * 1024;
private DroidGap ctx;
@@ -213,7 +213,7 @@ public class CordovaChromeClient extends WebChromeClient {
result.confirm(r);
}
// PhoneGap JS has initialized, so show webview
// Cordova JS has initialized, so show webview
// (This solves white flash seen when rendering HTML)
else if (reqOk && defaultValue != null && defaultValue.equals("gap_init:")) {
ctx.appView.setVisibility(View.VISIBLE);
framework/src/com/phonegap/CordovaWebViewClient.java → framework/src/org/apache/cordova/CordovaWebViewClient.java
+5 -5
View File
@@ -16,9 +16,9 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import com.phonegap.api.LOG;
import org.apache.cordova.api.LOG;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
@@ -135,7 +135,7 @@ public class CordovaWebViewClient extends WebViewClient {
// All else
else {
// If our app or file:, then load into a new phonegap webview container by starting a new instance of our activity.
// If our app or file:, then load into a new Cordova webview container by starting a new instance of our activity.
// Our app continues to run. When BACK is pressed, our app is redisplayed.
if (url.startsWith("file://") || url.indexOf(this.ctx.baseUrl) == 0 || ctx.isUrlWhiteListed(url)) {
this.ctx.loadUrl(url);
@@ -218,10 +218,10 @@ public class CordovaWebViewClient extends WebViewClient {
// not loaded yet then just set a flag so that the onNativeReady can be fired
// from the JS side when the JS gets to that code.
if (!url.equals("about:blank")) {
ctx.appView.loadUrl("javascript:try{ PhoneGap.onNativeReady.fire();}catch(e){_nativeReady = true;}");
ctx.appView.loadUrl("javascript:try{ Cordova.onNativeReady.fire();}catch(e){_nativeReady = true;}");
}
// Make app visible after 2 sec in case there was a JS error and PhoneGap JS never initialized correctly
// Make app visible after 2 sec in case there was a JS error and Cordova JS never initialized correctly
if (ctx.appView.getVisibility() == View.INVISIBLE) {
Thread t = new Thread(new Runnable() {
public void run() {
framework/src/com/phonegap/Device.java → framework/src/org/apache/cordova/Device.java
+15 -14
View File
@@ -16,16 +16,17 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import java.util.TimeZone;
import org.apache.cordova.api.LOG;
import org.apache.cordova.api.CordovaActivity;
import org.apache.cordova.api.Plugin;
import org.apache.cordova.api.PluginResult;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import com.phonegap.api.LOG;
import com.phonegap.api.PhonegapActivity;
import com.phonegap.api.Plugin;
import com.phonegap.api.PluginResult;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -37,7 +38,7 @@ import android.telephony.TelephonyManager;
public class Device extends Plugin {
public static final String TAG = "Device";
public static String phonegapVersion = "1.4.1"; // PhoneGap version
public static String cordovaVersion = "1.4.1"; // Cordova version
public static String platform = "Android"; // Device OS
public static String uuid; // Device UUID
@@ -55,7 +56,7 @@ public class Device extends Plugin {
*
* @param ctx The context of the main Activity.
*/
public void setContext(PhonegapActivity ctx) {
public void setContext(CordovaActivity ctx) {
super.setContext(ctx);
Device.uuid = getUuid();
this.initTelephonyReceiver();
@@ -80,10 +81,10 @@ public class Device extends Plugin {
r.put("version", this.getOSVersion());
r.put("platform", Device.platform);
r.put("name", this.getProductName());
r.put("phonegap", Device.phonegapVersion);
r.put("cordova", Device.cordovaVersion);
//JSONObject pg = new JSONObject();
//pg.put("version", Device.phonegapVersion);
//r.put("phonegap", pg);
//pg.put("version", Device.CordovaVersion);
//r.put("cordova", pg);
return new PluginResult(status, r);
}
return new PluginResult(status, result);
@@ -124,7 +125,7 @@ public class Device extends Plugin {
private void initTelephonyReceiver() {
IntentFilter intentFilter = new IntentFilter() ;
intentFilter.addAction(TelephonyManager.ACTION_PHONE_STATE_CHANGED);
final PhonegapActivity myctx = this.ctx;
final CordovaActivity myctx = this.ctx;
this.telephonyReceiver = new BroadcastReceiver() {
@Override
@@ -175,12 +176,12 @@ public class Device extends Plugin {
}
/**
* Get the PhoneGap version.
* Get the Cordova version.
*
* @return
*/
public String getPhonegapVersion() {
return Device.phonegapVersion;
public String getCordovaVersion() {
return Device.cordovaVersion;
}
public String getModel() {
framework/src/com/phonegap/DirectoryManager.java → framework/src/org/apache/cordova/DirectoryManager.java
+1 -1
View File
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import java.io.File;
framework/src/com/phonegap/DroidGap.java → framework/src/org/apache/cordova/DroidGap.java
+32 -32
View File
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import java.io.IOException;
import java.util.ArrayList;
@@ -27,6 +27,12 @@ import java.util.Stack;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.cordova.PreferenceNode;
import org.apache.cordova.PreferenceSet;
import org.apache.cordova.api.IPlugin;
import org.apache.cordova.api.LOG;
import org.apache.cordova.api.CordovaActivity;
import org.apache.cordova.api.PluginManager;
import org.json.JSONArray;
import org.json.JSONException;
import org.xmlpull.v1.XmlPullParserException;
@@ -70,25 +76,19 @@ import android.webkit.WebViewClient;
import android.widget.EditText;
import android.widget.LinearLayout;
import com.phonegap.api.IPlugin;
import com.phonegap.api.LOG;
import com.phonegap.api.PhonegapActivity;
import com.phonegap.api.PluginManager;
import com.phonegap.PreferenceNode;
import com.phonegap.PreferenceSet;
/**
* This class is the main Android activity that represents the PhoneGap
* This class is the main Android activity that represents the Cordova
* application. It should be extended by the user to load the specific
* html file that contains the application.
*
* As an example:
*
* package com.phonegap.examples;
* package org.apache.cordova.examples;
* import android.app.Activity;
* import android.os.Bundle;
* import com.phonegap.*;
* import org.apache.cordova.*;
*
* public class Examples extends DroidGap {
* @Override
@@ -140,26 +140,26 @@ import com.phonegap.PreferenceSet;
* // Enable app to keep running in background. (Boolean - default=true)
* super.setBooleanProperty("keepRunning", false);
*
* Phonegap.xml configuration:
* PhoneGap uses a configuration file at res/xml/phonegap.xml to specify the following settings.
* Cordova.xml configuration:
* Cordova uses a configuration file at res/xml/cordova.xml to specify the following settings.
*
* Approved list of URLs that can be loaded into DroidGap
* <access origin="http://server regexp" subdomains="true" />
* Log level: ERROR, WARN, INFO, DEBUG, VERBOSE (default=ERROR)
* <log level="DEBUG" />
*
* Phonegap plugins:
* PhoneGap uses a file at res/xml/plugins.xml to list all plugins that are installed.
* Cordova plugins:
* Cordova uses a file at res/xml/plugins.xml to list all plugins that are installed.
* Before using a new plugin, a new element must be added to the file.
* name attribute is the service name passed to PhoneGap.exec() in JavaScript
* name attribute is the service name passed to Cordova.exec() in JavaScript
* value attribute is the Java class name to call.
*
* <plugins>
* <plugin name="App" value="com.phonegap.App"/>
* <plugin name="App" value="org.apache.cordova.App"/>
* ...
* </plugins>
*/
public class DroidGap extends PhonegapActivity {
public class DroidGap extends CordovaActivity {
public static String TAG = "DroidGap";
// The webview for our app
@@ -223,7 +223,7 @@ public class DroidGap extends PhonegapActivity {
// when another application (activity) is started.
protected boolean keepRunning = true;
// preferences read from phonegap.xml
// preferences read from cordova.xml
protected PreferenceSet preferences;
private boolean classicRender;
@@ -319,7 +319,7 @@ public class DroidGap extends PhonegapActivity {
public void onCreate(Bundle savedInstanceState) {
preferences = new PreferenceSet();
// Load PhoneGap configuration:
// Load Cordova configuration:
// white list of allowed URLs
// debug setting
this.loadConfiguration();
@@ -847,7 +847,7 @@ public class DroidGap extends PhonegapActivity {
}
// Send pause event to JavaScript
this.appView.loadUrl("javascript:try{PhoneGap.fireDocumentEvent('pause');}catch(e){};");
this.appView.loadUrl("javascript:try{Cordova.fireDocumentEvent('pause');}catch(e){};");
// Forward to plugins
this.pluginManager.onPause(this.keepRunning);
@@ -888,7 +888,7 @@ public class DroidGap extends PhonegapActivity {
}
// Send resume event to JavaScript
this.appView.loadUrl("javascript:try{PhoneGap.fireDocumentEvent('resume');}catch(e){};");
this.appView.loadUrl("javascript:try{Cordova.fireDocumentEvent('resume');}catch(e){};");
// Forward to plugins
this.pluginManager.onResume(this.keepRunning || this.activityResultKeepRunning);
@@ -918,7 +918,7 @@ public class DroidGap extends PhonegapActivity {
// Send destroy event to JavaScript
this.appView.loadUrl("javascript:try{PhoneGap.onDestroy.fire();}catch(e){};");
this.appView.loadUrl("javascript:try{Cordova.onDestroy.fire();}catch(e){};");
// Load blank page so that JavaScript onunload is called
this.appView.loadUrl("about:blank");
@@ -968,12 +968,12 @@ public class DroidGap extends PhonegapActivity {
}
/**
* Load the specified URL in the PhoneGap webview or a new browser instance.
* Load the specified URL in the Cordova webview or a new browser instance.
*
* NOTE: If openExternal is false, only URLs listed in whitelist can be loaded.
*
* @param url The url to load.
* @param openExternal Load url in browser instead of PhoneGap webview.
* @param openExternal Load url in browser instead of Cordova webview.
* @param clearHistory Clear the history stack, so new page becomes top of history
* @param params DroidGap parameters for new app
*/
@@ -1080,7 +1080,7 @@ public class DroidGap extends PhonegapActivity {
// If back key is bound, then send event to JavaScript
if (this.bound) {
this.appView.loadUrl("javascript:PhoneGap.fireDocumentEvent('backbutton');");
this.appView.loadUrl("javascript:Cordova.fireDocumentEvent('backbutton');");
return true;
}
@@ -1102,13 +1102,13 @@ public class DroidGap extends PhonegapActivity {
// If menu key
else if (keyCode == KeyEvent.KEYCODE_MENU) {
this.appView.loadUrl("javascript:PhoneGap.fireDocumentEvent('menubutton');");
this.appView.loadUrl("javascript:Cordova.fireDocumentEvent('menubutton');");
return super.onKeyDown(keyCode, event);
}
// If search key
else if (keyCode == KeyEvent.KEYCODE_SEARCH) {
this.appView.loadUrl("javascript:PhoneGap.fireDocumentEvent('searchbutton');");
this.appView.loadUrl("javascript:Cordova.fireDocumentEvent('searchbutton');");
return true;
}
@@ -1243,16 +1243,16 @@ public class DroidGap extends PhonegapActivity {
/**
* Load PhoneGap configuration from res/xml/phonegap.xml.
* Load Cordova configuration from res/xml/cordova.xml.
* Approved list of URLs that can be loaded into DroidGap
* <access origin="http://server regexp" subdomains="true" />
* Log level: ERROR, WARN, INFO, DEBUG, VERBOSE (default=ERROR)
* <log level="DEBUG" />
*/
private void loadConfiguration() {
int id = getResources().getIdentifier("phonegap", "xml", getPackageName());
int id = getResources().getIdentifier("cordova", "xml", getPackageName());
if (id == 0) {
LOG.i("PhoneGapLog", "phonegap.xml missing. Ignoring...");
LOG.i("CordovaLog", "cordova.xml missing. Ignoring...");
return;
}
XmlResourceParser xml = getResources().getXml(id);
@@ -1269,7 +1269,7 @@ public class DroidGap extends PhonegapActivity {
}
else if (strNode.equals("log")) {
String level = xml.getAttributeValue(null, "level");
LOG.i("PhoneGapLog", "Found log level %s", level);
LOG.i("CordovaLog", "Found log level %s", level);
if (level != null) {
LOG.setLogLevel(level);
}
@@ -1282,7 +1282,7 @@ public class DroidGap extends PhonegapActivity {
boolean readonly = (readonlyString != null &&
readonlyString.equals("true"));
LOG.i("PhoneGapLog", "Found preference for %s", name);
LOG.i("CordovaLog", "Found preference for %s", name);
preferences.add(new PreferenceNode(name, value, readonly));
}
framework/src/com/phonegap/ExifHelper.java → framework/src/org/apache/cordova/ExifHelper.java
+1 -1
View File
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import java.io.IOException;
framework/src/com/phonegap/FileTransfer.java → framework/src/org/apache/cordova/FileTransfer.java
+4 -4
View File
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -41,6 +41,8 @@ import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
import org.apache.cordova.api.Plugin;
import org.apache.cordova.api.PluginResult;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -49,8 +51,6 @@ import android.net.Uri;
import android.util.Log;
import android.webkit.CookieManager;
import com.phonegap.api.Plugin;
import com.phonegap.api.PluginResult;
public class FileTransfer extends Plugin {
@@ -67,7 +67,7 @@ public class FileTransfer extends Plugin {
private HostnameVerifier defaultHostnameVerifier = null;
/* (non-Javadoc)
* @see com.phonegap.api.Plugin#execute(java.lang.String, org.json.JSONArray, java.lang.String)
* @see org.apache.cordova.api.Plugin#execute(java.lang.String, org.json.JSONArray, java.lang.String)
*/
@Override
public PluginResult execute(String action, JSONArray args, String callbackId) {
framework/src/com/phonegap/FileUploadResult.java → framework/src/org/apache/cordova/FileUploadResult.java
+1 -1
View File
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import org.json.JSONException;
import org.json.JSONObject;
framework/src/com/phonegap/FileUtils.java → framework/src/org/apache/cordova/FileUtils.java
+10 -10
View File
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import java.io.*;
import java.net.MalformedURLException;
@@ -25,6 +25,14 @@ import java.net.URLDecoder;
import java.nio.channels.FileChannel;
import org.apache.commons.codec.binary.Base64;
import org.apache.cordova.api.CordovaActivity;
import org.apache.cordova.api.Plugin;
import org.apache.cordova.api.PluginResult;
import org.apache.cordova.file.EncodingException;
import org.apache.cordova.file.FileExistsException;
import org.apache.cordova.file.InvalidModificationException;
import org.apache.cordova.file.NoModificationAllowedException;
import org.apache.cordova.file.TypeMismatchException;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -36,14 +44,6 @@ import android.provider.MediaStore;
import android.util.Log;
import android.webkit.MimeTypeMap;
import com.phonegap.api.PhonegapActivity;
import com.phonegap.api.Plugin;
import com.phonegap.api.PluginResult;
import com.phonegap.file.EncodingException;
import com.phonegap.file.FileExistsException;
import com.phonegap.file.InvalidModificationException;
import com.phonegap.file.NoModificationAllowedException;
import com.phonegap.file.TypeMismatchException;
/**
* This class provides SD card file and directory services to JavaScript.
@@ -1014,7 +1014,7 @@ public class FileUtils extends Plugin {
* @param ctx the current applicaiton context
* @return the full path to the file
*/
protected static String getRealPathFromURI(Uri contentUri, PhonegapActivity ctx) {
protected static String getRealPathFromURI(Uri contentUri, CordovaActivity ctx) {
String[] proj = { _DATA };
Cursor cursor = ctx.managedQuery(contentUri, proj, null, null, null);
int column_index = cursor.getColumnIndexOrThrow(_DATA);
framework/src/com/phonegap/GeoBroker.java → framework/src/org/apache/cordova/GeoBroker.java
+3 -3
View File
@@ -16,16 +16,16 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import java.util.HashMap;
import java.util.Map.Entry;
import org.apache.cordova.api.Plugin;
import org.apache.cordova.api.PluginResult;
import org.json.JSONArray;
import org.json.JSONException;
import com.phonegap.api.Plugin;
import com.phonegap.api.PluginResult;
/*
* This class is the interface to the Geolocation. It's bound to the geo object.
framework/src/com/phonegap/GeoListener.java → framework/src/org/apache/cordova/GeoListener.java
+1 -1
View File
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import android.content.Context;
import android.location.Location;
framework/src/com/phonegap/GpsListener.java → framework/src/org/apache/cordova/GpsListener.java
+4 -4
View File
@@ -17,9 +17,9 @@
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import com.phonegap.api.PhonegapActivity;
import org.apache.cordova.api.CordovaActivity;
import android.content.Context;
import android.location.Location;
@@ -33,7 +33,7 @@ import android.os.Bundle;
*/
public class GpsListener implements LocationListener {
private PhonegapActivity mCtx; // PhonegapActivity object
private CordovaActivity mCtx; // CordovaActivity object
private LocationManager mLocMan; // Location manager object
private GeoListener owner; // Geolistener object (parent)
@@ -49,7 +49,7 @@ public class GpsListener implements LocationListener {
* @param interval
* @param m
*/
public GpsListener(PhonegapActivity ctx, int interval, GeoListener m) {
public GpsListener(CordovaActivity ctx, int interval, GeoListener m) {
this.owner = m;
this.mCtx = ctx;
this.mLocMan = (LocationManager) this.mCtx.getSystemService(Context.LOCATION_SERVICE);
framework/src/com/phonegap/HttpHandler.java → framework/src/org/apache/cordova/HttpHandler.java
+1 -1
View File
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import java.io.FileOutputStream;
import java.io.IOException;
framework/src/com/phonegap/LinearLayoutSoftKeyboardDetect.java → framework/src/org/apache/cordova/LinearLayoutSoftKeyboardDetect.java
+4 -4
View File
@@ -16,8 +16,8 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
import com.phonegap.api.LOG;
package org.apache.cordova;
import org.apache.cordova.api.LOG;
import android.content.Context;
import android.view.View.MeasureSpec;
@@ -87,13 +87,13 @@ public class LinearLayoutSoftKeyboardDetect extends LinearLayout {
// gone away.
else if (height > oldHeight) {
if(app != null)
app.sendJavascript("PhoneGap.fireDocumentEvent('hidekeyboard');");
app.sendJavascript("Cordova.fireDocumentEvent('hidekeyboard');");
}
// If the height as gotten smaller then we will assume the soft keyboard has
// been displayed.
else if (height < oldHeight) {
if(app != null)
app.sendJavascript("PhoneGap.fireDocumentEvent('showkeyboard');");
app.sendJavascript("Cordova.fireDocumentEvent('showkeyboard');");
}
// Update the old height for the next event
framework/src/com/phonegap/NetworkListener.java → framework/src/org/apache/cordova/NetworkListener.java
+10 -10
View File
@@ -16,9 +16,9 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import com.phonegap.api.PhonegapActivity;
import org.apache.cordova.api.CordovaActivity;
import android.content.Context;
import android.location.Location;
@@ -28,13 +28,13 @@ import android.os.Bundle;
public class NetworkListener implements LocationListener {
private PhonegapActivity mCtx; // PhonegapActivity object
private CordovaActivity mCtx; // CordovaActivity object
private LocationManager mLocMan; // Location manager object
private GeoListener owner; // Geolistener object (parent)
private boolean hasData = false; // Flag indicates if location data is available in cLoc
private Location cLoc; // Last recieved location
private boolean running = false; // Flag indicates if listener is running
private LocationManager mLocMan; // Location manager object
private GeoListener owner; // Geolistener object (parent)
private boolean hasData = false; // Flag indicates if location data is available in cLoc
private Location cLoc; // Last recieved location
private boolean running = false; // Flag indicates if listener is running
/**
* Constructor.
@@ -44,7 +44,7 @@ public class NetworkListener implements LocationListener {
* @param interval
* @param m
*/
public NetworkListener(PhonegapActivity ctx, int interval, GeoListener m) {
public NetworkListener(CordovaActivity ctx, int interval, GeoListener m) {
this.owner = m;
this.mCtx = ctx;
this.mLocMan = (LocationManager) this.mCtx.getSystemService(Context.LOCATION_SERVICE);
@@ -115,7 +115,7 @@ public class NetworkListener implements LocationListener {
this.hasData = true;
this.cLoc = location;
// The GPS is the primary form of Geolocation in PhoneGap.
// The GPS is the primary form of Geolocation in Cordova.
// Only fire the success variables if the GPS is down for some reason.
if (!this.owner.mGps.hasLocation()) {
this.owner.success(location);
framework/src/com/phonegap/NetworkManager.java → framework/src/org/apache/cordova/NetworkManager.java
+5 -5
View File
@@ -16,13 +16,13 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import org.apache.cordova.api.CordovaActivity;
import org.apache.cordova.api.Plugin;
import org.apache.cordova.api.PluginResult;
import org.json.JSONArray;
import com.phonegap.api.PhonegapActivity;
import com.phonegap.api.Plugin;
import com.phonegap.api.PluginResult;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -87,7 +87,7 @@ public class NetworkManager extends Plugin {
*
* @param ctx The context of the main Activity.
*/
public void setContext(PhonegapActivity ctx) {
public void setContext(CordovaActivity ctx) {
super.setContext(ctx);
this.sockMan = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE);
this.connectionCallbackId = null;
framework/src/com/phonegap/Notification.java → framework/src/org/apache/cordova/Notification.java
+8 -8
View File
@@ -16,13 +16,13 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import org.apache.cordova.api.CordovaActivity;
import org.apache.cordova.api.Plugin;
import org.apache.cordova.api.PluginResult;
import org.json.JSONArray;
import org.json.JSONException;
import com.phonegap.api.Plugin;
import com.phonegap.api.PhonegapActivity;
import com.phonegap.api.PluginResult;
import android.app.AlertDialog;
import android.app.ProgressDialog;
import android.content.Context;
@@ -184,7 +184,7 @@ public class Notification extends Plugin {
*/
public synchronized void alert(final String message, final String title, final String buttonLabel, final String callbackId) {
final PhonegapActivity ctx = this.ctx;
final CordovaActivity ctx = this.ctx;
final Notification notification = this;
Runnable runnable = new Runnable() {
@@ -220,7 +220,7 @@ public class Notification extends Plugin {
*/
public synchronized void confirm(final String message, final String title, String buttonLabels, final String callbackId) {
final PhonegapActivity ctx = this.ctx;
final CordovaActivity ctx = this.ctx;
final Notification notification = this;
final String[] fButtons = buttonLabels.split(",");
@@ -284,7 +284,7 @@ public class Notification extends Plugin {
this.spinnerDialog = null;
}
final Notification notification = this;
final PhonegapActivity ctx = this.ctx;
final CordovaActivity ctx = this.ctx;
Runnable runnable = new Runnable() {
public void run() {
notification.spinnerDialog = ProgressDialog.show(ctx, title , message, true, true,
@@ -320,7 +320,7 @@ public class Notification extends Plugin {
this.progressDialog = null;
}
final Notification notification = this;
final PhonegapActivity ctx = this.ctx;
final CordovaActivity ctx = this.ctx;
Runnable runnable = new Runnable() {
public void run() {
notification.progressDialog = new ProgressDialog(ctx);
framework/src/com/phonegap/PreferenceNode.java → framework/src/org/apache/cordova/PreferenceNode.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.phonegap;
package org.apache.cordova;
// represents the <preference> element from the W3C config.xml spec
// see http://www.w3.org/TR/widgets/#the-preference-element-and-its-attributes
framework/src/com/phonegap/PreferenceSet.java → framework/src/org/apache/cordova/PreferenceSet.java
+3 -2
View File
@@ -1,8 +1,9 @@
package com.phonegap;
package org.apache.cordova;
import java.util.HashSet;
import com.phonegap.PreferenceNode;
import org.apache.cordova.PreferenceNode;
public class PreferenceSet {
private HashSet<PreferenceNode> innerSet;
framework/src/com/phonegap/StandAlone.java → framework/src/org/apache/cordova/StandAlone.java
+1 -1
View File
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import java.lang.reflect.Field;
framework/src/com/phonegap/Storage.java → framework/src/org/apache/cordova/Storage.java
+3 -3
View File
@@ -16,15 +16,15 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import java.io.File;
import org.apache.cordova.api.Plugin;
import org.apache.cordova.api.PluginResult;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import com.phonegap.api.Plugin;
import com.phonegap.api.PluginResult;
import android.content.Context;
import android.database.Cursor;
framework/src/com/phonegap/TempListener.java → framework/src/org/apache/cordova/TempListener.java
+5 -5
View File
@@ -16,15 +16,15 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap;
package org.apache.cordova;
import java.util.List;
import org.apache.cordova.api.CordovaActivity;
import org.apache.cordova.api.Plugin;
import org.apache.cordova.api.PluginResult;
import org.json.JSONArray;
import com.phonegap.api.PhonegapActivity;
import com.phonegap.api.Plugin;
import com.phonegap.api.PluginResult;
import android.hardware.Sensor;
import android.hardware.SensorEvent;
@@ -49,7 +49,7 @@ public class TempListener extends Plugin implements SensorEventListener {
*
* @param ctx The context of the main Activity.
*/
public void setContext(PhonegapActivity ctx) {
public void setContext(CordovaActivity ctx) {
super.setContext(ctx);
this.sensorManager = (SensorManager) ctx.getSystemService(Context.SENSOR_SERVICE);
}
framework/src/com/phonegap/api/PhonegapActivity.java → framework/src/org/apache/cordova/api/CordovaActivity.java
+5 -5
View File
@@ -16,16 +16,16 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap.api;
package org.apache.cordova.api;
import android.app.Activity;
import android.content.Intent;
/**
* The Phonegap activity abstract class that is extended by DroidGap.
* It is used to isolate plugin development, and remove dependency on entire Phonegap library.
* The Cordova activity abstract class that is extended by DroidGap.
* It is used to isolate plugin development, and remove dependency on entire Cordova library.
*/
public abstract class PhonegapActivity extends Activity {
public abstract class CordovaActivity extends Activity {
/**
* @deprecated
@@ -64,7 +64,7 @@ public abstract class PhonegapActivity extends Activity {
abstract public void setActivityResultCallback(IPlugin plugin);
/**
* Load the specified URL in the PhoneGap webview.
* Load the specified URL in the Cordova webview.
*
* @param url The URL to load.
*/
framework/src/com/phonegap/api/IPlugin.java → framework/src/org/apache/cordova/api/IPlugin.java
+5 -5
View File
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap.api;
package org.apache.cordova.api;
import org.json.JSONArray;
import android.content.Intent;
@@ -53,13 +53,13 @@ public interface IPlugin {
*
* @param ctx The context of the main Activity.
*/
void setContext(PhonegapActivity ctx);
void setContext(CordovaActivity ctx);
/**
* Sets the main View of the application, this is the WebView within which
* a PhoneGap app runs.
* a Cordova app runs.
*
* @param webView The PhoneGap WebView
* @param webView The Cordova WebView
*/
void setView(WebView webView);
@@ -109,7 +109,7 @@ public interface IPlugin {
/**
* By specifying a <url-filter> in plugins.xml you can map a URL (using startsWith atm) to this method.
*
* @param url The URL that is trying to be loaded in the PhoneGap webview.
* @param url The URL that is trying to be loaded in the Cordova webview.
* @return Return true to prevent the URL from loading. Default is false.
*/
boolean onOverrideUrlLoading(String url);
framework/src/com/phonegap/api/LOG.java → framework/src/org/apache/cordova/api/LOG.java
+3 -3
View File
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap.api;
package org.apache.cordova.api;
import android.util.Log;
@@ -44,7 +44,7 @@ public class LOG {
*/
public static void setLogLevel(int logLevel) {
LOGLEVEL = logLevel;
Log.i("PhoneGapLog", "Changing log level to " + logLevel);
Log.i("CordovaLog", "Changing log level to " + logLevel);
}
/**
@@ -58,7 +58,7 @@ public class LOG {
else if ("INFO".equals(logLevel)) LOGLEVEL = INFO;
else if ("WARN".equals(logLevel)) LOGLEVEL = WARN;
else if ("ERROR".equals(logLevel)) LOGLEVEL = ERROR;
Log.i("PhoneGapLog", "Changing log level to " + logLevel + "(" + LOGLEVEL + ")");
Log.i("CordovaLog", "Changing log level to " + logLevel + "(" + LOGLEVEL + ")");
}
/**
framework/src/com/phonegap/api/Plugin.java → framework/src/org/apache/cordova/api/Plugin.java
+6 -6
View File
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap.api;
package org.apache.cordova.api;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -33,7 +33,7 @@ public abstract class Plugin implements IPlugin {
public String id;
public WebView webView; // WebView object
public PhonegapActivity ctx; // PhonegapActivity object
public CordovaActivity ctx; // CordovaActivity object
/**
* Executes the request and returns PluginResult.
@@ -61,15 +61,15 @@ public abstract class Plugin implements IPlugin {
*
* @param ctx The context of the main Activity.
*/
public void setContext(PhonegapActivity ctx) {
public void setContext(CordovaActivity ctx) {
this.ctx = ctx;
}
/**
* Sets the main View of the application, this is the WebView within which
* a PhoneGap app runs.
* a Cordova app runs.
*
* @param webView The PhoneGap WebView
* @param webView The Cordova WebView
*/
public void setView(WebView webView) {
this.webView = webView;
@@ -127,7 +127,7 @@ public abstract class Plugin implements IPlugin {
/**
* By specifying a <url-filter> in plugins.xml you can map a URL (using startsWith atm) to this method.
*
* @param url The URL that is trying to be loaded in the PhoneGap webview.
* @param url The URL that is trying to be loaded in the Cordova webview.
* @return Return true to prevent the URL from loading. Default is false.
*/
public boolean onOverrideUrlLoading(String url) {
framework/src/com/phonegap/api/PluginManager.java → framework/src/org/apache/cordova/api/PluginManager.java
+13 -14
View File
@@ -1,5 +1,4 @@
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
@@ -16,7 +15,7 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap.api;
package org.apache.cordova.api;
import java.io.IOException;
import java.util.HashMap;
@@ -33,7 +32,7 @@ import android.util.Log;
import android.webkit.WebView;
/**
* PluginManager is exposed to JavaScript in the PhoneGap WebView.
* PluginManager is exposed to JavaScript in the Cordova WebView.
*
* Calling native plugin code can be done by calling PluginManager.exec(...)
* from JavaScript.
@@ -43,7 +42,7 @@ public final class PluginManager {
private HashMap<String, IPlugin> plugins = new HashMap<String,IPlugin>();
private HashMap<String, String> services = new HashMap<String,String>();
private final PhonegapActivity ctx;
private final CordovaActivity ctx;
private final WebView app;
// Map URL schemes like foo: to plugins that want to handle those schemes
@@ -56,7 +55,7 @@ public final class PluginManager {
* @param app
* @param ctx
*/
public PluginManager(WebView app, PhonegapActivity ctx) {
public PluginManager(WebView app, CordovaActivity ctx) {
this.ctx = ctx;
this.app = app;
this.loadPlugins();
@@ -126,8 +125,8 @@ public final class PluginManager {
* @param args An Array literal string containing any arguments needed in the
* plugin execute method.
* @param async Boolean indicating whether the calling JavaScript code is expecting an
* immediate return value. If true, either PhoneGap.callbackSuccess(...) or
* PhoneGap.callbackError(...) is called once the plugin code has executed.
* immediate return value. If true, either Cordova.callbackSuccess(...) or
* Cordova.callbackError(...) is called once the plugin code has executed.
*
* @return JSON encoded string with a response message and status.
*/
@@ -138,7 +137,7 @@ public final class PluginManager {
try {
final JSONArray args = new JSONArray(jsonArgs);
final IPlugin plugin = this.getPlugin(service);
final PhonegapActivity ctx = this.ctx;
final CordovaActivity ctx = this.ctx;
if (plugin != null) {
runAsync = async && !plugin.isSynch(action);
if (runAsync) {
@@ -213,15 +212,15 @@ public final class PluginManager {
/**
* Get the interfaces that a class implements and see if it implements the
* com.phonegap.api.Plugin interface.
* org.apache.cordova.api.Plugin interface.
*
* @param c The class to check the interfaces of.
* @return Boolean indicating if the class implements com.phonegap.api.Plugin
* @return Boolean indicating if the class implements org.apache.cordova.api.Plugin
*/
@SuppressWarnings("unchecked")
private boolean isPhoneGapPlugin(Class c) {
private boolean isCordovaPlugin(Class c) {
if (c != null) {
return com.phonegap.api.Plugin.class.isAssignableFrom(c) || com.phonegap.api.IPlugin.class.isAssignableFrom(c);
return org.apache.cordova.api.Plugin.class.isAssignableFrom(c) || org.apache.cordova.api.IPlugin.class.isAssignableFrom(c);
}
return false;
}
@@ -239,7 +238,7 @@ public final class PluginManager {
private IPlugin addPlugin(String pluginName, String className) {
try {
Class c = getClassByName(className);
if (isPhoneGapPlugin(c)) {
if (isCordovaPlugin(c)) {
IPlugin plugin = (IPlugin)c.newInstance();
this.plugins.put(className, plugin);
plugin.setContext(this.ctx);
@@ -353,7 +352,7 @@ public final class PluginManager {
private void pluginConfigurationMissing() {
System.err.println("=====================================================================================");
System.err.println("ERROR: plugin.xml is missing. Add res/xml/plugins.xml to your project.");
System.err.println("https://raw.github.com/phonegap/phonegap-android/master/framework/res/xml/plugins.xml");
System.err.println("https://git-wip-us.apache.org/repos/asf?p=incubator-cordova-android.git;a=blob;f=framework/res/xml/plugins.xml");
System.err.println("=====================================================================================");
}
}
framework/src/com/phonegap/api/PluginResult.java → framework/src/org/apache/cordova/api/PluginResult.java
+4 -4
View File
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
package com.phonegap.api;
package org.apache.cordova.api;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -100,16 +100,16 @@ public class PluginResult {
StringBuffer buf = new StringBuffer("");
if (cast != null) {
buf.append("var temp = "+cast+"("+this.getJSONString() + ");\n");
buf.append("PhoneGap.callbackSuccess('"+callbackId+"',temp);");
buf.append("Cordova.callbackSuccess('"+callbackId+"',temp);");
}
else {
buf.append("PhoneGap.callbackSuccess('"+callbackId+"',"+this.getJSONString()+");");
buf.append("Cordova.callbackSuccess('"+callbackId+"',"+this.getJSONString()+");");
}
return buf.toString();
}
public String toErrorCallbackString(String callbackId) {
return "PhoneGap.callbackError('"+callbackId+"', " + this.getJSONString()+ ");";
return "Cordova.callbackError('"+callbackId+"', " + this.getJSONString()+ ");";
}
public static String[] StatusMessages = new String[] {
framework/src/com/phonegap/file/EncodingException.java → framework/src/org/apache/cordova/file/EncodingException.java
+1 -1
View File
@@ -17,7 +17,7 @@
under the License.
*/
package com.phonegap.file;
package org.apache.cordova.file;
public class EncodingException extends Exception {
framework/src/com/phonegap/file/FileExistsException.java → framework/src/org/apache/cordova/file/FileExistsException.java
+1 -1
View File
@@ -17,7 +17,7 @@
under the License.
*/
package com.phonegap.file;
package org.apache.cordova.file;
public class FileExistsException extends Exception {
framework/src/com/phonegap/file/InvalidModificationException.java → framework/src/org/apache/cordova/file/InvalidModificationException.java
+1 -1
View File
@@ -18,7 +18,7 @@
*/
package com.phonegap.file;
package org.apache.cordova.file;
public class InvalidModificationException extends Exception {
framework/src/com/phonegap/file/NoModificationAllowedException.java → framework/src/org/apache/cordova/file/NoModificationAllowedException.java
+1 -1
View File
@@ -17,7 +17,7 @@
under the License.
*/
package com.phonegap.file;
package org.apache.cordova.file;
public class NoModificationAllowedException extends Exception {
framework/src/com/phonegap/file/TypeMismatchException.java → framework/src/org/apache/cordova/file/TypeMismatchException.java
+1 -1
View File
@@ -18,7 +18,7 @@
*/
package com.phonegap.file;
package org.apache.cordova.file;
public class TypeMismatchException extends Exception {