diff --git a/.gitignore b/.gitignore
index 0d47668d..b83f1e9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,9 +7,10 @@ framework/proguard.cfg
framework/phonegap.jar
framework/phonegap-*.jar
framework/bin
+framework/test/com/phonegap/*.class
framework/assets/www/.DS_Store
framework/assets/www/phonegap-*.js
example
-test
+./test
tmp
-*.tmp
\ No newline at end of file
+*.tmp
diff --git a/LICENSE b/LICENSE
index d6456956..6092a574 100644
--- a/LICENSE
+++ b/LICENSE
@@ -200,3 +200,227 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+
+ SUBCOMPONENTS
+
+ Apache Callback includes software components under different license terms.
+ Your use of these subcomponents is subject to the terms and conditions of
+ the following licenses.
+
+ For the framework/libs/junit-4.10.jar component:
+
+ Common Public License - v 1.0
+
+ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
+ LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+ CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+ 1. DEFINITIONS
+
+ "Contribution" means:
+
+ a) in the case of the initial Contributor, the initial code and
+ documentation distributed under this Agreement, and
+ b) in the case of each subsequent Contributor:
+
+ i) changes to the Program, and
+
+ ii) additions to the Program;
+
+ where such changes and/or additions to the Program originate from and are
+distributed by that particular Contributor. A Contribution 'originates' from a
+Contributor if it was added to the Program by such Contributor itself or anyone
+acting on such Contributor's behalf. Contributions do not include additions to
+the Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii) are
+not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+ 2. GRANT OF RIGHTS
+
+ a) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free copyright license to
+reproduce, prepare derivative works of, publicly display, publicly perform,
+distribute and sublicense the Contribution of such Contributor, if any, and
+such derivative works, in source code and object code form.
+
+ b) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free patent license under
+Licensed Patents to make, use, sell, offer to sell, import and otherwise
+transfer the Contribution of such Contributor, if any, in source code and
+object code form. This patent license shall apply to the combination of the
+Contribution and the Program if, at the time the Contribution is added by the
+Contributor, such addition of the Contribution causes such combination to be
+covered by the Licensed Patents. The patent license shall not apply to any
+other combinations which include the Contribution. No hardware per se is
+licensed hereunder.
+
+ c) Recipient understands that although each Contributor grants the
+licenses to its Contributions set forth herein, no assurances are provided by
+any Contributor that the Program does not infringe the patent or other
+intellectual property rights of any other entity. Each Contributor disclaims
+any liability to Recipient for claims brought by any other entity based on
+infringement of intellectual property rights or otherwise. As a condition to
+exercising the rights and licenses granted hereunder, each Recipient hereby
+assumes sole responsibility to secure any other intellectual property rights
+needed, if any. For example, if a third party patent license is required to
+allow Recipient to distribute the Program, it is Recipient's responsibility to
+acquire that license before distributing the Program.
+
+ d) Each Contributor represents that to its knowledge it has sufficient
+copyright rights in its Contribution, if any, to grant the copyright license
+set forth in this Agreement.
+
+ 3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under
+its own license agreement, provided that:
+
+ a) it complies with the terms and conditions of this Agreement; and
+
+ b) its license agreement:
+
+ i) effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose;
+
+ ii) effectively excludes on behalf of all Contributors all liability for
+damages, including direct, indirect, special, incidental and consequential
+damages, such as lost profits;
+
+ iii) states that any provisions which differ from this Agreement are
+offered by that Contributor alone and not by any other party; and
+
+ iv) states that source code for the Program is available from such
+Contributor, and informs licensees how to obtain it in a reasonable manner on
+or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+ a) it must be made available under this Agreement; and
+
+ b) a copy of this Agreement must be included with each copy of the
+Program.
+
+Contributors may not remove or alter any copyright notices contained within the
+Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if
+any, in a manner that reasonably allows subsequent Recipients to identify the
+originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a manner
+which does not create potential liability for other Contributors. Therefore, if
+a Contributor includes the Program in a commercial product offering, such
+Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+every other Contributor ("Indemnified Contributor") against any losses, damages
+and costs (collectively "Losses") arising from claims, lawsuits and other legal
+actions brought by a third party against the Indemnified Contributor to the
+extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may
+participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If that
+Commercial Contributor then makes performance claims, or offers warranties
+related to Product X, those performance claims and warranties are such
+Commercial Contributor's responsibility alone. Under this section, the
+Commercial Contributor would have to defend claims against the other
+Contributors related to those performance claims and warranties, and if a court
+requires any other Contributor to pay any damages as a result, the Commercial
+Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
+Recipient is solely responsible for determining the appropriateness of using
+and distributing the Program and assumes all risks associated with its exercise
+of rights under this Agreement, including but not limited to the risks and
+costs of program errors, compliance with applicable laws, damage to or loss of
+data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable
+law, it shall not affect the validity or enforceability of the remainder of the
+terms of this Agreement, and without further action by the parties hereto, such
+provision shall be reformed to the minimum extent necessary to make such
+provision valid and enforceable.
+
+If Recipient institutes patent litigation against a Contributor with respect to
+a patent applicable to software (including a cross-claim or counterclaim in a
+lawsuit), then any patent licenses granted by that Contributor to such
+Recipient under this Agreement shall terminate as of the date such litigation
+is filed. In addition, if Recipient institutes patent litigation against any
+entity (including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other software or
+hardware) infringes such Recipient's patent(s), then such Recipient's rights
+granted under Section 2(b) shall terminate as of the date such litigation is
+filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and does
+not cure such failure in a reasonable period of time after becoming aware of
+such noncompliance. If all Recipient's rights under this Agreement terminate,
+Recipient agrees to cease use and distribution of the Program as soon as
+reasonably practicable. However, Recipient's obligations under this Agreement
+and any licenses granted by Recipient relating to the Program shall continue
+and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in
+order to avoid inconsistency the Agreement is copyrighted and may only be
+modified in the following manner. The Agreement Steward reserves the right to
+publish new versions (including revisions) of this Agreement from time to time.
+No one other than the Agreement Steward has the right to modify this Agreement.
+IBM is the initial Agreement Steward. IBM may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year
+after the cause of action arose. Each party waives its rights to a jury trial
+in any resulting litigation.
diff --git a/NOTICE b/NOTICE
index fd7fb8e5..9795e405 100644
--- a/NOTICE
+++ b/NOTICE
@@ -4,3 +4,9 @@ Copyright 2011 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org)
+This product also includes the following third-party components:
+
+ * Junit (framework/libs/junit-4.10.jar) (http://junit.sourceforge.net)
+
+ Licensed under the Common Public License
+ http://junit.sourceforge.net/cpl-v10.html
diff --git a/README.md b/README.md
index 59431ec0..1f615532 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,16 @@
-PhoneGap Android
+Cordova Android
===
-PhoneGap Android is an Android application library that allows for PhoneGap based projects to be built for the Android Platform. PhoneGap based applications are, at the core, an application written with web technology: HTML, CSS and JavaScript.
+Cordova Android is an Android application library that allows for Cordova based projects to be built for the Android Platform. Cordova based applications are, at the core, an application written with web technology: HTML, CSS and JavaScript.
+
+Apache Cordova is an effort undergoing incubation at The Apache
+Software Foundation (ASF), sponsored by the Apache Incubator project.
+Incubation is required of all newly accepted projects until a further
+review indicates that the infrastructure, communications, and decision
+making process have stabilized in a manner consistent with other
+successful ASF projects. While incubation status is not necessarily
+a reflection of the completeness or stability of the code, it does
+indicate that the project has yet to be fully endorsed by the ASF.
Requires
---
@@ -10,21 +19,21 @@ Requires
- Apache ANT
- Android SDK [http://developer.android.com](http://developer.android.com)
-PhoneGap Android Developer Tools
+Cordova Android Developer Tools
---
-The PhoneGap developer tooling is split between general tooling and project level tooling.
+The Cordova developer tooling is split between general tooling and project level tooling.
General Commands
- ./bin/create [path package activity] ... create the ./example app or a phonegap android project
+ ./bin/create [path package activity] ... create the ./example app or a cordova android project
./bin/bench ............................ generate a bench proj
./bin/autotest ......................... test the cli tools
./bin/test ............................. run mobile-spec
Project Commands
-These commands live in a generated PhoneGap Android project.
+These commands live in a generated Cordova Android project.
./phonegap/debug [path] ..................... install to first device
./phonegap/emulate .......................... start avd (emulator) named default
@@ -52,12 +61,12 @@ Running the [callback/callback-test](http://github.com/callback/callback-test) t
./bin/test
-Creating a new PhoneGap Android Project
+Creating a new Cordova Android Project
---
./bin/create ~/Desktop/myapp com.phonegap.special MyApp
-Importing a PhoneGap Android Project into Eclipse
+Importing a Cordova Android Project into Eclipse
----
1. File > New > Project...
diff --git a/framework/assets/js/camera.js b/framework/assets/js/camera.js
index 17af89d7..e1467c63 100755
--- a/framework/assets/js/camera.js
+++ b/framework/assets/js/camera.js
@@ -127,7 +127,7 @@ Camera.prototype.getPicture = function(successCallback, errorCallback, options)
options.maxResolution = 0;
}
if (options.destinationType === null || typeof options.destinationType === "undefined") {
- options.destinationType = Camera.DestinationType.DATA_URL;
+ options.destinationType = Camera.DestinationType.FILE_URI;
}
if (options.sourceType === null || typeof options.sourceType === "undefined") {
options.sourceType = Camera.PictureSourceType.CAMERA;
diff --git a/framework/build.xml b/framework/build.xml
index 94b0bfdd..3e1da1d6 100644
--- a/framework/build.xml
+++ b/framework/build.xml
@@ -155,6 +155,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/framework/libs/junit-4.10.jar b/framework/libs/junit-4.10.jar
new file mode 100644
index 00000000..bf5c0b9c
Binary files /dev/null and b/framework/libs/junit-4.10.jar differ
diff --git a/framework/src/com/phonegap/AuthenticationToken.java b/framework/src/com/phonegap/AuthenticationToken.java
new file mode 100644
index 00000000..9b759aad
--- /dev/null
+++ b/framework/src/com/phonegap/AuthenticationToken.java
@@ -0,0 +1,51 @@
+package com.phonegap;
+
+/**
+ * The Class AuthenticationToken defines the userName and password to be used for authenticating a web resource
+ */
+public class AuthenticationToken {
+ private String userName;
+ private String password;
+
+ /**
+ * Gets the user name.
+ *
+ * @return the user name
+ */
+ public String getUserName() {
+ return userName;
+ }
+
+ /**
+ * Sets the user name.
+ *
+ * @param userName
+ * the new user name
+ */
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ /**
+ * Gets the password.
+ *
+ * @return the password
+ */
+ public String getPassword() {
+ return password;
+ }
+
+ /**
+ * Sets the password.
+ *
+ * @param password
+ * the new password
+ */
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+
+
+
+}
diff --git a/framework/src/com/phonegap/CallbackServer.java b/framework/src/com/phonegap/CallbackServer.java
index 81e5800c..d459d995 100755
--- a/framework/src/com/phonegap/CallbackServer.java
+++ b/framework/src/com/phonegap/CallbackServer.java
@@ -314,9 +314,10 @@ public class CallbackServer implements Runnable {
* @return int
*/
public int getSize() {
- int size = this.javascript.size();
- //System.out.println("getSize() = " + size);
- return size;
+ synchronized(this) {
+ int size = this.javascript.size();
+ return size;
+ }
}
/**
@@ -325,17 +326,16 @@ public class CallbackServer implements Runnable {
* @return String
*/
public String getJavascript() {
- if (this.javascript.size() == 0) {
- return null;
- }
- String statement = this.javascript.remove(0);
- //System.out.println("CallbackServer.getJavascript() = " + statement);
- if (this.javascript.size() == 0) {
- synchronized (this) {
- this.empty = true;
- }
- }
- return statement;
+ synchronized(this) {
+ if (this.javascript.size() == 0) {
+ return null;
+ }
+ String statement = this.javascript.remove(0);
+ if (this.javascript.size() == 0) {
+ this.empty = true;
+ }
+ return statement;
+ }
}
/**
@@ -344,12 +344,11 @@ public class CallbackServer implements Runnable {
* @param statement
*/
public void sendJavascript(String statement) {
- //System.out.println("CallbackServer.sendJavascript("+statement+")");
- this.javascript.add(statement);
- synchronized (this) {
- this.empty = false;
- this.notify();
- }
+ synchronized (this) {
+ this.javascript.add(statement);
+ this.empty = false;
+ this.notify();
+ }
}
/* The Following code has been modified from original implementation of URLEncoder */
diff --git a/framework/src/com/phonegap/CameraLauncher.java b/framework/src/com/phonegap/CameraLauncher.java
index dd619a24..f9257857 100755
--- a/framework/src/com/phonegap/CameraLauncher.java
+++ b/framework/src/com/phonegap/CameraLauncher.java
@@ -101,7 +101,7 @@ public class CameraLauncher extends Plugin {
try {
if (action.equals("takePicture")) {
int srcType = CAMERA;
- int destType = DATA_URL;
+ int destType = FILE_URI;
this.targetHeight = 0;
this.targetWidth = 0;
this.encodingType = JPEG;
diff --git a/framework/src/com/phonegap/ContactAccessorSdk5.java b/framework/src/com/phonegap/ContactAccessorSdk5.java
index 9e9cee20..47a8111f 100644
--- a/framework/src/com/phonegap/ContactAccessorSdk5.java
+++ b/framework/src/com/phonegap/ContactAccessorSdk5.java
@@ -819,50 +819,49 @@ public class ContactAccessorSdk5 extends ContactAccessor {
public String save(JSONObject contact) {
AccountManager mgr = AccountManager.get(mApp);
Account[] accounts = mgr.getAccounts();
- Account account = null;
+ String accountName = null;
+ String accountType = null;
- if (accounts.length == 1)
- account = accounts[0];
- else if (accounts.length > 1) {
- for(Account a : accounts){
- if(a.type.contains("eas")&& a.name.matches(EMAIL_REGEXP)) /*Exchange ActiveSync*/
- {
- account = a;
- break;
- }
- }
- if(account == null){
- for(Account a : accounts){
- if(a.type.contains("com.google") && a.name.matches(EMAIL_REGEXP)) /*Google sync provider*/
- {
- account = a;
- break;
- }
- }
- }
- if(account == null){
- for(Account a : accounts){
- if(a.name.matches(EMAIL_REGEXP)) /*Last resort, just look for an email address...*/
- {
- account = a;
- break;
- }
- }
- }
+ if (accounts.length == 1) {
+ accountName = accounts[0].name;
+ accountType = accounts[0].type;
}
-
- if(account == null) {
- return null;
+ else if (accounts.length > 1) {
+ for(Account a : accounts) {
+ if(a.type.contains("eas")&& a.name.matches(EMAIL_REGEXP)) /*Exchange ActiveSync*/ {
+ accountName = a.name;
+ accountType = a.type;
+ break;
+ }
+ }
+ if(accountName == null){
+ for(Account a : accounts){
+ if(a.type.contains("com.google") && a.name.matches(EMAIL_REGEXP)) /*Google sync provider*/ {
+ accountName = a.name;
+ accountType = a.type;
+ break;
+ }
+ }
+ }
+ if(accountName == null){
+ for(Account a : accounts){
+ if(a.name.matches(EMAIL_REGEXP)) /*Last resort, just look for an email address...*/ {
+ accountName = a.name;
+ accountType = a.type;
+ break;
+ }
+ }
+ }
}
String id = getJsonString(contact, "id");
// Create new contact
if (id == null) {
- return createNewContact(contact, account);
+ return createNewContact(contact, accountType, accountName);
}
// Modify existing contact
else {
- return modifyContact(id, contact, account);
+ return modifyContact(id, contact, accountType, accountName);
}
}
@@ -873,7 +872,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
* @param contact the contact to be saved
* @param account the account to be saved under
*/
- private String modifyContact(String id, JSONObject contact, Account account) {
+ private String modifyContact(String id, JSONObject contact, String accountType, String accountName) {
// Get the RAW_CONTACT_ID which is needed to insert new values in an already existing contact.
// But not needed to update existing values.
int rawId = (new Integer(getJsonString(contact,"rawId"))).intValue();
@@ -883,8 +882,8 @@ public class ContactAccessorSdk5 extends ContactAccessor {
//Add contact type
ops.add(ContentProviderOperation.newUpdate(ContactsContract.RawContacts.CONTENT_URI)
- .withValue(ContactsContract.RawContacts.ACCOUNT_TYPE, account.type)
- .withValue(ContactsContract.RawContacts.ACCOUNT_NAME, account.name)
+ .withValue(ContactsContract.RawContacts.ACCOUNT_TYPE, accountType)
+ .withValue(ContactsContract.RawContacts.ACCOUNT_NAME, accountName)
.build());
// Modify name
@@ -1427,14 +1426,14 @@ public class ContactAccessorSdk5 extends ContactAccessor {
* @param contact the contact to be saved
* @param account the account to be saved under
*/
- private String createNewContact(JSONObject contact, Account account) {
+ private String createNewContact(JSONObject contact, String accountType, String accountName) {
// Create a list of attributes to add to the contact database
ArrayList ops = new ArrayList();
//Add contact type
ops.add(ContentProviderOperation.newInsert(ContactsContract.RawContacts.CONTENT_URI)
- .withValue(ContactsContract.RawContacts.ACCOUNT_TYPE, account.type)
- .withValue(ContactsContract.RawContacts.ACCOUNT_NAME, account.name)
+ .withValue(ContactsContract.RawContacts.ACCOUNT_TYPE, accountType)
+ .withValue(ContactsContract.RawContacts.ACCOUNT_NAME, accountName)
.build());
// Add name
diff --git a/framework/src/com/phonegap/DroidGap.java b/framework/src/com/phonegap/DroidGap.java
index 26e3bc6a..149b49b8 100755
--- a/framework/src/com/phonegap/DroidGap.java
+++ b/framework/src/com/phonegap/DroidGap.java
@@ -18,16 +18,18 @@
*/
package com.phonegap;
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.util.Stack;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-import java.util.Iterator;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Stack;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import org.json.JSONArray;
import org.json.JSONException;
+import org.xmlpull.v1.XmlPullParserException;
import android.app.AlertDialog;
import android.app.ProgressDialog;
@@ -55,6 +57,7 @@ import android.view.Window;
import android.view.WindowManager;
import android.webkit.ConsoleMessage;
import android.webkit.GeolocationPermissions.Callback;
+import android.webkit.HttpAuthHandler;
import android.webkit.JsPromptResult;
import android.webkit.JsResult;
import android.webkit.SslErrorHandler;
@@ -67,11 +70,13 @@ 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.IPlugin;
import com.phonegap.api.PluginManager;
-import org.xmlpull.v1.XmlPullParserException;
+
+import com.phonegap.PreferenceNode;
+import com.phonegap.PreferenceSet;
/**
* This class is the main Android activity that represents the PhoneGap
@@ -199,6 +204,9 @@ public class DroidGap extends PhonegapActivity {
// (this is not the color for the webview, which is set in HTML)
private int backgroundColor = Color.BLACK;
+ /** The authorization tokens. */
+ private Hashtable authenticationTokens = new Hashtable();
+
/*
* The variables below are used to cache some of the activity properties.
*/
@@ -215,8 +223,93 @@ public class DroidGap extends PhonegapActivity {
// when another application (activity) is started.
protected boolean keepRunning = true;
+ // preferences read from phonegap.xml
+ protected PreferenceSet preferences;
+
private boolean classicRender;
+ /**
+ * Sets the authentication token.
+ *
+ * @param authenticationToken
+ * the authentication token
+ * @param host
+ * the host
+ * @param realm
+ * the realm
+ */
+ public void setAuthenticationToken(AuthenticationToken authenticationToken, String host, String realm) {
+
+ if(host == null) {
+ host = "";
+ }
+
+ if(realm == null) {
+ realm = "";
+ }
+
+ authenticationTokens.put(host.concat(realm), authenticationToken);
+ }
+
+ /**
+ * Removes the authentication token.
+ *
+ * @param host
+ * the host
+ * @param realm
+ * the realm
+ * @return the authentication token or null if did not exist
+ */
+ public AuthenticationToken removeAuthenticationToken(String host, String realm) {
+ return authenticationTokens.remove(host.concat(realm));
+ }
+
+ /**
+ * Gets the authentication token.
+ *
+ * In order it tries:
+ * 1- host + realm
+ * 2- host
+ * 3- realm
+ * 4- no host, no realm
+ *
+ * @param host
+ * the host
+ * @param realm
+ * the realm
+ * @return the authentication token
+ */
+ public AuthenticationToken getAuthenticationToken(String host, String realm) {
+ AuthenticationToken token = null;
+
+ token = authenticationTokens.get(host.concat(realm));
+
+ if(token == null) {
+ // try with just the host
+ token = authenticationTokens.get(host);
+
+ // Try the realm
+ if(token == null) {
+ token = authenticationTokens.get(realm);
+ }
+
+ // if no host found, just query for default
+ if(token == null) {
+ token = authenticationTokens.get("");
+ }
+ }
+
+ return token;
+ }
+
+ /**
+ * Clear all authentication tokens.
+ */
+ public void clearAuthenticationTokens() {
+ authenticationTokens.clear();
+ }
+
+
/**
* Called when the activity is first created.
*
@@ -224,13 +317,27 @@ public class DroidGap extends PhonegapActivity {
*/
@Override
public void onCreate(Bundle savedInstanceState) {
+ preferences = new PreferenceSet();
+
+ // Load PhoneGap configuration:
+ // white list of allowed URLs
+ // debug setting
+ this.loadConfiguration();
+
LOG.d(TAG, "DroidGap.onCreate()");
super.onCreate(savedInstanceState);
- getWindow().requestFeature(Window.FEATURE_NO_TITLE);
- getWindow().setFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN,
- WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
- // This builds the view. We could probably get away with NOT having a LinearLayout, but I like having a bucket!
+ getWindow().requestFeature(Window.FEATURE_NO_TITLE);
+
+ if (preferences.prefMatches("fullscreen","true")) {
+ getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+ WindowManager.LayoutParams.FLAG_FULLSCREEN);
+ } else {
+ getWindow().setFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN,
+ WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
+ }
+
+ // This builds the view. We could probably get away with NOT having a LinearLayout, but I like having a bucket!
Display display = getWindowManager().getDefaultDisplay();
int width = display.getWidth();
int height = display.getHeight();
@@ -240,11 +347,6 @@ public class DroidGap extends PhonegapActivity {
root.setBackgroundColor(this.backgroundColor);
root.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT,
ViewGroup.LayoutParams.FILL_PARENT, 0.0F));
-
- // Load PhoneGap configuration:
- // white list of allowed URLs
- // debug setting
- this.loadConfiguration();
// If url was passed in to intent, then init webview, which will load the url
Bundle bundle = this.getIntent().getExtras();
@@ -364,15 +466,15 @@ public class DroidGap extends PhonegapActivity {
* @param url
*/
public void loadUrl(String url) {
-
- // If first page of app, then set URL to load to be the one passed in
- if (this.initUrl == null || (this.urls.size() > 0)) {
- this.loadUrlIntoView(url);
- }
- // Otherwise use the URL specified in the activity's extras bundle
- else {
- this.loadUrlIntoView(this.initUrl);
- }
+
+ // If first page of app, then set URL to load to be the one passed in
+ if (this.initUrl == null || (this.urls.size() > 0)) {
+ this.loadUrlIntoView(url);
+ }
+ // Otherwise use the URL specified in the activity's extras bundle
+ else {
+ this.loadUrlIntoView(this.initUrl);
+ }
}
/**
@@ -434,10 +536,10 @@ public class DroidGap extends PhonegapActivity {
// If loadingDialog property, then show the App loading dialog for first page of app
String loading = null;
if (me.urls.size() == 1) {
- loading = me.getStringProperty("loadingDialog", null);
+ loading = me.getStringProperty("loadingDialog", null);
}
else {
- loading = me.getStringProperty("loadingPageDialog", null);
+ loading = me.getStringProperty("loadingPageDialog", null);
}
if (loading != null) {
@@ -493,15 +595,15 @@ public class DroidGap extends PhonegapActivity {
* @param time The number of ms to wait before loading webview
*/
public void loadUrl(final String url, int time) {
-
- // If first page of app, then set URL to load to be the one passed in
- if (this.initUrl == null || (this.urls.size() > 0)) {
- this.loadUrlIntoView(url, time);
- }
- // Otherwise use the URL specified in the activity's extras bundle
- else {
- this.loadUrlIntoView(this.initUrl);
- }
+
+ // If first page of app, then set URL to load to be the one passed in
+ if (this.initUrl == null || (this.urls.size() > 0)) {
+ this.loadUrlIntoView(url, time);
+ }
+ // Otherwise use the URL specified in the activity's extras bundle
+ else {
+ this.loadUrlIntoView(this.initUrl);
+ }
}
/**
@@ -515,14 +617,14 @@ public class DroidGap extends PhonegapActivity {
// Clear cancel flag
this.cancelLoadUrl = false;
-
- // If not first page of app, then load immediately
- if (this.urls.size() > 0) {
- this.loadUrlIntoView(url);
- }
- if (!url.startsWith("javascript:")) {
- LOG.d(TAG, "DroidGap.loadUrl(%s, %d)", url, time);
+ // If not first page of app, then load immediately
+ if (this.urls.size() > 0) {
+ this.loadUrlIntoView(url);
+ }
+
+ if (!url.startsWith("javascript:")) {
+ LOG.d(TAG, "DroidGap.loadUrl(%s, %d)", url, time);
}
final DroidGap me = this;
@@ -1358,6 +1460,32 @@ public class DroidGap extends PhonegapActivity {
return true;
}
+ /**
+ * On received http auth request.
+ * The method reacts on all registered authentication tokens. There is one and only one authentication token for any host + realm combination
+ *
+ * @param view
+ * the view
+ * @param handler
+ * the handler
+ * @param host
+ * the host
+ * @param realm
+ * the realm
+ */
+ @Override
+ public void onReceivedHttpAuthRequest(WebView view, HttpAuthHandler handler, String host,
+ String realm) {
+
+ // get the authentication token
+ AuthenticationToken token = getAuthenticationToken(host,realm);
+
+ if(token != null) {
+ handler.proceed(token.getUserName(), token.getPassword());
+ }
+ }
+
+
@Override
public void onPageStarted(WebView view, String url, Bitmap favicon) {
@@ -1732,7 +1860,7 @@ public class DroidGap extends PhonegapActivity {
/**
* Load PhoneGap configuration from res/xml/phonegap.xml.
* Approved list of URLs that can be loaded into DroidGap
- *
+ *
* Log level: ERROR, WARN, INFO, DEBUG, VERBOSE (default=ERROR)
*
*/
@@ -1767,7 +1895,18 @@ public class DroidGap extends PhonegapActivity {
{
this.classicRender = enabled.equals("true");
}
-
+ }
+ else if (strNode.equals("preference")) {
+ String name = xml.getAttributeValue(null, "name");
+ String value = xml.getAttributeValue(null, "value");
+ String readonlyString = xml.getAttributeValue(null, "readonly");
+
+ boolean readonly = (readonlyString != null &&
+ readonlyString.equals("true"));
+
+ LOG.i("PhoneGapLog", "Found preference for %s", name);
+
+ preferences.add(new PreferenceNode(name, value, readonly));
}
}
try {
diff --git a/framework/src/com/phonegap/PreferenceNode.java b/framework/src/com/phonegap/PreferenceNode.java
new file mode 100644
index 00000000..2851c24c
--- /dev/null
+++ b/framework/src/com/phonegap/PreferenceNode.java
@@ -0,0 +1,16 @@
+package com.phonegap;
+
+// represents the element from the W3C config.xml spec
+// see http://www.w3.org/TR/widgets/#the-preference-element-and-its-attributes
+public class PreferenceNode {
+ public String name;
+ public String value;
+ public boolean readonly;
+
+ // constructor
+ public PreferenceNode(String name, String value, boolean readonly) {
+ this.name = name;
+ this.value = value;
+ this.readonly = readonly;
+ }
+}
diff --git a/framework/src/com/phonegap/PreferenceSet.java b/framework/src/com/phonegap/PreferenceSet.java
new file mode 100644
index 00000000..86034608
--- /dev/null
+++ b/framework/src/com/phonegap/PreferenceSet.java
@@ -0,0 +1,43 @@
+package com.phonegap;
+
+import java.util.HashSet;
+
+import com.phonegap.PreferenceNode;
+
+public class PreferenceSet {
+ private HashSet innerSet;
+
+ public PreferenceSet() {
+ this.innerSet = new HashSet();
+ }
+
+ public void add(PreferenceNode node) {
+ this.innerSet.add(node);
+ }
+
+ public int size() {
+ return this.innerSet.size();
+ }
+
+ public void clear() {
+ this.innerSet.clear();
+ }
+
+ public String pref(String prefName) {
+ for (PreferenceNode n : innerSet)
+ if (prefName.equals(n.name))
+ return n.value;
+
+ return null;
+ }
+
+ public boolean prefMatches(String prefName, String prefValue) {
+ String value = pref(prefName);
+
+ if (value == null) {
+ return false;
+ } else {
+ return value.equals(prefValue);
+ }
+ }
+}
diff --git a/framework/src/com/phonegap/Storage.java b/framework/src/com/phonegap/Storage.java
index fc74dc12..516f6b42 100755
--- a/framework/src/com/phonegap/Storage.java
+++ b/framework/src/com/phonegap/Storage.java
@@ -18,17 +18,22 @@
*/
package com.phonegap;
+import java.io.File;
+
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;
import android.database.sqlite.*;
/**
- * This class implements the HTML5 database support for Android 1.X devices. It
- * is not used for Android 2.X, since HTML5 database is built in to the browser.
+ * This class implements the HTML5 database support to work around a bug for
+ * Android 3.0 devices. It is not used for other versions of Android, since
+ * HTML5 database is built in to the browser.
*/
public class Storage extends Plugin {
@@ -64,11 +69,7 @@ public class Storage extends Plugin {
String result = "";
try {
- // TODO: Do we want to allow a user to do this, since they could get
- // to other app databases?
- if (action.equals("setStorage")) {
- this.setStorage(args.getString(0));
- } else if (action.equals("openDatabase")) {
+ if (action.equals("openDatabase")) {
this.openDatabase(args.getString(0), args.getString(1),
args.getString(2), args.getLong(3));
} else if (action.equals("executeSql")) {
@@ -118,21 +119,6 @@ public class Storage extends Plugin {
// LOCAL METHODS
// --------------------------------------------------------------------------
- /**
- * Set the application package for the database. Each application saves its
- * database files in a directory with the application package as part of the
- * file name.
- *
- * For example, application "com.phonegap.demo.Demo" would save its database
- * files in "/data/data/com.phonegap.demo/databases/" directory.
- *
- * @param appPackage
- * The application package.
- */
- public void setStorage(String appPackage) {
- this.path = "/data/data/" + appPackage + "/databases/";
- }
-
/**
* Open database.
*
@@ -155,12 +141,10 @@ public class Storage extends Plugin {
// If no database path, generate from application package
if (this.path == null) {
- Package pack = this.ctx.getClass().getPackage();
- String appPackage = pack.getName();
- this.setStorage(appPackage);
+ this.path = this.ctx.getApplicationContext().getDir("database", Context.MODE_PRIVATE).getPath();
}
- this.dbName = this.path + db + ".db";
+ this.dbName = this.path + File.pathSeparator + db + ".db";
this.myDb = SQLiteDatabase.openOrCreateDatabase(this.dbName, null);
}
@@ -249,9 +233,7 @@ public class Storage extends Plugin {
}
// Let JavaScript know that there are no more rows
- this.sendJavascript("droiddb.completeQuery('" + tx_id + "', " + result
- + ");");
-
+ this.sendJavascript("droiddb.completeQuery('" + tx_id + "', " + result + ");");
}
}
diff --git a/framework/test/com/phonegap/PreferenceNodeTest.java b/framework/test/com/phonegap/PreferenceNodeTest.java
new file mode 100644
index 00000000..91cf4bfc
--- /dev/null
+++ b/framework/test/com/phonegap/PreferenceNodeTest.java
@@ -0,0 +1,35 @@
+import org.junit.*;
+import static org.junit.Assert.*;
+
+import com.phonegap.PreferenceNode;
+
+public class PreferenceNodeTest {
+ @Test
+ public void testConstructor() {
+ PreferenceNode foo = new com.phonegap.PreferenceNode("fullscreen", "false", false);
+ assertEquals("fullscreen", foo.name);
+ assertEquals("false", foo.value);
+ assertEquals(false, foo.readonly);
+ }
+
+ @Test
+ public void testNameAssignment() {
+ PreferenceNode foo = new com.phonegap.PreferenceNode("fullscreen", "false", false);
+ foo.name = "widescreen";
+ assertEquals("widescreen", foo.name);
+ }
+
+ @Test
+ public void testValueAssignment() {
+ PreferenceNode foo = new com.phonegap.PreferenceNode("fullscreen", "false", false);
+ foo.value = "maybe";
+ assertEquals("maybe", foo.value);
+ }
+
+ @Test
+ public void testReadonlyAssignment() {
+ PreferenceNode foo = new com.phonegap.PreferenceNode("fullscreen", "false", false);
+ foo.readonly = true;
+ assertEquals(true, foo.readonly);
+ }
+}
diff --git a/framework/test/com/phonegap/PreferenceSetTest.java b/framework/test/com/phonegap/PreferenceSetTest.java
new file mode 100644
index 00000000..2eba2451
--- /dev/null
+++ b/framework/test/com/phonegap/PreferenceSetTest.java
@@ -0,0 +1,55 @@
+import org.junit.*;
+import static org.junit.Assert.*;
+
+import com.phonegap.PreferenceNode;
+import com.phonegap.PreferenceSet;
+
+public class PreferenceSetTest {
+ private PreferenceSet preferences;
+ private PreferenceNode screen;
+
+ @Before
+ public void setUp() {
+ preferences = new PreferenceSet();
+ screen = new PreferenceNode("fullscreen", "true", false);
+ }
+
+ @Test
+ public void testAddition() {
+ preferences.add(screen);
+ assertEquals(1, preferences.size());
+ }
+
+ @Test
+ public void testClear() {
+ preferences.add(screen);
+ preferences.clear();
+ assertEquals(0, preferences.size());
+ }
+
+ @Test
+ public void testPreferenceRetrieval() {
+ preferences.add(screen);
+ assertEquals("true", preferences.pref("fullscreen"));
+ }
+
+ @Test
+ public void testNoPreferenceRetrieval() {
+ // return null if the preference is not defined
+ assertEquals(null, preferences.pref("antigravity"));
+ }
+
+ @Test
+ public void testUnsetPreferenceChecking() {
+ PreferenceSet emptySet = new PreferenceSet();
+ boolean value = emptySet.prefMatches("fullscreen", "true");
+ assertEquals(false, value);
+ }
+
+ @Test
+ public void testSetPreferenceChecking() {
+ preferences.add(screen);
+ boolean value = preferences.prefMatches("fullscreen", "true");
+ assertEquals(true, value);
+ }
+}