mobile_template 0.0.1 → 0.0.2

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

@@ -216,6 +216,9 @@ public class CordovaChromeClient extends WebChromeClient {
         // Cordova JS has initialized, so show webview
         // (This solves white flash seen when rendering HTML)
         else if (reqOk && defaultValue != null && defaultValue.equals("gap_init:")) {
+            if (ctx.splashscreen != 0) {
+                ctx.root.setBackgroundResource(0);
+            }
             ctx.appView.setVisibility(View.VISIBLE);
             ctx.spinnerStop();
             result.confirm("OK");

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

@@ -64,7 +64,7 @@ public class CordovaWebViewClient extends WebViewClient {
     public boolean shouldOverrideUrlLoading(WebView view, String url) {
         
         // First give any plugins the chance to handle the url themselves
-        if (this.ctx.pluginManager.onOverrideUrlLoading(url)) {
+        if ((this.ctx.pluginManager != null) && this.ctx.pluginManager.onOverrideUrlLoading(url)) {
         }
         
         // If dialing phone (tel:5551212)
@@ -217,7 +217,8 @@ public class CordovaWebViewClient extends WebViewClient {
         // not loaded yet then just set a flag so that the onNativeReady can be fired
         // from the JS side when the JS gets to that code.
         if (!url.equals("about:blank")) {
-            ctx.appView.loadUrl("javascript:try{ require('cordova/channel').onNativeReady.fire();}catch(e){_nativeReady = true;}");
+            ctx.appView.loadUrl("javascript:try{ cordova.require('cordova/channel').onNativeReady.fire();}catch(e){_nativeReady = true;}");
+            this.ctx.postMessage("onNativeReady", null);
         }
 
         // Make app visible after 2 sec in case there was a JS error and Cordova JS never initialized correctly
@@ -228,6 +229,9 @@ public class CordovaWebViewClient extends WebViewClient {
                         Thread.sleep(2000);
                         ctx.runOnUiThread(new Runnable() {
                             public void run() {
+                                if (ctx.splashscreen != 0) {
+                                    ctx.root.setBackgroundResource(0);
+                                }
                                 ctx.appView.setVisibility(View.VISIBLE);
                                 ctx.spinnerStop();
                             }

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

@@ -38,73 +38,73 @@ import android.telephony.TelephonyManager;
 public class Device extends Plugin {
     public static final String TAG = "Device";
 
-    public static String cordovaVersion = "1.5.0";              // Cordova version
-	public static String platform = "Android";					// Device OS
-	public static String uuid;									// Device UUID
+    public static String cordovaVersion = "1.7.0";              // Cordova version
+    public static String platform = "Android";                  // Device OS
+    public static String uuid;                                  // Device UUID
     
     BroadcastReceiver telephonyReceiver = null;
 
     /**
      * Constructor.
      */
-	public Device() {
+    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(CordovaInterface ctx) {
-		super.setContext(ctx);
+    
+    /**
+     * 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(CordovaInterface ctx) {
+        super.setContext(ctx);
         Device.uuid = getUuid();
         this.initTelephonyReceiver();
-	}
+    }
 
-	/**
-	 * 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("cordova", Device.cordovaVersion);
-				//JSONObject pg = new JSONObject();
-				//pg.put("version", Device.CordovaVersion);
-				//r.put("cordova", pg);
-				return new PluginResult(status, r);
-			}
-			return new PluginResult(status, result);
-		} catch (JSONException e) {
-			return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
-		}
-	}
+    /**
+     * 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("cordova", Device.cordovaVersion);
+                //JSONObject pg = new JSONObject();
+                //pg.put("version", Device.CordovaVersion);
+                //r.put("cordova", 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;
-	}
+    /**
+     * 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;
+    }
     
     /**
      * Unregister receiver.
@@ -156,59 +156,59 @@ public class Device extends Plugin {
         this.ctx.registerReceiver(this.telephonyReceiver, intentFilter);
     }
 
-	/**
-	 * 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 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 Cordova version.
-	 * 
-	 * @return
-	 */
-	public String getCordovaVersion() {
-		return Device.cordovaVersion;
-	}	
-	
-	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;
-	}
-	
+    /**
+     * Get the Cordova version.
+     * 
+     * @return
+     */
+    public String getCordovaVersion() {
+        return Device.cordovaVersion;
+    }   
+    
+    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();

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

@@ -37,17 +37,18 @@ import org.xmlpull.v1.XmlPullParserException;
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.content.res.XmlResourceParser;
-import android.database.Cursor;
 import android.graphics.Color;
 import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
 import android.view.Display;
 import android.view.KeyEvent;
 import android.view.Menu;
@@ -56,6 +57,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
+import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
 import android.webkit.WebSettings.LayoutAlgorithm;
 import android.webkit.WebView;
@@ -345,22 +347,33 @@ public class DroidGap extends Activity implements CordovaInterface {
     }
     
     /**
-     * Create and initialize web container.
+     * Create and initialize web container with default web view objects.
      */
     public void init() {
+    	this.init(new WebView(DroidGap.this), new CordovaWebViewClient(this), new CordovaChromeClient(DroidGap.this));
+    }
+    
+    /**
+     * Initialize web container with web view objects.
+     * 
+     * @param webView
+     * @param webViewClient
+     * @param webChromeClient
+     */
+    public void init(WebView webView, WebViewClient webViewClient, WebChromeClient webChromeClient) {
         LOG.d(TAG, "DroidGap.init()");
         
-        // Create web container
-        this.appView = new WebView(DroidGap.this);
+        // Set up web container
+       	this.appView = webView;
         this.appView.setId(100);
-        
+
         this.appView.setLayoutParams(new LinearLayout.LayoutParams(
                 ViewGroup.LayoutParams.FILL_PARENT,
                 ViewGroup.LayoutParams.FILL_PARENT, 
                 1.0F));
 
-        this.appView.setWebChromeClient(new CordovaChromeClient(DroidGap.this));
-        this.setWebViewClient(this.appView, new CordovaWebViewClient(this));
+       	this.appView.setWebChromeClient(webChromeClient);
+       	this.setWebViewClient(this.appView, webViewClient);
 
         this.appView.setInitialScale(0);
         this.appView.setVerticalScrollBarEnabled(false);
@@ -393,6 +406,9 @@ public class DroidGap extends Activity implements CordovaInterface {
         
         // Clear cancel flag
         this.cancelLoadUrl = false;
+        
+        // Create plugin manager
+        this.pluginManager = new PluginManager(this.appView, this);        
     }
     
     /**
@@ -418,9 +434,6 @@ public class DroidGap extends Activity implements CordovaInterface {
 
         // If spashscreen
         this.splashscreen = this.getIntegerProperty("splashscreen", 0);
-        if ((this.urls.size() == 0) && (this.splashscreen != 0)) {
-            root.setBackgroundResource(this.splashscreen);
-        }
 
         // If loadUrlTimeoutValue
         int timeout = this.getIntegerProperty("loadUrlTimeoutValue", 0);
@@ -498,12 +511,7 @@ public class DroidGap extends Activity implements CordovaInterface {
                 else {
                     me.callbackServer.reinit(url);
                 }
-                if (me.pluginManager == null) {
-                    me.pluginManager = new PluginManager(me.appView, me);        
-                }
-                else {
-                    me.pluginManager.reinit();
-                }
+                me.pluginManager.init();
                 
                 // If loadingDialog property, then show the App loading dialog for first page of app
                 String loading = null;
@@ -598,38 +606,12 @@ public class DroidGap extends Activity implements CordovaInterface {
         if (!url.startsWith("javascript:")) {
             LOG.d(TAG, "DroidGap.loadUrl(%s, %d)", url, time);
         }
-        final DroidGap me = this;
-
-        // Handle activity parameters
-        this.runOnUiThread(new Runnable() {
-            public void run() {
-                if (me.appView == null) {
-                    me.init();
-                }
-                me.handleActivityParameters();
-            }
-        });
-
-        Runnable runnable = new Runnable() {
-            public void run() {
-                try {
-                    synchronized(this) {
-                        this.wait(time);
-                    }
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-                if (!me.cancelLoadUrl) {
-                    me.loadUrlIntoView(url);
-                }
-                else{
-                    me.cancelLoadUrl = false;
-                    LOG.d(TAG, "Aborting loadUrl(%s): Another URL was loaded before timer expired.", url);
-                }
-            }
-        };
-        Thread thread = new Thread(runnable);
-        thread.start();
+        
+        this.handleActivityParameters();
+        if (this.splashscreen != 0) {
+            this.showSplashScreen(time);
+        }
+        this.loadUrlIntoView(url);
     }
     
     /**
@@ -831,11 +813,13 @@ public class DroidGap extends Activity implements CordovaInterface {
         }
 
         // Send pause event to JavaScript
-        this.appView.loadUrl("javascript:try{require('cordova/channel').onPause.fire();}catch(e){console.log('exception firing pause event from native');};");
+        this.appView.loadUrl("javascript:try{cordova.require('cordova/channel').onPause.fire();}catch(e){console.log('exception firing pause event from native');};");
 
         // Forward to plugins
-        this.pluginManager.onPause(this.keepRunning);
-
+        if (this.pluginManager != null) {
+        	this.pluginManager.onPause(this.keepRunning);
+        }
+        
         // If app doesn't want to run in background
         if (!this.keepRunning) {
 
@@ -852,7 +836,9 @@ public class DroidGap extends Activity implements CordovaInterface {
         super.onNewIntent(intent);
 
         //Forward to plugins
-        this.pluginManager.onNewIntent(intent);
+        if (this.pluginManager != null) {
+        	this.pluginManager.onNewIntent(intent);
+        }
     }
     
     @Override
@@ -872,11 +858,13 @@ public class DroidGap extends Activity implements CordovaInterface {
         }
 
         // Send resume event to JavaScript
-        this.appView.loadUrl("javascript:try{require('cordova/channel').onResume.fire();}catch(e){console.log('exception firing resume event from native');};");
+        this.appView.loadUrl("javascript:try{cordova.require('cordova/channel').onResume.fire();}catch(e){console.log('exception firing resume event from native');};");
 
         // Forward to plugins
-        this.pluginManager.onResume(this.keepRunning || this.activityResultKeepRunning);
-
+        if (this.pluginManager != null) {
+        	this.pluginManager.onResume(this.keepRunning || this.activityResultKeepRunning);
+        }
+        
         // If app doesn't want to run in background
         if (!this.keepRunning || this.activityResultKeepRunning) {
 
@@ -902,7 +890,7 @@ public class DroidGap extends Activity implements CordovaInterface {
 
 
             // Send destroy event to JavaScript
-            this.appView.loadUrl("javascript:try{require('cordova/channel').onDestroy.fire();}catch(e){console.log('exception firing destroy event from native');};");
+            this.appView.loadUrl("javascript:try{cordova.require('cordova/channel').onDestroy.fire();}catch(e){console.log('exception firing destroy event from native');};");
 
             // Load blank page so that JavaScript onunload is called
             this.appView.loadUrl("about:blank");
@@ -942,7 +930,9 @@ public class DroidGap extends Activity implements CordovaInterface {
      */
     @Deprecated
     public void addService(String serviceType, String className) {
-        this.pluginManager.addService(serviceType, className);
+        if (this.pluginManager != null) {
+        	this.pluginManager.addService(serviceType, className);
+        }
     }
     
     /**
@@ -952,7 +942,9 @@ public class DroidGap extends Activity implements CordovaInterface {
      * @param message
      */
     public void sendJavascript(String statement) {
-        this.callbackServer.sendJavascript(statement);
+        //We need to check for the null case on the Kindle Fire beacuse it changes the width and height on load
+        if(this.callbackServer != null)
+          this.callbackServer.sendJavascript(statement);
     }
 
     /**
@@ -1052,51 +1044,46 @@ public class DroidGap extends Activity implements CordovaInterface {
     }
     
     /**
-     * Called when a key is pressed.
+     * Called when a key is de-pressed. (Key UP)
      * 
      * @param keyCode
      * @param event
      */
     @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
+    public boolean onKeyUp(int keyCode, KeyEvent event) {
         if (this.appView == null) {
-            return super.onKeyDown(keyCode, event);
+            return super.onKeyUp(keyCode, event);
         }
 
         // If back key
         if (keyCode == KeyEvent.KEYCODE_BACK) {
-
             // If back key is bound, then send event to JavaScript
             if (this.bound) {
-                this.appView.loadUrl("javascript:require('cordova').fireDocumentEvent('backbutton');");
+                this.appView.loadUrl("javascript:cordova.fireDocumentEvent('backbutton');");
                 return true;
-            }
-
-            // If not bound
-            else {
-
+            } else {
+                // If not bound
                 // Go to previous page in webview if it is possible to go back
                 if (this.backHistory()) {
                     return true;
                 }
-
                 // If not, then invoke behavior of super class
                 else {
                     this.activityState = ACTIVITY_EXITING;
-                    return super.onKeyDown(keyCode, event);
+                    return super.onKeyUp(keyCode, event);
                 }
             }
         }
 
         // If menu key
         else if (keyCode == KeyEvent.KEYCODE_MENU) {
-            this.appView.loadUrl("javascript:require('cordova').fireDocumentEvent('menubutton');");
-            return super.onKeyDown(keyCode, event);
+            this.appView.loadUrl("javascript:cordova.fireDocumentEvent('menubutton');");
+            return super.onKeyUp(keyCode, event);
         }
 
         // If search key
         else if (keyCode == KeyEvent.KEYCODE_SEARCH) {
-            this.appView.loadUrl("javascript:require('cordova').fireDocumentEvent('searchbutton');");
+            this.appView.loadUrl("javascript:cordova.fireDocumentEvent('searchbutton');");
             return true;
         }
 
@@ -1185,13 +1172,16 @@ public class DroidGap extends Activity implements CordovaInterface {
                  }
              });
          }
-
          // If not, then display error dialog
          else {
+             final boolean exit = !(errorCode == WebViewClient.ERROR_HOST_LOOKUP);
              me.runOnUiThread(new Runnable() {
                  public void run() {
-                     me.appView.setVisibility(View.GONE);
-                     me.displayError("Application Error", description + " ("+failingUrl+")", "OK", true);
+                     if(exit)
+                     {
+                       me.appView.setVisibility(View.GONE);
+                       me.displayError("Application Error", description + " ("+failingUrl+")", "OK", exit);
+                     }
                  }
              });
          }
@@ -1328,7 +1318,7 @@ public class DroidGap extends Activity implements CordovaInterface {
      * @param url
      * @return
      */
-    boolean isUrlWhiteListed(String url) {
+    public boolean isUrlWhiteListed(String url) {
 
         // Check to see if we have matched url previously
         if (whiteListCache.get(url) != null) {
@@ -1414,4 +1404,47 @@ public class DroidGap extends Activity implements CordovaInterface {
       return this.bound;
     }
 
+    protected Dialog splashDialog;
+    
+    /**
+     * Removes the Dialog that displays the splash screen
+     */
+    public void removeSplashScreen() {
+        if (splashDialog != null) {
+            splashDialog.dismiss();
+            splashDialog = null;
+        }
+    }
+     
+    /**
+     * Shows the splash screen over the full Activity
+     */
+    protected void showSplashScreen(int time) {
+        // Get reference to display
+        Display display = getWindowManager().getDefaultDisplay();
+        
+        // Create the layout for the dialog
+        LinearLayout root = new LinearLayout(this);
+        root.setMinimumHeight(display.getHeight());
+        root.setMinimumWidth(display.getWidth());
+        root.setOrientation(LinearLayout.VERTICAL);
+        root.setBackgroundColor(this.getIntegerProperty("backgroundColor", Color.BLACK));
+        root.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, 
+                ViewGroup.LayoutParams.FILL_PARENT, 0.0F));
+        root.setBackgroundResource(this.splashscreen);
+
+        // Create and show the dialog
+        splashDialog = new Dialog(this, android.R.style.Theme_Translucent_NoTitleBar);       
+        splashDialog.setContentView(root);
+        splashDialog.setCancelable(false);
+        splashDialog.show();
+     
+        // Set Runnable to remove splash screen just in case
+        final Handler handler = new Handler();
+        handler.postDelayed(new Runnable() {
+          public void run() {
+            removeSplashScreen();
+          }
+        }, time);
+    }
 }