Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incu…

…bator-cordova-android
kborchers · Feb 20, 2012 · c9d4276 · c9d4276
2 parents fef0e42 + 9188773
commit c9d4276
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/framework/src/org/apache/cordova/CameraLauncher.java b/framework/src/org/apache/cordova/CameraLauncher.java
@@ -108,16 +108,12 @@ public PluginResult execute(String action, JSONArray args, String callbackId) {
                 this.mediaType = PICTURE;
                 this.mQuality = 80;
 
-                JSONObject options = args.optJSONObject(0);
-                if (options != null) {
-                    srcType = options.getInt("sourceType");
-                    destType = options.getInt("destinationType");
-                    this.targetHeight = options.getInt("targetHeight");
-                    this.targetWidth = options.getInt("targetWidth");
-                    this.encodingType = options.getInt("encodingType");
-                    this.mediaType = options.getInt("mediaType");
-                    this.mQuality = options.getInt("quality");
-                }
+                this.mQuality = args.getInt(0);
+                destType = args.getInt(1);
+                srcType = args.getInt(2);
+                this.targetWidth = args.getInt(3);
+                this.targetHeight = args.getInt(4);
+                this.encodingType = args.getInt(5);
 
                 if (srcType == CAMERA) {
                     this.takePicture(destType, encodingType);

diff --git a/framework/src/org/apache/cordova/LinearLayoutSoftKeyboardDetect.java b/framework/src/org/apache/cordova/LinearLayoutSoftKeyboardDetect.java
@@ -87,13 +87,13 @@ else if(screenHeight == width)
         // gone away.
         else if (height > oldHeight) {
             if(app != null)
-                app.sendJavascript("Cordova.fireDocumentEvent('hidekeyboard');");
+                app.sendJavascript("require('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("Cordova.fireDocumentEvent('showkeyboard');");
+                app.sendJavascript("require('cordova').fireDocumentEvent('showkeyboard');");
         }
 
         // Update the old height for the next event