Updating the JS and the version for tagging

We should only have these files in one place in the repo. Changes have been made to the scripts to pick up the xml files from their proper location.

.gitignore

@@ -1,7 +1,20 @@
+.DS_Store
 default.properties
 gen
-assets/www/phonegap.js
+assets/www/cordova.js
 local.properties
-framework/phonegap.jar
+framework/proguard.cfg
+framework/cordova.jar
+framework/cordova-*.jar
+framework/phonegap-*.jar
 framework/bin
+framework/test/org/apache/cordova/*.class
 framework/assets/www/.DS_Store
+framework/assets/www/cordova-*.js
+framework/assets/www/phonegap-*.js
+example
+./test
+tmp
+*.tmp
+test/libs/*.jar
+bin/node_modules

LICENSE

@@ -1,64 +1,202 @@
-PhoneGap is available under *either* the terms of the modified BSD license *or* the
-MIT License (2008). As a recipient of PhonegGap, you may choose which
-license to receive this code under (except as noted in per-module LICENSE
-files). Some modules may not be the copyright of Nitobi.   These
-modules contain explicit declarations of copyright in both the LICENSE files in
-the directories in which they reside and in the code itself. No external
-contributions are allowed under licenses which are fundamentally incompatible
-with the MIT or BSD licenses that PhoneGap is distributed under.
 
-The text of the MIT and BSD licenses is reproduced below. 
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
--------------------------------------------------------------------------------
-The "New" BSD License:
-**********************
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-Copyright (c) 2005-2010, Nitobi Software Inc.
-All rights reserved.
+   1. Definitions.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
 
-  * Redistributions of source code must retain the above copyright notice, this
-    list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-  * Neither the name of Phonegap/Nitobi nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 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
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
 
--------------------------------------------------------------------------------
-The MIT License
-*****************
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
 
-Copyright (c) <2010> <Nitobi Software Inc., et. al., >
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
 
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
 
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) 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. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   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.

NOTICE

@@ -0,0 +1,5 @@
+Apache Callback
+Copyright 2011 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org)

README.md

@@ -1,128 +1,107 @@
-PhoneGap/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
+===
+
+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
+---
 
-Pre Requisites
---------------
 - Java JDK 1.5
-- Android SDK [http://developer.android.com](http://developer.android.com)
 - Apache ANT
-- Ruby (Optional, see section: DroidGap with JRuby)
+- Android SDK [http://developer.android.com](http://developer.android.com)
+- Apache Commons Codec [http://commons.apache.org/codec/](http://commons.apache.org/codec/)
 
-Install
--------
+Building
+---
 
-On any POSIX machine add PhoneGap/Android to your PATH variable like so:
+To create your cordova.jar, copy the commons codec:
 
-    export PATH=$PATH:~/phonegap-android/bin
+    mv commons-codec-1.6.jar framework/libs
 
-On Windows add the phonegap-android/bin to your PATH as normal.
+then run in the framework directory:
 
-DroidGap: PhoneGap/Android Dev Script
--------------------------------------
+    android update project -p . -t android-15
+    ant jar
 
-Tools for developers building mobile apps using PhoneGap for Android.
 
-Usage:
+Cordova Android Developer Tools
+---
 
-<pre>droidgap [command] [parameters]</pre>
+The Cordova developer tooling is split between general tooling and project level tooling. 
 
-Commands:    
+To enable the command-line tools available in the ./bin directory, make
+sure you have all of the dependencies installed. You will need
+[NodeJS](http://nodejs.org) (which should come with `npm`). To install
+the dependencies:
 
-<pre>
-	help ...... See this message. Type help [command name] to see specific help topics.
-	gen ....... Generate the example PhoneGap application to current directory (or optionally provide an output directory as parameter).
-	create .... Creates an Android compatible project from a WWW folder. 
-	classic ... Backwards support for droidgap script. Run "droidgap help classic" for more info.
-	update .... Copy a fresh phonegap.jar and phonegap.js into a valid PhoneGap/Android project.
-	test ...... Gets edge copy of mobile-spec and runs in first device or emulator attached.
-</pre>
+    $ cd bin
+    $ npm install
 
-Quickstart:
+General Commands
 
-<pre>
-  	$ droidgap gen exampleapp 
-  	$ cd exampleapp
-	$ ant debug install && adb logcat
-</pre>
+    ./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
 
-DroidGap with JRuby
--------------------
+Project Commands
 
-If you want to use the droidgap command but do not want to install Ruby then you can call it using jruby jar included in the lib folder. All the options are the same and a call looks like this:
+These commands live in a generated Cordova Android project.
 
-    java -jar jruby-complete-1.4.0RC1.jar ../bin/droidgap help run
-    
-Keep in mind this will be slower due to JVM warmup.
+    ./cordovap/debug [path] ..................... install to first device
+    ./cordova/emulate .......................... start avd (emulator) named default
+    ./cordova/log .............................. starts logcat
 
-Importing a PhoneGap/Android app into Eclipse
----------------------------------------------
+Running the Example Project
+---
+
+Start avd (emulator) named `default`:
+
+    ./bin/emulate
+
+Create the example project and build it to the first device:
+
+    ./bin/create
+    cd example
+    ./cordova/debug
+
+Start adb logcat (console.log calls output here):
+
+    ./cordova/log
+
+Running the [callback/callback-test](http://github.com/callback/callback-test) tests:
+---
+
+    ./bin/test
+
+Creating a new Cordova Android Project
+---
+
+    ./bin/create ~/Desktop/myapp com.phonegap.special MyApp
+
+Importing a Cordova Android Project into Eclipse
+----
 
 1. File > New > Project...
 2. Android > Android Project
 3. Create project from existing source (point to the generated app found in tmp/android)
-4. Right click on libs/phonegap.jar and add to build path
+4. Right click on libs/cordova.jar and add to build path
 5. Right click on the project root: Run as > Run Configurations
 6. Click on the Target tab and select Manual (this way you can choose the emulator or device to build to)
 
 
-Common Command Line Tasks
-=========================
-
-Running Mobile Spec
+Further Reading
 ---
 
-droidgap test
-    
-Compile an APK
----
-
-Make sure you have a device plugged in (with debugging enabled) or a running emulator. Then:
-
-	ant debug install
-	
-or
-
-	droidgap run
-
-Converting a W3C Widget into a an APK
----
-
-Given a Widget called FooBar with an index.html file in it. You navigate to its folder and run:
-
-	droidgap create
-	cd ../FooBar_android
-	ant debug install
-
-List devices attached
----
-
-	adb devices 
-    List of devices attached 
-    0123456789012	device
-
-Install APK onto device
----
-
-	apk -s 0123456789012 install phonegap.apk
-    
-Logging 
----
-
-Via console.log calls from your apps javascript.
-
-	adb logcat
-    
-Debugging
----
-    
-Attach it to a process on the device
-
-    $ adb jdwp
-    adb forward tcp:8000 jdwp: jdb -attach localhost:8000
-    
-    
-For more info see
------------------
+- [http://developer.android.com](http://developer.android.com)
 - [http://docs.phonegap.com](http://docs.phonegap.com)
 - [http://wiki.phonegap.com](http://wiki.phonegap.com)

VERSION

@@ -1 +1 @@
-0.9.4
+1.8.0

bin/BOOM

@@ -0,0 +1,21 @@
+#! /bin/sh
+#       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
+#       to you under the Apache License, Version 2.0 (the
+#       "License"); you may not use this file except in compliance
+#       with the License.  You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#       Unless required by applicable law or agreed to in writing,
+#       software distributed under the License is distributed on an
+#       "AS IS" BASIS, 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.
+#
+#
+./bin/create
+cd ./example && ./cordova/debug && ./cordova/log

bin/android-sdk-path.bat

@@ -1,2 +0,0 @@
-@ECHO OFF
-echo %~dp$PATH:1

bin/autotest

@@ -0,0 +1,2 @@
+#! /usr/bin/env node
+require('nodeunit').reporters.default.run(['bin/tests'])

bin/bench

@@ -0,0 +1,47 @@
+#! /bin/sh
+#       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
+#       to you under the Apache License, Version 2.0 (the
+#       "License"); you may not use this file except in compliance
+#       with the License.  You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#       Unless required by applicable law or agreed to in writing,
+#       software distributed under the License is distributed on an
+#       "AS IS" BASIS, 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.
+#
+#
+#
+# Creates an app in `./bench` that posts results to http://cordova-bench.heroku.com with current cordova/Android sha.
+#
+# USAGE
+#   ./bin/bench
+#
+
+# clobber any existing bench
+if [ -e ./bench ]
+then
+    rm -rf ./bench
+fi
+
+# create a benching app
+./bin/create ./bench org.apache.cordova.bench cordovaBench
+
+# grab the latest bench www code
+git clone git@github.com:brianleroux/cordova-bench.git
+
+# copy it into the app
+cat ./cordova-bench/www/index.html > ./bench/assets/www/index.html
+#cat ~/Desktop/cordova-bench/www/index.html > ./bench/assets/www/index.html
+
+# clean up
+rm -rf ./cordova-bench
+
+# launch to the first device found
+./bin/debug ./bench

bin/create

@@ -0,0 +1,74 @@
+#! /bin/sh
+#       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
+#       to you under the Apache License, Version 2.0 (the
+#       "License"); you may not use this file except in compliance
+#       with the License.  You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#       Unless required by applicable law or agreed to in writing,
+#       software distributed under the License is distributed on an
+#       "AS IS" BASIS, 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.
+#
+# create a cordova/android project
+# 
+# USAGE
+#   ./create [path package activity]
+#
+set -e
+
+PROJECT_PATH=${1:-"./example"}
+PACKAGE=${2:-"org.apache.cordova.example"}
+ACTIVITY=${3:-"cordovaExample"}
+TARGET=$(android list targets | grep 'id: ' | sed 's/id: \([0-9]*\).*/\1/g' | tail -1)
+VERSION=$(cat ./VERSION)
+
+# clobber any existing example
+if [ $# -eq 0 ]
+then
+    rm -rf $PROJECT_PATH
+fi
+
+# update the cordova-android framework for the desired target
+android update project --target $TARGET --path ./framework
+
+if [ ! -e ./framework/libs/commons-codec-1.6.jar ]; then
+    # Use curl to get the jar (TODO: Support Apache Mirrors)
+    curl -OL http://mirror.symnds.com/software/Apache//commons/codec/binaries/commons-codec-1.6-bin.zip
+    unzip commons-codec-1.6-bin.zip
+    mkdir -p ./framework/libs
+    cp commons-codec-1.6/commons-codec-1.6.jar ./framework/libs/
+fi
+
+# compile cordova.js and cordova.jar
+cd ./framework && ant jar && cd ../
+
+# copy all the bin scripts etc in there
+cp -R ./bin/templates/project/ $PROJECT_PATH
+
+# copy in cordova.js
+cp ./framework/assets/www/cordova-$VERSION.js $PROJECT_PATH/.cordova/android/cordova-$VERSION.js
+
+# copy in cordova.jar
+cp ./framework/cordova-$VERSION.jar $PROJECT_PATH/.cordova/android/cordova-$VERSION.jar
+
+# copy in res/xml
+cp ./framework/res/xml/cordova.xml $PROJECT_PATH/.cordova/android/cordova.xml
+cp ./framework/res/xml/plugins.xml $PROJECT_PATH/.cordova/android/plugins.xml
+
+# app properties
+cat > $PROJECT_PATH/.cordova/config <<eom
+VERSION=$VERSION
+PROJECT_PATH=$PROJECT_PATH
+PACKAGE=$PACKAGE
+ACTIVITY=$ACTIVITY
+TARGET=$TARGET
+eom
+
+(cd $PROJECT_PATH && ./cordova/create)

bin/create.bat

@@ -0,0 +1 @@
+cscript bin\create.js %*

bin/create.js

@@ -0,0 +1,174 @@
+/*
+       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
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, 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.
+*/
+
+/*
+ * create a cordova/android project
+ *
+ * USAGE
+ *  ./create [path package activity]
+ */
+
+function read(filename) {
+    WScript.Echo('Reading in ' + filename);
+    var fso=WScript.CreateObject("Scripting.FileSystemObject");
+    var f=fso.OpenTextFile(filename, 1);
+    var s=f.ReadAll();
+    f.Close();
+    return s;
+}
+function write(filename, contents) {
+    var fso=WScript.CreateObject("Scripting.FileSystemObject");
+    var f=fso.OpenTextFile(filename, 2, true);
+    f.Write(contents);
+    f.Close();
+}
+function replaceInFile(filename, regexp, replacement) {
+    write(filename, read(filename).replace(regexp, replacement));
+}
+function exec(s, output) {
+    WScript.Echo('Executing ' + s);
+    var o=shell.Exec(s);
+    while (o.Status == 0) {
+        WScript.Sleep(100);
+    }
+    WScript.Echo("Command exited with code " + o.Status);
+}
+
+function fork(s) {
+    WScript.Echo('Executing ' + s);
+    var o=shell.Exec(s);
+    while (o.Status != 1) {
+        WScript.Sleep(100);
+    }
+    WScript.Echo(o.StdOut.ReadAll());
+    WScript.Echo(o.StdErr.ReadAll());
+    WScript.Echo("Command exited with code " + o.Status);
+}
+
+var args = WScript.Arguments, PROJECT_PATH="example", 
+    PACKAGE="org.apache.cordova.example", ACTIVITY="cordovaExample",
+    shell=WScript.CreateObject("WScript.Shell");
+    
+// working dir
+var ROOT = WScript.ScriptFullName.split('\\bin\\create.js').join('');
+
+if (args.Count() == 3) {
+    WScript.Echo('Found expected arguments');
+    PROJECT_PATH=args(0);
+    PACKAGE=args(1);
+    ACTIVITY=args(2);
+}
+
+var PACKAGE_AS_PATH=PACKAGE.replace(/\./g, '\\');
+var ACTIVITY_PATH=PROJECT_PATH+'\\src\\'+PACKAGE_AS_PATH+'\\'+ACTIVITY+'.java';
+var MANIFEST_PATH=PROJECT_PATH+'\\AndroidManifest.xml';
+var TARGET=shell.Exec('android.bat list targets').StdOut.ReadAll().match(/id:\s([0-9]).*/)[1];
+var VERSION=read('VERSION').replace(/\r\n/,'').replace(/\n/,'');
+
+WScript.Echo("Project path: " + PROJECT_PATH);
+WScript.Echo("Package: " + PACKAGE);
+WScript.Echo("Activity: " + ACTIVITY);
+WScript.Echo("Package as path: " + PACKAGE_AS_PATH);
+WScript.Echo("Activity path: " + ACTIVITY_PATH);
+WScript.Echo("Manifest path: " + MANIFEST_PATH);
+WScript.Echo("Cordova version: " + VERSION);
+
+// TODO: clobber any existing example
+
+/*
+if [ $# -eq 0 ]
+then
+    rm -rf $PROJECT_PATH
+fi
+*/
+
+// create the project
+exec('android.bat create project --target '+TARGET+' --path '+PROJECT_PATH+' --package '+PACKAGE+' --activity '+ACTIVITY);
+
+// update the cordova framework project to a target that exists on this machine
+exec('android.bat update project --target '+TARGET+' --path framework');
+
+// pull down commons codec if necessary
+var fso = WScript.CreateObject('Scripting.FileSystemObject');
+if (!fso.FileExists(ROOT + '\\framework\\libs\\commons-codec-1.6.jar')) {
+  // We need the .jar
+  var url = 'http://mirror.symnds.com/software/Apache//commons/codec/binaries/commons-codec-1.6-bin.zip';
+  var savePath = ROOT + '\\framework\\libs\\commons-codec-1.6-bin.zip';
+  if (!fso.FileExists(savePath)) {
+    // We need the zip to get the jar
+    var xhr = WScript.CreateObject('MSXML2.XMLHTTP');
+    xhr.open('GET', url, false);
+    xhr.send();
+    if (xhr.status == 200) {
+      var stream = WScript.CreateObject('ADODB.Stream');
+      stream.Open();
+      stream.Type = 1;
+      stream.Write(xhr.ResponseBody);
+      stream.Position = 0;
+      stream.SaveToFile(savePath);
+      stream.Close();
+    } else {
+      WScript.Echo('Could not retrieve the commons-codec. Please download it yourself and put into the framework/libs directory. This process may fail now. Sorry.');
+    }
+  }
+  var app = WScript.CreateObject('Shell.Application');
+  var source = app.NameSpace(savePath).Items();
+  var target = app.NameSpace(ROOT + '\\framework\\libs');
+  target.CopyHere(source, 256);
+  
+  // Move the jar into libs
+  fso.MoveFile(ROOT + '\\framework\\libs\\commons-codec-1.6\\commons-codec-1.6.jar', ROOT + '\\framework\\libs\\commons-codec-1.6.jar');
+  
+  // Clean up
+  fso.DeleteFile(ROOT + '\\framework\\libs\\commons-codec-1.6-bin.zip');
+  fso.DeleteFolder(ROOT + '\\framework\\libs\\commons-codec-1.6', true);
+}
+
+
+// compile cordova.js and cordova.jar
+// if you see an error about "Unable to resolve target" then you may need to 
+// update your android tools or install an additional Android platform version
+exec('ant.bat -f framework\\build.xml jar');
+
+// copy in the project template
+exec('cmd /c xcopy bin\\templates\\project\\* '+PROJECT_PATH+' /S /Y');
+
+// copy example www assets
+exec('cmd /c xcopy ' + PROJECT_PATH + '\\cordova\\assets ' + PROJECT_PATH + ' /S /Y');
+
+// copy in cordova.js
+exec('cmd /c copy framework\\assets\\js\\cordova.android.js '+PROJECT_PATH+'\\.cordova\\android\\cordova-'+VERSION+'.js /Y');
+
+// copy in cordova.jar
+exec('cmd /c copy framework\\cordova-'+VERSION+'.jar '+PROJECT_PATH+'\\.cordova\\android\\cordova-'+VERSION+'.jar /Y');
+
+// copy in xml
+exec('cmd /c copy framework\\res\\xml\\cordova.xml ' + PROJECT_PATH + '\\.cordova\\android\\cordova.xml /Y');
+exec('cmd /c copy framework\\res\\xml\\plugins.xml ' + PROJECT_PATH + '\\.cordova\\android\\plugins.xml /Y');
+
+// write out config file
+write(PROJECT_PATH + '\\.cordova\\config',
+  'VERSION=' + VERSION + '\r\n' +
+  'PROJECT_PATH=' + PROJECT_PATH + '\r\n' +
+  'PACKAGE=' + PACKAGE + '\r\n' +
+  'ACTIVITY=' + ACTIVITY + '\r\n' +
+  'TARGET=' + TARGET);
+
+// run project-specific create process
+fork('cscript.exe ' + PROJECT_PATH + '\\cordova\\create.js');

bin/create.xml

@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+       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
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, 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.
+-->
+
+<project name="cordova" default="create" basedir="../">
+
+	<property name="project.path" value="${basedir}/example"/>
+	<property name="package" value="org.apache.cordova.example"/>
+	<property name="activity" value="cordovaExample"/>
+
+	<target name="create">
+
+		<!-- this stuff is seriously stupid -->
+		<echo file="tmp/package.tmp">package-as-path=${package}</echo>
+		<replace file="tmp/package.tmp" token="." value="\\" />
+		<property file="tmp/package.tmp" />
+
+		<property name="activity.path" value="${project.path}/src/${package-as-path}/${activity}.java" />
+		<property name="manifest.path" value="${project.path}/AndroidManifest.xml" />
+
+		<!-- get the highest target on this machine -->
+		<!-- this stuff is also seriously stupid -->
+		<exec executable="cmd" osfamily="windows" output="tmp/target.list.tmp">
+			<arg line="/c android.bat list targets"/>
+		</exec>
+		<exec executable="android" osfamily="mac" output="tmp/target.list.tmp">
+			<arg line="list targets"/>
+		</exec>
+		<replaceregexp file="tmp/target.list.tmp" match=".*id:\s([0-9]).*" replace="target=\1" flags="s" />
+		<property file="tmp/target.list.tmp" />
+
+		<!-- var VERSION=read('VERSION').replace(/\r\n/,'').replace(/\n/,''); -->
+		<copy file="VERSION" tofile="tmp/VERSION.tmp" overwrite="true" />
+		<replaceregexp file="tmp/VERSION.tmp" match="^" replace="version=" />
+		<replaceregexp file="tmp/VERSION.tmp" match="\r\n" replace="" />
+		<property file="tmp/VERSION.tmp" />
+
+		<!-- clobber any existing example -->
+
+		<!-- create the project -->
+		<exec executable="cmd" osfamily="windows">
+			<arg line="/c android.bat create project --target ${target} --path ${project.path} --package ${package} --activity ${activity}"/>
+		</exec>
+		<exec executable="android" osfamily="mac">
+			<arg line="create project --target ${target} --path ${project.path} --package ${package} --activity ${activity}"/>
+		</exec>
+
+		<!-- update the framework dir -->
+		<exec executable="cmd" osfamily="windows">
+			<arg line="/c android.bat update project --target ${target} --path ${basedir}/framework"/>
+		</exec>
+		<exec executable="android" osfamily="mac">
+			<arg line="update project --target ${target} --path ${basedir}/framework"/>
+		</exec>
+
+		<!-- compile cordova.js and cordova.jar -->
+		<!--	// if you see an error about "Unable to resolve target" then you may need to 
+				// update your android tools or install an additional Android platform version -->
+		<ant antfile="${basedir}/framework/build.xml" useNativeBasedir="true" inheritAll="false" />
+
+		<!-- copy in the project template -->
+		<copy todir="${project.path}" overwrite="true">
+			<fileset dir="${basedir}/bin/templates/project"/>
+		</copy>
+
+		<!-- copy in cordova.js -->
+		<copy file="${basedir}/framework/assets/www/cordova-${version}.js" todir="${project.path}/assets/www/" />
+
+		<!-- copy in cordova.jar -->
+		<copy file="${basedir}/framework/cordova-${version}.jar" todir="${project.path}/libs/" />
+
+		<!-- copy in default activity -->
+		<copy file="${basedir}/bin/templates/Activity.java" tofile="${activity.path}" overwrite="true" />
+
+		<!-- interpolate the activity name and package -->
+		<replaceregexp file="${activity.path}" match="__ACTIVITY__" replace="${activity}" />
+		<replaceregexp file="${activity.path}" match="__ID__" replace="${package}" />
+
+		<replaceregexp file="${manifest.path}" match="__ACTIVITY__" replace="${activity}" />
+		<replaceregexp file="${manifest.path}" match="__PACKAGE__" replace="${package}" />
+	</target>
+</project>

bin/droidgap

@@ -1,173 +0,0 @@
-#!/usr/bin/env ruby
-ROOT = File.expand_path(File.dirname(__FILE__).gsub(/bin$/,''))
-require 'fileutils'
-require File.join(ROOT, "lib", "generate.rb")
-require File.join(ROOT, "lib", "classic.rb")
-require File.join(ROOT, "lib", "create.rb")
-require File.join(ROOT, "lib", "run.rb")
-require File.join(ROOT, "lib", "update.rb")
-require File.join(ROOT, "lib", "test.rb")
-
-# ---------------------------------------------------------- #
-#                                                            #
-#                   command line interface                   #
-#                                                            #
-# ---------------------------------------------------------- #
-
-# droidgap gen [app name]
-Generate.new(ARGV[1]) if ARGV.first == 'gen'
-
-# droidgap classic (for windows users mostly)
-Classic.new(ARGV[1..-1]) if ARGV.first == 'classic'
-
-# droidgap create [path to phonegap project]
-Create.new(ARGV[1]) if ARGV.first == 'create'
-
-# droidgap run [optional directory]
-Run.new if ARGV.first == 'run'
-
-# droidgap update [params]
-Update.new if ARGV.first == 'update'
-
-# droidgap log
-if ARGV.first == 'log'
-  $stdout.sync = true
-  IO.popen('adb logcat') do |f|
-    until f.eof?
-      puts f.gets
-    end
-  end
-end
-
-# droidgap test
-Test.new if ARGV.first == 'test'
-
-# TODO implement these!
-puts "droidgap ship not implemented" if ARGV.first == 'ship'
-
-if ARGV.first.nil? || ARGV.first == 'help'
-  help = <<-EOF
-  
-  DroidGap: PhoneGap/Android Dev Script
-  -------------------------------------
-  
-  Useful utilities for devlopers building mobile apps using PhoneGap for Android.
-  
-  Usage:
-  
-  droidgap <command> <parameters>
-  
-  Commands:
-  
-  help ...... See this message. Type help [command name] to see specific help topics.
-  gen ....... Generate the example PhoneGap application to current directory (or optionally provide an output directory as parameter).
-  create .... Creates an Android compatible project from a WWW folder. 
-  classic ... Backwards support for droidgap script. Run "droidgap help classic" for more info.
-  update .... Copy a fresh phonegap.jar and phonegap.js into a valid PhoneGap/Android project.
-  ship ...... Build and sign an APK suitable for submission to an Android Marketplace.
-    
-  Quickstart:
-  
-  $ droidgap gen exampleapp 
-  $ cd exampleapp
-  $ ant debug install && adb logcat
-  
-  EOF
-  
-  gen = <<-EOF
-  
-  DroidGap Generate
-  -----------------
-  
-  Generate the example PhoneGap application to path supplied or current working directory if none is supplied.
-  
-  Usage:
-  
-    droidgap gen [path]
-    
-  NOTE: Do *not* run "droidgap gen example" - you will end up with a recursive directory problem.
-  
-  EOF
-  
-  run = <<-EOF
-  
-  DroidGap Run
-  ------------
-  
-  Launches PhoneGap project to first device found and attaches a logger that listens for console.log statements.
-  
-  Usage:
-
-    droidgap run <path>
-    
-  EOF
-  
-  ship = <<-EOF
-  
-  DroidGap Ship
-  -------------
-  
-  Build and sign an APK suitable for submission to an Android Marketplace.
-  
-  Usage:
-  
-    droidgap ship <path>
-  
-  EOF
-  
-  log = <<-EOF
-  
-  DroidGap Log
-  -------------
-  
-  Launches LogCat
-  
-  Usage:
-  
-    droidgap log
-  
-  EOF
-  
-  create = <<-EOF
-  
-  DroidGap Create
-  ----------------
-  
-  Creates an Android compatable project from a PhoneGap project. For example, if you have MyProject with index.html this command will create MyProject_android.
-  
-  Usage:
-  
-    droidgap create <path>
-  
-  EOF
-  
-  update = <<-EOF
-
-  DroidGap Update
-  ~~~~~~~~~~~~~~~
-  
-  Builds the JS and PhoneGap Android jar file and copies them to your project.
-  
-  EOF
-  
-  classic = <<-EOF
-
-  DroidGap Classic
-  ~~~~~~~~~~~~-~~~
-  
-  Compatability for older droidgap scripts. 
-  
-  Usage:
-  
-  droidgap classic [android_sdk_path] [name] [package_name] [www] [path]
-
-  android_sdk_path ... The path to your Android SDK install.
-  name ............... The name of your application.
-  package_name ....... The name of your package (For example: com.nitobi.demo)
-  www ................ The path to your www folder. (Wherein your HTML, CSS and JS app is.)
-  path ............... The path to generate the application.
-  
-  EOF
-  
-  puts ARGV[1].nil? ? help : eval(ARGV[1])
-end

bin/droidgap.bat

@@ -1 +0,0 @@
-ruby %~dp0droidgap %1 %2

bin/package.json

@@ -0,0 +1,26 @@
+{
+  "name":         "cordova-android-cli",
+  "description":  "CLI tooling for the cordova-android project",
+  "version":      "0.0.1",
+  "licenses":     [{
+    "type":       "APL 2.0",
+    "url":        "http://www.apache.org/licenses/LICENSE-2.0"
+  }],
+  "main" : "./create",
+  "bin":          {
+    "create":   "./create",
+    "bench":    "./bench",
+    "autotest": "./autotest",
+    "BOOM":     "./BOOM",
+    "test":     "./test"
+  },
+  "homepage":     "http://incubator.apache.org/cordova",
+  "repository":   {
+    "type": "git",
+    "url": "http://git-wip-us.apache.org/repos/asf/incubator-cordova-android.git"
+  },
+  "dependencies":{
+    "coffee-script":"1.1.2",
+    "nodeunit":"0.5.3"
+  }
+}

bin/templates/project/.cordova/android/readme.md

@@ -0,0 +1 @@
+ok...

bin/templates/project/.cordova/readme.md

@@ -0,0 +1,3 @@
+this is local config for cordova stuff to be eventually moved to
+config.xml ...we think. feedback to @davejohnson/@brianleroux
+appreciated here!

bin/templates/project/cordova/create

@@ -0,0 +1,58 @@
+#! /bin/sh
+#       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
+#       to you under the Apache License, Version 2.0 (the
+#       "License"); you may not use this file except in compliance
+#       with the License.  You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#       Unless required by applicable law or agreed to in writing,
+#       software distributed under the License is distributed on an
+#       "AS IS" BASIS, 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.
+#
+#
+# create a cordova/android project
+# 
+# USAGE
+#   ./create [path package activity]
+#
+
+# load up the config
+. ./.cordova/config
+
+PACKAGE_AS_PATH=$(echo $PACKAGE | sed 's/\./\//g')
+ACTIVITY_PATH=./src/$PACKAGE_AS_PATH/$ACTIVITY.java
+MANIFEST_PATH=./AndroidManifest.xml
+
+# create the project
+android create project --target $TARGET --path . --package $PACKAGE --activity $ACTIVITY
+
+# copy all the cordova scripts etc in there
+cp -R ./cordova/templates/project/* .
+
+# copy in cordova.js
+cp ./.cordova/android/cordova-$VERSION.js ./assets/www
+
+# copy in cordova.jar
+cp ./.cordova/android/cordova-$VERSION.jar ./libs
+
+# copy in res/xml
+mkdir ./res/xml
+cp ./.cordova/android/cordova.xml ./res/xml
+cp ./.cordova/android/plugins.xml ./res/xml
+
+# copy in default activity
+cat ./cordova/templates/Activity.java > $ACTIVITY_PATH
+
+# interpolate the acivity name and package
+find "$ACTIVITY_PATH" | xargs grep '__ACTIVITY__' -sl | xargs -L1 sed -i -e "s/__ACTIVITY__/${ACTIVITY}/g"
+find "$ACTIVITY_PATH" | xargs grep '__ID__' -sl | xargs -L1 sed -i -e "s/__ID__/${PACKAGE}/g"
+
+find "$MANIFEST_PATH" | xargs grep '__ACTIVITY__' -sl | xargs -L1 sed -i -e "s/__ACTIVITY__/${ACTIVITY}/g"
+find "$MANIFEST_PATH" | xargs grep '__PACKAGE__' -sl | xargs -L1 sed -i -e "s/__PACKAGE__/${PACKAGE}/g"

bin/templates/project/cordova/create.bat

@@ -0,0 +1,2 @@
+echo "BALLS"
+cscript cordova\create.js

bin/templates/project/cordova/create.js

@@ -0,0 +1,69 @@
+var shell=WScript.CreateObject("WScript.Shell");
+
+function exec(s, output) {
+    WScript.Echo('Executing ' + s);
+    var o=shell.Exec(s);
+    while (o.Status == 0) {
+        WScript.Sleep(100);
+    }
+    WScript.Echo("Command exited with code " + o.Status);
+}
+function read(filename) {
+    var fso=WScript.CreateObject("Scripting.FileSystemObject");
+    var f=fso.OpenTextFile(filename, 1);
+    var s=f.ReadAll();
+    f.Close();
+    return s;
+}
+function write(filename, contents) {
+    var fso=WScript.CreateObject("Scripting.FileSystemObject");
+    var f=fso.OpenTextFile(filename, 2, true);
+    f.Write(contents);
+    f.Close();
+}
+function replaceInFile(filename, regexp, replacement) {
+    write(filename, read(filename).replace(regexp, replacement));
+}
+
+// working dir
+var PWD = WScript.ScriptFullName.split('\\cordova\\create.js').join('');
+
+var fso=WScript.CreateObject("Scripting.FileSystemObject");
+var f=fso.OpenTextFile(PWD + '\\.cordova\\config', 1);
+while (!f.AtEndOfStream) {
+  var prop = f.ReadLine().split('=');
+  var line = 'var ' + prop[0] + '=' + "'" + prop[1] + "';";
+  eval(line); // hacky shit to load config but whatevs
+}
+
+var PACKAGE_AS_PATH=PACKAGE.replace(/\./g, '\\');
+var ACTIVITY_PATH=PWD+'\\src\\'+PACKAGE_AS_PATH+'\\'+ACTIVITY+'.java';
+var MANIFEST_PATH=PWD+'\\AndroidManifest.xml';
+
+exec('android.bat create project --target ' + TARGET + ' --path ' + PWD + ' --package ' + PACKAGE + ' --activity ' + ACTIVITY);
+
+// copy in activity and other android assets
+exec('cmd /c xcopy ' + PWD + '\\cordova\\templates\\project\\* ' + PWD +' /Y /S');
+
+// copy in cordova.js
+exec('cmd /c copy ' + PWD + '\\.cordova\\android\\cordova-' + VERSION + '.js ' + PWD + '\\assets\\www /Y');
+
+// copy in cordova.jar
+exec('cmd /c copy ' + PWD + '\\.cordova\\android\\cordova-' + VERSION + '.jar ' + PWD + '\\libs /Y');
+
+// copy in res/xml
+exec('cmd /c md ' + PWD + '\\res\\xml');
+exec('cmd /c copy ' + PWD + '\\.cordova\\android\\cordova.xml ' + PWD + '\\res\\xml /Y');
+exec('cmd /c copy ' + PWD + '\\.cordova\\android\\plugins.xml ' + PWD + '\\res\\xml /Y');
+
+// copy in default activity
+exec('cmd /c copy ' + PWD + '\\cordova\\templates\\Activity.java ' + ACTIVITY_PATH + ' /Y');
+
+// interpolate the activity name and package
+replaceInFile(ACTIVITY_PATH, /__ACTIVITY__/, ACTIVITY);
+replaceInFile(ACTIVITY_PATH, /__ID__/, PACKAGE);
+
+replaceInFile(MANIFEST_PATH, /__ACTIVITY__/, ACTIVITY);
+replaceInFile(MANIFEST_PATH, /__PACKAGE__/, PACKAGE);
+
+WScript.Echo('Create completed successfully.');

bin/templates/project/cordova/debug

@@ -0,0 +1,27 @@
+#! /bin/sh
+#       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
+#       to you under the Apache License, Version 2.0 (the
+#       "License"); you may not use this file except in compliance
+#       with the License.  You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#       Unless required by applicable law or agreed to in writing,
+#       software distributed under the License is distributed on an
+#       "AS IS" BASIS, 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.
+#
+#
+
+. ./.cordova/config
+
+# if there are no devices listed then emulate
+
+ant clean
+ant debug install
+adb shell am start -n $PACKAGE/$PACKAGE.$ACTIVITY

bin/templates/project/cordova/emulate

@@ -0,0 +1,31 @@
+#! /bin/sh
+#       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
+#       to you under the Apache License, Version 2.0 (the
+#       "License"); you may not use this file except in compliance
+#       with the License.  You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#       Unless required by applicable law or agreed to in writing,
+#       software distributed under the License is distributed on an
+#       "AS IS" BASIS, 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.
+#
+#
+
+
+#Available Android Virtual Devices:
+#    Name: default
+#    Path: /Users/davejohnson/.android/avd/default.avd
+#  Target: Android 2.2 (API level 8)
+#    Skin: WVGA800
+#  Sdcard: 100M
+
+# get the name of the first virtual device or use command line arg or use "default"
+
+emulator -cpu-delay 0 -no-boot-anim -cache ./tmp/cache -avd default > /dev/null 2>&1 & # put the avd's chatty ass in the background

bin/templates/project/cordova/log

@@ -0,0 +1,21 @@
+#! /bin/sh 
+#       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
+#       to you under the Apache License, Version 2.0 (the
+#       "License"); you may not use this file except in compliance
+#       with the License.  You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#       Unless required by applicable law or agreed to in writing,
+#       software distributed under the License is distributed on an
+#       "AS IS" BASIS, 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.
+#
+#
+
+adb logcat

bin/templates/project/cordova/templates/Activity.java

@@ -0,0 +1,35 @@
+/*
+       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
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, 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.
+ */
+
+package __ID__;
+
+import android.app.Activity;
+import android.os.Bundle;
+import org.apache.cordova.*;
+
+public class __ACTIVITY__ extends DroidGap
+{
+    @Override
+    public void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        super.loadUrl("file:///android_asset/www/index.html");
+    }
+}
+

bin/templates/project/cordova/templates/project/AndroidManifest.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+       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
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, 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.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:windowSoftInputMode="adjustPan"
+      package="__PACKAGE__" android:versionName="1.1" android:versionCode="5">
+    <supports-screens
+        android:largeScreens="true"
+        android:normalScreens="true"
+        android:smallScreens="true"
+        android:xlargeScreens="true"
+        android:resizeable="true"
+        android:anyDensity="true"
+        />
+
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.RECEIVE_SMS" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.RECORD_VIDEO"/>
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.WRITE_CONTACTS" />   
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />   
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
+
+
+    <application android:icon="@drawable/icon" android:label="@string/app_name"
+        android:debuggable="true">
+        <activity android:name="__ACTIVITY__" android:label="@string/app_name" 
+                  android:configChanges="orientation|keyboardHidden">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+    <uses-sdk android:minSdkVersion="5" />
+</manifest> 

bin/templates/project/cordova/templates/project/assets/www/index.html

@@ -0,0 +1,60 @@
+<!DOCTYPE HTML>
+<!--
+       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
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, 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.
+-->
+<html>
+  <head>
+    <meta name="viewport" content="width=320; user-scalable=no" />
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    <title>PhoneGap</title>
+      <link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title">
+      <script type="text/javascript" charset="utf-8" src="cordova-1.8.0.js"></script>
+      <script type="text/javascript" charset="utf-8" src="main.js"></script>
+
+  </head>
+  <body onload="init();" id="stage" class="theme">
+    <h1>Welcome to Cordova!</h1>
+    <h2>this file is located at assets/www/index.html</h2>
+    <div id="info">
+        <h4>Platform: <span id="platform"> &nbsp;</span>,   Version: <span id="version">&nbsp;</span></h4>
+        <h4>UUID: <span id="uuid"> &nbsp;</span>,   Name: <span id="name">&nbsp;</span></h4>
+        <h4>Width: <span id="width"> &nbsp;</span>,   Height: <span id="height">&nbsp;
+                   </span>, Color Depth: <span id="colorDepth"></span></h4>
+     </div>
+    <dl id="accel-data">
+      <dt>X:</dt><dd id="x">&nbsp;</dd>
+      <dt>Y:</dt><dd id="y">&nbsp;</dd>
+      <dt>Z:</dt><dd id="z">&nbsp;</dd>
+    </dl>
+    <a href="#" class="btn large" onclick="toggleAccel();">Toggle Accelerometer</a>
+    <a href="#" class="btn large" onclick="getLocation();">Get Location</a>
+    <a href="tel:411" class="btn large">Call 411</a>
+    <a href="#" class="btn large" onclick="beep();">Beep</a>
+    <a href="#" class="btn large" onclick="vibrate();">Vibrate</a>
+    <a href="#" class="btn large" onclick="show_pic();">Get a Picture</a>
+    <a href="#" class="btn large" onclick="get_contacts();return false;">Get Phone's Contacts</a>
+    <a href="#" class="btn large" onclick="check_network();return false;">Check Network</a>
+    <dl>
+    <dt>Compass Heading:</dt><dd id="h">Off</dd>
+    </dl>
+    <a href="#" class="btn large" onclick="toggleCompass();return false;">Toggle Compass</a>
+    <div id="viewport" class="viewport" style="display: none;">
+      <img style="width:60px;height:60px" id="test_img" src="" />
+    </div>
+  </body>
+</html>

bin/templates/project/cordova/templates/project/assets/www/main.js

@@ -1,3 +1,22 @@
+/*
+       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
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, 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.
+*/
+
 var deviceInfo = function() {
     document.getElementById("platform").innerHTML = device.platform;
     document.getElementById("version").innerHTML = device.version;
@@ -69,7 +88,7 @@ function dump_pic(data) {
     viewport.style.position = "absolute";
     viewport.style.top = "10px";
     viewport.style.left = "10px";
-    document.getElementById("test_img").src = "data:image/jpeg;base64," + data;
+    document.getElementById("test_img").src = data;
 }
 
 function fail(msg) {
@@ -88,16 +107,6 @@ function close() {
     viewport.style.display = "none";
 }
 
-// This is just to do this.
-function readFile() {
-    navigator.file.read('/sdcard/phonegap.txt', fail, fail);
-}
-
-function writeFile() {
-    navigator.file.write('foo.txt', "This is a test of writing to a file",
-            fail, fail);
-}
-
 function contacts_success(contacts) {
     alert(contacts.length
             + ' contacts returned.'
@@ -109,27 +118,43 @@ function get_contacts() {
     var obj = new ContactFindOptions();
     obj.filter = "";
     obj.multiple = true;
-    obj.limit = 5;
-    navigator.service.contacts.find(
+    navigator.contacts.find(
             [ "displayName", "name" ], contacts_success,
             fail, obj);
 }
 
-var networkReachableCallback = function(reachability) {
-    // There is no consistency on the format of reachability
-    var networkState = reachability.code || reachability;
-
-    var currentState = {};
-    currentState[NetworkStatus.NOT_REACHABLE] = 'No network connection';
-    currentState[NetworkStatus.REACHABLE_VIA_CARRIER_DATA_NETWORK] = 'Carrier data connection';
-    currentState[NetworkStatus.REACHABLE_VIA_WIFI_NETWORK] = 'WiFi connection';
-
-    confirm("Connection type:\n" + currentState[networkState]);
-};
-
 function check_network() {
-    navigator.network.isReachable("www.mobiledevelopersolutions.com",
-            networkReachableCallback, {});
+    var networkState = navigator.network.connection.type;
+
+    var states = {};
+    states[Connection.UNKNOWN]  = 'Unknown connection';
+    states[Connection.ETHERNET] = 'Ethernet connection';
+    states[Connection.WIFI]     = 'WiFi connection';
+    states[Connection.CELL_2G]  = 'Cell 2G connection';
+    states[Connection.CELL_3G]  = 'Cell 3G connection';
+    states[Connection.CELL_4G]  = 'Cell 4G connection';
+    states[Connection.NONE]     = 'No network connection';
+
+    confirm('Connection type:\n ' + states[networkState]);
+}
+
+var watchID = null;
+
+function updateHeading(h) {
+    document.getElementById('h').innerHTML = h.magneticHeading;
+}
+
+function toggleCompass() {
+    if (watchID !== null) {
+        navigator.compass.clearWatch(watchID);
+        watchID = null;
+        updateHeading({ magneticHeading : "Off"});
+    } else {        
+        var options = { frequency: 1000 };
+        watchID = navigator.compass.watchHeading(updateHeading, function(e) {
+            alert('Compass Error: ' + e.code);
+        }, options);
+    }
 }
 
 function init() {

bin/templates/project/cordova/templates/project/assets/www/master.css

@@ -1,4 +1,24 @@
-  body {
+/*
+       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
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, 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.
+*/
+
+
+ body {
     background:#222 none repeat scroll 0 0;
     color:#666;
     font-family:Helvetica;

bin/test

@@ -0,0 +1,44 @@
+#! /bin/sh
+#       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
+#       to you under the Apache License, Version 2.0 (the
+#       "License"); you may not use this file except in compliance
+#       with the License.  You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#       Unless required by applicable law or agreed to in writing,
+#       software distributed under the License is distributed on an
+#       "AS IS" BASIS, 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.
+#
+#
+set -e
+
+VERSION=$(cat ./VERSION)
+
+# get the latest mobile-spec
+git clone git@github.com:callback/callback-test.git
+
+# clobber test if it exists
+if [ -e ./test ]
+then
+    rm -rf ./test
+fi
+
+# generate a working proj
+./bin/create ./test org.apache.cordova.test CordovaTest
+
+# kill the default app and replace it w/ mobile-spec
+rm -rf ./test/assets/www
+mv ./callback-test ./test/assets/www
+
+# copy in cordova.js since www dir was replaced above
+cp ./framework/assets/www/cordova-$VERSION.js ./test/assets/www/cordova-$VERSION.js
+
+# build it, launch it and start logging on stdout
+cd ./test && ./cordova/debug && ./cordova/log

bin/tests/autotest.coffee

@@ -0,0 +1,24 @@
+/*
+       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
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, 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.
+*/
+
+
+exports['you are sane'] = (test) ->
+  test.expect 1
+  test.ok true, "this assertion should always pass"
+  test.done()

bin/tests/create.coffee

@@ -0,0 +1,40 @@
+/*
+       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
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, 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.
+*/
+
+util = require 'util'
+exec = require('child_process').exec
+path = require 'path'
+
+exports['default example project is generated'] = (test) ->
+  test.expect 1
+  exec './bin/create', (error, stdout, stderr) ->
+    test.ok true, "this assertion should pass" unless error?
+    test.done()
+
+exports['default example project has a ./.cordova folder'] = (test) ->
+  test.expect 1
+  path.exists './example/.cordova', (exists) ->
+    test.ok exists, 'the cordova folder exists'
+    test.done()
+
+exports['default example project has a /cordova folder'] = (test) ->
+  test.expect 1
+  path.exists './example/cordova', (exists) ->
+    test.ok exists, 'the other cordova folder exists'
+    test.done()

bin/tests/debug.coffee

@@ -0,0 +1,18 @@
+/*
+       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
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, 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.
+*/

example/index.html

@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-  <head>
-    <meta name="viewport" content="width=320; user-scalable=no" />
-    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
-    <title>PhoneGap</title>
-	  <link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title" charset="utf-8">
-	  <script type="text/javascript" charset="utf-8" src="phonegap.0.9.4.min.js"></script>
-	  <script type="text/javascript" charset="utf-8" src="main.js"></script>  
-
-  </head>
-  <body onload="init();" id="stage" class="theme">
-    <h1>Welcome to PhoneGap!</h1>
-    <h2>this file is located at assets/www/index.html</h2>
-    <div id="info">
-        <h4>Platform: <span id="platform"> &nbsp;</span>,   Version: <span id="version">&nbsp;</span></h4>
-        <h4>UUID: <span id="uuid"> &nbsp;</span>,   Name: <span id="name">&nbsp;</span></h4>
-        <h4>Width: <span id="width"> &nbsp;</span>,   Height: <span id="height">&nbsp;
-                   </span>, Color Depth: <span id="colorDepth"></span></h4>
-     </div>
-    <dl id="accel-data">
-      <dt>X:</dt><dd id="x">&nbsp;</dd>
-      <dt>Y:</dt><dd id="y">&nbsp;</dd>
-      <dt>Z:</dt><dd id="z">&nbsp;</dd>
-    </dl>
-    <a href="#" class="btn large" onclick="toggleAccel();">Toggle Accelerometer</a>
-    <a href="#" class="btn large" onclick="getLocation();">Get Location</a>
-	<a href="tel://411" class="btn large">Call 411</a>
-    <a href="#" class="btn large" onclick="beep();">Beep</a>
-    <a href="#" class="btn large" onclick="vibrate();">Vibrate</a>
-    <a href="#" class="btn large" onclick="show_pic();">Get a Picture</a>
-    <a href="#" class="btn large" onclick="get_contacts();">Get Phone's Contacts</a>
-    <a href="#" class="btn large" onclick="check_network();">Check Network</a>
-    <div id="viewport" class="viewport" style="display: none;">       
-      <img style="width:60px;height:60px" id="test_img" src="" />
-    </div> 
-  </body>
-</html>

framework/.classpath

@@ -3,6 +3,6 @@
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="lib" path="libs/commons-codec-1.3.jar"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="lib" path="libs/commons-codec-1.6.jar"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

framework/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>PhoneGap</name>
+	<name>Cordova</name>
 	<comment></comment>
 	<projects>
 	</projects>

framework/AndroidManifest.xml

@@ -1,38 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.phonegap" android:versionName="1.1" android:versionCode="5">
+<!-- 
+       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
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, 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.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:windowSoftInputMode="adjustPan"
+      package="org.apache.cordova" android:versionName="1.1" android:versionCode="5">
     <supports-screens
-    	android:largeScreens="true"
-    	android:normalScreens="true"
-    	android:smallScreens="true"
-    	android:resizeable="true"
-    	android:anyDensity="true"
-    	/>
-    <uses-permission android:name="android.permission.CAMERA" />
+        android:largeScreens="true"
+        android:normalScreens="true"
+        android:smallScreens="true"
+        android:resizeable="true"
+        android:anyDensity="true"
+        />
+    <!-- android:xlargeScreens="true" screen supported only after Android-9 -->
+
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_SMS" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.RECORD_VIDEO"/>
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />   
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />   
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
     
+    <uses-feature android:name="android.hardware.camera" />
+    <uses-feature android:name="android.hardware.camera.autofocus" />
+
     <application android:icon="@drawable/icon" android:label="@string/app_name"
-    	android:debuggable="true">
-        <activity android:name=".StandAlone"
+        android:debuggable="true">
+        <activity android:name=".StandAlone" android:windowSoftInputMode="adjustPan"
                   android:label="@string/app_name" android:configChanges="orientation|keyboardHidden">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name="org.apache.cordova.DroidGap" android:label="@string/app_name" 
+                  android:configChanges="orientation|keyboardHidden">
+            <intent-filter>
+            </intent-filter>
+        </activity>
     </application>
-	<uses-sdk android:minSdkVersion="2" />
 
+    <uses-sdk android:minSdkVersion="2" />
 </manifest> 

framework/ant.properties

@@ -0,0 +1,34 @@
+#       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
+#       to you under the Apache License, Version 2.0 (the
+#       "License"); you may not use this file except in compliance
+#       with the License.  You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#       Unless required by applicable law or agreed to in writing,
+#       software distributed under the License is distributed on an
+#       "AS IS" BASIS, 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.
+#
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked in Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+#  'source.dir' for the location of your java source folder and
+#  'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+#  'key.store' for the location of your keystore and
+#  'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.
+

framework/assets/js/accelerometer.js

@@ -1,121 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-
-function Acceleration(x, y, z) {
-  this.x = x;
-  this.y = y;
-  this.z = z;
-  this.timestamp = new Date().getTime();
-}
-
-/**
- * This class provides access to device accelerometer data.
- * @constructor
- */
-function Accelerometer() {
-
-    /**
-     * The last known acceleration.  type=Acceleration()
-     */
-    this.lastAcceleration = null;
-
-    /**
-     * List of accelerometer watch timers
-     */
-    this.timers = {};
-}
-
-Accelerometer.ERROR_MSG = ["Not running", "Starting", "", "Failed to start"];
-
-/**
- * Asynchronously aquires the current acceleration.
- *
- * @param {Function} successCallback    The function to call when the acceleration data is available
- * @param {Function} errorCallback      The function to call when there is an error getting the acceleration data. (OPTIONAL)
- * @param {AccelerationOptions} options The options for getting the accelerometer data such as timeout. (OPTIONAL)
- */
-Accelerometer.prototype.getCurrentAcceleration = function(successCallback, errorCallback, options) {
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Accelerometer Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Accelerometer Error: errorCallback is not a function");
-        return;
-    }
-
-    // Get acceleration
-    PhoneGap.exec(successCallback, errorCallback, "Accelerometer", "getAcceleration", []);
-};
-
-/**
- * Asynchronously aquires the acceleration repeatedly at a given interval.
- *
- * @param {Function} successCallback    The function to call each time the acceleration data is available
- * @param {Function} errorCallback      The function to call when there is an error getting the acceleration data. (OPTIONAL)
- * @param {AccelerationOptions} options The options for getting the accelerometer data such as timeout. (OPTIONAL)
- * @return String                       The watch id that must be passed to #clearWatch to stop watching.
- */
-Accelerometer.prototype.watchAcceleration = function(successCallback, errorCallback, options) {
-
-    // Default interval (10 sec)
-    var frequency = (options !== undefined)? options.frequency : 10000;
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Accelerometer Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Accelerometer Error: errorCallback is not a function");
-        return;
-    }
-
-    // Make sure accelerometer timeout > frequency + 10 sec
-    PhoneGap.exec(
-        function(timeout) {
-            if (timeout < (frequency + 10000)) {
-                PhoneGap.exec(null, null, "Accelerometer", "setTimeout", [frequency + 10000]);
-            }
-        },
-        function(e) { }, "Accelerometer", "getTimeout", []);
-
-    // Start watch timer
-    var id = PhoneGap.createUUID();
-    navigator.accelerometer.timers[id] = setInterval(function() {
-        PhoneGap.exec(successCallback, errorCallback, "Accelerometer", "getAcceleration", []);
-    }, (frequency ? frequency : 1));
-
-    return id;
-};
-
-/**
- * Clears the specified accelerometer watch.
- *
- * @param {String} id       The id of the watch returned from #watchAcceleration.
- */
-Accelerometer.prototype.clearWatch = function(id) {
-
-    // Stop javascript timer & remove from timer list
-    if (id && navigator.accelerometer.timers[id] !== undefined) {
-        clearInterval(navigator.accelerometer.timers[id]);
-        delete navigator.accelerometer.timers[id];
-    }
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.accelerometer === "undefined") {
-        navigator.accelerometer = new Accelerometer();
-    }
-});

framework/assets/js/app.js

@@ -1,89 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010-2011, IBM Corporation
- */
-
-/**
- * Constructor
- */
-function App() {}
-
-/**
- * Clear the resource cache.
- */
-App.prototype.clearCache = function() {
-    PhoneGap.exec(null, null, "App", "clearCache", []);
-};
-
-/**
- * Load the url into the webview.
- * 
- * @param url           The URL to load
- * @param props         Properties that can be passed in to the activity:
- *      wait: int                           => wait msec before loading URL
- *      loadingDialog: "Title,Message"      => display a native loading dialog
- *      hideLoadingDialogOnPage: boolean    => hide loadingDialog when page loaded instead of when deviceready event occurs.
- *      loadInWebView: boolean              => cause all links on web page to be loaded into existing web view, instead of being loaded into new browser.
- *      loadUrlTimeoutValue: int            => time in msec to wait before triggering a timeout error
- *      errorUrl: URL                       => URL to load if there's an error loading specified URL with loadUrl().  Should be a local URL such as file:///android_asset/www/error.html");
- *      keepRunning: boolean                => enable app to keep running in background
- * 
- * Example:
- *      App app = new App();
- *      app.loadUrl("http://server/myapp/index.html", {wait:2000, loadingDialog:"Wait,Loading App", loadUrlTimeoutValue: 60000});
- */
-App.prototype.loadUrl = function(url, props) {
-    PhoneGap.exec(null, null, "App", "loadUrl", [url, props]);
-};
-
-/**
- * Cancel loadUrl that is waiting to be loaded.
- */
-App.prototype.cancelLoadUrl = function() {
-    PhoneGap.exec(null, null, "App", "cancelLoadUrl", []);
-};
-
-/**
- * Clear web history in this web view.
- * Instead of BACK button loading the previous web page, it will exit the app.
- */
-App.prototype.clearHistory = function() {
-    PhoneGap.exec(null, null, "App", "clearHistory", []);
-};
-
-/**
- * Add a class that implements a service.
- * 
- * @param serviceType
- * @param className
- */
-App.prototype.addService = function(serviceType, className) {
-	PhoneGap.exec(null, null, "App", "addService", [serviceType, className]);
-};
-
-/**
- * Override the default behavior of the Android back button.
- * If overridden, when the back button is pressed, the "backKeyDown" JavaScript event will be fired.
- * 
- * Note: The user should not have to call this method.  Instead, when the user
- *       registers for the "backbutton" event, this is automatically done.
- * 
- * @param override		T=override, F=cancel override
- */
-App.prototype.overrideBackbutton = function(override) {
-    PhoneGap.exec(null, null, "App", "overrideBackbutton", [override]);
-};
-
-/**
- * Exit and terminate the application.
- */
-App.prototype.exitApp = function() {
-	return PhoneGap.exec(null, null, "App", "exitApp", []);
-};
-
-PhoneGap.addConstructor(function() {
-    navigator.app = window.app = new App();
-});

framework/assets/js/camera.js

@@ -1,93 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-
-/**
- * This class provides access to the device camera.
- *
- * @constructor
- */
-Camera = function() {
-    this.successCallback = null;
-    this.errorCallback = null;
-    this.options = null;
-};
-
-/**
- * Format of image that returned from getPicture.
- *
- * Example: navigator.camera.getPicture(success, fail,
- *              { quality: 80,
- *                destinationType: Camera.DestinationType.DATA_URL,
- *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY})
- */
-Camera.DestinationType = {
-    DATA_URL: 0,                // Return base64 encoded string
-    FILE_URI: 1                 // Return file uri (content://media/external/images/media/2 for Android)
-};
-Camera.prototype.DestinationType = Camera.DestinationType;
-
-/**
- * Source to getPicture from.
- *
- * Example: navigator.camera.getPicture(success, fail,
- *              { quality: 80,
- *                destinationType: Camera.DestinationType.DATA_URL,
- *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY})
- */
-Camera.PictureSourceType = {
-    PHOTOLIBRARY : 0,           // Choose image from picture library (same as SAVEDPHOTOALBUM for Android)
-    CAMERA : 1,                 // Take picture from camera
-    SAVEDPHOTOALBUM : 2         // Choose image from picture library (same as PHOTOLIBRARY for Android)
-};
-Camera.prototype.PictureSourceType = Camera.PictureSourceType;
-
-/**
- * Gets a picture from source defined by "options.sourceType", and returns the
- * image as defined by the "options.destinationType" option.
-
- * The defaults are sourceType=CAMERA and destinationType=DATA_URL.
- *
- * @param {Function} successCallback
- * @param {Function} errorCallback
- * @param {Object} options
- */
-Camera.prototype.getPicture = function(successCallback, errorCallback, options) {
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Camera Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Camera Error: errorCallback is not a function");
-        return;
-    }
-
-    this.options = options;
-    var quality = 80;
-    if (options.quality) {
-        quality = this.options.quality;
-    }
-    var destinationType = Camera.DestinationType.DATA_URL;
-    if (this.options.destinationType) {
-        destinationType = this.options.destinationType;
-    }
-    var sourceType = Camera.PictureSourceType.CAMERA;
-    if (typeof this.options.sourceType === "number") {
-        sourceType = this.options.sourceType;
-    }
-    PhoneGap.exec(successCallback, errorCallback, "Camera", "takePicture", [quality, destinationType, sourceType]);
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.camera === "undefined") {
-        navigator.camera = new Camera();
-    }
-});

framework/assets/js/compass.js

@@ -1,115 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-
-/**
- * This class provides access to device Compass data.
- * @constructor
- */
-function Compass() {
-    /**
-     * The last known Compass position.
-     */
-    this.lastHeading = null;
-
-    /**
-     * List of compass watch timers
-     */
-    this.timers = {};
-}
-
-Compass.ERROR_MSG = ["Not running", "Starting", "", "Failed to start"];
-
-/**
- * Asynchronously aquires the current heading.
- *
- * @param {Function} successCallback The function to call when the heading data is available
- * @param {Function} errorCallback The function to call when there is an error getting the heading data. (OPTIONAL)
- * @param {PositionOptions} options The options for getting the heading data such as timeout. (OPTIONAL)
- */
-Compass.prototype.getCurrentHeading = function(successCallback, errorCallback, options) {
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Compass Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Compass Error: errorCallback is not a function");
-        return;
-    }
-
-    // Get heading
-    PhoneGap.exec(successCallback, errorCallback, "Compass", "getHeading", []);
-};
-
-/**
- * Asynchronously aquires the heading repeatedly at a given interval.
- *
- * @param {Function} successCallback    The function to call each time the heading data is available
- * @param {Function} errorCallback      The function to call when there is an error getting the heading data. (OPTIONAL)
- * @param {HeadingOptions} options      The options for getting the heading data such as timeout and the frequency of the watch. (OPTIONAL)
- * @return String                       The watch id that must be passed to #clearWatch to stop watching.
- */
-Compass.prototype.watchHeading= function(successCallback, errorCallback, options) {
-
-    // Default interval (100 msec)
-    var frequency = (options !== undefined) ? options.frequency : 100;
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Compass Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Compass Error: errorCallback is not a function");
-        return;
-    }
-
-    // Make sure compass timeout > frequency + 10 sec
-    PhoneGap.exec(
-        function(timeout) {
-            if (timeout < (frequency + 10000)) {
-                PhoneGap.exec(null, null, "Compass", "setTimeout", [frequency + 10000]);
-            }
-        },
-        function(e) { }, "Compass", "getTimeout", []);
-
-    // Start watch timer to get headings
-    var id = PhoneGap.createUUID();
-    navigator.compass.timers[id] = setInterval(
-        function() {
-            PhoneGap.exec(successCallback, errorCallback, "Compass", "getHeading", []);
-        }, (frequency ? frequency : 1));
-
-    return id;
-};
-
-
-/**
- * Clears the specified heading watch.
- *
- * @param {String} id       The ID of the watch returned from #watchHeading.
- */
-Compass.prototype.clearWatch = function(id) {
-
-    // Stop javascript timer & remove from timer list
-    if (id && navigator.compass.timers[id]) {
-        clearInterval(navigator.compass.timers[id]);
-        delete navigator.compass.timers[id];
-    }
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.compass === "undefined") {
-        navigator.compass = new Compass();
-    }
-});

framework/assets/js/contact.js

@@ -1,297 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-
-/**
-* Contains information about a single contact.
-* @param {DOMString} id unique identifier
-* @param {DOMString} displayName
-* @param {ContactName} name
-* @param {DOMString} nickname
-* @param {ContactField[]} phoneNumbers array of phone numbers
-* @param {ContactField[]} emails array of email addresses
-* @param {ContactAddress[]} addresses array of addresses
-* @param {ContactField[]} ims instant messaging user ids
-* @param {ContactOrganization[]} organizations
-* @param {DOMString} revision date contact was last updated
-* @param {DOMString} birthday contact's birthday
-* @param {DOMString} gender contact's gender
-* @param {DOMString} note user notes about contact
-* @param {ContactField[]} photos
-* @param {ContactField[]} categories
-* @param {ContactField[]} urls contact's web sites
-* @param {DOMString} timezone the contacts time zone
-*/
-var Contact = function (id, displayName, name, nickname, phoneNumbers, emails, addresses,
-    ims, organizations, revision, birthday, gender, note, photos, categories, urls, timezone) {
-    this.id = id || null;
-    this.rawId = null;
-    this.displayName = displayName || null;
-    this.name = name || null; // ContactName
-    this.nickname = nickname || null;
-    this.phoneNumbers = phoneNumbers || null; // ContactField[]
-    this.emails = emails || null; // ContactField[]
-    this.addresses = addresses || null; // ContactAddress[]
-    this.ims = ims || null; // ContactField[]
-    this.organizations = organizations || null; // ContactOrganization[]
-    this.revision = revision || null;
-    this.birthday = birthday || null;
-    this.gender = gender || null;
-    this.note = note || null;
-    this.photos = photos || null; // ContactField[]
-    this.categories = categories || null; // ContactField[]
-    this.urls = urls || null; // ContactField[]
-    this.timezone = timezone || null;
-};
-
-/**
- *  ContactError.
- *  An error code assigned by an implementation when an error has occurred
- */
-var ContactError = function() {
-    this.code=null;
-};
-
-/**
- * Error codes
- */
-ContactError.UNKNOWN_ERROR = 0;
-ContactError.INVALID_ARGUMENT_ERROR = 1;
-ContactError.NOT_FOUND_ERROR = 2;
-ContactError.TIMEOUT_ERROR = 3;
-ContactError.PENDING_OPERATION_ERROR = 4;
-ContactError.IO_ERROR = 5;
-ContactError.NOT_SUPPORTED_ERROR = 6;
-ContactError.PERMISSION_DENIED_ERROR = 20;
-
-/**
-* Removes contact from device storage.
-* @param successCB success callback
-* @param errorCB error callback
-*/
-Contact.prototype.remove = function(successCB, errorCB) {
-    if (this.id === null) {
-        var errorObj = new ContactError();
-        errorObj.code = ContactError.NOT_FOUND_ERROR;
-        errorCB(errorObj);
-    }
-    else {
-        PhoneGap.exec(successCB, errorCB, "Contacts", "remove", [this.id]);
-    }
-};
-
-/**
-* Creates a deep copy of this Contact.
-* With the contact ID set to null.
-* @return copy of this Contact
-*/
-Contact.prototype.clone = function() {
-    var clonedContact = PhoneGap.clone(this);
-    var i;
-    clonedContact.id = null;
-    clonedContact.rawId = null;
-    // Loop through and clear out any id's in phones, emails, etc.
-    if (clonedContact.phoneNumbers) {
-        for (i = 0; i < clonedContact.phoneNumbers.length; i++) {
-            clonedContact.phoneNumbers[i].id = null;
-        }
-    }
-    if (clonedContact.emails) {
-        for (i = 0; i < clonedContact.emails.length; i++) {
-            clonedContact.emails[i].id = null;
-        }
-    }
-    if (clonedContact.addresses) {
-        for (i = 0; i < clonedContact.addresses.length; i++) {
-            clonedContact.addresses[i].id = null;
-        }
-    }
-    if (clonedContact.ims) {
-        for (i = 0; i < clonedContact.ims.length; i++) {
-            clonedContact.ims[i].id = null;
-        }
-    }
-    if (clonedContact.organizations) {
-        for (i = 0; i < clonedContact.organizations.length; i++) {
-            clonedContact.organizations[i].id = null;
-        }
-    }
-    if (clonedContact.tags) {
-        for (i = 0; i < clonedContact.tags.length; i++) {
-            clonedContact.tags[i].id = null;
-        }
-    }
-    if (clonedContact.photos) {
-        for (i = 0; i < clonedContact.photos.length; i++) {
-            clonedContact.photos[i].id = null;
-        }
-    }
-    if (clonedContact.urls) {
-        for (i = 0; i < clonedContact.urls.length; i++) {
-            clonedContact.urls[i].id = null;
-        }
-    }
-    return clonedContact;
-};
-
-/**
-* Persists contact to device storage.
-* @param successCB success callback
-* @param errorCB error callback
-*/
-Contact.prototype.save = function(successCB, errorCB) {
-    PhoneGap.exec(successCB, errorCB, "Contacts", "save", [this]);
-};
-
-/**
-* Contact name.
-* @param formatted
-* @param familyName
-* @param givenName
-* @param middle
-* @param prefix
-* @param suffix
-*/
-var ContactName = function(formatted, familyName, givenName, middle, prefix, suffix) {
-    this.formatted = formatted || null;
-    this.familyName = familyName || null;
-    this.givenName = givenName || null;
-    this.middleName = middle || null;
-    this.honorificPrefix = prefix || null;
-    this.honorificSuffix = suffix || null;
-};
-
-/**
-* Generic contact field.
-* @param {DOMString} id unique identifier, should only be set by native code
-* @param type
-* @param value
-* @param pref
-*/
-var ContactField = function(type, value, pref) {
-	this.id = null;
-    this.type = type || null;
-    this.value = value || null;
-    this.pref = pref || null;
-};
-
-/**
-* Contact address.
-* @param {DOMString} id unique identifier, should only be set by native code
-* @param formatted
-* @param streetAddress
-* @param locality
-* @param region
-* @param postalCode
-* @param country
-*/
-var ContactAddress = function(formatted, streetAddress, locality, region, postalCode, country) {
-	this.id = null;
-    this.formatted = formatted || null;
-    this.streetAddress = streetAddress || null;
-    this.locality = locality || null;
-    this.region = region || null;
-    this.postalCode = postalCode || null;
-    this.country = country || null;
-};
-
-/**
-* Contact organization.
-* @param {DOMString} id unique identifier, should only be set by native code
-* @param name
-* @param dept
-* @param title
-* @param startDate
-* @param endDate
-* @param location
-* @param desc
-*/
-var ContactOrganization = function(name, dept, title) {
-	this.id = null;
-    this.name = name || null;
-    this.department = dept || null;
-    this.title = title || null;
-};
-
-/**
-* Represents a group of Contacts.
-*/
-var Contacts = function() {
-    this.inProgress = false;
-    this.records = [];
-};
-/**
-* Returns an array of Contacts matching the search criteria.
-* @param fields that should be searched
-* @param successCB success callback
-* @param errorCB error callback
-* @param {ContactFindOptions} options that can be applied to contact searching
-* @return array of Contacts matching search criteria
-*/
-Contacts.prototype.find = function(fields, successCB, errorCB, options) {
-    PhoneGap.exec(successCB, errorCB, "Contacts", "search", [fields, options]);
-};
-
-/**
-* This function creates a new contact, but it does not persist the contact
-* to device storage. To persist the contact to device storage, invoke
-* contact.save().
-* @param properties an object who's properties will be examined to create a new Contact
-* @returns new Contact object
-*/
-Contacts.prototype.create = function(properties) {
-    var i;
-	var contact = new Contact();
-    for (i in properties) {
-        if (contact[i] !== 'undefined') {
-            contact[i] = properties[i];
-        }
-    }
-    return contact;
-};
-
-/**
-* This function returns and array of contacts.  It is required as we need to convert raw 
-* JSON objects into concrete Contact objects.  Currently this method is called after 
-* navigator.service.contacts.find but before the find methods success call back.
-* 
-* @param jsonArray an array of JSON Objects that need to be converted to Contact objects.
-* @returns an array of Contact objects
-*/
-Contacts.prototype.cast = function(pluginResult) {
-	var contacts = [];
-	var i;
-	for (i=0; i<pluginResult.message.length; i++) {
-		contacts.push(navigator.service.contacts.create(pluginResult.message[i]));
-	}
-	pluginResult.message = contacts;
-	return pluginResult;
-};
-
-/**
- * ContactFindOptions.
- * @param filter used to match contacts against
- * @param multiple boolean used to determine if more than one contact should be returned
- * @param updatedSince return only contact records that have been updated on or after the given time
- */
-var ContactFindOptions = function(filter, multiple, updatedSince) {
-    this.filter = filter || '';
-    this.multiple = multiple || true;
-    this.updatedSince = updatedSince || '';
-};
-
-/**
- * Add the contact interface into the browser.
- */
-PhoneGap.addConstructor(function() {
-    if(typeof navigator.service === "undefined") {
-        navigator.service = {};
-    }
-    if(typeof navigator.service.contacts === "undefined") {
-        navigator.service.contacts = new Contacts();
-    }
-});

framework/assets/js/crypto.js

@@ -1,37 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-
-// TODO: Needs to be commented
-
-var Crypto = function() {
-};
-
-Crypto.prototype.encrypt = function(seed, string, callback) {
-    this.encryptWin = callback;
-    PhoneGap.exec(null, null, "Crypto", "encrypt", [seed, string]);
-};
-
-Crypto.prototype.decrypt = function(seed, string, callback) {
-    this.decryptWin = callback;
-    PhoneGap.exec(null, null, "Crypto", "decrypt", [seed, string]);
-};
-
-Crypto.prototype.gotCryptedString = function(string) {
-    this.encryptWin(string);
-};
-
-Crypto.prototype.getPlainString = function(string) {
-    this.decryptWin(string);
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.Crypto === "undefined") {
-        navigator.Crypto = new Crypto();
-    }
-});
-

framework/assets/js/device.js

@@ -1,99 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010-2011, IBM Corporation
- */
-
-/**
- * This represents the mobile device, and provides properties for inspecting the model, version, UUID of the
- * phone, etc.
- * @constructor
- */
-function Device() {
-    this.available = PhoneGap.available;
-    this.platform = null;
-    this.version = null;
-    this.name = null;
-    this.uuid = null;
-    this.phonegap = null;
-
-    var me = this;
-    this.getInfo(
-        function(info) {
-            me.available = true;
-            me.platform = info.platform;
-            me.version = info.version;
-            me.name = info.name;
-            me.uuid = info.uuid;
-            me.phonegap = info.phonegap;
-            PhoneGap.onPhoneGapInfoReady.fire();
-        },
-        function(e) {
-            me.available = false;
-            console.log("Error initializing PhoneGap: " + e);
-            alert("Error initializing PhoneGap: "+e);
-        });
-}
-
-/**
- * Get device info
- *
- * @param {Function} successCallback The function to call when the heading data is available
- * @param {Function} errorCallback The function to call when there is an error getting the heading data. (OPTIONAL)
- */
-Device.prototype.getInfo = function(successCallback, errorCallback) {
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Device Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Device Error: errorCallback is not a function");
-        return;
-    }
-
-    // Get info
-    PhoneGap.exec(successCallback, errorCallback, "Device", "getDeviceInfo", []);
-};
-
-/*
- * DEPRECATED
- * This is only for Android.
- *
- * You must explicitly override the back button.
- */
-Device.prototype.overrideBackButton = function() {
-	console.log("Device.overrideBackButton() is deprecated.  Use App.overrideBackbutton(true).");
-	app.overrideBackbutton(true);
-};
-
-/*
- * DEPRECATED
- * This is only for Android.
- *
- * This resets the back button to the default behaviour
- */
-Device.prototype.resetBackButton = function() {
-	console.log("Device.resetBackButton() is deprecated.  Use App.overrideBackbutton(false).");
-	app.overrideBackbutton(false);
-};
-
-/*
- * DEPRECATED
- * This is only for Android.
- *
- * This terminates the activity!
- */
-Device.prototype.exitApp = function() {
-	console.log("Device.exitApp() is deprecated.  Use App.exitApp().");
-	app.exitApp();
-};
-
-PhoneGap.addConstructor(function() {
-    navigator.device = window.device = new Device();
-});

framework/assets/js/filetransfer.js

@@ -1,77 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *  
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-
-/**
- * FileTransfer uploads a file to a remote server.
- */
-function FileTransfer() {}
-
-/**
- * FileUploadResult
- */
-function FileUploadResult() {
-    this.bytesSent = 0;
-    this.responseCode = null;
-    this.response = null;
-}
-
-/**
- * FileTransferError
- */
-function FileTransferError() {
-    this.code = null;
-}
-
-FileTransferError.FILE_NOT_FOUND_ERR = 1;
-FileTransferError.INVALID_URL_ERR = 2;
-FileTransferError.CONNECTION_ERR = 3;
-
-/**
-* Given an absolute file path, uploads a file on the device to a remote server 
-* using a multipart HTTP request.
-* @param filePath {String}           Full path of the file on the device
-* @param server {String}             URL of the server to receive the file
-* @param successCallback (Function}  Callback to be invoked when upload has completed
-* @param errorCallback {Function}    Callback to be invoked upon error
-* @param options {FileUploadOptions} Optional parameters such as file name and mimetype           
-*/
-FileTransfer.prototype.upload = function(filePath, server, successCallback, errorCallback, options, debug) {
-
-    // check for options
-    var fileKey = null;
-    var fileName = null;
-    var mimeType = null;
-    var params = null;
-    if (options) {
-        fileKey = options.fileKey;
-        fileName = options.fileName;
-        mimeType = options.mimeType;
-        if (options.params) {
-            params = options.params;
-        }
-        else {
-            params = {};
-        }
-    }
-    
-    PhoneGap.exec(successCallback, errorCallback, 'FileTransfer', 'upload', [filePath, server, fileKey, fileName, mimeType, params, debug]);
-};
-
-/**
- * Options to customize the HTTP request used to upload files.
- * @param fileKey {String}   Name of file request parameter.
- * @param fileName {String}  Filename to be used by the server. Defaults to image.jpg.
- * @param mimeType {String}  Mimetype of the uploaded file. Defaults to image/jpeg.
- * @param params {Object}    Object with key: value params to send to the server.
- */
-function FileUploadOptions(fileKey, fileName, mimeType, params) {
-    this.fileKey = fileKey || null;
-    this.fileName = fileName || null;
-    this.mimeType = mimeType || null;
-    this.params = params || null;
-}

framework/assets/js/geolocation.js

@@ -1,194 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-
-/**
- * This class provides access to device GPS data.
- * @constructor
- */
-function Geolocation() {
-
-    // The last known GPS position.
-    this.lastPosition = null;
-
-    // Geolocation listeners
-    this.listeners = {};
-}
-
-/**
- * Position error object
- *
- * @param code
- * @param message
- */
-function PositionError(code, message) {
-    this.code = code;
-    this.message = message;
-}
-
-PositionError.PERMISSION_DENIED = 1;
-PositionError.POSITION_UNAVAILABLE = 2;
-PositionError.TIMEOUT = 3;
-
-/**
- * Asynchronously aquires the current position.
- *
- * @param {Function} successCallback    The function to call when the position data is available
- * @param {Function} errorCallback      The function to call when there is an error getting the heading position. (OPTIONAL)
- * @param {PositionOptions} options     The options for getting the position data. (OPTIONAL)
- */
-Geolocation.prototype.getCurrentPosition = function(successCallback, errorCallback, options) {
-    if (navigator._geo.listeners.global) {
-        console.log("Geolocation Error: Still waiting for previous getCurrentPosition() request.");
-        try {
-            errorCallback(new PositionError(PositionError.TIMEOUT, "Geolocation Error: Still waiting for previous getCurrentPosition() request."));
-        } catch (e) {
-        }
-        return;
-    }
-    var maximumAge = 10000;
-    var enableHighAccuracy = false;
-    var timeout = 10000;
-    if (typeof options !== "undefined") {
-        if (typeof options.maximumAge !== "undefined") {
-            maximumAge = options.maximumAge;
-        }
-        if (typeof options.enableHighAccuracy !== "undefined") {
-            enableHighAccuracy = options.enableHighAccuracy;
-        }
-        if (typeof options.timeout !== "undefined") {
-            timeout = options.timeout;
-        }
-    }
-    navigator._geo.listeners.global = {"success" : successCallback, "fail" : errorCallback };
-    PhoneGap.exec(null, null, "Geolocation", "getCurrentLocation", [enableHighAccuracy, timeout, maximumAge]);
-};
-
-/**
- * Asynchronously watches the geolocation for changes to geolocation.  When a change occurs,
- * the successCallback is called with the new location.
- *
- * @param {Function} successCallback    The function to call each time the location data is available
- * @param {Function} errorCallback      The function to call when there is an error getting the location data. (OPTIONAL)
- * @param {PositionOptions} options     The options for getting the location data such as frequency. (OPTIONAL)
- * @return String                       The watch id that must be passed to #clearWatch to stop watching.
- */
-Geolocation.prototype.watchPosition = function(successCallback, errorCallback, options) {
-    var maximumAge = 10000;
-    var enableHighAccuracy = false;
-    var timeout = 10000;
-    if (typeof options !== "undefined") {
-        if (typeof options.frequency  !== "undefined") {
-            maximumAge = options.frequency;
-        }
-        if (typeof options.maximumAge !== "undefined") {
-            maximumAge = options.maximumAge;
-        }
-        if (typeof options.enableHighAccuracy !== "undefined") {
-            enableHighAccuracy = options.enableHighAccuracy;
-        }
-        if (typeof options.timeout !== "undefined") {
-            timeout = options.timeout;
-        }
-    }
-    var id = PhoneGap.createUUID();
-    navigator._geo.listeners[id] = {"success" : successCallback, "fail" : errorCallback };
-    PhoneGap.exec(null, null, "Geolocation", "start", [id, enableHighAccuracy, timeout, maximumAge]);
-    return id;
-};
-
-/*
- * Native callback when watch position has a new position.
- * PRIVATE METHOD
- *
- * @param {String} id
- * @param {Number} lat
- * @param {Number} lng
- * @param {Number} alt
- * @param {Number} altacc
- * @param {Number} head
- * @param {Number} vel
- * @param {Number} stamp
- */
-Geolocation.prototype.success = function(id, lat, lng, alt, altacc, head, vel, stamp) {
-    var coords = new Coordinates(lat, lng, alt, altacc, head, vel);
-    var loc = new Position(coords, stamp);
-    try {
-        if (lat === "undefined" || lng === "undefined") {
-            navigator._geo.listeners[id].fail(new PositionError(PositionError.POSITION_UNAVAILABLE, "Lat/Lng are undefined."));
-        }
-        else {
-            navigator._geo.lastPosition = loc;
-            navigator._geo.listeners[id].success(loc);
-        }
-    }
-    catch (e) {
-        console.log("Geolocation Error: Error calling success callback function.");
-    }
-
-    if (id === "global") {
-        delete navigator._geo.listeners.global;
-    }
-};
-
-/**
- * Native callback when watch position has an error.
- * PRIVATE METHOD
- *
- * @param {String} id       The ID of the watch
- * @param {Number} code     The error code
- * @param {String} msg      The error message
- */
-Geolocation.prototype.fail = function(id, code, msg) {
-    try {
-        navigator._geo.listeners[id].fail(new PositionError(code, msg));
-    }
-    catch (e) {
-        console.log("Geolocation Error: Error calling error callback function.");
-    }
-};
-
-/**
- * Clears the specified heading watch.
- *
- * @param {String} id       The ID of the watch returned from #watchPosition
- */
-Geolocation.prototype.clearWatch = function(id) {
-    PhoneGap.exec(null, null, "Geolocation", "stop", [id]);
-    delete navigator._geo.listeners[id];
-};
-
-/**
- * Force the PhoneGap geolocation to be used instead of built-in.
- */
-Geolocation.usingPhoneGap = false;
-Geolocation.usePhoneGap = function() {
-    if (Geolocation.usingPhoneGap) {
-        return;
-    }
-    Geolocation.usingPhoneGap = true;
-
-    // Set built-in geolocation methods to our own implementations
-    // (Cannot replace entire geolocation, but can replace individual methods)
-    navigator.geolocation.setLocation = navigator._geo.setLocation;
-    navigator.geolocation.getCurrentPosition = navigator._geo.getCurrentPosition;
-    navigator.geolocation.watchPosition = navigator._geo.watchPosition;
-    navigator.geolocation.clearWatch = navigator._geo.clearWatch;
-    navigator.geolocation.start = navigator._geo.start;
-    navigator.geolocation.stop = navigator._geo.stop;
-};
-
-PhoneGap.addConstructor(function() {
-    navigator._geo = new Geolocation();
-
-    // No native geolocation object for Android 1.x, so use PhoneGap geolocation
-    if (typeof navigator.geolocation === 'undefined') {
-        navigator.geolocation = navigator._geo;
-        Geolocation.usingPhoneGap = true;
-    }
-});
-

framework/assets/js/header.txt

@@ -1,7 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */

framework/assets/js/media.js

@@ -1,201 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-
-/**
- * List of media objects.
- * PRIVATE
- */
-PhoneGap.mediaObjects = {};
-
-/**
- * Object that receives native callbacks.
- * PRIVATE
- */
-PhoneGap.Media = function() {};
-
-/**
- * Get the media object.
- * PRIVATE
- *
- * @param id            The media object id (string)
- */
-PhoneGap.Media.getMediaObject = function(id) {
-    return PhoneGap.mediaObjects[id];
-};
-
-/**
- * Audio has status update.
- * PRIVATE
- *
- * @param id            The media object id (string)
- * @param status        The status code (int)
- * @param msg           The status message (string)
- */
-PhoneGap.Media.onStatus = function(id, msg, value) {
-    var media = PhoneGap.mediaObjects[id];
-
-    // If state update
-    if (msg === Media.MEDIA_STATE) {
-        if (value === Media.MEDIA_STOPPED) {
-            if (media.successCallback) {
-                media.successCallback();
-            }
-        }
-        if (media.statusCallback) {
-            media.statusCallback(value);
-        }
-    }
-    else if (msg === Media.MEDIA_DURATION) {
-        media._duration = value;
-    }
-    else if (msg === Media.MEDIA_ERROR) {
-        if (media.errorCallback) {
-            media.errorCallback(value);
-        }
-    }
-};
-
-/**
- * This class provides access to the device media, interfaces to both sound and video
- *
- * @param src                   The file name or url to play
- * @param successCallback       The callback to be called when the file is done playing or recording.
- *                                  successCallback() - OPTIONAL
- * @param errorCallback         The callback to be called if there is an error.
- *                                  errorCallback(int errorCode) - OPTIONAL
- * @param statusCallback        The callback to be called when media status has changed.
- *                                  statusCallback(int statusCode) - OPTIONAL
- * @param positionCallback      The callback to be called when media position has changed.
- *                                  positionCallback(long position) - OPTIONAL
- */
-Media = function(src, successCallback, errorCallback, statusCallback, positionCallback) {
-
-    // successCallback optional
-    if (successCallback && (typeof successCallback !== "function")) {
-        console.log("Media Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Media Error: errorCallback is not a function");
-        return;
-    }
-
-    // statusCallback optional
-    if (statusCallback && (typeof statusCallback !== "function")) {
-        console.log("Media Error: statusCallback is not a function");
-        return;
-    }
-
-    // statusCallback optional
-    if (positionCallback && (typeof positionCallback !== "function")) {
-        console.log("Media Error: positionCallback is not a function");
-        return;
-    }
-
-    this.id = PhoneGap.createUUID();
-    PhoneGap.mediaObjects[this.id] = this;
-    this.src = src;
-    this.successCallback = successCallback;
-    this.errorCallback = errorCallback;
-    this.statusCallback = statusCallback;
-    this.positionCallback = positionCallback;
-    this._duration = -1;
-    this._position = -1;
-};
-
-// Media messages
-Media.MEDIA_STATE = 1;
-Media.MEDIA_DURATION = 2;
-Media.MEDIA_ERROR = 9;
-
-// Media states
-Media.MEDIA_NONE = 0;
-Media.MEDIA_STARTING = 1;
-Media.MEDIA_RUNNING = 2;
-Media.MEDIA_PAUSED = 3;
-Media.MEDIA_STOPPED = 4;
-Media.MEDIA_MSG = ["None", "Starting", "Running", "Paused", "Stopped"];
-
-// TODO: Will MediaError be used?
-/**
- * This class contains information about any Media errors.
- * @constructor
- */
-function MediaError() {
-    this.code = null;
-    this.message = "";
-}
-
-MediaError.MEDIA_ERR_ABORTED        = 1;
-MediaError.MEDIA_ERR_NETWORK        = 2;
-MediaError.MEDIA_ERR_DECODE         = 3;
-MediaError.MEDIA_ERR_NONE_SUPPORTED = 4;
-
-/**
- * Start or resume playing audio file.
- */
-Media.prototype.play = function() {
-    PhoneGap.exec(null, null, "Media", "startPlayingAudio", [this.id, this.src]);
-};
-
-/**
- * Stop playing audio file.
- */
-Media.prototype.stop = function() {
-    return PhoneGap.exec(null, null, "Media", "stopPlayingAudio", [this.id]);
-};
-
-/**
- * Pause playing audio file.
- */
-Media.prototype.pause = function() {
-    PhoneGap.exec(null, null, "Media", "pausePlayingAudio", [this.id]);
-};
-
-/**
- * Get duration of an audio file.
- * The duration is only set for audio that is playing, paused or stopped.
- *
- * @return      duration or -1 if not known.
- */
-Media.prototype.getDuration = function() {
-    return this._duration;
-};
-
-/**
- * Get position of audio.
- *
- * @return
- */
-Media.prototype.getCurrentPosition = function(success, fail) {
-    PhoneGap.exec(success, fail, "Media", "getCurrentPositionAudio", [this.id]);
-};
-
-/**
- * Start recording audio file.
- */
-Media.prototype.startRecord = function() {
-    PhoneGap.exec(null, null, "Media", "startRecordingAudio", [this.id, this.src]);
-};
-
-/**
- * Stop recording audio file.
- */
-Media.prototype.stopRecord = function() {
-    PhoneGap.exec(null, null, "Media", "stopRecordingAudio", [this.id]);
-};
-
-/**
- * Release the resources.
- */
-Media.prototype.release = function() {
-    PhoneGap.exec(null, null, "Media", "release", [this.id]);
-};
-

framework/assets/js/network.js

@@ -1,64 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-
-/**
- * This class contains information about any NetworkStatus.
- * @constructor
- */
-function NetworkStatus() {
-    //this.code = null;
-    //this.message = "";
-}
-
-NetworkStatus.NOT_REACHABLE = 0;
-NetworkStatus.REACHABLE_VIA_CARRIER_DATA_NETWORK = 1;
-NetworkStatus.REACHABLE_VIA_WIFI_NETWORK = 2;
-
-/**
- * This class provides access to device Network data (reachability).
- * @constructor
- */
-function Network() {
-    /**
-     * The last known Network status.
-     * { hostName: string, ipAddress: string,
-        remoteHostStatus: int(0/1/2), internetConnectionStatus: int(0/1/2), localWiFiConnectionStatus: int (0/2) }
-     */
-    this.lastReachability = null;
-}
-
-/**
- * Called by the geolocation framework when the reachability status has changed.
- * @param {Reachibility} reachability The current reachability status.
- */
-// TODO: Callback from native code not implemented for Android
-Network.prototype.updateReachability = function(reachability) {
-    this.lastReachability = reachability;
-};
-
-/**
- * Determine if a URI is reachable over the network.
-
- * @param {Object} uri
- * @param {Function} callback
- * @param {Object} options  (isIpAddress:boolean)
- */
-Network.prototype.isReachable = function(uri, callback, options) {
-    var isIpAddress = false;
-    if (options && options.isIpAddress) {
-        isIpAddress = options.isIpAddress;
-    }
-    PhoneGap.exec(callback, null, "Network Status", "isReachable", [uri, isIpAddress]);
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.network === "undefined") {
-        navigator.network = new Network();
-    }
-});
-

framework/assets/js/notification.js

@@ -1,118 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-
-/**
- * This class provides access to notifications on the device.
- */
-function Notification() {
-}
-
-/**
- * Open a native alert dialog, with a customizable title and button text.
- *
- * @param {String} message              Message to print in the body of the alert
- * @param {Function} completeCallback   The callback that is called when user clicks on a button.
- * @param {String} title                Title of the alert dialog (default: Alert)
- * @param {String} buttonLabel          Label of the close button (default: OK)
- */
-Notification.prototype.alert = function(message, completeCallback, title, buttonLabel) {
-    var _title = (title || "Alert");
-    var _buttonLabel = (buttonLabel || "OK");
-    PhoneGap.exec(completeCallback, null, "Notification", "alert", [message,_title,_buttonLabel]);
-};
-
-/**
- * Open a native confirm dialog, with a customizable title and button text.
- * The result that the user selects is returned to the result callback.
- *
- * @param {String} message              Message to print in the body of the alert
- * @param {Function} resultCallback     The callback that is called when user clicks on a button.
- * @param {String} title                Title of the alert dialog (default: Confirm)
- * @param {String} buttonLabels         Comma separated list of the labels of the buttons (default: 'OK,Cancel')
- */
-Notification.prototype.confirm = function(message, resultCallback, title, buttonLabels) {
-    var _title = (title || "Confirm");
-    var _buttonLabels = (buttonLabels || "OK,Cancel");
-    PhoneGap.exec(resultCallback, null, "Notification", "confirm", [message,_title,_buttonLabels]);
-};
-
-/**
- * Start spinning the activity indicator on the statusbar
- */
-Notification.prototype.activityStart = function() {
-    PhoneGap.exec(null, null, "Notification", "activityStart", ["Busy","Please wait..."]);
-};
-
-/**
- * Stop spinning the activity indicator on the statusbar, if it's currently spinning
- */
-Notification.prototype.activityStop = function() {
-    PhoneGap.exec(null, null, "Notification", "activityStop", []);
-};
-
-/**
- * Display a progress dialog with progress bar that goes from 0 to 100.
- *
- * @param {String} title        Title of the progress dialog.
- * @param {String} message      Message to display in the dialog.
- */
-Notification.prototype.progressStart = function(title, message) {
-    PhoneGap.exec(null, null, "Notification", "progressStart", [title, message]);
-};
-
-/**
- * Set the progress dialog value.
- *
- * @param {Number} value         0-100
- */
-Notification.prototype.progressValue = function(value) {
-    PhoneGap.exec(null, null, "Notification", "progressValue", [value]);
-};
-
-/**
- * Close the progress dialog.
- */
-Notification.prototype.progressStop = function() {
-    PhoneGap.exec(null, null, "Notification", "progressStop", []);
-};
-
-/**
- * Causes the device to blink a status LED.
- *
- * @param {Integer} count       The number of blinks.
- * @param {String} colour       The colour of the light.
- */
-Notification.prototype.blink = function(count, colour) {
-    // NOT IMPLEMENTED
-};
-
-/**
- * Causes the device to vibrate.
- *
- * @param {Integer} mills       The number of milliseconds to vibrate for.
- */
-Notification.prototype.vibrate = function(mills) {
-    PhoneGap.exec(null, null, "Notification", "vibrate", [mills]);
-};
-
-/**
- * Causes the device to beep.
- * On Android, the default notification ringtone is played "count" times.
- *
- * @param {Integer} count       The number of beeps.
- */
-Notification.prototype.beep = function(count) {
-    PhoneGap.exec(null, null, "Notification", "beep", [count]);
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.notification === "undefined") {
-        navigator.notification = new Notification();
-    }
-});
-

framework/assets/js/phonegap.js.base

@@ -1,866 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010-2011, IBM Corporation
- */
-
-
-/**
- * The order of events during page load and PhoneGap startup is as follows:
- *
- * onDOMContentLoaded         Internal event that is received when the web page is loaded and parsed.
- * window.onload              Body onload event.
- * onNativeReady              Internal event that indicates the PhoneGap native side is ready.
- * onPhoneGapInit             Internal event that kicks off creation of all PhoneGap JavaScript objects (runs constructors).
- * onPhoneGapReady            Internal event fired when all PhoneGap JavaScript objects have been created
- * onPhoneGapInfoReady        Internal event fired when device properties are available
- * onDeviceReady              User event fired to indicate that PhoneGap is ready
- * onResume                   User event fired to indicate a start/resume lifecycle event
- *
- * The only PhoneGap events that user code should register for are:
- *      onDeviceReady
- *      onResume
- *
- * Listeners can be registered as:
- *      document.addEventListener("deviceready", myDeviceReadyListener, false);
- *      document.addEventListener("resume", myResumeListener, false);
- */
-
-if (typeof(DeviceInfo) !== 'object') {
-    DeviceInfo = {};
-}
-
-/**
- * This represents the PhoneGap API itself, and provides a global namespace for accessing
- * information about the state of PhoneGap.
- * @class
- */
-var PhoneGap = {
-    queue: {
-        ready: true,
-        commands: [],
-        timer: null
-    }
-};
-
-
-/**
- * Custom pub-sub channel that can have functions subscribed to it
- */
-PhoneGap.Channel = function (type)
-{
-    this.type = type;
-    this.handlers = {};
-    this.guid = 0;
-    this.fired = false;
-    this.enabled = true;
-};
-
-/**
- * Subscribes the given function to the channel. Any time that 
- * Channel.fire is called so too will the function.
- * Optionally specify an execution context for the function
- * and a guid that can be used to stop subscribing to the channel.
- * Returns the guid.
- */
-PhoneGap.Channel.prototype.subscribe = function(f, c, g) {
-    // need a function to call
-    if (f === null) { return; }
-
-    var func = f;
-    if (typeof c === "object" && f instanceof Function) { func = PhoneGap.close(c, f); }
-
-    g = g || func.observer_guid || f.observer_guid || this.guid++;
-    func.observer_guid = g;
-    f.observer_guid = g;
-    this.handlers[g] = func;
-    return g;
-};
-
-/**
- * Like subscribe but the function is only called once and then it
- * auto-unsubscribes itself.
- */
-PhoneGap.Channel.prototype.subscribeOnce = function(f, c) {
-    var g = null;
-    var _this = this;
-    var m = function() {
-        f.apply(c || null, arguments);
-        _this.unsubscribe(g);
-    };
-    if (this.fired) {
-	    if (typeof c === "object" && f instanceof Function) { f = PhoneGap.close(c, f); }
-        f.apply(this, this.fireArgs);
-    } else {
-        g = this.subscribe(m);
-    }
-    return g;
-};
-
-/** 
- * Unsubscribes the function with the given guid from the channel.
- */
-PhoneGap.Channel.prototype.unsubscribe = function(g) {
-    if (g instanceof Function) { g = g.observer_guid; }
-    this.handlers[g] = null;
-    delete this.handlers[g];
-};
-
-/** 
- * Calls all functions subscribed to this channel.
- */
-PhoneGap.Channel.prototype.fire = function(e) {
-    if (this.enabled) {
-        var fail = false;
-        var item, handler, rv;
-        for (item in this.handlers) {
-            if (this.handlers.hasOwnProperty(item)) {
-                handler = this.handlers[item];
-                if (handler instanceof Function) {
-                    rv = (handler.apply(this, arguments) === false);
-                    fail = fail || rv;
-                }
-            }
-        }
-        this.fired = true;
-        this.fireArgs = arguments;
-        return !fail;
-    }
-    return true;
-};
-
-/**
- * Calls the provided function only after all of the channels specified
- * have been fired.
- */
-PhoneGap.Channel.join = function(h, c) {
-    var i = c.length;
-    var f = function() {
-        if (!(--i)) {
-            h();
-        }
-    };
-    var len = i;
-    var j;
-    for (j=0; j<len; j++) {
-        if (!c[j].fired) {
-            c[j].subscribeOnce(f);
-        }
-        else {
-            i--;
-        }
-    }
-    if (!i) {
-        h();
-    }
-};
-
-/**
- * Boolean flag indicating if the PhoneGap API is available and initialized.
- */ // TODO: Remove this, it is unused here ... -jm
-PhoneGap.available = DeviceInfo.uuid !== undefined;
-
-/**
- * Add an initialization function to a queue that ensures it will run and initialize
- * application constructors only once PhoneGap has been initialized.
- * @param {Function} func The function callback you want run once PhoneGap is initialized
- */
-PhoneGap.addConstructor = function(func) {
-    PhoneGap.onPhoneGapInit.subscribeOnce(function() {
-        try {
-            func();
-        } catch(e) {
-            console.log("Failed to run constructor: " + e);
-        }
-    });
-};
-
-/**
- * Plugins object
- */
-if (!window.plugins) {
-    window.plugins = {};
-}
-
-/**
- * Adds a plugin object to window.plugins.
- * The plugin is accessed using window.plugins.<name>
- *
- * @param name          The plugin name
- * @param obj           The plugin object
- */
-PhoneGap.addPlugin = function(name, obj) {
-    if (!window.plugins[name]) {
-        window.plugins[name] = obj;
-    }
-    else {
-        console.log("Error: Plugin "+name+" already exists.");
-    }
-};
-
-/**
- * onDOMContentLoaded channel is fired when the DOM content 
- * of the page has been parsed.
- */
-PhoneGap.onDOMContentLoaded = new PhoneGap.Channel('onDOMContentLoaded');
-
-/**
- * onNativeReady channel is fired when the PhoneGap native code
- * has been initialized.
- */
-PhoneGap.onNativeReady = new PhoneGap.Channel('onNativeReady');
-
-/**
- * onPhoneGapInit channel is fired when the web page is fully loaded and
- * PhoneGap native code has been initialized.
- */
-PhoneGap.onPhoneGapInit = new PhoneGap.Channel('onPhoneGapInit');
-
-/**
- * onPhoneGapReady channel is fired when the JS PhoneGap objects have been created.
- */
-PhoneGap.onPhoneGapReady = new PhoneGap.Channel('onPhoneGapReady');
-
-/**
- * onPhoneGapInfoReady channel is fired when the PhoneGap device properties
- * has been set.
- */
-PhoneGap.onPhoneGapInfoReady = new PhoneGap.Channel('onPhoneGapInfoReady');
-
-/**
- * onResume channel is fired when the PhoneGap native code
- * resumes.
- */
-PhoneGap.onResume = new PhoneGap.Channel('onResume');
-
-/**
- * onPause channel is fired when the PhoneGap native code
- * pauses.
- */
-PhoneGap.onPause = new PhoneGap.Channel('onPause');
-
-// _nativeReady is global variable that the native side can set
-// to signify that the native code is ready. It is a global since 
-// it may be called before any PhoneGap JS is ready.
-if (typeof _nativeReady !== 'undefined') { PhoneGap.onNativeReady.fire(); }
-
-/**
- * onDeviceReady is fired only after all PhoneGap objects are created and
- * the device properties are set.
- */
-PhoneGap.onDeviceReady = new PhoneGap.Channel('onDeviceReady');
-
-
-// Array of channels that must fire before "deviceready" is fired
-PhoneGap.deviceReadyChannelsArray = [ PhoneGap.onPhoneGapReady, PhoneGap.onPhoneGapInfoReady];
-
-// Hashtable of user defined channels that must also fire before "deviceready" is fired
-PhoneGap.deviceReadyChannelsMap = {};
-
-/**
- * Indicate that a feature needs to be initialized before it is ready to be used.
- * This holds up PhoneGap's "deviceready" event until the feature has been initialized
- * and PhoneGap.initComplete(feature) is called.
- *
- * @param feature {String}     The unique feature name
- */
-PhoneGap.waitForInitialization = function(feature) {
-    if (feature) {
-        var channel = new PhoneGap.Channel(feature);
-        PhoneGap.deviceReadyChannelsMap[feature] = channel;
-        PhoneGap.deviceReadyChannelsArray.push(channel);
-    }
-};
-
-/**
- * Indicate that initialization code has completed and the feature is ready to be used.
- *
- * @param feature {String}     The unique feature name
- */ 
-PhoneGap.initializationComplete = function(feature) {
-    var channel = PhoneGap.deviceReadyChannelsMap[feature];
-    if (channel) {
-        channel.fire();
-    }
-};
-
-/**
- * Create all PhoneGap objects once page has fully loaded and native side is ready.
- */
-PhoneGap.Channel.join(function() {
-
-    // Start listening for XHR callbacks
-    setTimeout(function() {
-            if (PhoneGap.UsePolling) {
-                PhoneGap.JSCallbackPolling();
-            }
-            else {
-                var polling = prompt("usePolling", "gap_callbackServer:");
-                if (polling == "true") {
-                    PhoneGap.JSCallbackPolling();
-                }
-                else {
-                    PhoneGap.JSCallback();
-                }
-            }
-        }, 1);
-
-    // Run PhoneGap constructors
-    PhoneGap.onPhoneGapInit.fire();
-
-    // Fire event to notify that all objects are created
-    PhoneGap.onPhoneGapReady.fire();
-
-    // Fire onDeviceReady event once all constructors have run and PhoneGap info has been
-    // received from native side, and any user defined initialization channels.
-    PhoneGap.Channel.join(function() {
-    
-        // Turn off app loading dialog
-        navigator.notification.activityStop();
-
-        PhoneGap.onDeviceReady.fire();
-
-        // Fire the onresume event, since first one happens before JavaScript is loaded
-        PhoneGap.onResume.fire();
-    }, PhoneGap.deviceReadyChannelsArray);
-
-}, [ PhoneGap.onDOMContentLoaded, PhoneGap.onNativeReady ]);
-
-// Listen for DOMContentLoaded and notify our channel subscribers
-document.addEventListener('DOMContentLoaded', function() {
-    PhoneGap.onDOMContentLoaded.fire();
-}, false);
-
-// Intercept calls to document.addEventListener and watch for deviceready
-PhoneGap.m_document_addEventListener = document.addEventListener;
-
-document.addEventListener = function(evt, handler, capture) {
-    var e = evt.toLowerCase();
-    if (e === 'deviceready') {
-        PhoneGap.onDeviceReady.subscribeOnce(handler);
-    } else if (e === 'resume') {
-        PhoneGap.onResume.subscribe(handler);
-        if (PhoneGap.onDeviceReady.fired) {
-            PhoneGap.onResume.fire();
-        }
-    } else if (e === 'pause') {
-        PhoneGap.onPause.subscribe(handler);
-    }     
-    else {
-        // If subscribing to Android backbutton
-        if (e === 'backbutton') {
-            PhoneGap.exec(null, null, "App", "overrideBackbutton", [true]);
-        } 
-        
-        PhoneGap.m_document_addEventListener.call(document, evt, handler, capture);
-    }
-};
-
-// Intercept calls to document.removeEventListener and watch for events that 
-// are generated by PhoneGap native code
-PhoneGap.m_document_removeEventListener = document.removeEventListener;
-
-document.removeEventListener = function(evt, handler, capture) {
-    var e = evt.toLowerCase();
-
-    // If unsubscribing to Android backbutton
-    if (e === 'backbutton') {
-        PhoneGap.exec(null, null, "App", "overrideBackbutton", [false]);
-    } 
-
-    PhoneGap.m_document_removeEventListener.call(document, evt, handler, capture);
-};
-
-/**
- * Method to fire event from native code
- */
-PhoneGap.fireEvent = function(type) {
-    var e = document.createEvent('Events');
-    e.initEvent(type);
-    document.dispatchEvent(e);
-};
-
-/**
- * If JSON not included, use our own stringify. (Android 1.6)
- * The restriction on ours is that it must be an array of simple types.
- *
- * @param args
- * @return
- */
-PhoneGap.stringify = function(args) {
-    if (typeof JSON === "undefined") {
-        var s = "[";
-        var i, type, start, name, nameType, a;
-        for (i = 0; i < args.length; i++) {
-            if (args[i] != null) {
-                if (i > 0) {
-                    s = s + ",";
-                }
-                type = typeof args[i];
-                if ((type === "number") || (type === "boolean")) {
-                    s = s + args[i];
-                } else if (args[i] instanceof Array) {
-                    s = s + "[" + args[i] + "]";
-                } else if (args[i] instanceof Object) {
-                    start = true;
-                    s = s + '{';
-                    for (name in args[i]) {
-                        if (args[i][name] !== null) {
-                            if (!start) {
-                                s = s + ',';
-                            }
-                            s = s + '"' + name + '":';
-                            nameType = typeof args[i][name];
-                            if ((nameType === "number") || (nameType === "boolean")) {
-                                s = s + args[i][name];
-                            } else if ((typeof args[i][name]) === 'function') {
-                                // don't copy the functions
-                                s = s + '""';
-                            } else if (args[i][name] instanceof Object) {
-                                s = s + this.stringify(args[i][name]);
-                            } else {
-                                s = s + '"' + args[i][name] + '"';
-                            }
-                            start = false;
-                        }
-                    }
-                    s = s + '}';
-                } else {
-                    a = args[i].replace(/\\/g, '\\\\');
-                    a = a.replace(/"/g, '\\"');
-                    s = s + '"' + a + '"';
-                }
-            }
-        }
-        s = s + "]";
-        return s;
-    } else {
-        return JSON.stringify(args);
-    }
-};
-
-/**
- * Does a deep clone of the object.
- *
- * @param obj
- * @return
- */
-PhoneGap.clone = function(obj) {
-    var i, retVal;
-	if(!obj) { 
-		return obj;
-	}
-	
-	if(obj instanceof Array){
-		retVal = [];
-		for(i = 0; i < obj.length; ++i){
-			retVal.push(PhoneGap.clone(obj[i]));
-		}
-		return retVal;
-	}
-	
-	if (obj instanceof Function) {
-		return obj;
-	}
-	
-	if(!(obj instanceof Object)){
-		return obj;
-	}
-	
-    if (obj instanceof Date) {
-        return obj;
-    }
-    
-	retVal = {};
-	for(i in obj){
-		if(!(i in retVal) || retVal[i] !== obj[i]) {
-			retVal[i] = PhoneGap.clone(obj[i]);
-		}
-	}
-	return retVal;
-};
-
-PhoneGap.callbackId = 0;
-PhoneGap.callbacks = {};
-PhoneGap.callbackStatus = {
-    NO_RESULT: 0,
-    OK: 1,
-    CLASS_NOT_FOUND_EXCEPTION: 2,
-    ILLEGAL_ACCESS_EXCEPTION: 3,
-    INSTANTIATION_EXCEPTION: 4,
-    MALFORMED_URL_EXCEPTION: 5,
-    IO_EXCEPTION: 6,
-    INVALID_ACTION: 7,
-    JSON_EXCEPTION: 8,
-    ERROR: 9
-    };
-
-
-/**
- * Execute a PhoneGap command.  It is up to the native side whether this action is synch or async.  
- * The native side can return:
- *      Synchronous: PluginResult object as a JSON string
- *      Asynchrounous: Empty string ""
- * If async, the native side will PhoneGap.callbackSuccess or PhoneGap.callbackError,
- * depending upon the result of the action.
- *
- * @param {Function} success    The success callback
- * @param {Function} fail       The fail callback
- * @param {String} service      The name of the service to use
- * @param {String} action       Action to be run in PhoneGap
- * @param {String[]} [args]     Zero or more arguments to pass to the method
- */
-PhoneGap.exec = function(success, fail, service, action, args) {
-    try {
-        var callbackId = service + PhoneGap.callbackId++;
-        if (success || fail) {
-            PhoneGap.callbacks[callbackId] = {success:success, fail:fail};
-        }
-        
-        var r = prompt(this.stringify(args), "gap:"+this.stringify([service, action, callbackId, true]));
-        
-        // If a result was returned
-        if (r.length > 0) {
-            eval("var v="+r+";");
-        
-            // If status is OK, then return value back to caller
-            if (v.status === PhoneGap.callbackStatus.OK) {
-
-                // If there is a success callback, then call it now with
-                // returned value
-                if (success) {
-                    try {
-                        success(v.message);
-                    } catch (e) {
-                        console.log("Error in success callback: " + callbackId  + " = " + e);
-                    }
-
-                    // Clear callback if not expecting any more results
-                    if (!v.keepCallback) {
-                        delete PhoneGap.callbacks[callbackId];
-                    }
-                }
-                return v.message;
-            }
-
-            // If no result
-            else if (v.status === PhoneGap.callbackStatus.NO_RESULT) {
-                    
-                // Clear callback if not expecting any more results
-                if (!v.keepCallback) {
-                    delete PhoneGap.callbacks[callbackId];
-                }
-            }
-
-            // If error, then display error
-            else {
-                console.log("Error: Status="+v.status+" Message="+v.message);
-
-                // If there is a fail callback, then call it now with returned value
-                if (fail) {
-                    try {
-                        fail(v.message);
-                    }
-                    catch (e1) {
-                        console.log("Error in error callback: "+callbackId+" = "+e1);
-                    }
-
-                    // Clear callback if not expecting any more results
-                    if (!v.keepCallback) {
-                        delete PhoneGap.callbacks[callbackId];
-                    }
-                }
-                return null;
-            }
-        }
-    } catch (e2) {
-        console.log("Error: "+e2);
-    }
-};
-
-/**
- * Called by native code when returning successful result from an action.
- *
- * @param callbackId
- * @param args
- */
-PhoneGap.callbackSuccess = function(callbackId, args) {
-    if (PhoneGap.callbacks[callbackId]) {
-
-        // If result is to be sent to callback
-        if (args.status === PhoneGap.callbackStatus.OK) {
-            try {
-                if (PhoneGap.callbacks[callbackId].success) {
-                    PhoneGap.callbacks[callbackId].success(args.message);
-                }
-            }
-            catch (e) {
-                console.log("Error in success callback: "+callbackId+" = "+e);
-            }
-        }
-    
-        // Clear callback if not expecting any more results
-        if (!args.keepCallback) {
-            delete PhoneGap.callbacks[callbackId];
-        }
-    }
-};
-
-/**
- * Called by native code when returning error result from an action.
- *
- * @param callbackId
- * @param args
- */
-PhoneGap.callbackError = function(callbackId, args) {
-    if (PhoneGap.callbacks[callbackId]) {
-        try {
-            if (PhoneGap.callbacks[callbackId].fail) {
-                PhoneGap.callbacks[callbackId].fail(args.message);
-            }
-        }
-        catch (e) {
-            console.log("Error in error callback: "+callbackId+" = "+e);
-        }
-        
-        // Clear callback if not expecting any more results
-        if (!args.keepCallback) {
-            delete PhoneGap.callbacks[callbackId];
-        }
-    }
-};
-
-
-/**
- * Internal function used to dispatch the request to PhoneGap.  It processes the
- * command queue and executes the next command on the list.  If one of the
- * arguments is a JavaScript object, it will be passed on the QueryString of the
- * url, which will be turned into a dictionary on the other end.
- * @private
- */
-// TODO: Is this used?
-PhoneGap.run_command = function() {
-    if (!PhoneGap.available || !PhoneGap.queue.ready) {
-        return;
-    }
-    PhoneGap.queue.ready = false;
-
-    var args = PhoneGap.queue.commands.shift();
-    if (PhoneGap.queue.commands.length === 0) {
-        clearInterval(PhoneGap.queue.timer);
-        PhoneGap.queue.timer = null;
-    }
-
-    var uri = [];
-    var dict = null;
-    var i;
-    for (i = 1; i < args.length; i++) {
-        var arg = args[i];
-        if (arg === undefined || arg === null) {
-            arg = '';
-        }
-        if (typeof(arg) === 'object') {
-            dict = arg;
-        } else {
-            uri.push(encodeURIComponent(arg));
-        }
-    }
-    var url = "gap://" + args[0] + "/" + uri.join("/");
-    if (dict !== null) {
-        var name;
-        var query_args = [];
-        for (name in dict) {
-            if (dict.hasOwnProperty(name) && (typeof (name) === 'string')) {
-                query_args.push(encodeURIComponent(name) + "=" + encodeURIComponent(dict[name]));
-            }
-        }
-        if (query_args.length > 0) {
-            url += "?" + query_args.join("&");
-        }
-    }
-    document.location = url;
-
-};
-
-PhoneGap.JSCallbackPort = null;
-PhoneGap.JSCallbackToken = null;
-
-/**
- * This is only for Android.
- *
- * Internal function that uses XHR to call into PhoneGap Java code and retrieve 
- * any JavaScript code that needs to be run.  This is used for callbacks from
- * Java to JavaScript.
- */
-PhoneGap.JSCallback = function() {
-
-    // If polling flag was changed, start using polling from now on
-    if (PhoneGap.UsePolling) {
-        PhoneGap.JSCallbackPolling();
-        return;
-    }
-
-    var xmlhttp = new XMLHttpRequest();
-
-    // Callback function when XMLHttpRequest is ready
-    xmlhttp.onreadystatechange=function(){
-        if(xmlhttp.readyState === 4){
-
-            // If callback has JavaScript statement to execute
-            if (xmlhttp.status === 200) {
-
-                var msg = xmlhttp.responseText;
-                setTimeout(function() {
-                    try {
-                        var t = eval(msg);
-                    }
-                    catch (e) {
-                        // If we're getting an error here, seeing the message will help in debugging
-                        console.log("JSCallback: Message from Server: " + msg);
-                        console.log("JSCallback Error: "+e);
-                    }
-                }, 1);
-                setTimeout(PhoneGap.JSCallback, 1);
-            }
-
-            // If callback ping (used to keep XHR request from timing out)
-            else if (xmlhttp.status === 404) {
-                setTimeout(PhoneGap.JSCallback, 10);
-            }
-
-            // If security error
-            else if (xmlhttp.status === 403) {
-                console.log("JSCallback Error: Invalid token.  Stopping callbacks.");
-            }
-
-            // If server is stopping
-            else if (xmlhttp.status === 503) {
-                console.log("JSCallback Error: Service unavailable.  Stopping callbacks.");
-            }
-
-            // If request wasn't GET
-            else if (xmlhttp.status === 400) {
-                console.log("JSCallback Error: Bad request.  Stopping callbacks.");
-            }
-
-            // If error, restart callback server
-            else {
-                console.log("JSCallback Error: Request failed.");
-                prompt("restartServer", "gap_callbackServer:");
-                PhoneGap.JSCallbackPort = null;
-                PhoneGap.JSCallbackToken = null;
-                setTimeout(PhoneGap.JSCallback, 100);
-            }
-        }
-    };
-
-    if (PhoneGap.JSCallbackPort === null) {
-        PhoneGap.JSCallbackPort = prompt("getPort", "gap_callbackServer:");
-    }
-    if (PhoneGap.JSCallbackToken === null) {
-        PhoneGap.JSCallbackToken = prompt("getToken", "gap_callbackServer:");
-    }
-    xmlhttp.open("GET", "http://127.0.0.1:"+PhoneGap.JSCallbackPort+"/"+PhoneGap.JSCallbackToken , true);
-    xmlhttp.send();
-};
-
-/**
- * The polling period to use with JSCallbackPolling.
- * This can be changed by the application.  The default is 50ms.
- */
-PhoneGap.JSCallbackPollingPeriod = 50;
-
-/**
- * Flag that can be set by the user to force polling to be used or force XHR to be used.
- */
-PhoneGap.UsePolling = false;    // T=use polling, F=use XHR
-
-/**
- * This is only for Android.
- *
- * Internal function that uses polling to call into PhoneGap Java code and retrieve 
- * any JavaScript code that needs to be run.  This is used for callbacks from
- * Java to JavaScript.
- */
-PhoneGap.JSCallbackPolling = function() {
-
-    // If polling flag was changed, stop using polling from now on
-    if (!PhoneGap.UsePolling) {
-        PhoneGap.JSCallback();
-        return;
-    }
-
-    var msg = prompt("", "gap_poll:");
-    if (msg) {
-        setTimeout(function() {
-            try {
-                var t = eval(""+msg);
-            }
-            catch (e) {
-                console.log("JSCallbackPolling: Message from Server: " + msg);
-                console.log("JSCallbackPolling Error: "+e);
-            }
-        }, 1);
-        setTimeout(PhoneGap.JSCallbackPolling, 1);
-    }
-    else {
-        setTimeout(PhoneGap.JSCallbackPolling, PhoneGap.JSCallbackPollingPeriod);
-    }
-};
-
-/**
- * Create a UUID
- *
- * @return
- */
-PhoneGap.createUUID = function() {
-    return PhoneGap.UUIDcreatePart(4) + '-' +
-        PhoneGap.UUIDcreatePart(2) + '-' +
-        PhoneGap.UUIDcreatePart(2) + '-' +
-        PhoneGap.UUIDcreatePart(2) + '-' +
-        PhoneGap.UUIDcreatePart(6);
-};
-
-PhoneGap.UUIDcreatePart = function(length) {
-    var uuidpart = "";
-    var i, uuidchar;
-    for (i=0; i<length; i++) {
-        uuidchar = parseInt((Math.random() * 256),0).toString(16);
-        if (uuidchar.length === 1) {
-            uuidchar = "0" + uuidchar;
-        }
-        uuidpart += uuidchar;
-    }
-    return uuidpart;
-};
-
-PhoneGap.close = function(context, func, params) {
-    if (typeof params === 'undefined') {
-        return function() {
-            return func.apply(context, arguments);
-        };
-    } else {
-        return function() {
-            return func.apply(context, params);
-        };
-    }
-};
-
-/**
- * Load a JavaScript file after page has loaded.
- *
- * @param {String} jsfile               The url of the JavaScript file to load.
- * @param {Function} successCallback    The callback to call when the file has been loaded.
- */
-PhoneGap.includeJavascript = function(jsfile, successCallback) {
-    var id = document.getElementsByTagName("head")[0];         
-    var el = document.createElement('script');
-    el.type = 'text/javascript';
-    if (typeof successCallback === 'function') {
-        el.onload = successCallback;
-    }
-    el.src = jsfile;
-    id.appendChild(el);
-};

framework/assets/js/position.js

@@ -1,84 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-
-/**
- * This class contains position information.
- * @param {Object} lat
- * @param {Object} lng
- * @param {Object} acc
- * @param {Object} alt
- * @param {Object} altacc
- * @param {Object} head
- * @param {Object} vel
- * @constructor
- */
-function Position(coords, timestamp) {
-	this.coords = coords;
-	this.timestamp = (timestamp !== 'undefined') ? timestamp : new Date().getTime();
-}
-
-function Coordinates(lat, lng, alt, acc, head, vel, altacc) {
-	/**
-	 * The latitude of the position.
-	 */
-	this.latitude = lat;
-	/**
-	 * The longitude of the position,
-	 */
-	this.longitude = lng;
-	/**
-	 * The accuracy of the position.
-	 */
-	this.accuracy = acc;
-	/**
-	 * The altitude of the position.
-	 */
-	this.altitude = alt;
-	/**
-	 * The direction the device is moving at the position.
-	 */
-	this.heading = head;
-	/**
-	 * The velocity with which the device is moving at the position.
-	 */
-	this.speed = vel;
-	/**
-	 * The altitude accuracy of the position.
-	 */
-	this.altitudeAccuracy = (altacc !== 'undefined') ? altacc : null; 
-}
-
-/**
- * This class specifies the options for requesting position data.
- * @constructor
- */
-function PositionOptions() {
-	/**
-	 * Specifies the desired position accuracy.
-	 */
-	this.enableHighAccuracy = true;
-	/**
-	 * The timeout after which if position data cannot be obtained the errorCallback
-	 * is called.
-	 */
-	this.timeout = 10000;
-}
-
-/**
- * This class contains information about any GSP errors.
- * @constructor
- */
-function PositionError() {
-	this.code = null;
-	this.message = "";
-}
-
-PositionError.UNKNOWN_ERROR = 0;
-PositionError.PERMISSION_DENIED = 1;
-PositionError.POSITION_UNAVAILABLE = 2;
-PositionError.TIMEOUT = 3;

framework/assets/js/storage.js

@@ -1,377 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-
-/*
- * This is purely for the Android 1.5/1.6 HTML 5 Storage
- * I was hoping that Android 2.0 would deprecate this, but given the fact that
- * most manufacturers ship with Android 1.5 and do not do OTA Updates, this is required
- */
-
-/**
- * Storage object that is called by native code when performing queries.
- * PRIVATE METHOD
- */
-var DroidDB = function() {
-    this.queryQueue = {};
-};
-
-/**
- * Callback from native code when query is complete.
- * PRIVATE METHOD
- *
- * @param id                Query id
- */
-DroidDB.prototype.completeQuery = function(id, data) {
-    var query = this.queryQueue[id];
-    if (query) {
-        try {
-            delete this.queryQueue[id];
-
-            // Get transaction
-            var tx = query.tx;
-
-            // If transaction hasn't failed
-            // Note: We ignore all query results if previous query
-            //       in the same transaction failed.
-            if (tx && tx.queryList[id]) {
-
-                // Save query results
-                var r = new DroidDB_Result();
-                r.rows.resultSet = data;
-                r.rows.length = data.length;
-                try {
-                    if (typeof query.successCallback === 'function') {
-                        query.successCallback(query.tx, r);
-                    }
-                } catch (ex) {
-                    console.log("executeSql error calling user success callback: "+ex);
-                }
-
-                tx.queryComplete(id);
-            }
-        } catch (e) {
-            console.log("executeSql error: "+e);
-        }
-    }
-};
-
-/**
- * Callback from native code when query fails
- * PRIVATE METHOD
- *
- * @param reason            Error message
- * @param id                Query id
- */
-DroidDB.prototype.fail = function(reason, id) {
-    var query = this.queryQueue[id];
-    if (query) {
-        try {
-            delete this.queryQueue[id];
-
-            // Get transaction
-            var tx = query.tx;
-
-            // If transaction hasn't failed
-            // Note: We ignore all query results if previous query
-            //       in the same transaction failed.
-            if (tx && tx.queryList[id]) {
-                tx.queryList = {};
-
-                try {
-                    if (typeof query.errorCallback === 'function') {
-                        query.errorCallback(query.tx, reason);
-                    }
-                } catch (ex) {
-                    console.log("executeSql error calling user error callback: "+ex);
-                }
-
-                tx.queryFailed(id, reason);
-            }
-
-        } catch (e) {
-            console.log("executeSql error: "+e);
-        }
-    }
-};
-
-/**
- * Transaction object
- * PRIVATE METHOD
- */
-var DroidDB_Tx = function() {
-
-    // Set the id of the transaction
-    this.id = PhoneGap.createUUID();
-
-    // Callbacks
-    this.successCallback = null;
-    this.errorCallback = null;
-
-    // Query list
-    this.queryList = {};
-};
-
-
-var DatabaseShell = function() {
-};
-
-/**
- * Start a transaction.
- * Does not support rollback in event of failure.
- *
- * @param process {Function}            The transaction function
- * @param successCallback {Function}
- * @param errorCallback {Function}
- */
-DatabaseShell.prototype.transaction = function(process, errorCallback, successCallback) {
-    var tx = new DroidDB_Tx();
-    tx.successCallback = successCallback;
-    tx.errorCallback = errorCallback;
-    try {
-        process(tx);
-    } catch (e) {
-        console.log("Transaction error: "+e);
-        if (tx.errorCallback) {
-            try {
-                tx.errorCallback(e);
-            } catch (ex) {
-                console.log("Transaction error calling user error callback: "+e);
-            }
-        }
-    }
-};
-
-
-/**
- * Mark query in transaction as complete.
- * If all queries are complete, call the user's transaction success callback.
- *
- * @param id                Query id
- */
-DroidDB_Tx.prototype.queryComplete = function(id) {
-    delete this.queryList[id];
-
-    // If no more outstanding queries, then fire transaction success
-    if (this.successCallback) {
-        var count = 0;
-        var i;
-        for (i in this.queryList) {
-            if (this.queryList.hasOwnProperty(i)) {
-                count++;   
-            }
-        }
-        if (count === 0) {
-            try {
-                this.successCallback();
-            } catch(e) {
-                console.log("Transaction error calling user success callback: " + e);
-            }
-        }
-    }
-};
-
-/**
- * Mark query in transaction as failed.
- *
- * @param id                Query id
- * @param reason            Error message
- */
-DroidDB_Tx.prototype.queryFailed = function(id, reason) {
-
-    // The sql queries in this transaction have already been run, since
-    // we really don't have a real transaction implemented in native code.
-    // However, the user callbacks for the remaining sql queries in transaction
-    // will not be called.
-    this.queryList = {};
-
-    if (this.errorCallback) {
-        try {
-            this.errorCallback(reason);
-        } catch(e) {
-            console.log("Transaction error calling user error callback: " + e);
-        }
-    }
-};
-
-/**
- * SQL query object
- * PRIVATE METHOD
- *
- * @param tx                The transaction object that this query belongs to
- */
-var DroidDB_Query = function(tx) {
-
-    // Set the id of the query
-    this.id = PhoneGap.createUUID();
-
-    // Add this query to the queue
-    droiddb.queryQueue[this.id] = this;
-
-    // Init result
-    this.resultSet = [];
-
-    // Set transaction that this query belongs to
-    this.tx = tx;
-
-    // Add this query to transaction list
-    this.tx.queryList[this.id] = this;
-
-    // Callbacks
-    this.successCallback = null;
-    this.errorCallback = null;
-
-};
-
-/**
- * Execute SQL statement
- *
- * @param sql                   SQL statement to execute
- * @param params                Statement parameters
- * @param successCallback       Success callback
- * @param errorCallback         Error callback
- */
-DroidDB_Tx.prototype.executeSql = function(sql, params, successCallback, errorCallback) {
-
-    // Init params array
-    if (typeof params === 'undefined') {
-        params = [];
-    }
-
-    // Create query and add to queue
-    var query = new DroidDB_Query(this);
-    droiddb.queryQueue[query.id] = query;
-
-    // Save callbacks
-    query.successCallback = successCallback;
-    query.errorCallback = errorCallback;
-
-    // Call native code
-    PhoneGap.exec(null, null, "Storage", "executeSql", [sql, params, query.id]);
-};
-
-/**
- * SQL result set that is returned to user.
- * PRIVATE METHOD
- */
-DroidDB_Result = function() {
-    this.rows = new DroidDB_Rows();
-};
-
-/**
- * SQL result set object
- * PRIVATE METHOD
- */
-DroidDB_Rows = function() {
-    this.resultSet = [];    // results array
-    this.length = 0;        // number of rows
-};
-
-/**
- * Get item from SQL result set
- *
- * @param row           The row number to return
- * @return              The row object
- */
-DroidDB_Rows.prototype.item = function(row) {
-    return this.resultSet[row];
-};
-
-/**
- * Open database
- *
- * @param name              Database name
- * @param version           Database version
- * @param display_name      Database display name
- * @param size              Database size in bytes
- * @return                  Database object
- */
-DroidDB_openDatabase = function(name, version, display_name, size) {
-    PhoneGap.exec(null, null, "Storage", "openDatabase", [name, version, display_name, size]);
-    var db = new DatabaseShell();
-    return db;
-};
-
-
-/**
- * For browsers with no localStorage we emulate it with SQLite. Follows the w3c api. 
- * TODO: Do similar for sessionStorage. 
- */
-
-var CupcakeLocalStorage = function() {
-		try {
-
-			this.db = openDatabase('localStorage', '1.0', 'localStorage', 2621440);	
-			var storage = {};
-			this.db.transaction(
-				function (transaction) {
-				    var i;
-					transaction.executeSql('CREATE TABLE IF NOT EXISTS storage (id NVARCHAR(40) PRIMARY KEY, body NVARCHAR(255))');
-					transaction.executeSql('SELECT * FROM storage', [], function(tx, result) {
-	                    for(i = 0; i < result.rows.length; i++) {
-							storage[result.rows.item(i).id] =  result.rows.item(i).body;
-						}
-	                    PhoneGap.initializationComplete("cupcakeStorage");
-					});
-					
-				}, 
-				function (err) {
-					alert(err.message);
-				}
-			);
-			this.setItem = function(key, val) {
-				//console.log('set');
-				storage[key] = val;
-				
-				this.db.transaction(
-					function (transaction) {
-						transaction.executeSql('CREATE TABLE IF NOT EXISTS storage (id NVARCHAR(40) PRIMARY KEY, body NVARCHAR(255))');
-						
-						transaction.executeSql('REPLACE INTO storage (id, body) values(?,?)', [key,val]);
-					}
-				);
-			};
-			this.getItem = function(key) {			
-				return storage[key];
-			};
-			this.removeItem = function(key) {
-				delete storage[key];
-				this.db.transaction(
-					function (transaction) {
-						transaction.executeSql('CREATE TABLE IF NOT EXISTS storage (id NVARCHAR(40) PRIMARY KEY, body NVARCHAR(255))');
-						
-						transaction.executeSql('DELETE FROM storage where id=?', [key]);
-					}
-				);
-			};
-			this.clear = function() {
-				storage = {};
-				this.db.transaction(
-					function (transaction) {
-						transaction.executeSql('CREATE TABLE IF NOT EXISTS storage (id NVARCHAR(40) PRIMARY KEY, body NVARCHAR(255))');
-						
-						transaction.executeSql('DELETE FROM storage', []);
-					}
-				);
-			};				
-		} catch(e) {
-			alert("Database error "+e+".");
-		    return;
-		}
-};
-PhoneGap.addConstructor(function() {
-	if (typeof window.openDatabase === "undefined") {
-        navigator.openDatabase = window.openDatabase = DroidDB_openDatabase;
-        window.droiddb = new DroidDB();
-    }
-    
-    if (typeof window.localStorage === "undefined") {
-        navigator.localStorage = window.localStorage = new CupcakeLocalStorage();
-        PhoneGap.waitForInitialization("cupcakeStorage");
-    }
-});
-

framework/assets/www/index.html

@@ -1,7 +1,25 @@
+<!-- 
+       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
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, 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.
+-->
 <html>
   <head>
     <title></title>
-    <script src="phonegap.0.9.4.min.js"></script>
+    <script src="cordova-1.8.0.js"></script>
   </head>
   <body>
 

framework/build.xml

@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="PhoneGap" default="help">
+<!-- 
+       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
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, 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.
+-->
+<project name="Cordova" default="jar">
 
     <!-- LOAD VERSION -->
     <loadfile property="version" srcFile="../VERSION">
@@ -9,172 +27,150 @@
     </loadfile>
 
     <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked in in Version
-         Control Systems. -->
-    <property file="local.properties" />
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <loadproperties srcFile="local.properties" />
 
-    <!-- The build.properties file can be created by you and is never touched
-         by the 'android' tool. This is the place to change some of the default property values
-         used by the Ant rules.
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
          Here are some properties you may want to change/update:
 
-         application.package
-             the name of your application package as defined in the manifest. Used by the
-             'uninstall' rule.
          source.dir
-             the name of the source directory. Default is 'src'.
+             The name of the source directory. Default is 'src'.
          out.dir
-             the name of the output directory. Default is 'bin'.
+             The name of the output directory. Default is 'bin'.
 
-         Properties related to the SDK location or the project target should be updated
-          using the 'android' tool with the 'update' action.
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
 
-         This file is an integral part of the build system for your application and
-         should be checked in in Version Control Systems.
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
 
          -->
-    <property file="build.properties" />
+    <property file="ant.properties" />
+    
+    <!-- We need to setup the double quote. -->
+    <property name="dblQuote">"</property>
 
-    <!-- The default.properties file is created and updated by the 'android' tool, as well
-         as ADT.
-         This file is an integral part of the build system for your application and
-         should be checked in in Version Control Systems. -->
-    <property file="default.properties" />
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
 
-    <!-- Custom Android task to deal with the project target, and import the proper rules.
-         This requires ant 1.6.0 or above. -->
-    <path id="android.antlibs">
-        <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+   <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
+            unless="sdk.dir"
+    />
+
+   <!-- version-tag: custom -->
+<!-- extension targets. Uncomment the ones where you want to do custom work
+     in between standard targets -->
+<!--
+    <target name="-pre-build">
+    </target>
+    <target name="-pre-compile">
+    </target>
+
+    /* This is typically used for code obfuscation.
+       Compiled code location: ${out.classes.absolute.dir}
+       If this is not done in place, override ${out.dex.input.absolute.dir} */
+    <target name="-post-compile">
+    </target>
+-->
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+   <import file="${sdk.dir}/tools/ant/build.xml" />
+
+    <!-- Combine JavaScript files into one cordova-uncompressed.js file. -->
+    <target name="build-javascript" depends="clean">
+        
+      <!-- Clean up existing files -->
+      <!--<delete file="assets/www/cordova_${version}.js"/>-->
+        
+      <!-- Create uncompressed JS file -->
+      <concat destfile="assets/www/cordova-${version}.js">
+        <filelist dir="assets/js" files="cordova.android.js"/>
+      </concat>
+
+      <!-- update project files to reference cordova-x.x.x.min.js -->
+      <replaceregexp match="cordova(.*)\.js" replace="cordova-${version}.js" byline="true">
+         <fileset file="assets/www/index.html" /> 
+         <fileset file="../bin/templates/project/cordova/templates/project/assets/www/index.html" /> 
+      </replaceregexp>
+
+      <!-- This is sketchy, but it works, ${dblQuote} does not -->
+      <replaceregexp match="cordovaVersion = [\u0022].*[\u0022];" replace='cordovaVersion = ${dblQuote}${version}${dblQuote};' byline="true">
+        <fileset file="src/org/apache/cordova/Device.java" />
+      </replaceregexp>
+    </target>
+
+    <!-- Build Cordova jar file that includes all native code, and Cordova JS file
+         that includes all JavaScript code.
+    -->
+    <target name="jar" depends="build-javascript, -compile">
+      <jar jarfile="cordova-${version}.jar" basedir="bin/classes" excludes="org/apache/cordova/R.class,org/apache/cordova/R$*.class"/>
+    </target>
+
+    <!-- tests for Java files -->
+    <property name="test.dir" location="test/org/apache/cordova" />
+
+    <path id="test.classpath">
+        <!-- requires both junit and cordova -->
+        <pathelement location="libs/junit-4.10.jar" />
+        <pathelement location="cordova-${version}.jar" />
+        <pathelement location="${test.dir}" />
     </path>
 
-    <taskdef name="setup"
-        classname="com.android.ant.SetupTask"
-        classpathref="android.antlibs" />
-
-    <!-- Execute the Android Setup task that will setup some properties specific to the target,
-         and import the build rules files.
-
-         The rules file is imported from
-            <SDK>/platforms/<target_platform>/templates/android_rules.xml
-
-         To customize some build steps for your project:
-         - copy the content of the main node <project> from android_rules.xml
-         - paste it in this build.xml below the <setup /> task.
-         - disable the import by changing the setup task below to <setup import="false" />
-
-         This will ensure that the properties are setup correctly but that your customized
-         build steps are used.
-    -->
-    <setup />
-
-	<target name="check-javascript" depends="build-javascript">
-		<delete dir="assets/lib"/>
-		<mkdir dir="assets/lib"/>
-		<echo file="assets/lib/lint.js">var alert=function(){},device={},Element={},debug={};</echo>
-		<concat destfile="assets/lib/phonegap-lint.js" append="true">
-			<fileset dir="assets/lib">
-				<include name="lint.js" />
-			</fileset>
-			<fileset dir="assets/www">
-				<include name="phonegap.${version}.js" />
-			</fileset>
-		</concat>
-
-		<exec executable="cmd" os="Windows 7">
-			<arg value="/c"/>
-			<arg value="java"/>
-			<arg value="-cp"/>
-			<arg value="${basedir}/util/js.jar"/>
-			<arg value="org.mozilla.javascript.tools.shell.Main"/>
-			<arg value="${basedir}/util/jslint.js"/>
-			<arg value="${basedir}/js/lib/phonegap-lint.js"/>
-		</exec>
-		<exec executable="java" os="Mac OS X">
-			<arg value="-cp"/>
-			<arg value="../util/js.jar"/>
-			<arg value="org.mozilla.javascript.tools.shell.Main"/>
-			<arg value="../util/jslint.js"/>
-			<arg value="assets/lib/phonegap-lint.js"/>
-		</exec>
-	</target>
-
-    <!-- Combine JavaScript files into one phonegap.js file.
-         This task does not create a compressed JavaScript file. -->
-    <target name="build-uncompressed-javascript">
-
-      <!-- Clean up existing files -->
-      <delete file="assets/www/phonegap.${version}.min.js"/>
-      <delete file="assets/www/phonegap-tmp.js"/>
-      <delete file="assets/www/phonegap.${version}.js"/>
-      
-      <!-- Create uncompressed JS file -->
-      <concat destfile="assets/www/phonegap.${version}.js">
-        <fileset dir="assets/js" includes="phonegap.js.base" />
-        <fileset dir="assets/js" includes="*.js" />
-      </concat>
-
-      <!-- update project files to reference phonegap-x.x.x.js -->
-      <replaceregexp match="phonegap(.*)\.js" replace="phonegap.${version}.js" byline="true">
-        <fileset file="assets/www/index.html" />
-        <fileset file="../example/index.html" />
-      </replaceregexp>
-    </target>
-    
-    <!-- Combine JavaScript files into one phonegap-uncompressed.js file.
-         Compress this file using yuicompressor to create phonegap.js.  -->
-    <target name="build-javascript">
-        
-      <!-- Clean up existing files -->
-      <delete file="assets/www/phonegap_${version}.min.js"/>
-      <delete file="assets/www/phonegap-tmp.js"/>
-      <delete file="assets/www/phonegap_${version}.js"/>
-        
-      <!-- Create uncompressed JS file -->
-      <concat destfile="assets/www/phonegap.${version}.js">
-        <fileset dir="assets/js" includes="phonegap.js.base" />
-        <fileset dir="assets/js" includes="*.js" />
-      </concat>
-
-      <!-- Compress JS file -->
-      <java jar="${basedir}/../util/yuicompressor/yuicompressor-2.4.2.jar" fork="true" failonerror="true">
-        <arg line="--nomunge -o assets/www/phonegap-tmp.js assets/www/phonegap.${version}.js"/>
-      </java>
-      <concat destfile="assets/www/phonegap.${version}.min.js">
-        <fileset dir="assets/js" includes="header.txt" />
-        <fileset dir="assets/www" includes="phonegap-tmp.js" />
-      </concat>
-
-      <!-- update project files to reference phonegap-x.x.x.min.js -->
-      <replaceregexp match="phonegap(.*)\.js" replace="phonegap.${version}.min.js" byline="true">
-        <fileset file="assets/www/index.html" />
-        <fileset file="../example/index.html" />
-      </replaceregexp>
-        
-      <!-- Delete temp file -->
-      <delete file="assets/www/phonegap-tmp.js"/>
+    <target name="compile-test">
+        <javac srcdir="${test.dir}" >
+            <classpath refid="test.classpath" />
+        </javac>
     </target>
 
-    <!-- Build PhoneGap jar file that includes all native code, and PhoneGap JS file
-         that includes all JavaScript code.
-      
-         The default is to compress the JavaScript code using yuicompressor.
-      
-         If you want uncompressed JavaScript, change 
-            "build-javascript" => "build-uncompressed-javascript".
-    -->
-    <target name="jar" depends="build-javascript, compile">
-      <jar jarfile="phonegap.${version}.jar" basedir="bin/classes" excludes="com/phonegap/R.class,com/phonegap/R$*.class"/>
+    <target name="test" depends="jar, compile-test">
+        <junit showoutput="true">
+            <classpath refid="test.classpath" />
+            <formatter type="brief" usefile="false" />
+            <batchtest fork="yes">
+                <fileset dir="${test.dir}">
+                    <include name="*Test.java" />
+                    <include name="**/*Test.java" />
+                </fileset>
+            </batchtest>
+        </junit>
     </target>
 
-    <target name="phonegap_debug" depends="build-javascript, debug">
+    <target name="cordova_debug" depends="build-javascript, debug">
     </target>
 
-    <target name="phonegap_release" depends="build-javascript, release">
+    <target name="cordova_release" depends="build-javascript, release">
     </target>
 
-
 </project>

framework/default.properties

@@ -10,5 +10,5 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-8
+target=android-14
 apk-configurations=

framework/gen/com/phonegap/R.java

@@ -1,27 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package com.phonegap;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class drawable {
-        public static final int icon=0x7f020000;
-        public static final int splash=0x7f020001;
-    }
-    public static final class id {
-        public static final int appView=0x7f050000;
-    }
-    public static final class layout {
-        public static final int main=0x7f030000;
-    }
-    public static final class string {
-        public static final int app_name=0x7f040000;
-        public static final int go=0x7f040001;
-    }
-}

framework/project.properties

@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+
+# Indicates whether an apk should be generated for each density.
+split.density=false
+# Project target.
+target=Google Inc.:Google APIs:15
+apk-configurations=

framework/res/layout/main.xml

@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- 
+       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
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, 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.
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="fill_parent"

framework/res/values/strings.xml

@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- 
+       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
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, 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.
+-->
 <resources>
-  <string name="app_name">PhoneGap</string>
+  <string name="app_name">Cordova</string>
   <string name="go">Snap</string>
 </resources>

framework/res/xml/cordova.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+       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
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, 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.
+-->
+<cordova>
+	<!--  
+	access elements control the Android whitelist.  
+	Domains are assumed blocked unless set otherwise
+	 -->
+
+    <access origin="http://127.0.0.1*"/> <!-- allow local pages -->
+
+	<!-- <access origin="https://example.com" /> allow any secure requests to example.com -->
+	<!-- <access origin="https://example.com" subdomains="true" /> such as above, but including subdomains, such as www -->
+	<!-- <access origin=".*"/> Allow all domains, suggested development use only -->
+
+    <log level="DEBUG"/>
+    <preference name="classicRender" value="true" />
+</cordova>
+
+
+

framework/res/xml/plugins.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+       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
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, 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.
+-->
+<plugins>
+    <plugin name="App" value="org.apache.cordova.App"/>
+    <plugin name="Geolocation" value="org.apache.cordova.GeoBroker"/>
+    <plugin name="Device" value="org.apache.cordova.Device"/>
+    <plugin name="Accelerometer" value="org.apache.cordova.AccelListener"/>
+    <plugin name="Compass" value="org.apache.cordova.CompassListener"/>
+    <plugin name="Media" value="org.apache.cordova.AudioHandler"/>
+    <plugin name="Camera" value="org.apache.cordova.CameraLauncher"/>
+    <plugin name="Contacts" value="org.apache.cordova.ContactManager"/>
+    <plugin name="File" value="org.apache.cordova.FileUtils"/>
+    <plugin name="NetworkStatus" value="org.apache.cordova.NetworkManager"/>
+    <plugin name="Notification" value="org.apache.cordova.Notification"/>
+    <plugin name="Storage" value="org.apache.cordova.Storage"/>
+    <plugin name="Temperature" value="org.apache.cordova.TempListener"/>
+    <plugin name="FileTransfer" value="org.apache.cordova.FileTransfer"/>
+    <plugin name="Capture" value="org.apache.cordova.Capture"/>
+    <plugin name="Battery" value="org.apache.cordova.BatteryListener"/>
+    <plugin name="SplashScreen" value="org.apache.cordova.SplashScreen"/>
+</plugins>

framework/src/com/phonegap/AccelListener.java

@@ -1,297 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-package com.phonegap;
-
-import java.util.List;
-
-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;
-import android.hardware.SensorEventListener;
-import android.hardware.SensorManager;
-import android.content.Context;
-
-/**
- * This class listens to the accelerometer sensor and stores the latest 
- * acceleration values x,y,z.
- */
-public class AccelListener extends Plugin implements SensorEventListener {
-
-	public static int STOPPED = 0;
-	public static int STARTING = 1;
-    public static int RUNNING = 2;
-    public static int ERROR_FAILED_TO_START = 3;
-    
-    public float TIMEOUT = 30000;		// Timeout in msec to shut off listener
-    
-    float x,y,z;						// most recent acceleration values
-    long timestamp;						// time of most recent value
-    int status;							// status of listener
-    long lastAccessTime;				// time the value was last retrieved
-
-    private SensorManager sensorManager;// Sensor manager
-    Sensor mSensor;						// Acceleration sensor returned by sensor manager
-
-    /**
-     * Create an accelerometer listener.
-     */
-    public AccelListener() {
-        this.x = 0;
-        this.y = 0;
-        this.z = 0;
-        this.timestamp = 0;
-        this.setStatus(AccelListener.STOPPED);
-     }
-    
-	/**
-	 * Sets the context of the Command. This can then be used to do things like
-	 * get file paths associated with the Activity.
-	 * 
-	 * @param ctx The context of the main Activity.
-	 */
-	public void setContext(PhonegapActivity ctx) {
-		super.setContext(ctx);
-        this.sensorManager = (SensorManager) ctx.getSystemService(Context.SENSOR_SERVICE);
-	}
-
-	/**
-	 * Executes the request and returns PluginResult.
-	 * 
-	 * @param action 		The action to execute.
-	 * @param args 			JSONArry of arguments for the plugin.
-	 * @param callbackId	The callback id used when calling back into JavaScript.
-	 * @return 				A PluginResult object with a status and message.
-	 */
-	public PluginResult execute(String action, JSONArray args, String callbackId) {
-		PluginResult.Status status = PluginResult.Status.OK;
-		String result = "";		
-		
-		try {
-			if (action.equals("getStatus")) {
-				int i = this.getStatus();
-				return new PluginResult(status, i);
-			}
-			else if (action.equals("start")) {
-				int i = this.start();
-				return new PluginResult(status, i);
-			}
-			else if (action.equals("stop")) {
-				this.stop();
-				return new PluginResult(status, 0);
-			}
-			else if (action.equals("getAcceleration")) {
-				// If not running, then this is an async call, so don't worry about waiting
-				if (this.status != AccelListener.RUNNING) {
-					int r = this.start();
-					if (r == AccelListener.ERROR_FAILED_TO_START) {
-						return new PluginResult(PluginResult.Status.IO_EXCEPTION, AccelListener.ERROR_FAILED_TO_START);
-					}
-					// Wait until running
-					long timeout = 2000;
-					while ((this.status == STARTING) && (timeout > 0)) {
-						timeout = timeout - 100;
-						try {
-							Thread.sleep(100);
-						} catch (InterruptedException e) {
-							e.printStackTrace();
-						}
-					}
-					if (timeout == 0) {
-						return new PluginResult(PluginResult.Status.IO_EXCEPTION, AccelListener.ERROR_FAILED_TO_START);						
-					}
-				}
-	            this.lastAccessTime = System.currentTimeMillis();
-				JSONObject r = new JSONObject();
-				r.put("x", this.x);
-				r.put("y", this.y);
-				r.put("z", this.z);
-				// TODO: Should timestamp be sent?
-				r.put("timestamp", this.timestamp);
-				return new PluginResult(status, r);
-			}
-			else if (action.equals("setTimeout")) {
-				try {
-					float timeout = Float.parseFloat(args.getString(0));
-					this.setTimeout(timeout);
-					return new PluginResult(status, 0);
-				} catch (NumberFormatException e) {
-					status = PluginResult.Status.INVALID_ACTION;
-					e.printStackTrace();
-				} catch (JSONException e) {
-					status = PluginResult.Status.JSON_EXCEPTION;
-					e.printStackTrace();
-				}
-			}
-			else if (action.equals("getTimeout")) {
-				float f = this.getTimeout();
-				return new PluginResult(status, f);
-			}
-			return new PluginResult(status, result);
-		} catch (JSONException e) {
-			return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
-		}
-	}
-
-	/**
-	 * Identifies if action to be executed returns a value and should be run synchronously.
-	 * 
-	 * @param action	The action to execute
-	 * @return			T=returns value
-	 */
-	public boolean isSynch(String action) {
-		if (action.equals("getStatus")) {
-			return true;
-		}
-		else if (action.equals("getAcceleration")) {
-			// Can only return value if RUNNING
-			if (this.status == RUNNING) {
-				return true;
-			}
-		}
-		else if (action.equals("getTimeout")) {
-			return true;
-		}
-		return false;
-	}
-    
-    /**
-     * Called by AccelBroker when listener is to be shut down.
-     * Stop listener.
-     */
-    public void onDestroy() {
-    	this.stop();    	
-    }
-
-    //--------------------------------------------------------------------------
-    // LOCAL METHODS
-    //--------------------------------------------------------------------------
-
-    /**
-     * Start listening for acceleration sensor.
-     * 
-     * @return 			status of listener
-     */
-    public int start() {
-
-		// If already starting or running, then just return
-        if ((this.status == AccelListener.RUNNING) || (this.status == AccelListener.STARTING)) {
-        	return this.status;
-        }
-
-        // Get accelerometer from sensor manager
-        List<Sensor> list = this.sensorManager.getSensorList(Sensor.TYPE_ACCELEROMETER);
-        
-        // If found, then register as listener
-        if ((list != null) && (list.size() > 0)) {
-            this.mSensor = list.get(0);
-            this.sensorManager.registerListener(this, this.mSensor, SensorManager.SENSOR_DELAY_FASTEST);
-            this.setStatus(AccelListener.STARTING);
-            this.lastAccessTime = System.currentTimeMillis();
-        }
-        
-        // If error, then set status to error
-        else {
-            this.setStatus(AccelListener.ERROR_FAILED_TO_START);
-        }
-        
-        return this.status;
-    }
-
-    /**
-     * Stop listening to acceleration sensor.
-     */
-    public void stop() {
-        if (this.status != AccelListener.STOPPED) {
-        	this.sensorManager.unregisterListener(this);
-        }
-        this.setStatus(AccelListener.STOPPED);
-    }
-
-    /**
-     * Called when the accuracy of the sensor has changed.
-     * 
-     * @param sensor
-     * @param accuracy
-     */
-    public void onAccuracyChanged(Sensor sensor, int accuracy) {
-    }
-
-    /**
-     * Sensor listener event.
-     * 
-     * @param SensorEvent event
-     */
-    public void onSensorChanged(SensorEvent event) {
-    	
-    	// Only look at accelerometer events
-        if (event.sensor.getType() != Sensor.TYPE_ACCELEROMETER) {
-            return;
-        }
-        
-        // If not running, then just return
-        if (this.status == AccelListener.STOPPED) {
-        	return;
-        }
-        
-        // Save time that event was received
-        this.timestamp = System.currentTimeMillis();
-        this.x = event.values[0];
-        this.y = event.values[1];
-        this.z = event.values[2];            
-
-        this.setStatus(AccelListener.RUNNING);
-
-        // If values haven't been read for TIMEOUT time, then turn off accelerometer sensor to save power
-		if ((this.timestamp - this.lastAccessTime) > this.TIMEOUT) {
-			this.stop();
-		}		
-    }
-
-    /**
-     * Get status of accelerometer sensor.
-     * 
-     * @return			status
-     */
-	public int getStatus() {
-		return this.status;
-	}
-		
-	/**
-	 * Set the timeout to turn off accelerometer sensor if getX() hasn't been called.
-	 * 
-	 * @param timeout		Timeout in msec.
-	 */
-	public void setTimeout(float timeout) {
-		this.TIMEOUT = timeout;
-	}
-	
-	/**
-	 * Get the timeout to turn off accelerometer sensor if getX() hasn't been called.
-	 * 
-	 * @return timeout in msec
-	 */
-	public float getTimeout() {
-		return this.TIMEOUT;
-	}
-	
-	/**
-	 * Set the status and send it to JavaScript.
-	 * @param status
-	 */
-	private void setStatus(int status) {
-		this.status = status;
-	}
-    
-}

framework/src/com/phonegap/CameraLauncher.java

@@ -1,289 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-package com.phonegap;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.commons.codec.binary.Base64;
-import org.json.JSONArray;
-import org.json.JSONException;
-
-import com.phonegap.api.Plugin;
-import com.phonegap.api.PluginResult;
-
-import android.app.Activity;
-import android.content.ContentValues;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.Bitmap.CompressFormat;
-import android.net.Uri;
-import android.os.Environment;
-import android.provider.MediaStore;
-
-/**
- * This class launches the camera view, allows the user to take a picture, closes the camera view,
- * and returns the captured image.  When the camera view is closed, the screen displayed before 
- * the camera view was shown is redisplayed.
- */
-public class CameraLauncher extends Plugin {
-
-	private static final int DATA_URL = 0;				// Return base64 encoded string
-	private static final int FILE_URI = 1;				// Return file uri (content://media/external/images/media/2 for Android)
-	
-	private static final int PHOTOLIBRARY = 0;			// Choose image from picture library (same as SAVEDPHOTOALBUM for Android)
-	private static final int CAMERA = 1;				// Take picture from camera
-	private static final int SAVEDPHOTOALBUM = 2;		// Choose image from picture library (same as PHOTOLIBRARY for Android)
-	
-	private int mQuality;					// Compression quality hint (0-100: 0=low quality & high compression, 100=compress of max quality)
-	private Uri imageUri;					// Uri of captured image 
-	public String callbackId;
-	
-    /**
-     * Constructor.
-     */
-	public CameraLauncher() {
-	}
-
-	/**
-	 * Executes the request and returns PluginResult.
-	 * 
-	 * @param action 		The action to execute.
-	 * @param args 			JSONArry of arguments for the plugin.
-	 * @param callbackId	The callback id used when calling back into JavaScript.
-	 * @return 				A PluginResult object with a status and message.
-	 */
-	public PluginResult execute(String action, JSONArray args, String callbackId) {
-		PluginResult.Status status = PluginResult.Status.OK;
-		String result = "";		
-		this.callbackId = callbackId;
-		
-		try {
-			if (action.equals("takePicture")) {
-				int destType = DATA_URL;
-				if (args.length() > 1) {
-					destType = args.getInt(1);
-				}
-				int srcType = CAMERA;
-				if (args.length() > 2) {
-					srcType = args.getInt(2);
-				}
-				if (srcType == CAMERA) {
-					this.takePicture(args.getInt(0), destType);
-				}
-				else if ((srcType == PHOTOLIBRARY) || (srcType == SAVEDPHOTOALBUM)) {
-					this.getImage(args.getInt(0), srcType, destType);
-				}
-				PluginResult r = new PluginResult(PluginResult.Status.NO_RESULT);
-				r.setKeepCallback(true);
-				return r;
-			}
-			return new PluginResult(status, result);
-		} catch (JSONException e) {
-			e.printStackTrace();
-			return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
-		}
-	}
-	
-    //--------------------------------------------------------------------------
-    // LOCAL METHODS
-    //--------------------------------------------------------------------------
-    
-	/**
-	 * 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.
-	 * 
-	 * 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:
-	 * 		img.src="data:image/jpeg;base64,"+result;
-	 * or to display URI in an img tag
-	 * 		img.src=result;
-	 * 
-	 * @param quality			Compression quality hint (0-100: 0=low quality & high compression, 100=compress of max quality)
-	 * @param returnType		Set the type of image to return. 
-	 */
-	public void takePicture(int quality, int returnType) {
-		this.mQuality = quality;
-		
-		// Display camera
-        Intent intent = new Intent("android.media.action.IMAGE_CAPTURE");
-        
-        // Specify file so that large image is captured and returned
-        // TODO: What if there isn't any external storage?
-        File photo = new File(Environment.getExternalStorageDirectory(),  "Pic.jpg");
-        intent.putExtra(android.provider.MediaStore.EXTRA_OUTPUT, Uri.fromFile(photo));
-        this.imageUri = Uri.fromFile(photo);
-
-        this.ctx.startActivityForResult((Plugin) this, intent, (CAMERA+1)*16 + returnType+1);
-	}
-	
-	/**
-	 * Get image from photo library.
-	 * 
-	 * @param quality			Compression quality hint (0-100: 0=low quality & high compression, 100=compress of max quality)
-	 * @param srcType			The album to get image from.
-	 * @param returnType		Set the type of image to return. 
-	 */
-	// TODO: Images selected from SDCARD don't display correctly, but from CAMERA ALBUM do!
-	public void getImage(int quality, int srcType, int returnType) {
-		this.mQuality = quality;
-
-		Intent intent = new Intent();
-		intent.setType("image/*");
-		intent.setAction(Intent.ACTION_GET_CONTENT);
-		intent.addCategory(Intent.CATEGORY_OPENABLE);
-		this.ctx.startActivityForResult((Plugin) this, Intent.createChooser(intent,
-				new String("Get Picture")), (srcType+1)*16 + returnType + 1);
-	}
-
-    /**
-     * Called when the camera view exits. 
-     * 
-     * @param requestCode		The request code originally supplied to startActivityForResult(), 
-     * 							allowing you to identify who this result came from.
-     * @param resultCode		The integer result code returned by the child activity through its setResult().
-     * @param intent			An Intent, which can return result data to the caller (various data can be attached to Intent "extras").
-     */
-	public void onActivityResult(int requestCode, int resultCode, Intent intent) {
-		
-		// Get src and dest types from request code
-		int srcType = (requestCode/16) - 1;
-		int destType = (requestCode % 16) - 1;
-
-		// If CAMERA
-		if (srcType == CAMERA) {
-			
-			// If image available
-			if (resultCode == Activity.RESULT_OK) {
-				try {
-					// Read in bitmap of captured image
-					Bitmap bitmap = android.provider.MediaStore.Images.Media.getBitmap(this.ctx.getContentResolver(), imageUri);
-
-					// If sending base64 image back
-					if (destType == DATA_URL) {
-						this.processPicture(bitmap);
-					}
-
-					// If sending filename back
-					else if (destType == FILE_URI){
-						// Create entry in media store for image
-						// (Don't use insertImage() because it uses default compression setting of 50 - no way to change it)
-						ContentValues values = new ContentValues();
-						values.put(android.provider.MediaStore.Images.Media.MIME_TYPE, "image/jpeg");
-						Uri uri = null;
-						try {
-							uri = this.ctx.getContentResolver().insert(android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values);
-						} catch (UnsupportedOperationException e) {
-							System.out.println("Can't write to external media storage.");
-							try {
-								uri = this.ctx.getContentResolver().insert(android.provider.MediaStore.Images.Media.INTERNAL_CONTENT_URI, values);
-							} catch (UnsupportedOperationException ex) {
-								System.out.println("Can't write to internal media storage.");							
-								this.failPicture("Error capturing image - no media storage found.");
-								return;
-							}
-						}
-
-						// Add compressed version of captured image to returned media store Uri
-						OutputStream os = this.ctx.getContentResolver().openOutputStream(uri);
-						bitmap.compress(Bitmap.CompressFormat.JPEG, this.mQuality, os);
-						os.close();
-
-						// Send Uri back to JavaScript for viewing image
-						this.success(new PluginResult(PluginResult.Status.OK, uri.toString()), this.callbackId);
-					}
-					bitmap.recycle();
-					bitmap = null;
-					System.gc();
-				} catch (IOException e) {
-					e.printStackTrace();
-					this.failPicture("Error capturing image.");
-				}		
-			}
-
-			// If cancelled
-			else if (resultCode == Activity.RESULT_CANCELED) {
-				this.failPicture("Camera cancelled.");
-			}
-
-			// If something else
-			else {
-				this.failPicture("Did not complete!");
-			}
-		}
-		
-		// If retrieving photo from library
-		else if ((srcType == PHOTOLIBRARY) || (srcType == SAVEDPHOTOALBUM)) {
-			if (resultCode == Activity.RESULT_OK) {
-				Uri uri = intent.getData();
-				android.content.ContentResolver resolver = this.ctx.getContentResolver();
-				// If sending base64 image back
-				if (destType == DATA_URL) {
-					try {
-						Bitmap bitmap =	android.graphics.BitmapFactory.decodeStream(resolver.openInputStream(uri));
-						this.processPicture(bitmap);
-						bitmap.recycle();
-						bitmap = null;
-						System.gc();
-					} catch (FileNotFoundException e) {
-						e.printStackTrace();
-						this.failPicture("Error retrieving image.");
-					}
-				}
-				
-				// If sending filename back
-				else if (destType == FILE_URI) {
-					this.success(new PluginResult(PluginResult.Status.OK, uri.toString()), this.callbackId);
-				}
-			}
-			else if (resultCode == Activity.RESULT_CANCELED) {
-				this.failPicture("Selection cancelled.");				
-			}
-			else {
-				this.failPicture("Selection did not complete!");				
-			}
-		}
-	}
-	
-	/**
-	 * Compress bitmap using jpeg, convert to Base64 encoded string, and return to JavaScript.
-	 *
-	 * @param bitmap
-	 */
-	public void processPicture(Bitmap bitmap) {		
-		ByteArrayOutputStream jpeg_data = new ByteArrayOutputStream();
-		try {
-			if (bitmap.compress(CompressFormat.JPEG, mQuality, jpeg_data)) {
-				byte[] code  = jpeg_data.toByteArray();
-				byte[] output = Base64.encodeBase64(code);
-				String js_out = new String(output);
-				this.success(new PluginResult(PluginResult.Status.OK, js_out), this.callbackId);
-				js_out = null;
-				output = null;
-				code = null;
-			}	
-		}
-		catch(Exception e) {
-			this.failPicture("Error compressing image.");
-		}		
-		jpeg_data = null;
-	}
-	
-	/**
-	 * Send error message to JavaScript.
-	 * 
-	 * @param err
-	 */
-	public void failPicture(String err) {
-		this.error(new PluginResult(PluginResult.Status.ERROR, err), this.callbackId);
-	}
-}

framework/src/com/phonegap/CompassListener.java

@@ -1,270 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-package com.phonegap;
-
-import java.util.List;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-
-import com.phonegap.api.PhonegapActivity;
-import com.phonegap.api.Plugin;
-import com.phonegap.api.PluginResult;
-
-import android.hardware.Sensor;
-import android.hardware.SensorEvent;
-import android.hardware.SensorEventListener;
-import android.hardware.SensorManager;
-import android.content.Context;
-
-/**
- * This class listens to the compass sensor and stores the latest heading value.
- */
-public class CompassListener extends Plugin implements SensorEventListener {
-
-	public static int STOPPED = 0;
-	public static int STARTING = 1;
-    public static int RUNNING = 2;
-    public static int ERROR_FAILED_TO_START = 3;
-    
-    public long TIMEOUT = 30000;		// Timeout in msec to shut off listener
-	
-    int status;							// status of listener
-    float heading;						// most recent heading value
-    long timeStamp;						// time of most recent value
-    long lastAccessTime;				// time the value was last retrieved
-	
-    private SensorManager sensorManager;// Sensor manager
-    Sensor mSensor;						// Compass sensor returned by sensor manager
-	
-	/**
-	 * Constructor.
-	 */
-	public CompassListener() {
-        this.timeStamp = 0;
-        this.setStatus(CompassListener.STOPPED);
-	}
-
-	/**
-	 * Sets the context of the Command. This can then be used to do things like
-	 * get file paths associated with the Activity.
-	 * 
-	 * @param ctx The context of the main Activity.
-	 */
-	public void setContext(PhonegapActivity ctx) {
-		super.setContext(ctx);
-        this.sensorManager = (SensorManager) ctx.getSystemService(Context.SENSOR_SERVICE);
-	}
-
-	/**
-	 * Executes the request and returns PluginResult.
-	 * 
-	 * @param action 		The action to execute.
-	 * @param args 			JSONArry of arguments for the plugin.
-	 * @param callbackId	The callback id used when calling back into JavaScript.
-	 * @return 				A PluginResult object with a status and message.
-	 */
-	public PluginResult execute(String action, JSONArray args, String callbackId) {
-		PluginResult.Status status = PluginResult.Status.OK;
-		String result = "";		
-		
-		try {
-			if (action.equals("start")) {
-				this.start();
-			}
-			else if (action.equals("stop")) {
-				this.stop();
-			}
-			else if (action.equals("getStatus")) {
-				int i = this.getStatus();
-				return new PluginResult(status, i);
-			}
-			else if (action.equals("getHeading")) {
-				// If not running, then this is an async call, so don't worry about waiting
-				if (this.status != RUNNING) {
-					int r = this.start();
-					if (r == ERROR_FAILED_TO_START) {
-						return new PluginResult(PluginResult.Status.IO_EXCEPTION, ERROR_FAILED_TO_START);
-					}
-					// Wait until running
-					long timeout = 2000;
-					while ((this.status == STARTING) && (timeout > 0)) {
-						timeout = timeout - 100;
-						try {
-							Thread.sleep(100);
-						} catch (InterruptedException e) {
-							e.printStackTrace();
-						}
-					}
-					if (timeout == 0) {
-						return new PluginResult(PluginResult.Status.IO_EXCEPTION, AccelListener.ERROR_FAILED_TO_START);						
-					}
-				}
-				float f = this.getHeading();
-				return new PluginResult(status, f);
-			}
-			else if (action.equals("setTimeout")) {
-				this.setTimeout(args.getLong(0));
-			}
-			else if (action.equals("getTimeout")) {
-				long l = this.getTimeout();
-				return new PluginResult(status, l);
-			}
-			return new PluginResult(status, result);
-		} catch (JSONException e) {
-			e.printStackTrace();
-			return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
-		}
-	}
-
-	/**
-	 * Identifies if action to be executed returns a value and should be run synchronously.
-	 * 
-	 * @param action	The action to execute
-	 * @return			T=returns value
-	 */
-	public boolean isSynch(String action) {
-		if (action.equals("getStatus")) {
-			return true;
-		}
-		else if (action.equals("getHeading")) {
-			// Can only return value if RUNNING
-			if (this.status == RUNNING) {
-				return true;
-			}
-		}
-		else if (action.equals("getTimeout")) {
-			return true;
-		}
-		return false;
-	}
-    
-    /**
-     * Called when listener is to be shut down and object is being destroyed.
-     */
-	public void onDestroy() {
-		this.stop();
-	}
-
-    //--------------------------------------------------------------------------
-    // LOCAL METHODS
-    //--------------------------------------------------------------------------
-
-    /**
-     * Start listening for compass sensor.
-     * 
-     * @return 			status of listener
-     */
-	public int start() {
-		
-		// If already starting or running, then just return
-        if ((this.status == CompassListener.RUNNING) || (this.status == CompassListener.STARTING)) {
-        	return this.status;
-        }
-
-		// Get accelerometer from sensor manager
-		List<Sensor> list = this.sensorManager.getSensorList(Sensor.TYPE_ORIENTATION);
-
-        // If found, then register as listener
-		if (list.size() > 0) {
-			this.mSensor = list.get(0);
-			this.sensorManager.registerListener(this, this.mSensor, SensorManager.SENSOR_DELAY_NORMAL);
-            this.lastAccessTime = System.currentTimeMillis();
-            this.setStatus(CompassListener.STARTING);
-		}
-
-		// If error, then set status to error
-        else {
-            this.setStatus(CompassListener.ERROR_FAILED_TO_START);
-        }
-        
-        return this.status;
-	}
-	
-    /**
-     * Stop listening to compass sensor.
-     */
-	public void stop() {
-        if (this.status != CompassListener.STOPPED) {
-        	this.sensorManager.unregisterListener(this);
-        }
-        this.setStatus(CompassListener.STOPPED);
-	}
-	
-	
-	public void onAccuracyChanged(Sensor sensor, int accuracy) {
-		// TODO Auto-generated method stub	
-	}
-
-    /**
-     * Sensor listener event.
-     * 
-     * @param SensorEvent event
-     */
-	public void onSensorChanged(SensorEvent event) {
-
-		// We only care about the orientation as far as it refers to Magnetic North
-		float heading = event.values[0];
-
-		// Save heading
-        this.timeStamp = System.currentTimeMillis();
-		this.heading = heading;
-		this.setStatus(CompassListener.RUNNING);
-
-		// If heading hasn't been read for TIMEOUT time, then turn off compass sensor to save power
-		if ((this.timeStamp - this.lastAccessTime) > this.TIMEOUT) {
-			this.stop();
-		}
-	}
-	
-    /**
-     * Get status of compass sensor.
-     * 
-     * @return			status
-     */
-	public int getStatus() {
-		return this.status;
-	}
-	
-	/**
-	 * Get the most recent compass heading.
-	 * 
-	 * @return			heading
-	 */
-	public float getHeading() {
-        this.lastAccessTime = System.currentTimeMillis();
-		return this.heading;
-	}
-	
-	/**
-	 * Set the timeout to turn off compass sensor if getHeading() hasn't been called.
-	 * 
-	 * @param timeout		Timeout in msec.
-	 */
-	public void setTimeout(long timeout) {
-		this.TIMEOUT = timeout;
-	}
-	
-	/**
-	 * Get the timeout to turn off compass sensor if getHeading() hasn't been called.
-	 * 
-	 * @return timeout in msec
-	 */
-	public long getTimeout() {
-		return this.TIMEOUT;
-	}
-
-	/**
-	 * Set the status and send it to JavaScript.
-	 * @param status
-	 */
-	private void setStatus(int status) {
-		this.status = status;
-	}
-
-}

framework/src/com/phonegap/ContactAccessor.java

@@ -1,228 +0,0 @@
-// Taken from Android Tutorials
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-
-package com.phonegap;
-
-import java.lang.reflect.Constructor;
-import java.util.HashMap;
-
-import android.app.Activity;
-import android.util.Log;
-import android.webkit.WebView;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * This abstract class defines SDK-independent API for communication with
- * Contacts Provider. The actual implementation used by the application depends
- * on the level of API available on the device. If the API level is Cupcake or
- * Donut, we want to use the {@link ContactAccessorSdk3_4} class. If it is
- * Eclair or higher, we want to use {@link ContactAccessorSdk5}.
- */
-public abstract class ContactAccessor {
-	
-    /**
-     * Static singleton instance of {@link ContactAccessor} holding the
-     * SDK-specific implementation of the class.
-     */
-    private static ContactAccessor sInstance;
-    protected final String LOG_TAG = "ContactsAccessor";
-    protected Activity mApp;
-    protected WebView mView;
-
-    public static ContactAccessor getInstance(WebView view, Activity app) {
-        if (sInstance == null) {
-            String className;
-
-            /*
-             * Check the version of the SDK we are running on. Choose an
-             * implementation class designed for that version of the SDK.
-             *
-             * Unfortunately we have to use strings to represent the class
-             * names. If we used the conventional ContactAccessorSdk5.class.getName()
-             * syntax, we would get a ClassNotFoundException at runtime on pre-Eclair SDKs.
-             * Using the above syntax would force Dalvik to load the class and try to
-             * resolve references to all other classes it uses. Since the pre-Eclair
-             * does not have those classes, the loading of ContactAccessorSdk5 would fail.
-             */
-            
-            if (android.os.Build.VERSION.RELEASE.startsWith("1.")) {
-                className = "com.phonegap.ContactAccessorSdk3_4";
-            } else {
-                className = "com.phonegap.ContactAccessorSdk5";
-            }
-
-            /*
-             * Find the required class by name and instantiate it.
-             */
-            try {
-                Class<? extends ContactAccessor> clazz =
-                        Class.forName(className).asSubclass(ContactAccessor.class);
-                // Grab constructor for contactsmanager class dynamically.
-                Constructor<? extends ContactAccessor> classConstructor = clazz.getConstructor(Class.forName("android.webkit.WebView"), Class.forName("android.app.Activity"));
-                sInstance = classConstructor.newInstance(view, app);
-            } catch (Exception e) {
-                throw new IllegalStateException(e);
-            }
-        }
-
-        return sInstance;
-    }
-	
-    /**
-     * Check to see if the data associated with the key is required to 
-     * be populated in the Contact object.
-     * @param key 
-     * @param map created by running buildPopulationSet.
-     * @return true if the key data is required
-     */
-    protected boolean isRequired(String key, HashMap<String,Boolean> map) {
-		Boolean retVal = map.get(key);
-		return (retVal == null) ? false : retVal.booleanValue();
-	}
-    
-    /**
-     * Create a hash map of what data needs to be populated in the Contact object
-     * @param fields the list of fields to populate
-     * @return the hash map of required data
-     */
-	protected HashMap<String,Boolean> buildPopulationSet(JSONArray fields) {
-		HashMap<String,Boolean> map = new HashMap<String,Boolean>();
-		
-		String key;
-		try {
-			for (int i=0; i<fields.length(); i++) {
-				key = fields.getString(i);
-				if (key.startsWith("displayName")) {
-					map.put("displayName", true);
-				}
-				else if (key.startsWith("name")) {
-					map.put("name", true);
-				}
-				else if (key.startsWith("nickname")) {
-					map.put("nickname", true);
-				}
-				else if (key.startsWith("phoneNumbers")) {
-					map.put("phoneNumbers", true);
-				}
-				else if (key.startsWith("emails")) {
-					map.put("emails", true);
-				}
-				else if (key.startsWith("addresses")) {
-					map.put("addresses", true);
-				}
-				else if (key.startsWith("ims")) {
-					map.put("ims", true);
-				}
-				else if (key.startsWith("organizations")) {
-					map.put("organizations", true);
-				}
-				else if (key.startsWith("birthday")) {
-					map.put("birthday", true);
-				}
-				else if (key.startsWith("anniversary")) {
-					map.put("anniversary", true);
-				}
-				else if (key.startsWith("note")) {
-					map.put("note", true);
-				}
-				else if (key.startsWith("relationships")) {
-					map.put("relationships", true);
-				}
-				else if (key.startsWith("urls")) {
-					map.put("urls", true);
-				}
-				else if (key.startsWith("photos")) {
-					map.put("photos", true);
-				}
-			}
-		}
-		catch (JSONException e) {
-			Log.e(LOG_TAG, e.getMessage(), e);
-		}
-		return map;
-	}
-	
-	/**
-	 * Convenience method to get a string from a JSON object.  Saves a 
-	 * lot of try/catch writing.
-	 * If the property is not found in the object null will be returned.
-	 * 
-	 * @param obj contact object to search
-	 * @param property to be looked up
-	 * @return The value of the property
-	 */
-	protected String getJsonString(JSONObject obj, String property) {
-		String value = null;
-		try {
-			value = obj.getString(property);
-			if (value.equals("null")) {
-				Log.d(LOG_TAG, property + " is string called 'null'");
-				value = null;
-			}
-		}
-		catch (JSONException e) {
-			Log.d(LOG_TAG, "Could not get = " + e.getMessage());
-		}		
-		return value;
-	}
-
-    /**
-     * Handles adding a JSON Contact object into the database.
-     * @return TODO
-     */
-	public abstract boolean save(JSONObject contact);
-
-    /**
-     * Handles searching through SDK-specific contacts API.
-     */
-    public abstract JSONArray search(JSONArray filter, JSONObject options);
-
-    /**
-     * Handles removing a contact from the database.
-     */
-	public abstract boolean remove(String id);
-	
-	/**
-	 * A class that represents the where clause to be used in the database query 
-	 */
-	class WhereOptions {
-		private String where;
-		private String[] whereArgs;
-		public void setWhere(String where) {
-			this.where = where;
-		}
-		public String getWhere() {
-			return where;
-		}
-		public void setWhereArgs(String[] whereArgs) {
-			this.whereArgs = whereArgs;
-		}
-		public String[] getWhereArgs() {
-			return whereArgs;
-		}
-	}
-}

framework/src/com/phonegap/ContactAccessorSdk3_4.java

@@ -1,827 +0,0 @@
-// Taken from Android tutorials
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-
-package com.phonegap;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.Contacts;
-import android.provider.Contacts.ContactMethods;
-import android.provider.Contacts.ContactMethodsColumns;
-import android.provider.Contacts.Organizations;
-import android.provider.Contacts.People;
-import android.provider.Contacts.Phones;
-import android.util.Log;
-import android.webkit.WebView;
-
-/**
- * An implementation of {@link ContactAccessor} that uses legacy Contacts API.
- * These APIs are deprecated and should not be used unless we are running on a
- * pre-Eclair SDK.
- * <p>
- * There are several reasons why we wouldn't want to use this class on an Eclair device:
- * <ul>
- * <li>It would see at most one account, namely the first Google account created on the device.
- * <li>It would work through a compatibility layer, which would make it inherently less efficient.
- * <li>Not relevant to this particular example, but it would not have access to new kinds
- * of data available through current APIs.
- * </ul>
- */
-@SuppressWarnings("deprecation")
-public class ContactAccessorSdk3_4 extends ContactAccessor {
-	private static final String PEOPLE_ID_EQUALS = "people._id = ?";
-	/**
-	 * A static map that converts the JavaScript property name to Android database column name.
-	 */
-    private static final Map<String, String> dbMap = new HashMap<String, String>();
-    static {
-    	dbMap.put("id", People._ID);
-    	dbMap.put("displayName", People.DISPLAY_NAME);
-    	dbMap.put("phoneNumbers", Phones.NUMBER);
-    	dbMap.put("phoneNumbers.value", Phones.NUMBER);
-    	dbMap.put("emails", ContactMethods.DATA);
-    	dbMap.put("emails.value", ContactMethods.DATA);
-    	dbMap.put("addresses", ContactMethodsColumns.DATA);
-    	dbMap.put("addresses.formatted", ContactMethodsColumns.DATA);
-    	dbMap.put("ims", ContactMethodsColumns.DATA);
-    	dbMap.put("ims.value", ContactMethodsColumns.DATA);
-    	dbMap.put("organizations", Organizations.COMPANY);
-    	dbMap.put("organizations.name", Organizations.COMPANY);
-    	dbMap.put("organizations.title", Organizations.TITLE);
-    	dbMap.put("note", People.NOTES);
-    }
-	
-    /**
-     * Create an contact accessor.
-     */
-	public ContactAccessorSdk3_4(WebView view, Activity app)
-	{
-		mApp = app;
-		mView = view;
-	}
-	
-	@Override
-	/** 
-	 * This method takes the fields required and search options in order to produce an 
-	 * array of contacts that matches the criteria provided.
-	 * @param fields an array of items to be used as search criteria
-	 * @param options that can be applied to contact searching
-	 * @return an array of contacts 
-	 */
-	public JSONArray search(JSONArray fields, JSONObject options) {
-		String searchTerm = "";
-		int limit = Integer.MAX_VALUE;
-		boolean multiple = true;
-
-		if (options != null) {
-			searchTerm = options.optString("filter");
-			if (searchTerm.length()==0) {
-				searchTerm = "%";
-			}
-			else {
-				searchTerm = "%" + searchTerm + "%";
-			}
-			try {
-				multiple = options.getBoolean("multiple");
-				if (!multiple) {
-					limit = 1;
-				}
-			} catch (JSONException e) {
-				// Multiple was not specified so we assume the default is true.
-			}
-		}
-		else {
-			searchTerm = "%";
-		}
-		
-    	ContentResolver cr = mApp.getContentResolver();
-    	
-    	Set<String> contactIds = buildSetOfContactIds(fields, searchTerm);
-		HashMap<String,Boolean> populate = buildPopulationSet(fields);
-
-    	Iterator<String> it = contactIds.iterator();
-    		
-    	JSONArray contacts = new JSONArray();
-    	JSONObject contact;
-    	String contactId;
-    	int pos = 0;
-    	while (it.hasNext() && (pos < limit)) {
-    		contact = new JSONObject();
-	    	try {	    		
-	    		contactId = it.next();
-		    	contact.put("id", contactId);
-		    	
-		    	// Do query for name and note
-		        Cursor cur = cr.query(People.CONTENT_URI, 
-					new String[] {People.DISPLAY_NAME, People.NOTES},
-					PEOPLE_ID_EQUALS,
-					new String[] {contactId},
-					null);
-		        cur.moveToFirst();
-		    	
-				if (isRequired("displayName",populate)) {
-					contact.put("displayName", cur.getString(cur.getColumnIndex(People.DISPLAY_NAME)));		    	
-				}
-				if (isRequired("phoneNumbers",populate)) {
-					contact.put("phoneNumbers", phoneQuery(cr, contactId));
-				}
-				if (isRequired("emails",populate)) {
-					contact.put("emails", emailQuery(cr, contactId));
-				}
-				if (isRequired("addresses",populate)) {
-					contact.put("addresses", addressQuery(cr, contactId));
-				}
-				if (isRequired("organizations",populate)) {
-					contact.put("organizations", organizationQuery(cr, contactId));
-				}
-				if (isRequired("ims",populate)) {
-					contact.put("ims", imQuery(cr, contactId));
-				}
-				if (isRequired("note",populate)) {
-					contact.put("note", cur.getString(cur.getColumnIndex(People.NOTES)));
-				}
-				// nickname
-				// urls
-				// relationship
-				// birthdays
-				// anniversary
-		    	
-		    	pos++;
-				cur.close();
-	    	} catch (JSONException e) {
-	    		Log.e(LOG_TAG, e.getMessage(), e);
-	    	}
-	    	contacts.put(contact);
-        }
-    	return contacts;
-	}
-	
-	/**
-	 * Query the database using the search term to build up a list of contact ID's 
-	 * matching the search term
-	 * @param fields
-	 * @param searchTerm
-	 * @return a set of contact ID's
-	 */
-	private Set<String> buildSetOfContactIds(JSONArray fields, String searchTerm) {
-		Set<String> contactIds = new HashSet<String>();	
-		
-		String key;
-		try {
-			for (int i=0; i<fields.length(); i++) {
-				key = fields.getString(i);
-				if (key.startsWith("displayName")) {
-					doQuery(searchTerm, contactIds,
-							People.CONTENT_URI,
-							People._ID,
-							dbMap.get(key) + " LIKE ?",
-							new String[] {searchTerm});
-				}
-//				else if (key.startsWith("name")) {
-//					Log.d(LOG_TAG, "Doing " + key + " query");
-//					doQuery(searchTerm, contactIds,
-//							ContactsContract.Data.CONTENT_URI,
-//							ContactsContract.Data.CONTACT_ID,
-//							dbMap.get(key) + " LIKE ? AND " + ContactsContract.Data.MIMETYPE + " = ?",
-//							new String[] {searchTerm, ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE});
-//				}
-				else if (key.startsWith("phoneNumbers")) {
-					doQuery(searchTerm, contactIds,
-							Phones.CONTENT_URI,
-							Phones.PERSON_ID,
-							dbMap.get(key) + " LIKE ?",
-							new String[] {searchTerm});
-				}
-				else if (key.startsWith("emails")) {
-					doQuery(searchTerm, contactIds,
-							ContactMethods.CONTENT_EMAIL_URI,
-							ContactMethods.PERSON_ID,
-							dbMap.get(key) + " LIKE ? AND " + ContactMethods.KIND + " = ?", 
-							new String[] {searchTerm, ContactMethods.CONTENT_EMAIL_ITEM_TYPE});
-				}
-				else if (key.startsWith("addresses")) {
-					doQuery(searchTerm, contactIds,
-							ContactMethods.CONTENT_URI,
-							ContactMethods.PERSON_ID,
-							dbMap.get(key) + " LIKE ? AND " + ContactMethods.KIND + " = ?",
-							new String[] {searchTerm, ContactMethods.CONTENT_POSTAL_ITEM_TYPE});					
-				}
-				else if (key.startsWith("ims")) {
-					doQuery(searchTerm, contactIds,
-							ContactMethods.CONTENT_URI,
-							ContactMethods.PERSON_ID,
-							dbMap.get(key) + " LIKE ? AND " + ContactMethods.KIND + " = ?",
-							new String[] {searchTerm, ContactMethods.CONTENT_IM_ITEM_TYPE});					
-				}
-				else if (key.startsWith("organizations")) {
-					doQuery(searchTerm, contactIds,
-							Organizations.CONTENT_URI,
-							ContactMethods.PERSON_ID,
-							dbMap.get(key) + " LIKE ?",
-							new String[] {searchTerm});					
-				}
-				else if (key.startsWith("note")) {
-					doQuery(searchTerm, contactIds,
-							People.CONTENT_URI,
-							People._ID,
-							dbMap.get(key) + " LIKE ?",
-							new String[] {searchTerm});					
-				}
-			}
-		}
-		catch (JSONException e) {
-			Log.e(LOG_TAG, e.getMessage(), e);
-		}
-		
-		return contactIds;
-	}
-
-	/**
-	 * A convenience method so we don't duplicate code in doQuery
-	 * @param searchTerm
-	 * @param contactIds
-	 * @param uri
-	 * @param projection
-	 * @param selection
-	 * @param selectionArgs
-	 */
-	private void doQuery(String searchTerm, Set<String> contactIds, 
-			Uri uri, String projection, String selection, String[] selectionArgs) {
-		ContentResolver cr = mApp.getContentResolver();
-
-		Cursor cursor = cr.query(
-				uri, 
-				null,
-				selection,
-				selectionArgs,
-				null);
-		
-		while (cursor.moveToNext()) {
-			contactIds.add(cursor.getString(cursor.getColumnIndex(projection)));
-		}
-		cursor.close();
-	}
-	
-	/**
-	 * Create a ContactField JSONArray
-	 * @param cr database access object
-	 * @param contactId the ID to search the database for
-	 * @return a JSONArray representing a set of ContactFields
-	 */
-	private JSONArray imQuery(ContentResolver cr, String contactId) {
-		String imWhere = ContactMethods.PERSON_ID 
-        	+ " = ? AND " + ContactMethods.KIND + " = ?"; 
-		String[] imWhereParams = new String[]{contactId, ContactMethods.CONTENT_IM_ITEM_TYPE}; 
-		Cursor cursor = cr.query(ContactMethods.CONTENT_URI, 
-		         null, imWhere, imWhereParams, null); 
-		JSONArray ims = new JSONArray();
-		JSONObject im;
-		while (cursor.moveToNext()) {
-			im = new JSONObject();
-			try{
-			im.put("id", cursor.getString(
-					cursor.getColumnIndex(ContactMethods._ID)));
-			im.put("perf", false);
-			im.put("value", cursor.getString(
-					cursor.getColumnIndex(ContactMethodsColumns.DATA)));
-			im.put("type", getContactType(cursor.getInt(
-					cursor.getColumnIndex(ContactMethodsColumns.TYPE))));
-			ims.put(im);
-			} catch (JSONException e) {
-				Log.e(LOG_TAG, e.getMessage(), e);
-			}
-		} 
-		cursor.close();
-		return null;
-	}
-
-	/**
-	 * Create a ContactOrganization JSONArray
-	 * @param cr database access object
-	 * @param contactId the ID to search the database for
-	 * @return a JSONArray representing a set of ContactOrganization
-	 */
-	private JSONArray organizationQuery(ContentResolver cr, String contactId) {
-		String orgWhere = ContactMethods.PERSON_ID + " = ?"; 
-		String[] orgWhereParams = new String[]{contactId}; 
-		Cursor cursor = cr.query(Organizations.CONTENT_URI, 
-	              null, orgWhere, orgWhereParams, null);
-		JSONArray organizations = new JSONArray();
-		JSONObject organization;
-		while (cursor.moveToNext()) {
-			organization = new JSONObject();
-			try{
-				organization.put("id", cursor.getString(cursor.getColumnIndex(Organizations._ID)));
-				organization.put("name", cursor.getString(cursor.getColumnIndex(Organizations.COMPANY)));
-				organization.put("title", cursor.getString(cursor.getColumnIndex(Organizations.TITLE)));
-				// organization.put("department", cursor.getString(cursor.getColumnIndex(Organizations)));
-				organizations.put(organization);
-			} catch (JSONException e) {
-				Log.e(LOG_TAG, e.getMessage(), e);
-			}
-		} 
-		return organizations;
-	}
-	
-	/**
-	 * Create a ContactAddress JSONArray
-	 * @param cr database access object
-	 * @param contactId the ID to search the database for
-	 * @return a JSONArray representing a set of ContactAddress
-	 */
-	private JSONArray addressQuery(ContentResolver cr, String contactId) {
-		String addrWhere = ContactMethods.PERSON_ID 
-			+ " = ? AND " + ContactMethods.KIND + " = ?"; 
-		String[] addrWhereParams = new String[]{contactId, 
-		ContactMethods.CONTENT_POSTAL_ITEM_TYPE}; 		
-		Cursor cursor = cr.query(ContactMethods.CONTENT_URI, 
-				null, addrWhere, addrWhereParams, null); 
-		JSONArray addresses = new JSONArray();
-		JSONObject address;
-		while (cursor.moveToNext()) {
-			address = new JSONObject();
-			try{
-				address.put("id", cursor.getString(cursor.getColumnIndex(ContactMethods._ID)));
-				address.put("formatted", cursor.getString(cursor.getColumnIndex(ContactMethodsColumns.DATA)));
-				addresses.put(address);
-			} catch (JSONException e) {
-				Log.e(LOG_TAG, e.getMessage(), e);
-			}
-		} 
-		return addresses;
-	}
-	
-	/**
-	 * Create a ContactField JSONArray
-	 * @param cr database access object
-	 * @param contactId the ID to search the database for
-	 * @return a JSONArray representing a set of ContactFields
-	 */
-	private JSONArray phoneQuery(ContentResolver cr, String contactId) {
-		Cursor cursor = cr.query(
-				Phones.CONTENT_URI, 
-				null, 
-				Phones.PERSON_ID +" = ?", 
-				new String[]{contactId}, null);
-		JSONArray phones = new JSONArray();
-		JSONObject phone;
-		while (cursor.moveToNext()) {
-			phone = new JSONObject();
-			try{
-				phone.put("id", cursor.getString(cursor.getColumnIndex(Phones._ID)));
-				phone.put("perf", false);
-				phone.put("value", cursor.getString(cursor.getColumnIndex(Phones.NUMBER)));
-				phone.put("type", getPhoneType(cursor.getInt(cursor.getColumnIndex(Phones.TYPE))));
-				phones.put(phone);
-			} catch (JSONException e) {
-				Log.e(LOG_TAG, e.getMessage(), e);
-			}
-		} 
-		return phones;
-	}
-	
-	/**
-	 * Create a ContactField JSONArray
-	 * @param cr database access object
-	 * @param contactId the ID to search the database for
-	 * @return a JSONArray representing a set of ContactFields
-	 */
-	private JSONArray emailQuery(ContentResolver cr, String contactId) {
-		Cursor cursor = cr.query(
-				ContactMethods.CONTENT_EMAIL_URI, 
-				null, 
-				ContactMethods.PERSON_ID +" = ?", 
-				new String[]{contactId}, null);
-		JSONArray emails = new JSONArray();
-		JSONObject email;
-		while (cursor.moveToNext()) {
-			email = new JSONObject();
-			try{
-				email.put("id", cursor.getString(cursor.getColumnIndex(ContactMethods._ID)));
-				email.put("perf", false);
-				email.put("value", cursor.getString(cursor.getColumnIndex(ContactMethods.DATA)));
-				// TODO Find out why adding an email type throws and exception
-				//email.put("type", cursor.getString(cursor.getColumnIndex(ContactMethods.TYPE)));
-				emails.put(email);
-			} catch (JSONException e) {
-				Log.e(LOG_TAG, e.getMessage(), e);
-			}
-		} 
-		return emails;
-	}
-
-	/**
-	 * This method will save a contact object into the devices contacts database.
-	 * 
-	 * @param contact the contact to be saved.
-	 * @returns true if the contact is successfully saved, false otherwise.
-	 */
-	@Override
-	public boolean save(JSONObject contact) {
-		ContentValues personValues = new ContentValues();
-
-		String id = getJsonString(contact, "id");
-			
-		String name = getJsonString(contact, "displayName");
-		if (name != null) {
-			personValues.put(Contacts.People.NAME, name);				
-		}
-		String note = getJsonString(contact, "note");
-		if (note != null) {
-			personValues.put(Contacts.People.NOTES, note);
-		}
-
-		/* STARRED 0 = Contacts, 1 = Favorites */
-		personValues.put(Contacts.People.STARRED, 0);
-		
-		Uri newPersonUri;
-		// Add new contact
-		if (id == null) {
-			newPersonUri = Contacts.People.createPersonInMyContactsGroup(mApp.getContentResolver(), personValues);
-		}
-		// modify existing contact
-		else {
-			newPersonUri = Uri.withAppendedPath(Contacts.People.CONTENT_URI, id);
-			mApp.getContentResolver().update(newPersonUri, personValues, PEOPLE_ID_EQUALS,  new String[]{id});
-		}
-		
-		if (newPersonUri != null) {
-			// phoneNumbers
-			savePhoneNumbers(contact, newPersonUri);
-			// emails
-			saveEntries(contact, newPersonUri, "emails", Contacts.KIND_EMAIL);
-			// addresses
-			saveAddresses(contact, newPersonUri);
-			// organizations
-			saveOrganizations(contact, newPersonUri);
-			// ims
-			saveEntries(contact, newPersonUri, "ims", Contacts.KIND_IM);
-			
-			// Successfully create a Contact
-			return true;
-		}
-		return false;
-	}
-	
-	/** 
-	 * Takes a JSON contact object and loops through the available organizations.  If the  
-	 * organization has an id that is not equal to null the organization will be updated in the database.
-	 * If the id is null then we treat it as a new organization.
-	 * 
-	 * @param contact the contact to extract the organizations from
-	 * @param uri the base URI for this contact.
-	 */
-	private void saveOrganizations(JSONObject contact, Uri newPersonUri) {
-		ContentValues values = new ContentValues();
-		Uri orgUri = Uri.withAppendedPath(newPersonUri,
-				Contacts.Organizations.CONTENT_DIRECTORY);
-		String id = null;
-		try {
-			JSONArray orgs = contact.getJSONArray("organizations");
-			if (orgs != null && orgs.length() > 0) {
-				JSONObject org;
-				for (int i=0; i<orgs.length(); i++) {
-					org = orgs.getJSONObject(i);
-					id = getJsonString(org, "id");					
-					values.put(Contacts.Organizations.COMPANY, getJsonString(org, "name"));
-					values.put(Contacts.Organizations.TITLE, getJsonString(org, "title"));
-					if (id == null) {
-						Uri contactUpdate = mApp.getContentResolver().insert(orgUri, values);
-					}
-					else {
-						Uri tempUri = Uri.withAppendedPath(orgUri, id);					
-						mApp.getContentResolver().update(tempUri, values, null, null);
-					}
-				}
-			}
-		}
-		catch (JSONException e) {
-			Log.d(LOG_TAG, "Could not save organizations = " + e.getMessage());
-		}
-	}
-
-	/** 
-	 * Takes a JSON contact object and loops through the available addresses.  If the  
-	 * address has an id that is not equal to null the address will be updated in the database.
-	 * If the id is null then we treat it as a new address.
-	 * 
-	 * @param contact the contact to extract the addresses from
-	 * @param uri the base URI for this contact.
-	 */
-	private void saveAddresses(JSONObject contact, Uri uri) {
-		ContentValues values = new ContentValues();
-		Uri newUri = Uri.withAppendedPath(uri,
-				Contacts.People.ContactMethods.CONTENT_DIRECTORY);
-		String id = null;
-		try {
-			JSONArray entries = contact.getJSONArray("addresses");
-			if (entries != null && entries.length() > 0) {
-				JSONObject entry;
-				values.put(Contacts.ContactMethods.KIND, Contacts.KIND_POSTAL);
-				for (int i=0; i<entries.length(); i++) {
-					entry = entries.getJSONObject(i);
-					id = getJsonString(entry, "id");
-					
-					String address = getJsonString(entry, "formatted");
-					if (address != null) {
-						values.put(Contacts.ContactMethods.DATA, address);
-					}
-					else {
-						values.put(Contacts.ContactMethods.DATA, createAddressString(entry));
-					}
-					
-					if (id == null) {
-						Uri contactUpdate = mApp.getContentResolver().insert(newUri, values);
-					}
-					else {
-						Uri tempUri = Uri.withAppendedPath(newUri, id);
-						mApp.getContentResolver().update(tempUri, values, null, null);
-					}
-				}
-			}
-		}
-		catch (JSONException e) {
-			Log.d(LOG_TAG, "Could not save address = " + e.getMessage());
-		}
-	}
-
-	/**
-	 * Takes a ContactAddress JSON object and creates a fully 
-	 * formatted address string.
-	 * 
-	 * @param entry the full address object
-	 * @return a formatted address string
-	 */
-	private String createAddressString(JSONObject entry) {
-		StringBuffer buffer = new StringBuffer("");
-		if (getJsonString(entry, "locality") != null ) {
-			buffer.append(getJsonString(entry, "locality"));
-		}
-		if (getJsonString(entry, "region") != null ) {
-			if (buffer.length() > 0 ) {
-				buffer.append(", ");
-			}
-			buffer.append(getJsonString(entry, "region"));
-		}
-		if (getJsonString(entry, "postalCode") != null ) {
-			if (buffer.length() > 0 ) {
-				buffer.append(", ");
-			}
-			buffer.append(getJsonString(entry, "postalCode"));
-		}
-		if (getJsonString(entry, "country") != null ) {
-			if (buffer.length() > 0 ) {
-				buffer.append(", ");
-			}
-			buffer.append(getJsonString(entry, "country"));
-		}
-		return buffer.toString();
-	}
-
-	/** 
-	 * Takes a JSON contact object and loops through the available entries (Emails/IM's).  If the  
-	 * entry has an id that is not equal to null the entry will be updated in the database.
-	 * If the id is null then we treat it as a new entry.
-	 * 
-	 * @param contact the contact to extract the entries from
-	 * @param uri the base URI for this contact.
-	 */
-	private void saveEntries(JSONObject contact, Uri uri, String dataType, int contactKind) {
-		ContentValues values = new ContentValues();
-		Uri newUri = Uri.withAppendedPath(uri,
-				Contacts.People.ContactMethods.CONTENT_DIRECTORY);
-		String id = null;
-
-		try {
-			JSONArray entries = contact.getJSONArray(dataType);
-			if (entries != null && entries.length() > 0) {
-				JSONObject entry;
-				values.put(Contacts.ContactMethods.KIND, contactKind);
-				for (int i=0; i<entries.length(); i++) {
-					entry = entries.getJSONObject(i);
-					id = getJsonString(entry, "id");
-					values.put(Contacts.ContactMethods.DATA, getJsonString(entry, "value"));
-					values.put(Contacts.ContactMethods.TYPE, getContactType(getJsonString(entry, "type")));
-					if (id==null) {
-						Uri contactUpdate = mApp.getContentResolver().insert(newUri, values);
-					}
-					else {
-						Uri tempUri = Uri.withAppendedPath(newUri, id);
-						mApp.getContentResolver().update(tempUri, values, null, null);
-					}
-				}
-			}
-		}
-		catch (JSONException e) {
-			Log.d(LOG_TAG, "Could not save " + dataType + " = " + e.getMessage());
-		}
-	}
-
-	/**
-	 * Converts a string from the W3C Contact API to it's Android int value.
-	 * @param string
-	 * @return Android int value
-	 */
-	private int getContactType(String string) {
-		int type = Contacts.ContactMethods.TYPE_OTHER;
-		if (string!=null) {
-			if ("home".equals(string.toLowerCase())) {
-				return Contacts.ContactMethods.TYPE_HOME;
-			}
-			else if ("work".equals(string.toLowerCase())) {
-				return Contacts.ContactMethods.TYPE_WORK;
-			}
-			else if ("other".equals(string.toLowerCase())) {
-				return Contacts.ContactMethods.TYPE_OTHER;
-			}
-			else if ("custom".equals(string.toLowerCase())) {
-				return Contacts.ContactMethods.TYPE_CUSTOM;
-			}		
-		}
-		return type;
-	}
-
-	/**
-	 * getPhoneType converts an Android phone type into a string
-	 * @param type 
-	 * @return phone type as string.
-	 */
-	private String getContactType(int type) {
-		String stringType;
-		switch (type) {
-			case Contacts.ContactMethods.TYPE_CUSTOM: 
-				stringType = "custom";
-				break;
-			case Contacts.ContactMethods.TYPE_HOME: 
-				stringType = "home";
-				break;
-			case Contacts.ContactMethods.TYPE_WORK: 
-				stringType = "work";
-				break;
-			case Contacts.ContactMethods.TYPE_OTHER: 
-			default: 
-				stringType = "other";
-				break;
-		}
-		return stringType;
-	}
-
-	/** 
-	 * Takes a JSON contact object and loops through the available phone numbers.  If the phone 
-	 * number has an id that is not equal to null the phone number will be updated in the database.
-	 * If the id is null then we treat it as a new phone number.
-	 * 
-	 * @param contact the contact to extract the phone numbers from
-	 * @param uri the base URI for this contact.
-	 */
-	private void savePhoneNumbers(JSONObject contact, Uri uri) {
-		ContentValues values = new ContentValues();
-		Uri phonesUri = Uri.withAppendedPath(uri,
-				Contacts.People.Phones.CONTENT_DIRECTORY);	
-		String id = null;
-
-		try {
-			JSONArray phones = contact.getJSONArray("phoneNumbers");
-			if (phones != null && phones.length() > 0) {
-				JSONObject phone;
-				for (int i=0; i<phones.length(); i++) {
-					phone = phones.getJSONObject(i);
-					id = getJsonString(phone, "id");
-					values.put(Contacts.Phones.NUMBER, getJsonString(phone, "value"));
-					values.put(Contacts.Phones.TYPE, getPhoneType(getJsonString(phone, "type")));
-					if (id==null) {
-						Uri phoneUpdate = mApp.getContentResolver().insert(phonesUri, values);
-					}
-					else {
-						Uri newUri = Uri.withAppendedPath(phonesUri, id);
-						mApp.getContentResolver().update(newUri, values, null, null);
-					}
-				}
-			}
-		}
-		catch (JSONException e) {
-			Log.d(LOG_TAG, "Could not save phones = " + e.getMessage());
-		}
-	}
-
-	/**
-	 * Converts a string from the W3C Contact API to it's Android int value.
-	 * @param string
-	 * @return Android int value
-	 */
-	private int getPhoneType(String string) {
-		int type = Contacts.Phones.TYPE_OTHER;
-		if ("home".equals(string.toLowerCase())) {
-			return Contacts.Phones.TYPE_HOME;
-		}
-		else if ("mobile".equals(string.toLowerCase())) {
-			return Contacts.Phones.TYPE_MOBILE;
-		}
-		else if ("work".equals(string.toLowerCase())) {
-			return Contacts.Phones.TYPE_WORK;
-		}
-		else if ("work fax".equals(string.toLowerCase())) {
-			return Contacts.Phones.TYPE_FAX_WORK;
-		}
-		else if ("home fax".equals(string.toLowerCase())) {
-			return Contacts.Phones.TYPE_FAX_HOME;
-		}
-		else if ("fax".equals(string.toLowerCase())) {
-			return Contacts.Phones.TYPE_FAX_WORK;
-		}
-		else if ("pager".equals(string.toLowerCase())) {
-			return Contacts.Phones.TYPE_PAGER;
-		}
-		else if ("other".equals(string.toLowerCase())) {
-			return Contacts.Phones.TYPE_OTHER;
-		}
-		else if ("custom".equals(string.toLowerCase())) {
-			return Contacts.Phones.TYPE_CUSTOM;
-		}
-		return type;
-	}
-
-	/**
-	 * getPhoneType converts an Android phone type into a string
-	 * @param type 
-	 * @return phone type as string.
-	 */
-	private String getPhoneType(int type) {
-		String stringType;
-		switch (type) {
-		case Contacts.Phones.TYPE_CUSTOM:
-			stringType = "custom";
-			break;
-		case Contacts.Phones.TYPE_FAX_HOME:
-			stringType = "home fax";
-			break;
-		case Contacts.Phones.TYPE_FAX_WORK:
-			stringType = "work fax";
-			break;
-		case Contacts.Phones.TYPE_HOME:
-			stringType = "home";
-			break;
-		case Contacts.Phones.TYPE_MOBILE:
-			stringType = "mobile";
-			break;
-		case Contacts.Phones.TYPE_PAGER:
-			stringType = "pager";
-			break;
-		case Contacts.Phones.TYPE_WORK:
-			stringType = "work";
-			break;
-		case Contacts.Phones.TYPE_OTHER:
-		default: 
-			stringType = "custom";
-			break;
-		}
-		return stringType;
-	}
-
-	@Override
-	/** 
-	 * This method will remove a Contact from the database based on ID.
-	 * @param id the unique ID of the contact to remove
-	 */
-	public boolean remove(String id) {
-    	int result = mApp.getContentResolver().delete(People.CONTENT_URI, 
-    			PEOPLE_ID_EQUALS, 
-    			new String[] {id});
-    	
-    	return (result > 0) ? true : false;
-	}
-}

framework/src/com/phonegap/ContactManager.java

@@ -1,67 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-package com.phonegap;
-
-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 {
-	
-    private static ContactAccessor contactAccessor;
-	private static final String LOG_TAG = "Contact Query";
-
-	/**
-	 * Constructor.
-	 */
-	public ContactManager()	{
-	}
-	
-	/**
-	 * Executes the request and returns PluginResult.
-	 * 
-	 * @param action 		The action to execute.
-	 * @param args 			JSONArry of arguments for the plugin.
-	 * @param callbackId	The callback id used when calling back into JavaScript.
-	 * @return 				A PluginResult object with a status and message.
-	 */
-	public PluginResult execute(String action, JSONArray args, String callbackId) {
-		if (contactAccessor == null) {
-			contactAccessor = ContactAccessor.getInstance(webView, ctx);
-		}
-		PluginResult.Status status = PluginResult.Status.OK;
-		String result = "";		
-		
-		try {
-			if (action.equals("search")) {
-				JSONArray res = contactAccessor.search(args.getJSONArray(0), args.optJSONObject(1));
-				return new PluginResult(status, res, "navigator.service.contacts.cast");
-			}
-			else if (action.equals("save")) {
-				return new PluginResult(status, contactAccessor.save(args.getJSONObject(0)));
-			}
-			else if (action.equals("remove")) {
-				if (contactAccessor.remove(args.getString(0))) {
-					return new PluginResult(status, result);					
-				}
-				else {
-					JSONObject r = new JSONObject();
-					r.put("code", 2);
-					return new PluginResult(PluginResult.Status.ERROR, r);
-				}
-			}
-			return new PluginResult(status, result);
-		} catch (JSONException e) {
-			Log.e(LOG_TAG, e.getMessage(), e);
-			return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
-		}
-	}
-}

framework/src/com/phonegap/CryptoHandler.java

@@ -1,71 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-package com.phonegap;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-
-import com.phonegap.api.Plugin;
-import com.phonegap.api.PluginResult;
-
-public class CryptoHandler extends Plugin {
-		
-	/**
-	 * Constructor.
-	 */
-	public CryptoHandler() {
-	}
-
-	/**
-	 * Executes the request and returns PluginResult.
-	 * 
-	 * @param action 		The action to execute.
-	 * @param args 			JSONArry of arguments for the plugin.
-	 * @param callbackId	The callback id used when calling back into JavaScript.
-	 * @return 				A PluginResult object with a status and message.
-	 */
-	public PluginResult execute(String action, JSONArray args, String callbackId) {
-		PluginResult.Status status = PluginResult.Status.OK;
-		String result = "";		
-		
-		try {
-			if (action.equals("encrypt")) {
-				this.encrypt(args.getString(0), args.getString(1));
-			}
-			else if (action.equals("decrypt")) {
-				this.decrypt(args.getString(0), args.getString(1));
-			}
-			return new PluginResult(status, result);
-		} catch (JSONException e) {
-			return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
-		}
-	}
-
-    //--------------------------------------------------------------------------
-    // LOCAL METHODS
-    //--------------------------------------------------------------------------
-
-	public void encrypt(String pass, String text) {
-		try {
-			String encrypted = SimpleCrypto.encrypt(pass,text);
-			// TODO: Why not just return text now?
-			this.sendJavascript("Crypto.gotCryptedString('" + text + "')");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	public void decrypt(String pass, String text) {
-		try {
-			String decrypted = SimpleCrypto.decrypt(pass,text);
-			this.sendJavascript("Crypto.gotPlainString('" + text + "')");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-}

framework/src/com/phonegap/Device.java

@@ -1,174 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-package com.phonegap;
-
-import java.util.TimeZone;
-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.content.Context;
-import android.provider.Settings;
-import android.telephony.TelephonyManager;
-
-public class Device extends Plugin {
-	
-	public static String phonegapVersion = "0.9.4";				// PhoneGap version
-	public static String platform = "Android";					// Device OS
-	public static String uuid;									// Device UUID
-    
-    /**
-     * Constructor.
-     */
-	public Device() {
-    }
-	
-	/**
-	 * Sets the context of the Command. This can then be used to do things like
-	 * get file paths associated with the Activity.
-	 * 
-	 * @param ctx The context of the main Activity.
-	 */
-	public void setContext(PhonegapActivity ctx) {
-		super.setContext(ctx);
-        Device.uuid = getUuid();
-	}
-
-	/**
-	 * Executes the request and returns PluginResult.
-	 * 
-	 * @param action 		The action to execute.
-	 * @param args 			JSONArry of arguments for the plugin.
-	 * @param callbackId	The callback id used when calling back into JavaScript.
-	 * @return 				A PluginResult object with a status and message.
-	 */
-	public PluginResult execute(String action, JSONArray args, String callbackId) {
-		PluginResult.Status status = PluginResult.Status.OK;
-		String result = "";		
-	
-		try {
-			if (action.equals("getDeviceInfo")) {
-				JSONObject r = new JSONObject();
-				r.put("uuid", Device.uuid);
-				r.put("version", this.getOSVersion());
-				r.put("platform", Device.platform);
-				r.put("name", this.getProductName());
-				r.put("phonegap", Device.phonegapVersion);
-				//JSONObject pg = new JSONObject();
-				//pg.put("version", Device.phonegapVersion);
-				//r.put("phonegap", pg);
-				return new PluginResult(status, r);
-			}
-			return new PluginResult(status, result);
-		} catch (JSONException e) {
-			return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
-		}
-	}
-
-	/**
-	 * Identifies if action to be executed returns a value and should be run synchronously.
-	 * 
-	 * @param action	The action to execute
-	 * @return			T=returns value
-	 */
-	public boolean isSynch(String action) {
-		if (action.equals("getDeviceInfo")) {
-			return true;
-		}
-		return false;
-	}
-
-    //--------------------------------------------------------------------------
-    // LOCAL METHODS
-    //--------------------------------------------------------------------------
-		
-	/**
-	 * Get the OS name.
-	 * 
-	 * @return
-	 */
-	public String getPlatform()	{
-		return Device.platform;
-	}
-	
-	/**
-	 * Get the device's Universally Unique Identifier (UUID).
-	 * 
-	 * @return
-	 */
-	public String getUuid()	{		
-		String uuid = Settings.Secure.getString(this.ctx.getContentResolver(), android.provider.Settings.Secure.ANDROID_ID);
-		return uuid;
-	}
-
-	/**
-	 * Get the PhoneGap version.
-	 * 
-	 * @return
-	 */
-	public String getPhonegapVersion() {
-		return Device.phonegapVersion;
-	}	
-
-	public String getLine1Number(){
-	  TelephonyManager operator = (TelephonyManager)this.ctx.getSystemService(Context.TELEPHONY_SERVICE);
-	  return operator.getLine1Number();
-	}
-	
-	public String getDeviceId(){
-	  TelephonyManager operator = (TelephonyManager)this.ctx.getSystemService(Context.TELEPHONY_SERVICE);
-	  return operator.getDeviceId();
-	}
-	
-	public String getSimSerialNumber(){
-	  TelephonyManager operator = (TelephonyManager)this.ctx.getSystemService(Context.TELEPHONY_SERVICE);
-	  return operator.getSimSerialNumber();
-  }
-  
-	public String getSubscriberId(){
-	  TelephonyManager operator = (TelephonyManager)this.ctx.getSystemService(Context.TELEPHONY_SERVICE);
-	  return operator.getSubscriberId();
-	}
-	
-	public String getModel()
-	{
-		String model = android.os.Build.MODEL;
-		return model;
-	}
-	public String getProductName()
-	{
-		String productname = android.os.Build.PRODUCT;
-		return productname;
-	}
-	
-	/**
-	 * Get the OS version.
-	 * 
-	 * @return
-	 */
-	public String getOSVersion() {
-		String osversion = android.os.Build.VERSION.RELEASE;
-		return osversion;
-	}
-	
-	public String getSDKVersion()
-	{
-		String sdkversion = android.os.Build.VERSION.SDK;
-		return sdkversion;
-	}
-	
-    
-    public String getTimeZoneID() {
-       TimeZone tz = TimeZone.getDefault();
-        return(tz.getID());
-    } 
-    
-}
-

framework/src/com/phonegap/DirectoryManager.java

@@ -1,114 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-package com.phonegap;
-
-import java.io.File;
-
-import android.os.Environment;
-import android.os.StatFs;
-
-/**
- * This class provides file directory utilities.  
- * All file operations are performed on the SD card.
- *   
- * It is used by the FileUtils class.
- */
-public class DirectoryManager {
-	
-	private static final String LOG_TAG = "DirectoryManager";
-
-	/**
-	 * Determine if a file or directory exists.
-	 * 
-	 * @param name				The name of the file to check.
-	 * @return					T=exists, F=not found
-	 */
-	protected static boolean testFileExists(String name) {
-		boolean status;
-		
-		// If SD card exists
-		if ((testSaveLocationExists()) && (!name.equals(""))) {
-    		File path = Environment.getExternalStorageDirectory();
-            File newPath = constructFilePaths(path.toString(), name);
-            status = newPath.exists();
-    	}
-		// If no SD card
-		else{
-    		status = false;
-    	}
-		return status;
-	}
-	
-	/**
-	 * Get the free disk space on the SD card
-	 * 
-	 * @return 		Size in KB or -1 if not available
-	 */
-	protected static long getFreeDiskSpace() {
-		String status = Environment.getExternalStorageState();
-		long freeSpace = 0;
-		
-		// If SD card exists
-		if (status.equals(Environment.MEDIA_MOUNTED)) {
-			try {
-				File path = Environment.getExternalStorageDirectory();
-				StatFs stat = new StatFs(path.getPath());
-				long blockSize = stat.getBlockSize();
-				long availableBlocks = stat.getAvailableBlocks();
-				freeSpace = availableBlocks*blockSize/1024;
-			} catch (Exception e) {e.printStackTrace(); }
-		} 
-		
-		// If no SD card, then return -1
-		else { 
-			return -1; 
-		}
-		
-		return (freeSpace);
-	}	
-	
-	
-	/**
-	 * Determine if SD card exists.
-	 * 
-	 * @return				T=exists, F=not found
-	 */
-	protected static boolean testSaveLocationExists() {
-		String sDCardStatus = Environment.getExternalStorageState();
-		boolean status;
-		
-		// If SD card is mounted
-		if (sDCardStatus.equals(Environment.MEDIA_MOUNTED)) {
-			status = true;
-		}
-		
-		// If no SD card
-		else {
-			status = false;
-		}
-		return status;
-	}
-	
-	/**
-	 * Create a new file object from two file paths.
-	 * 
-	 * @param file1			Base file path
-	 * @param file2			Remaining file path
-	 * @return				File object
-	 */
-	private static File constructFilePaths (String file1, String file2) {
-		File newPath;
-		if (file2.startsWith(file1)) {
-			newPath = new File(file2);
-		}
-		else {
-			newPath = new File(file1+"/"+file2);
-		}
-		return newPath;
-	}
-}

framework/src/com/phonegap/FileTransfer.java

@@ -1,359 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-package com.phonegap;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import java.util.Iterator;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-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 {
-
-	private static final String LOG_TAG = "FileUploader";
-	private static final String LINE_START = "--";
-	private static final String LINE_END = "\r\n";
-	private static final String BOUNDRY =  "*****";
-
-	public static int FILE_NOT_FOUND_ERR = 1;
-    public static int INVALID_URL_ERR = 2;
-    public static int CONNECTION_ERR = 3;
-    
-    private SSLSocketFactory defaultSSLSocketFactory = null;
-    private HostnameVerifier defaultHostnameVerifier = null;
-
-	/* (non-Javadoc)
-	* @see com.phonegap.api.Plugin#execute(java.lang.String, org.json.JSONArray, java.lang.String)
-	*/
-	@Override
-	public PluginResult execute(String action, JSONArray args, String callbackId) {
-		String file = null;
-		String server = null;
-		try {
-			file = args.getString(0);
-			server = args.getString(1);
-		}
-		catch (JSONException e) {
-			Log.d(LOG_TAG, "Missing filename or server name");
-			return new PluginResult(PluginResult.Status.JSON_EXCEPTION, "Missing filename or server name");
-		}
-		
-		// Setup the options
-		String fileKey = null;
-		String fileName = null;
-		String mimeType = null;		
-		
-		fileKey = getArgument(args, 2, "file");		
-		fileName = getArgument(args, 3, "image.jpg");
-		mimeType = getArgument(args, 4, "image/jpeg");
-
-		try {
-			JSONObject params = args.optJSONObject(5);
-			boolean trustEveryone = args.optBoolean(6);
-
-			if (action.equals("upload")) {
-				FileUploadResult r = upload(file, server, fileKey, fileName, mimeType, params, trustEveryone);
-				Log.d(LOG_TAG, "****** About to return a result from upload");
-				return new PluginResult(PluginResult.Status.OK, r.toJSONObject());
-			} else {
-	            return new PluginResult(PluginResult.Status.INVALID_ACTION);
-			}
-		} catch (FileNotFoundException e) {
-			Log.e(LOG_TAG, e.getMessage(), e);
-			JSONObject error = createFileUploadError(FILE_NOT_FOUND_ERR);
-            return new PluginResult(PluginResult.Status.IO_EXCEPTION, error);
-        } catch (IllegalArgumentException e) {
-			Log.e(LOG_TAG, e.getMessage(), e);
-			JSONObject error = createFileUploadError(INVALID_URL_ERR);
-            return new PluginResult(PluginResult.Status.IO_EXCEPTION, error);
-		} catch (SSLException e) {
-			Log.e(LOG_TAG, e.getMessage(), e);
-			Log.d(LOG_TAG, "Got my ssl exception!!!");
-			JSONObject error = createFileUploadError(CONNECTION_ERR);
-            return new PluginResult(PluginResult.Status.IO_EXCEPTION, error);
-        } catch (IOException e) {
-			Log.e(LOG_TAG, e.getMessage(), e);
-			JSONObject error = createFileUploadError(CONNECTION_ERR);
-            return new PluginResult(PluginResult.Status.IO_EXCEPTION, error);
-		} catch (JSONException e) {
-			Log.e(LOG_TAG, e.getMessage(), e);
-			return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
-		}
-	}
-
-	// always verify the host - don't check for certificate
-	final static HostnameVerifier DO_NOT_VERIFY = new HostnameVerifier() {
-		public boolean verify(String hostname, SSLSession session) {
-			return true;
-        }
-	};
-
-	/**
-	 * This function will install a trust manager that will blindly trust all SSL 
-	 * certificates.  The reason this code is being added is to enable developers 
-	 * to do development using self signed SSL certificates on their web server.
-	 * 
-	 * The standard HttpsURLConnection class will throw an exception on self 
-	 * signed certificates if this code is not run.
-	 */
-	private void trustAllHosts() {
-        // Create a trust manager that does not validate certificate chains
-        TrustManager[] trustAllCerts = new TrustManager[] { new X509TrustManager() {
-            public java.security.cert.X509Certificate[] getAcceptedIssuers() {
-            	return new java.security.cert.X509Certificate[] {};
-            }
-
-            public void checkClientTrusted(X509Certificate[] chain,
-                            String authType) throws CertificateException {
-            }
-
-            public void checkServerTrusted(X509Certificate[] chain,
-                            String authType) throws CertificateException {
-            }
-        } };
-
-        // Install the all-trusting trust manager
-        try {
-        	// Backup the current SSL socket factory
-        	defaultSSLSocketFactory = HttpsURLConnection.getDefaultSSLSocketFactory();
-        	// Install our all trusting manager
-        	SSLContext sc = SSLContext.getInstance("TLS");
-            sc.init(null, trustAllCerts, new java.security.SecureRandom());
-            HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
-        } catch (Exception e) {
-            Log.e(LOG_TAG, e.getMessage(), e);
-        }
-	}
-
-	/**
-	 * Create an error object based on the passed in errorCode
-	 * @param errorCode 	the error 
-	 * @return JSONObject containing the error
-	 */
-	private JSONObject createFileUploadError(int errorCode) {
-		JSONObject error = null;
-		try {
-			error = new JSONObject();
-			error.put("code", errorCode);
-		} catch (JSONException e) {
-			Log.e(LOG_TAG, e.getMessage(), e);
-		}
-		return error;
-	}
-
-	/**
-	 * Convenience method to read a parameter from the list of JSON args.
-	 * @param args			the args passed to the Plugin
-	 * @param position		the position to retrieve the arg from
-	 * @param defaultString the default to be used if the arg does not exist
-	 * @return String with the retrieved value
-	 */
-	private String getArgument(JSONArray args, int position, String defaultString) {
-		String arg = defaultString;
-		if(args.length() >= position) {
-			arg = args.optString(position);
-			if (arg == null || "null".equals(arg)) {
-				arg = defaultString;
-			}
-		}
-		return arg;
-	}
-	
-    /**
-     * Uploads the specified file to the server URL provided using an HTTP 
-     * multipart request. 
-     * @param file      Full path of the file on the file system
-     * @param server        URL of the server to receive the file
-     * @param fileKey       Name of file request parameter
-     * @param fileName      File name to be used on server
-     * @param mimeType      Describes file content type
-     * @param params        key:value pairs of user-defined parameters
-     * @return FileUploadResult containing result of upload request
-     */
-	public FileUploadResult upload(String file, String server, final String fileKey, final String fileName, 
-			final String mimeType, JSONObject params, boolean trustEveryone) throws IOException, SSLException {
-		// Create return object
-		FileUploadResult result = new FileUploadResult();
-		
-		// Get a input stream of the file on the phone
-		InputStream fileInputStream = getPathFromUri(file);
-
-		HttpURLConnection conn = null;
-		DataOutputStream dos = null;
-
-		int bytesRead, bytesAvailable, bufferSize;
-		long totalBytes;
-		byte[] buffer;
-		int maxBufferSize = 8096;
-
-		//------------------ CLIENT REQUEST
-		// open a URL connection to the server 
-		URL url = new URL(server);
-		
-		// Open a HTTP connection to the URL based on protocol 
-        if (url.getProtocol().toLowerCase().equals("https")) {
-    		// Using standard HTTPS connection. Will not allow self signed certificate
-        	if (!trustEveryone) {
-        		conn = (HttpsURLConnection) url.openConnection();
-        	}
-        	// Use our HTTPS connection that blindly trusts everyone.
-        	// This should only be used in debug environments
-        	else {
-        		// Setup the HTTPS connection class to trust everyone
-	            trustAllHosts();
-	            HttpsURLConnection https = (HttpsURLConnection) url.openConnection();
-	            // Save the current hostnameVerifier
-	            defaultHostnameVerifier = https.getHostnameVerifier();
-	            // Setup the connection not to verify hostnames 
-	            https.setHostnameVerifier(DO_NOT_VERIFY);
-	        	conn = https;
-        	}
-        } 
-        // Return a standard HTTP conneciton
-        else {
-        	conn = (HttpURLConnection) url.openConnection();
-        }
-		
-		// Allow Inputs
-		conn.setDoInput(true);
-		
-		// Allow Outputs
-		conn.setDoOutput(true);
-		
-		// Don't use a cached copy.
-		conn.setUseCaches(false);
-		
-		// Use a post method.
-		conn.setRequestMethod("POST");
-		conn.setRequestProperty("Connection", "Keep-Alive");
-		conn.setRequestProperty("Content-Type", "multipart/form-data;boundary="+BOUNDRY);
-
-		// Set the cookies on the response
-		String cookie = CookieManager.getInstance().getCookie(server);
-		if (cookie != null) {
-			conn.setRequestProperty("Cookie", cookie);
-		}
-
-		dos = new DataOutputStream( conn.getOutputStream() );
-
-		// Send any extra parameters
-		try {
-			for (Iterator iter = params.keys(); iter.hasNext();) {
-				Object key = iter.next();
-				dos.writeBytes(LINE_START + BOUNDRY + LINE_END); 
-				dos.writeBytes("Content-Disposition: form-data; name=\"" +  key.toString() + "\"; ");
-				dos.writeBytes(LINE_END + LINE_END); 
-				dos.writeBytes(params.getString(key.toString()));
-				dos.writeBytes(LINE_END); 
-			}
-		} catch (JSONException e) {
-			Log.e(LOG_TAG, e.getMessage(), e); 
-		}
-		
-		dos.writeBytes(LINE_START + BOUNDRY + LINE_END);
-		dos.writeBytes("Content-Disposition: form-data; name=\"" + fileKey + "\";" + " filename=\"" + fileName +"\"" + LINE_END);
-		dos.writeBytes("Content-Type: " + mimeType + LINE_END); 
-		dos.writeBytes(LINE_END);
-		
-		// create a buffer of maximum size
-		bytesAvailable = fileInputStream.available();
-		bufferSize = Math.min(bytesAvailable, maxBufferSize);
-		buffer = new byte[bufferSize];
-		
-		// read file and write it into form...
-		bytesRead = fileInputStream.read(buffer, 0, bufferSize);
-		totalBytes = 0;
-
-		while (bytesRead > 0) {
-			totalBytes += bytesRead;
-			result.setBytesSent(totalBytes);
-			dos.write(buffer, 0, bufferSize);
-			bytesAvailable = fileInputStream.available();
-			bufferSize = Math.min(bytesAvailable, maxBufferSize);
-			bytesRead = fileInputStream.read(buffer, 0, bufferSize);
-		}
-
-		// send multipart form data necesssary after file data...
-		dos.writeBytes(LINE_END);
-		dos.writeBytes(LINE_START + BOUNDRY + LINE_START + LINE_END);
-		
-		// close streams
-		fileInputStream.close();
-		dos.flush();
-		dos.close();
-
-		//------------------ read the SERVER RESPONSE
-		StringBuffer responseString = new StringBuffer("");
-		DataInputStream inStream = new DataInputStream ( conn.getInputStream() );
-		String line;
-		while (( line = inStream.readLine()) != null) {
-			responseString.append(line);
-		}
-		Log.d(LOG_TAG, "got response from server");
-		Log.d(LOG_TAG, responseString.toString());
-
-		// send request and retrieve response
-        result.setResponseCode(conn.getResponseCode());
-        result.setResponse(responseString.toString());
-
-        inStream.close();
-        conn.disconnect();
-        
-        // Revert back to the proper verifier and socket factories
-        if (trustEveryone && url.getProtocol().toLowerCase().equals("https")) {
-        	((HttpsURLConnection)conn).setHostnameVerifier(defaultHostnameVerifier);
-        	HttpsURLConnection.setDefaultSSLSocketFactory(defaultSSLSocketFactory);
-        }        
-        
-		return result;
-	}
-
-	/**
-     * Get an input stream based on file path or content:// uri
-     * 
-     * @param path
-     * @return an input stream
-     * @throws FileNotFoundException 
-     */
-    private InputStream getPathFromUri(String path) throws FileNotFoundException {  	  
-    	if (path.startsWith("content:")) {
-    		Uri uri = Uri.parse(path);
-    		return ctx.getContentResolver().openInputStream(uri);
-    	}
-    	else {
-    		return new FileInputStream(path);
-    	}
-    }  
-
-}

framework/src/com/phonegap/GeoBroker.java

@@ -1,154 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-package com.phonegap;
-
-import java.util.HashMap;
-import java.util.Map.Entry;
-
-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.
- * 
- * This class only starts and stops various GeoListeners, which consist of a GPS and a Network Listener
- */
-
-public class GeoBroker extends Plugin {
-    
-    // List of gGeolocation listeners
-    private HashMap<String, GeoListener> geoListeners;
-	private GeoListener global;
-	
-	/**
-	 * Constructor.
-	 */
-	public GeoBroker() {
-		this.geoListeners = new HashMap<String, GeoListener>();
-	}
-
-	/**
-	 * Executes the request and returns PluginResult.
-	 * 
-	 * @param action 		The action to execute.
-	 * @param args 			JSONArry of arguments for the plugin.
-	 * @param callbackId	The callback id used when calling back into JavaScript.
-	 * @return 				A PluginResult object with a status and message.
-	 */
-	public PluginResult execute(String action, JSONArray args, String callbackId) {
-		PluginResult.Status status = PluginResult.Status.OK;
-		String result = "";		
-		
-		try {
-			if (action.equals("getCurrentLocation")) {
-				this.getCurrentLocation(args.getBoolean(0), args.getInt(1), args.getInt(2));
-			}
-			else if (action.equals("start")) {
-				String s = this.start(args.getString(0), args.getBoolean(1), args.getInt(2), args.getInt(3));
-				return new PluginResult(status, s);
-			}
-			else if (action.equals("stop")) {
-				this.stop(args.getString(0));
-			}
-			return new PluginResult(status, result);
-		} catch (JSONException e) {
-			return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
-		}
-	}
-
-	/**
-	 * Identifies if action to be executed returns a value and should be run synchronously.
-	 * 
-	 * @param action	The action to execute
-	 * @return			T=returns value
-	 */
-	public boolean isSynch(String action) {
-		// Starting listeners is easier to run on main thread, so don't run async.
-		return true;
-	}
-    
-    /**
-     * Called when the activity is to be shut down.
-     * Stop listener.
-     */
-    public void onDestroy() {
-		java.util.Set<Entry<String,GeoListener>> s = this.geoListeners.entrySet();
-        java.util.Iterator<Entry<String,GeoListener>> it = s.iterator();
-        while (it.hasNext()) {
-            Entry<String,GeoListener> entry = it.next();
-            GeoListener listener = entry.getValue();
-            listener.destroy();
-		}
-        this.geoListeners.clear();
-        if (this.global != null) {
-        	this.global.destroy();
-        }
-        this.global = null;
-    }
-
-    //--------------------------------------------------------------------------
-    // LOCAL METHODS
-    //--------------------------------------------------------------------------
-
-    /**
-     * Get current location.
-     * The result is returned to JavaScript via a callback.
-     * 
-	 * @param enableHighAccuracy
-	 * @param timeout
-	 * @param maximumAge
-     */
-	public void getCurrentLocation(boolean enableHighAccuracy, int timeout, int maximumAge) {
-		
-		// Create a geolocation listener just for getCurrentLocation and call it "global"
-		if (this.global == null) {
-			this.global = new GeoListener(this, "global", maximumAge);
-		}
-		else {
-			this.global.start(maximumAge);
-		}
-	}
-	
-	/**
-	 * Start geolocation listener and add to listener list.
-	 * 
-	 * @param key					The listener id
-	 * @param enableHighAccuracy
-	 * @param timeout
-	 * @param maximumAge
-	 * @return
-	 */
-	public String start(String key, boolean enableHighAccuracy, int timeout, int maximumAge) {
-		
-		// Make sure this listener doesn't already exist
-		GeoListener listener = geoListeners.get(key);
-		if (listener == null) {
-			listener = new GeoListener(this, key, maximumAge);
-			geoListeners.put(key, listener);
-		}
-		
-		// Start it
-		listener.start(maximumAge);
-		return key;
-	}
-	
-	/**
-	 * Stop geolocation listener and remove from listener list.
-	 * 
-	 * @param key			The listener id
-	 */
-	public void stop(String key) {
-		GeoListener listener = geoListeners.remove(key);
-		if (listener != null) {
-			listener.stop();
-		}
-	}
-}

framework/src/com/phonegap/GeoListener.java

@@ -1,122 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-package com.phonegap;
-
-import android.content.Context;
-import android.location.Location;
-import android.location.LocationManager;
-import android.webkit.WebView;
-
-public class GeoListener {
-	public static int PERMISSION_DENIED = 1;
-	public static int POSITION_UNAVAILABLE = 2;
-	public static int TIMEOUT = 3;
-
-	String id;							// Listener ID
-	String successCallback;				// 
-	String failCallback;
-    GpsListener mGps;					// GPS listener
-    NetworkListener mNetwork;			// Network listener
-    LocationManager mLocMan;			// Location manager
-    
-    private GeoBroker broker;			// GeoBroker object
-	
-	int interval;
-	
-	/**
-	 * Constructor.
-	 * 
-	 * @param id			Listener id
-	 * @param ctx
-	 * @param time			Sampling period in msec
-	 * @param appView
-	 */
-	GeoListener(GeoBroker broker, String id, int time) {
-		this.id = id;
-		this.interval = time;
-		this.broker = broker;
-		this.mGps = null;
-		this.mNetwork = null;
-		this.mLocMan = (LocationManager) broker.ctx.getSystemService(Context.LOCATION_SERVICE);
-
-		// If GPS provider, then create and start GPS listener
-		if (this.mLocMan.getProvider(LocationManager.GPS_PROVIDER) != null) {
-			this.mGps = new GpsListener(broker.ctx, time, this);
-		}
-		
-		// If network provider, then create and start network listener
-		if (this.mLocMan.getProvider(LocationManager.NETWORK_PROVIDER) != null) {
-			this.mNetwork = new NetworkListener(broker.ctx, time, this);
-		}
-	}
-	
-	/**
-	 * Destroy listener.
-	 */
-	public void destroy() {
-		this.stop();
-	}
-	
-	/**
-	 * Location found.  Send location back to JavaScript.
-	 * 
-	 * @param loc
-	 */
-	void success(Location loc) {
-		
-		String params = loc.getLatitude() + "," + loc.getLongitude() + ", " + loc.getAltitude() + 
-				"," + loc.getAccuracy() + "," + loc.getBearing() +
-		 		"," + loc.getSpeed() + "," + loc.getTime();
-		
-		if (id == "global") {
-			this.stop();
-		}
-		this.broker.sendJavascript("navigator._geo.success('" + id + "'," +  params + ");");
-	}
-	
-	/**
-	 * Location failed.  Send error back to JavaScript.
-	 * 
-	 * @param code			The error code
-	 * @param msg			The error message
-	 */
-	void fail(int code, String msg) {
-		this.broker.sendJavascript("navigator._geo.fail('" + this.id + "', '" + code + "', '" + msg + "');");
-		this.stop();
-	}
-	
-	/**
-	 * Start retrieving location.
-	 * 
-	 * @param interval
-	 */
-	void start(int interval) {
-		if (this.mGps != null) {
-			this.mGps.start(interval);
-		}
-		if (this.mNetwork != null) {
-			this.mNetwork.start(interval);
-		}
-		if (this.mNetwork == null && this.mGps == null) {
-			this.fail(POSITION_UNAVAILABLE, "No location providers available.");
-		}
-	}
-	
-	/**
-	 * Stop listening for location.
-	 */
-	void stop() {
-		if (this.mGps != null) {
-			this.mGps.stop();
-		}
-		if (this.mNetwork != null) {
-			this.mNetwork.stop();
-		}
-	}
-
-}

framework/src/com/phonegap/GpsListener.java

@@ -1,151 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-package com.phonegap;
-
-import com.phonegap.api.PhonegapActivity;
-
-import android.content.Context;
-import android.location.Location;
-import android.location.LocationManager;
-import android.location.LocationListener;
-import android.os.Bundle;
-
-/**
- * This class handles requests for GPS location services.
- *
- */
-public class GpsListener implements LocationListener {
-	
-	private PhonegapActivity mCtx;				// PhonegapActivity 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
-	
-	/**
-	 * Constructor.  
-	 * Automatically starts listening.
-	 * 
-	 * @param ctx
-	 * @param interval
-	 * @param m
-	 */
-	public GpsListener(PhonegapActivity ctx, int interval, GeoListener m) {
-		this.owner = m;
-		this.mCtx = ctx;
-		this.mLocMan = (LocationManager) this.mCtx.getSystemService(Context.LOCATION_SERVICE);
-		this.running = false;
-		this.start(interval);
-	}
-	
-	/**
-	 * Get last location.
-	 * 
-	 * @return 				Location object
-	 */
-	public Location getLocation() {
-		this.cLoc = this.mLocMan.getLastKnownLocation(LocationManager.GPS_PROVIDER);
-		if (this.cLoc != null) {
-			this.hasData = true;
-		}
-		return this.cLoc;
-	}
-	
-	/**
-	 * Called when the provider is disabled by the user.
-	 * 
-	 * @param provider
-	 */
-	public void onProviderDisabled(String provider) {
-		this.owner.fail(GeoListener.POSITION_UNAVAILABLE, "GPS provider disabled.");
-	}
-
-	/**
-	 * Called when the provider is enabled by the user.
-	 * 
-	 * @param provider
-	 */
-	public void onProviderEnabled(String provider) {
-		System.out.println("GpsListener: The provider "+ provider + " is enabled");
-	}
-
-	/**
-	 * Called when the provider status changes. This method is called when a 
-	 * provider is unable to fetch a location or if the provider has recently 
-	 * become available after a period of unavailability.
-	 * 
-	 * @param provider
-	 * @param status
-	 * @param extras
-	 */
-	public void onStatusChanged(String provider, int status, Bundle extras) {
-		System.out.println("GpsListener: The status of the provider " + provider + " has changed");
-		if (status == 0) {
-			System.out.println("GpsListener: " + provider + " is OUT OF SERVICE");
-			this.owner.fail(GeoListener.POSITION_UNAVAILABLE, "GPS out of service.");
-		}
-		else if (status == 1) {
-			System.out.println("GpsListener: " + provider + " is TEMPORARILY_UNAVAILABLE");
-		}
-		else {
-			System.out.println("GpsListener: " + provider + " is Available");
-		}
-	}
-
-	/**
-	 * Called when the location has changed.
-	 * 
-	 * @param location
-	 */
-	public void onLocationChanged(Location location) {
-		System.out.println("GpsListener: The location has been updated!");
-		this.hasData = true;
-		this.cLoc = location;
-		this.owner.success(location);
-	}
-
-	/**
-	 * Determine if location data is available.
-	 * 
-	 * @return
-	 */
-	public boolean hasLocation() {
-		return this.hasData;
-	}
-	
-	/**
-	 * Start requesting location updates.
-	 * 
-	 * @param interval
-	 */
-	public void start(int interval) {
-		if (!this.running) {
-			this.running = true;
-			this.mLocMan.requestLocationUpdates(LocationManager.GPS_PROVIDER, interval, 0, this);
-			this.getLocation();
-
-			// If GPS provider has data, then send now
-			if (this.hasData) {
-				this.owner.success(this.cLoc);
-			}
-		}
-	}
-
-	/**
-	 * Stop receiving location updates.
-	 */
-	public void stop() {
-		if (this.running) {
-			this.mLocMan.removeUpdates(this);
-		}
-		this.running = false;
-	}
-	
-}

framework/src/com/phonegap/HttpHandler.java

@@ -1,71 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-package com.phonegap;
-
-import java.io.EOFException;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.DefaultHttpClient;
-
-public class HttpHandler {
-
-	protected Boolean get(String url, String file)
-	{
-		HttpEntity entity = getHttpEntity(url);
-		try {
-			writeToDisk(entity, file);
-		} catch (Exception e) { e.printStackTrace(); return false; }
-		try {
-			entity.consumeContent();
-		} catch (Exception e) { e.printStackTrace(); return false; }
-		return true;
-	}
-	
-	private HttpEntity getHttpEntity(String url)
-	/**
-	 * get the http entity at a given url
-	 */
-	{
-		HttpEntity entity=null;
-		try {
-			DefaultHttpClient httpclient = new DefaultHttpClient();
-			HttpGet httpget = new HttpGet(url);
-			HttpResponse response = httpclient.execute(httpget);
-			entity = response.getEntity();
-		} catch (Exception e) { e.printStackTrace(); return null; }
-		return entity;
-	}
-	
-	private void writeToDisk(HttpEntity entity, String file) throws EOFException
-	/**
-	 * writes a HTTP entity to the specified filename and location on disk
-	 */
-	{  
-		int i=0;
-		String FilePath="/sdcard/" + file;
-		try {
-			InputStream in = entity.getContent();
-			byte buff[] = new byte[1024];    
-			FileOutputStream out=
-				new FileOutputStream(FilePath);
-			do {
-				int numread = in.read(buff);
-				if (numread <= 0)
-                   	break;
-				out.write(buff, 0, numread);
-				i++;
-			} while (true);
-			out.flush();
-			out.close();	
-		} catch (Exception e) { e.printStackTrace(); }
-	}
-}

framework/src/com/phonegap/NetworkListener.java

@@ -1,142 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-package com.phonegap;
-
-import com.phonegap.api.PhonegapActivity;
-
-import android.content.Context;
-import android.location.Location;
-import android.location.LocationManager;
-import android.location.LocationListener;
-import android.os.Bundle;
-
-public class NetworkListener implements LocationListener {
-	
-	private PhonegapActivity mCtx;				// PhonegapActivity 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
-
-	/**
-	 * Constructor.  
-	 * Automatically starts listening.
-	 * 
-	 * @param ctx
-	 * @param interval
-	 * @param m
-	 */
-	public NetworkListener(PhonegapActivity ctx, int interval, GeoListener m) {
-		this.owner = m;
-		this.mCtx = ctx;
-		this.mLocMan = (LocationManager) this.mCtx.getSystemService(Context.LOCATION_SERVICE);
-		this.running = false;
-		this.start(interval);
-	}
-	
-	/**
-	 * Get last location.
-	 * 
-	 * @return 				Location object
-	 */
-	public Location getLocation() {
-		this.cLoc = this.mLocMan.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
-		if (this.cLoc != null) {
-			this.hasData = true;
-		}
-		return this.cLoc;
-	}
-
-	/**
-	 * Called when the provider is disabled by the user.
-	 * 
-	 * @param provider
-	 */
-	public void onProviderDisabled(String provider) {
-		System.out.println("NetworkListener: The provider " + provider + " is disabled");
-	}
-
-	/**
-	 * Called when the provider is enabled by the user.
-	 * 
-	 * @param provider
-	 */
-	public void onProviderEnabled(String provider) {
-		System.out.println("NetworkListener: The provider "+ provider + " is enabled");
-	}
-
-	/**
-	 * Called when the provider status changes. This method is called when a 
-	 * provider is unable to fetch a location or if the provider has recently 
-	 * become available after a period of unavailability.
-	 * 
-	 * @param provider
-	 * @param status
-	 * @param extras
-	 */
-	public void onStatusChanged(String provider, int status, Bundle extras) {
-		System.out.println("NetworkListener: The status of the provider " + provider + " has changed");
-		if (status == 0) {
-			System.out.println("NetworkListener: " + provider + " is OUT OF SERVICE");
-		}
-		else if (status == 1) {
-			System.out.println("NetworkListener: " + provider + " is TEMPORARILY_UNAVAILABLE");
-		}
-		else {
-			System.out.println("NetworkListener: " + provider + " is Available");
-		}
-	}
-
-	/**
-	 * Called when the location has changed.
-	 * 
-	 * @param location
-	 */
-	public void onLocationChanged(Location location) {
-		System.out.println("NetworkListener: The location has been updated!");
-		this.hasData = true;
-		this.cLoc = location;
-		
-		// The GPS is the primary form of Geolocation in PhoneGap.  
-		// Only fire the success variables if the GPS is down for some reason.
-		if (!this.owner.mGps.hasLocation()) {
-			this.owner.success(location);
-		}
-	}
-	
-	/**
-	 * Start requesting location updates.
-	 * 
-	 * @param interval
-	 */
-	public void start(int interval)	{
-		if (!this.running) {
-			this.running = true;
-			this.mLocMan.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, interval, 0, this);
-			this.getLocation();
-			
-			// If Network provider has data but GPS provider doesn't, then send ours
-			if (this.hasData && !this.owner.mGps.hasLocation()) {
-				this.owner.success(this.cLoc);
-			}
-		}
-	}
-	
-	/**
-	 * Stop receiving location updates.
-	 */
-	public void stop() {
-		if (this.running) {
-			this.mLocMan.removeUpdates(this);
-		}
-		this.running = false;
-	}
-	
-}

framework/src/com/phonegap/NetworkManager.java

@@ -1,153 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-package com.phonegap;
-
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.json.JSONArray;
-import org.json.JSONException;
-
-import com.phonegap.api.PhonegapActivity;
-import com.phonegap.api.Plugin;
-import com.phonegap.api.PluginResult;
-
-import android.content.Context;
-import android.net.*;
-
-public class NetworkManager extends Plugin {
-	
-	public static int NOT_REACHABLE = 0;
-	public static int REACHABLE_VIA_CARRIER_DATA_NETWORK = 1;
-	public static int REACHABLE_VIA_WIFI_NETWORK = 2;
-	
-    ConnectivityManager sockMan;
-	
-	/**
-	 * Constructor.
-	 */
-	public NetworkManager()	{
-	}
-
-	/**
-	 * Sets the context of the Command. This can then be used to do things like
-	 * get file paths associated with the Activity.
-	 * 
-	 * @param ctx The context of the main Activity.
-	 */
-	public void setContext(PhonegapActivity ctx) {
-		super.setContext(ctx);
-		this.sockMan = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE);
-	}
-
-	/**
-	 * Executes the request and returns PluginResult.
-	 * 
-	 * @param action 		The action to execute.
-	 * @param args 			JSONArry of arguments for the plugin.
-	 * @param callbackId	The callback id used when calling back into JavaScript.
-	 * @return 				A PluginResult object with a status and message.
-	 */
-	public PluginResult execute(String action, JSONArray args, String callbackId) {
-		PluginResult.Status status = PluginResult.Status.OK;
-		String result = "";		
-		try {
-			if (action.equals("isAvailable")) {
-				boolean b = this.isAvailable();
-				return new PluginResult(status, b);
-			}
-			else if (action.equals("isWifiActive")) {
-				boolean b = this.isWifiActive();
-				return new PluginResult(status, b);
-			}
-			else if (action.equals("isReachable")) {
-				int i = this.isReachable(args.getString(0), args.getBoolean(1));
-				return new PluginResult(status, i);
-			}
-			return new PluginResult(status, result);
-		} catch (JSONException e) {
-			return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
-		}
-	}
-
-	/**
-	 * Identifies if action to be executed returns a value and should be run synchronously.
-	 * 
-	 * @param action	The action to execute
-	 * @return			T=returns value
-	 */
-	public boolean isSynch(String action) {
-		// All methods take a while, so always use async
-		return false;
-	}
-
-    //--------------------------------------------------------------------------
-    // LOCAL METHODS
-    //--------------------------------------------------------------------------
-
-    /**
-     * Determine if a network connection exists.
-     * 
-     * @return
-     */
-	public boolean isAvailable() {
-		NetworkInfo info = sockMan.getActiveNetworkInfo();
-		boolean conn = false;
-		if (info != null) {
-			conn = info.isConnected();
-		}
-		return conn;
-	}
-	
-	/**
-	 * Determine if a WIFI connection exists.
-	 * 
-	 * @return
-	 */
-	public boolean isWifiActive() {
-		NetworkInfo info = sockMan.getActiveNetworkInfo();
-		if (info != null) {
-			String type = info.getTypeName();
-			return type.equals("WIFI");
-		}
-		return false;
-	}
-	
-	/**
-	 * Determine if a URI is reachable over the network.
-	 * 
-	 * @param uri
-	 * @param isIpAddress
-	 * @return
-	 */
-	public int isReachable(String uri, boolean isIpAddress) {
-		int reachable = NOT_REACHABLE;
-		
-		if (uri.indexOf("http://") == -1) {
-			uri = "http://" + uri;
-		}
-
-		if (this.isAvailable()) {
-			try {
-				DefaultHttpClient httpclient = new DefaultHttpClient();
-				HttpGet httpget = new HttpGet(uri);
-				httpclient.execute(httpget);			
-
-				if (this.isWifiActive()) {
-					reachable = REACHABLE_VIA_WIFI_NETWORK;
-				}
-				else {
-					reachable = REACHABLE_VIA_CARRIER_DATA_NETWORK;
-				}
-			} catch (Exception e) { 
-				reachable = NOT_REACHABLE;
-			}
-		}
-				
-		return reachable;
-	}
-}

framework/src/com/phonegap/Notification.java

@@ -1,355 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-package com.phonegap;
-
-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;
-import android.content.DialogInterface;
-import android.media.Ringtone;
-import android.media.RingtoneManager;
-import android.net.Uri;
-import android.os.Vibrator;
-
-/**
- * This class provides access to notifications on the device.
- */
-public class Notification extends Plugin {
-	
-	public int confirmResult = -1;
-	public ProgressDialog spinnerDialog = null;
-	public ProgressDialog progressDialog = null;	
-	
-	/**
-	 * Constructor.
-	 */
-	public Notification() {
-	}
-
-	/**
-	 * Executes the request and returns PluginResult.
-	 * 
-	 * @param action 		The action to execute.
-	 * @param args 			JSONArry of arguments for the plugin.
-	 * @param callbackId	The callback id used when calling back into JavaScript.
-	 * @return 				A PluginResult object with a status and message.
-	 */
-	public PluginResult execute(String action, JSONArray args, String callbackId) {
-		PluginResult.Status status = PluginResult.Status.OK;
-		String result = "";		
-		
-		try {
-			if (action.equals("beep")) {
-				this.beep(args.getLong(0));
-			}
-			else if (action.equals("vibrate")) {
-				this.vibrate(args.getLong(0));
-			}
-			else if (action.equals("alert")) {
-				this.alert(args.getString(0),args.getString(1),args.getString(2), callbackId);
-				PluginResult r = new PluginResult(PluginResult.Status.NO_RESULT);
-				r.setKeepCallback(true);
-				return r;
-			}
-			else if (action.equals("confirm")) {
-				this.confirm(args.getString(0),args.getString(1),args.getString(2), callbackId);
-				PluginResult r = new PluginResult(PluginResult.Status.NO_RESULT);
-				r.setKeepCallback(true);
-				return r;
-			}
-			else if (action.equals("activityStart")) {
-				this.activityStart(args.getString(0),args.getString(1));
-			}
-			else if (action.equals("activityStop")) {
-				this.activityStop();
-			}
-			else if (action.equals("progressStart")) {
-				this.progressStart(args.getString(0),args.getString(1));
-			}
-			else if (action.equals("progressValue")) {
-				this.progressValue(args.getInt(0));
-			}
-			else if (action.equals("progressStop")) {
-				this.progressStop();
-			}
-			return new PluginResult(status, result);
-		} catch (JSONException e) {
-			return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
-		}
-	}
-
-	/**
-	 * Identifies if action to be executed returns a value and should be run synchronously.
-	 * 
-	 * @param action	The action to execute
-	 * @return			T=returns value
-	 */
-	public boolean isSynch(String action) {
-		if (action.equals("alert")) {
-			return true;
-		}
-		else if (action.equals("confirm")) {
-			return true;
-		}
-		else if (action.equals("activityStart")) {
-			return true;
-		}
-		else if (action.equals("activityStop")) {
-			return true;
-		}
-		else if (action.equals("progressStart")) {
-			return true;
-		}
-		else if (action.equals("progressValue")) {
-			return true;
-		}
-		else if (action.equals("progressStop")) {
-			return true;
-		}
-		else {
-			return false;
-		}
-	}
-
-    //--------------------------------------------------------------------------
-    // LOCAL METHODS
-    //--------------------------------------------------------------------------
-
-	/**
-	 * Beep plays the default notification ringtone.
-	 * 
-	 * @param count			Number of times to play notification
-	 */
-	public void beep(long count) {
-		Uri ringtone = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
-		Ringtone notification = RingtoneManager.getRingtone(this.ctx, ringtone);
-		
-		// If phone is not set to silent mode
-		if (notification != null) {
-			for (long i = 0; i < count; ++i) {
-				notification.play();
-				long timeout = 5000;
-				while (notification.isPlaying() && (timeout > 0)) {
-					timeout = timeout - 100;
-					try {
-						Thread.sleep(100);
-					} catch (InterruptedException e) {
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Vibrates the device for the specified amount of time.
-	 * 
-	 * @param time			Time to vibrate in ms.
-	 */
-	public void vibrate(long time){
-        // Start the vibration, 0 defaults to half a second.
-		if (time == 0) {
-			time = 500;
-		}
-        Vibrator vibrator = (Vibrator) this.ctx.getSystemService(Context.VIBRATOR_SERVICE);
-        vibrator.vibrate(time);
-	}
-	
-	/**
-	 * Builds and shows a native Android alert with given Strings
-	 * @param message 		The message the alert should display
-	 * @param title 		The title of the alert
-	 * @param buttonLabel 	The label of the button 
-	 * @param callbackId	The callback id
-	 */
-	public synchronized void alert(final String message, final String title, final String buttonLabel, final String callbackId) {
-
-		final PhonegapActivity ctx = this.ctx;
-		final Notification notification = this;
-		
-		Runnable runnable = new Runnable() {
-			public void run() {
-		
-				AlertDialog.Builder dlg = new AlertDialog.Builder(ctx);
-				dlg.setMessage(message);
-				dlg.setTitle(title);
-				dlg.setCancelable(false);
-				dlg.setPositiveButton(buttonLabel,
-						new AlertDialog.OnClickListener() {
-					public void onClick(DialogInterface dialog, int which) {
-						dialog.dismiss();
-						notification.success(new PluginResult(PluginResult.Status.OK, 0), callbackId);
-					}
-				});
-				dlg.create();
-				dlg.show();
-			};
-		};
-		this.ctx.runOnUiThread(runnable);
-	}
-
-	/**
-	 * Builds and shows a native Android confirm dialog with given title, message, buttons.
-	 * This dialog only shows up to 3 buttons.  Any labels after that will be ignored.
-	 * The index of the button pressed will be returned to the JavaScript callback identified by callbackId.
-	 * 
-	 * @param message 		The message the dialog should display
-	 * @param title 		The title of the dialog
-	 * @param buttonLabels 	A comma separated list of button labels (Up to 3 buttons)
-	 * @param callbackId	The callback id
-	 */
-	public synchronized void confirm(final String message, final String title, String buttonLabels, final String callbackId) {
-
-		final PhonegapActivity ctx = this.ctx;
-		final Notification notification = this;
-		final String[] fButtons = buttonLabels.split(",");
-
-		Runnable runnable = new Runnable() {
-			public void run() {
-				AlertDialog.Builder dlg = new AlertDialog.Builder(ctx);
-				dlg.setMessage(message);
-				dlg.setTitle(title);
-				dlg.setCancelable(false);
-
-				// First button
-				if (fButtons.length > 0) {
-					dlg.setPositiveButton(fButtons[0],
-							new AlertDialog.OnClickListener() {
-						public void onClick(DialogInterface dialog, int which) {
-							dialog.dismiss();
-							notification.success(new PluginResult(PluginResult.Status.OK, 1), callbackId);
-						}
-					});
-				}
-
-				// Second button
-				if (fButtons.length > 1) {
-					dlg.setNeutralButton(fButtons[1], 
-							new AlertDialog.OnClickListener() {
-						public void onClick(DialogInterface dialog, int which) {
-							dialog.dismiss();
-							notification.success(new PluginResult(PluginResult.Status.OK, 2), callbackId);
-						}
-					});
-				}
-
-				// Third button
-				if (fButtons.length > 2) {
-					dlg.setNegativeButton(fButtons[2],
-							new AlertDialog.OnClickListener() {
-						public void onClick(DialogInterface dialog, int which) {
-							dialog.dismiss();
-							notification.success(new PluginResult(PluginResult.Status.OK, 3), callbackId);
-						}
-					}
-					);
-				}
-
-				dlg.create();
-				dlg.show();
-			};
-		};
-		this.ctx.runOnUiThread(runnable);
-	}
-
-	/**
-	 * Show the spinner.
-	 * 
-	 * @param title			Title of the dialog
-	 * @param message		The message of the dialog
-	 */
-	public synchronized void activityStart(final String title, final String message) {
-		if (this.spinnerDialog != null) {
-			this.spinnerDialog.dismiss();
-			this.spinnerDialog = null;
-		}
-		final Notification notification = this;
-		final PhonegapActivity ctx = this.ctx;
-		Runnable runnable = new Runnable() {
-			public void run() {
-				notification.spinnerDialog = ProgressDialog.show(ctx, title , message, true, true, 
-					new DialogInterface.OnCancelListener() { 
-						public void onCancel(DialogInterface dialog) {
-							notification.spinnerDialog = null;
-						}
-					});
-				}
-			};
-		this.ctx.runOnUiThread(runnable);
-	}
-	
-	/**
-	 * Stop spinner.
-	 */
-	public synchronized void activityStop() {
-		if (this.spinnerDialog != null) {
-			this.spinnerDialog.dismiss();
-			this.spinnerDialog = null;
-		}
-	}
-
-	/**
-	 * Show the progress dialog.
-	 * 
-	 * @param title			Title of the dialog
-	 * @param message		The message of the dialog
-	 */
-	public synchronized void progressStart(final String title, final String message) {
-		if (this.progressDialog != null) {
-			this.progressDialog.dismiss();
-			this.progressDialog = null;
-		}
-		final Notification notification = this;
-		final PhonegapActivity ctx = this.ctx;
-		Runnable runnable = new Runnable() {
-			public void run() {
-				notification.progressDialog = new ProgressDialog(ctx);
-				notification.progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
-				notification.progressDialog.setTitle(title);
-				notification.progressDialog.setMessage(message);
-				notification.progressDialog.setCancelable(true);
-				notification.progressDialog.setMax(100);
-				notification.progressDialog.setProgress(0);
-				notification.progressDialog.setOnCancelListener(
-					new DialogInterface.OnCancelListener() { 
-						public void onCancel(DialogInterface dialog) {
-							notification.progressDialog = null;
-						}
-					});
-				notification.progressDialog.show();
-			}
-		};
-		this.ctx.runOnUiThread(runnable);
-	}
-	
-	/**
-	 * Set value of progress bar.
-	 * 
-	 * @param value			0-100
-	 */
-	public synchronized void progressValue(int value) {
-		if (this.progressDialog != null) {
-			this.progressDialog.setProgress(value);
-		}		
-	}
-	
-	/**
-	 * Stop progress dialog.
-	 */
-	public synchronized void progressStop() {
-		if (this.progressDialog != null) {
-			this.progressDialog.dismiss();
-			this.progressDialog = null;
-		}
-	}
-
-}