Chromoting Android app mouse/keyboard bugfixes and enhancements

remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chromoting.jni;
 
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ skipping 180 matching lines @@
         if (sRedrawCallback != null)
             sRedrawCallback.run();
     }
 
     /**
      * Obtains the image buffer.
      * This should not be called from the UI thread. (We prefer the native graphics thread.)
      */
     public static Bitmap retrieveVideoFrame() {
         if (Looper.myLooper() == Looper.getMainLooper()) {
-            Log.w("deskview", "Canvas being redrawn on UI thread");
+            Log.w("jniiface", "Canvas being redrawn on UI thread");
         }
 
         if (!sConnected) {
             return null;
         }
 
         int[] frame = new int[sWidth * sHeight];
 
         sBuffer.order(ByteOrder.LITTLE_ENDIAN);
         sBuffer.asIntBuffer().get(frame, 0, frame.length);
 
         return Bitmap.createBitmap(frame, 0, sWidth, sWidth, sHeight, Bitmap.Config.ARGB_8888);
     }
 
-    /** Moves the mouse cursor, possibly while clicking. */
+    /** Moves the mouse cursor, possibly while clicking the specified (nonnegative) button. */
     public static void mouseAction(int x, int y, int whichButton, boolean buttonDown) {
+        if (whichButton < 0) {
+            Log.e("jniiface", "Attempted to press a negative mouse button");

[garykac, 2013/07/30 17:50:05]

Why are there negative buttons?  Isn't this constrained to be 0, 1 and 3 (or
something like that)?

[solb, 2013/07/30 18:28:54]

Yes, it is constrained thusly. However, I added these error-checks to enforce
these methods' contracts and prevent them from ever sending invalid button/key
presses to the host.

+            return;
+        }
         if (!sConnected) {
             return;
         }
 
         mouseActionNative(x, y, whichButton, buttonDown);
     }
 
-    /** Presses and releases the specified key. */
+    /** Presses and releases the specified (nonnegative) key. */
     public static void keyboardAction(int keyCode, boolean keyDown) {
+        if (keyCode < 0) {
+            Log.e("jniiface", "Attempted to hit a negative key");
+            return;
+        }
         if (!sConnected) {
             return;
         }
 
         keyboardActionNative(keyCode, keyDown);
     }
 
     /** Performs the native response to the user's PIN. */
     private static native void authenticationResponse(String pin);
 
     /** Schedules a redraw on the native graphics thread. */
     private static native void scheduleRedrawNative();
 
     /** Passes mouse information to the native handling code. */
     private static native void mouseActionNative(int x, int y, int whichButton, boolean buttonDown);
 
     /** Passes key press information to the native handling code. */
     private static native void keyboardActionNative(int keyCode, boolean keyDown);
 }