mobile_template 0.0.1 → 0.0.2

data/templates/cordova_android/framework/src/org/apache/cordova/FileTransfer.java

@@ -94,7 +94,7 @@ public class FileTransfer extends Plugin {
                 mimeType = getArgument(args, 4, "image/jpeg");
                 JSONObject params = args.optJSONObject(5);
                 boolean trustEveryone = args.optBoolean(6);
-                boolean chunkedMode = args.optBoolean(7);
+                boolean chunkedMode = args.optBoolean(7) || args.isNull(7); //Always use chunked mode unless set to false as per API
                 FileUploadResult r = upload(source, target, fileKey, fileName, mimeType, params, trustEveryone, chunkedMode);
                 Log.d(LOG_TAG, "****** About to return a result from upload");
                 return new PluginResult(PluginResult.Status.OK, r.toJSONObject());
@@ -225,7 +225,7 @@ public class FileTransfer extends Plugin {
         FileUploadResult result = new FileUploadResult();
 
         // Get a input stream of the file on the phone
-        InputStream fileInputStream = getPathFromUri(file);
+        FileInputStream fileInputStream = (FileInputStream) getPathFromUri(file);
 
         HttpURLConnection conn = null;
         DataOutputStream dos = null;
@@ -276,7 +276,7 @@ public class FileTransfer extends Plugin {
         conn.setRequestMethod("POST");
         conn.setRequestProperty("Connection", "Keep-Alive");
         conn.setRequestProperty("Content-Type", "multipart/form-data;boundary="+BOUNDRY);
-        
+
         // Handle the other headers
         try {
           JSONObject headers = params.getJSONObject("headers");
@@ -294,35 +294,54 @@ public class FileTransfer extends Plugin {
         if (cookie != null) {
             conn.setRequestProperty("Cookie", cookie);
         }
+        
 
-        // Should set this up as an option
-        if (chunkedMode) {
-            conn.setChunkedStreamingMode(maxBufferSize);
-        }
-
-        dos = new DataOutputStream( conn.getOutputStream() );
-
-        // Send any extra parameters
+        /*
+         * Store the non-file portions of the multipart data as a string, so that we can add it 
+         * to the contentSize, since it is part of the body of the HTTP request.
+         */
+        String extraParams = "";
         try {
             for (Iterator iter = params.keys(); iter.hasNext();) {
                 Object key = iter.next();
                 if(key.toString() != "headers")
                 {
-                  dos.writeBytes(LINE_START + BOUNDRY + LINE_END);
-                  dos.writeBytes("Content-Disposition: form-data; name=\"" +  key.toString() + "\";");
-                  dos.writeBytes(LINE_END + LINE_END);
-                  dos.write(params.getString(key.toString()).getBytes());
-                  dos.writeBytes(LINE_END);
+                  extraParams += LINE_START + BOUNDRY + LINE_END;
+                  extraParams += "Content-Disposition: form-data; name=\"" +  key.toString() + "\";";
+                  extraParams += LINE_END + LINE_END;
+                  extraParams += params.getString(key.toString());
+                  extraParams += LINE_END;
                 }
             }
         } catch (JSONException e) {
             Log.e(LOG_TAG, e.getMessage(), e);
         }
+        
+        extraParams += LINE_START + BOUNDRY + LINE_END;
+        extraParams += "Content-Disposition: form-data; name=\"" + fileKey + "\";" + " filename=\"";
+        
+        String midParams = "\"" + LINE_END + "Content-Type: " + mimeType + LINE_END + LINE_END;
+        String tailParams = LINE_END + LINE_START + BOUNDRY + LINE_START + LINE_END;
+        
+        // Should set this up as an option
+        if (chunkedMode) {
+            conn.setChunkedStreamingMode(maxBufferSize);
+        }
+        else
+        {
+          int stringLength = extraParams.length() + midParams.length() + tailParams.length() + fileName.getBytes("UTF-8").length;
+          Log.d(LOG_TAG, "String Length: " + stringLength);
+          int fixedLength = (int) fileInputStream.getChannel().size() + stringLength;
+          Log.d(LOG_TAG, "Content Length: " + fixedLength);
+          conn.setFixedLengthStreamingMode(fixedLength);
+        }
+        
 
-        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);
+        dos = new DataOutputStream( conn.getOutputStream() );
+        dos.writeBytes(extraParams);
+        //We don't want to chagne encoding, we just want this to write for all Unicode.
+        dos.write(fileName.getBytes("UTF-8"));
+        dos.writeBytes(midParams);
 
         // create a buffer of maximum size
         bytesAvailable = fileInputStream.available();
@@ -343,8 +362,7 @@ public class FileTransfer extends Plugin {
         }
 
         // send multipart form data necesssary after file data...
-        dos.writeBytes(LINE_END);
-        dos.writeBytes(LINE_START + BOUNDRY + LINE_START + LINE_END);
+        dos.writeBytes(tailParams);
 
         // close streams
         fileInputStream.close();
@@ -392,38 +410,53 @@ public class FileTransfer extends Plugin {
      */
     public JSONObject download(String source, String target) throws IOException {
         try {
-            File file = new File(target);
+            File file = getFileFromPath(target);
 
             // create needed directories
             file.getParentFile().mkdirs();
 
             // connect to server
-            URL url = new URL(source);
-            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-            connection.setRequestMethod("GET");
-            connection.connect();
-
-            Log.d(LOG_TAG, "Download file:" + url);
-
-            InputStream inputStream = connection.getInputStream();
-            byte[] buffer = new byte[1024];
-            int bytesRead = 0;
-
-            FileOutputStream outputStream = new FileOutputStream(file);
-
-            // write bytes to file
-            while ( (bytesRead = inputStream.read(buffer)) > 0 ) {
+            if(this.ctx.isUrlWhiteListed(source))
+            {
+              URL url = new URL(source);
+              HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+              connection.setRequestMethod("GET");
+              
+              //Add cookie support
+              String cookie = CookieManager.getInstance().getCookie(source);
+              if(cookie != null)
+              {
+                connection.setRequestProperty("cookie", cookie);
+              }
+              
+              connection.connect();
+
+              Log.d(LOG_TAG, "Download file:" + url);
+
+              InputStream inputStream = connection.getInputStream();
+              byte[] buffer = new byte[1024];
+              int bytesRead = 0;
+
+              FileOutputStream outputStream = new FileOutputStream(file);
+
+              // write bytes to file
+              while ( (bytesRead = inputStream.read(buffer)) > 0 ) {
                 outputStream.write(buffer,0, bytesRead);
-            }
+              }
 
-            outputStream.close();
+              outputStream.close();
 
-            Log.d(LOG_TAG, "Saved file: " + target);
+              Log.d(LOG_TAG, "Saved file: " + target);
 
-            // create FileEntry object
-            FileUtils fileUtil = new FileUtils();
+              // create FileEntry object
+              FileUtils fileUtil = new FileUtils();
 
-            return fileUtil.getEntry(file);
+              return fileUtil.getEntry(file);
+            }
+            else
+            {
+              throw new IOException("Error: Unable to connect to domain");
+            }
         } catch (Exception e) {
             Log.d(LOG_TAG, e.getMessage(), e);
             throw new IOException("Error while downloading");
@@ -455,4 +488,17 @@ public class FileTransfer extends Plugin {
         }
     }
 
+    /**
+     * Get a File object from the passed in path
+     * 
+     * @param path
+     * @return
+     */
+    private File getFileFromPath(String path) {
+        if (path.startsWith("file://")) {
+            return new File(path.substring(7));
+        } else {
+            return new File(path);
+        }
+    }
 }

data/templates/cordova_android/framework/src/org/apache/cordova/FileUtils.java

@@ -142,8 +142,7 @@ public class FileUtils extends Plugin {
                 return new PluginResult(status, obj);
             }
             else if (action.equals("getMetadata")) {
-                JSONObject obj = getMetadata(args.getString(0));
-                return new PluginResult(status, obj);
+                return new PluginResult(status, getMetadata(args.getString(0)));
             }
             else if (action.equals("getFileMetadata")) {
                 JSONObject obj = getFileMetadata(args.getString(0));
@@ -254,7 +253,12 @@ public class FileUtils extends Plugin {
             URL testUrl = new URL(decoded);
 
             if (decoded.startsWith("file://")) {
-                fp = new File(decoded.substring(7, decoded.length()));
+                int questionMark = decoded.indexOf("?");
+                if (questionMark < 0) {
+                    fp = new File(decoded.substring(7, decoded.length()));
+                } else {
+                    fp = new File(decoded.substring(7, questionMark));
+                }
             } else {
                 fp = new File(decoded);
             }
@@ -759,21 +763,17 @@ public class FileUtils extends Plugin {
      * Look up metadata about this entry.
      *
      * @param filePath to entry
-     * @return a Metadata object
+     * @return a long
      * @throws FileNotFoundException
-     * @throws JSONException
      */
-    private JSONObject getMetadata(String filePath) throws FileNotFoundException, JSONException {
+    private long getMetadata(String filePath) throws FileNotFoundException {
         File file = createFileObject(filePath);
 
         if (!file.exists()) {
             throw new FileNotFoundException("Failed to find file in getMetadata");
         }
 
-        JSONObject metadata = new JSONObject();
-        metadata.put("modificationTime", file.lastModified());
-
-        return metadata;
+        return file.lastModified();
     }
 
     /**
@@ -973,23 +973,23 @@ public class FileUtils extends Plugin {
     /**/
     public long write(String filename, String data, int offset) throws FileNotFoundException, IOException {
         filename = stripFileProtocol(filename);
-
+        
         boolean append = false;
         if (offset > 0) {
             this.truncateFile(filename, offset);
             append = true;
         }
 
-       byte [] rawData = data.getBytes();
-       ByteArrayInputStream in = new ByteArrayInputStream(rawData);
-       FileOutputStream out = new FileOutputStream(filename, append);
-       byte buff[] = new byte[rawData.length];
-       in.read(buff, 0, buff.length);
-       out.write(buff, 0, rawData.length);
-       out.flush();
-       out.close();
+        byte [] rawData = data.getBytes();
+        ByteArrayInputStream in = new ByteArrayInputStream(rawData);
+        FileOutputStream out = new FileOutputStream(filename, append);
+        byte buff[] = new byte[rawData.length];
+        in.read(buff, 0, buff.length);
+        out.write(buff, 0, rawData.length);
+        out.flush();
+        out.close();
 
-        return data.length();
+        return rawData.length;
     }
 
     /**

data/templates/cordova_android/framework/src/org/apache/cordova/LinearLayoutSoftKeyboardDetect.java

@@ -87,13 +87,13 @@ public class LinearLayoutSoftKeyboardDetect extends LinearLayout {
         // gone away.
         else if (height > oldHeight) {
             if(app != null)
-                app.sendJavascript("require('cordova').fireDocumentEvent('hidekeyboard');");
+                app.sendJavascript("cordova.fireDocumentEvent('hidekeyboard');");
         } 
         // If the height as gotten smaller then we will assume the soft keyboard has 
         // been displayed.
         else if (height < oldHeight) {
             if(app != null)
-                app.sendJavascript("require('cordova').fireDocumentEvent('showkeyboard');");
+                app.sendJavascript("cordova.fireDocumentEvent('showkeyboard');");
         }
 
         // Update the old height for the next event

data/templates/cordova_android/framework/src/org/apache/cordova/NetworkManager.java

@@ -58,7 +58,7 @@ public class NetworkManager extends Plugin {
     public static final String LTE = "lte";
     public static final String UMB = "umb";
     public static final String HSPA_PLUS = "hspa+";
-    // return types
+    // return type
     public static final String TYPE_UNKNOWN = "unknown";
     public static final String TYPE_ETHERNET = "ethernet";
     public static final String TYPE_WIFI = "wifi";
@@ -89,7 +89,7 @@ public class NetworkManager extends Plugin {
      */
     public void setContext(CordovaInterface ctx) {
         super.setContext(ctx);
-        this.sockMan = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE);        
+        this.sockMan = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE);
         this.connectionCallbackId = null;
         
         // We need to listen to connectivity events to update navigator.connection
@@ -98,7 +98,7 @@ public class NetworkManager extends Plugin {
         if (this.receiver == null) {
             this.receiver = new BroadcastReceiver() {
                 @Override
-                public void onReceive(Context context, Intent intent) {                
+                public void onReceive(Context context, Intent intent) {
                     updateConnectionInfo((NetworkInfo) intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK_INFO));                
                 }
             };
@@ -117,7 +117,7 @@ public class NetworkManager extends Plugin {
      */
     public PluginResult execute(String action, JSONArray args, String callbackId) {
         PluginResult.Status status = PluginResult.Status.INVALID_ACTION;
-        String result = "Unsupported Operation: " + action;    
+        String result = "Unsupported Operation: " + action;
         
         if (action.equals("getConnectionInfo")) {
             this.connectionCallbackId = callbackId;
@@ -137,8 +137,7 @@ public class NetworkManager extends Plugin {
      * @return            T=returns value
      */
     public boolean isSynch(String action) {
-        // All methods take a while, so always use async
-        return false;
+        return true;
     }
     
     /**
@@ -182,7 +181,7 @@ public class NetworkManager extends Plugin {
             // If we are not connected to any network set type to none
             if (!info.isConnected()) {
                 type = TYPE_NONE;
-            }            
+            }
             else {
                 type = getType(info);
             }
@@ -212,7 +211,7 @@ public class NetworkManager extends Plugin {
      */
     private String getType(NetworkInfo info) {
         if (info != null) {
-            String type = info.getTypeName(); 
+            String type = info.getTypeName();
 
             if (type.toLowerCase().equals(WIFI)) {
                 return TYPE_WIFI;

data/templates/cordova_android/framework/src/org/apache/cordova/Notification.java

@@ -233,7 +233,7 @@ public class Notification extends Plugin {
 
         // First button
         if (fButtons.length > 0) {
-          dlg.setPositiveButton(fButtons[0],
+          dlg.setNegativeButton(fButtons[0],
               new AlertDialog.OnClickListener() {
             public void onClick(DialogInterface dialog, int which) {
               dialog.dismiss();
@@ -255,7 +255,7 @@ public class Notification extends Plugin {
 
         // Third button
         if (fButtons.length > 2) {
-          dlg.setNegativeButton(fButtons[2],
+          dlg.setPositiveButton(fButtons[2],
               new AlertDialog.OnClickListener() {
             public void onClick(DialogInterface dialog, int which) {
               dialog.dismiss();

data/templates/cordova_android/framework/src/org/apache/cordova/SplashScreen.java

@@ -0,0 +1,23 @@
+package org.apache.cordova;
+
+import org.apache.cordova.api.Plugin;
+import org.apache.cordova.api.PluginResult;
+import org.json.JSONArray;
+
+public class SplashScreen extends Plugin {
+
+    @Override
+    public PluginResult execute(String action, JSONArray args, String callbackId) {
+        PluginResult.Status status = PluginResult.Status.OK;
+        String result = "";
+
+        if (action.equals("hide")) {
+            ((DroidGap)this.ctx).removeSplashScreen();
+        }
+        else {
+            status = PluginResult.Status.INVALID_ACTION;
+        }
+        return new PluginResult(status, result);
+    }
+
+}

data/templates/cordova_android/framework/src/org/apache/cordova/Storage.java

@@ -162,7 +162,7 @@ public class Storage extends Plugin {
 		try {
 			if (isDDL(query)) {
 				this.myDb.execSQL(query);
-				this.sendJavascript("require('cordova/plugin/android/storage').completeQuery('" + tx_id + "', '');");
+				this.sendJavascript("cordova.require('cordova/plugin/android/storage').completeQuery('" + tx_id + "', '');");
 			} 
 			else {
 				Cursor myCursor = this.myDb.rawQuery(query, params);
@@ -175,7 +175,7 @@ public class Storage extends Plugin {
 			System.out.println("Storage.executeSql(): Error=" +  ex.getMessage());
 			
 			// Send error message back to JavaScript
-			this.sendJavascript("require('cordova/plugin/android/storage').fail('" + ex.getMessage() + "','" + tx_id + "');");
+			this.sendJavascript("cordova.require('cordova/plugin/android/storage').fail('" + ex.getMessage() + "','" + tx_id + "');");
 		}
 	}
 
@@ -233,7 +233,7 @@ public class Storage extends Plugin {
 		}
 
 		// Let JavaScript know that there are no more rows
-		this.sendJavascript("require('cordova/plugin/android/storage').completeQuery('" + tx_id + "', " + result + ");");
+		this.sendJavascript("cordova.require('cordova/plugin/android/storage').completeQuery('" + tx_id + "', " + result + ");");
 	}
 
 }

data/templates/cordova_android/framework/src/org/apache/cordova/api/CordovaInterface.java

@@ -141,5 +141,7 @@ public interface CordovaInterface {
             boolean clearHistory, HashMap<String, Object> params);
 
     public abstract Context getApplicationContext();
+
+    public abstract boolean isUrlWhiteListed(String source);
  
 }

data/templates/cordova_android/framework/src/org/apache/cordova/api/PluginEntry.java

@@ -0,0 +1,119 @@
+/*
+       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 org.apache.cordova.api;
+
+import android.webkit.WebView;
+
+/**
+ * This class represents a service entry object.
+ */
+public class PluginEntry {
+
+    /**
+     * The name of the service that this plugin implements
+     */
+    public String service = "";
+
+    /**
+     * The plugin class name that implements the service.
+     */
+    public String pluginClass = "";
+
+    /**
+     * The plugin object.
+     * Plugin objects are only created when they are called from JavaScript.  (see PluginManager.exec)
+     * The exception is if the onload flag is set, then they are created when PluginManager is initialized.
+     */
+    public IPlugin plugin = null;
+
+    /**
+     * Flag that indicates the plugin object should be created when PluginManager is initialized. 
+     */
+    public boolean onload = false;
+
+    /**
+     * Constructor
+     * 
+     * @param service               The name of the service
+     * @param pluginClass           The plugin class name
+     * @param onload                Create plugin object when HTML page is loaded
+     */
+    public PluginEntry(String service, String pluginClass, boolean onload) {
+        this.service = service;
+        this.pluginClass = pluginClass;
+        this.onload = onload;
+    }
+
+    /**
+     * Create plugin object.
+     * If plugin is already created, then just return it.
+     * 
+     * @return                      The plugin object
+     */
+    @SuppressWarnings("unchecked")
+    public IPlugin createPlugin(WebView webView, CordovaInterface ctx) {
+        if (this.plugin != null) {
+            return this.plugin;
+        }
+        try {
+            Class c = getClassByName(this.pluginClass);
+            if (isCordovaPlugin(c)) {
+                this.plugin = (IPlugin) c.newInstance();
+                this.plugin.setContext(ctx);
+                this.plugin.setView(webView);
+                return plugin;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.println("Error adding plugin " + this.pluginClass + ".");
+        }
+        return null;
+    }
+
+    /**
+     * Get the class.
+     * 
+     * @param clazz
+     * @return
+     * @throws ClassNotFoundException
+     */
+    @SuppressWarnings("unchecked")
+    private Class getClassByName(final String clazz) throws ClassNotFoundException {
+        Class c = null;
+        if (clazz != null) {
+            c = Class.forName(clazz);
+        }
+        return c;
+    }
+
+    /**
+     * Get the interfaces that a class implements and see if it implements the
+     * org.apache.cordova.api.Plugin interface.
+     * 
+     * @param c                     The class to check the interfaces of.
+     * @return                      Boolean indicating if the class implements org.apache.cordova.api.Plugin
+     */
+    @SuppressWarnings("unchecked")
+    private boolean isCordovaPlugin(Class c) {
+        if (c != null) {
+            return org.apache.cordova.api.Plugin.class.isAssignableFrom(c) || org.apache.cordova.api.IPlugin.class.isAssignableFrom(c);
+        }
+        return false;
+    }
+}