Capabilities + Extensions + Cast Host Extension Support for Android client

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;
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.Point;
 import android.os.Build;
 import android.os.Looper;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
+import org.chromium.chromoting.CapabilityManager;
 import org.chromium.chromoting.Chromoting;
 import org.chromium.chromoting.R;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
 /**
  * Initializes the Chromium remoting library, and provides JNI calls into it.
  * All interaction with the native code is centralized in this class.
  */
@@ skipping 101 matching lines @@
 
     /** Protects access to sFrameBitmap. */
     private static final Object sFrameLock = new Object();
 
     /** Position of cursor hot-spot. Accessed on the graphics thread. */
     private static Point sCursorHotspot = new Point();
 
     /** Bitmap holding the cursor shape. Accessed on the graphics thread. */
     private static Bitmap sCursorBitmap = null;
 
+    /** Capability Manager through which capabilities and extensions are handled. */
+    private static CapabilityManager sCapabilityManager = CapabilityManager.getInstance();
+
     /**
      * To be called once from the main Activity. Any subsequent calls will update the application
      * context, but not reload the library. This is useful e.g. when the activity is closed and the
      * user later wants to return to the application. Called on the UI thread.
      */
     public static void loadLibrary(Activity context) {
         sContext = context;
 
         if (sLoaded) return;
 
@@ skipping 14 matching lines @@
     public static native String nativeGetClientSecret();
 
     /** Attempts to form a connection to the user-selected host. Called on the UI thread. */
     public static void connectToHost(String username, String authToken,
             String hostJid, String hostId, String hostPubkey, ConnectionListener listener) {
         disconnectFromHost();
 
         sConnectionListener = listener;
         SharedPreferences prefs = sContext.getPreferences(Activity.MODE_PRIVATE);
         nativeConnect(username, authToken, hostJid, hostId, hostPubkey,
-                prefs.getString(hostId + "_id", ""), prefs.getString(hostId + "_secret", ""));
+            prefs.getString(hostId + "_id", ""), prefs.getString(hostId + "_secret", ""),

[Lambros, 2014/08/14 23:54:25]

nit: 8-space indent

[aiguha, 2014/08/15 03:37:30]

Done.

+            sCapabilityManager.getLocalCapabilities());
         sConnected = true;
     }
 
     /** Performs the native portion of the connection. */
-    private static native void nativeConnect(String username, String authToken, String hostJid,
-            String hostId, String hostPubkey, String pairId, String pairSecret);
+    private static native void nativeConnect(
+        String username, String authToken, String hostJid, String hostId, String hostPubkey,

[Lambros, 2014/08/14 23:54:25]

nit: 8-space indent. Also you can begin the parameters after the '('.

[aiguha, 2014/08/15 03:37:30]

Done.

+        String pairId, String pairSecret, String capabilities);
 
     /** Severs the connection and cleans up. Called on the UI thread. */
     public static void disconnectFromHost() {
         if (!sConnected) {
             return;
         }
 
         sConnectionListener.onConnectionState(ConnectionListener.State.CLOSED,
                 ConnectionListener.Error.OK);
 
@@ skipping 286 matching lines @@
     public static void onThirdPartyTokenFetched(String token, String sharedSecret) {
         if (!sConnected) {
             return;
         }
 
         nativeOnThirdPartyTokenFetched(token, sharedSecret);
     }
 
     /** Passes authentication data to the native handling code. */
     private static native void nativeOnThirdPartyTokenFetched(String token, String sharedSecret);
+
+    //
+    // Host and Client Capabilities
+    //
+
+    /** Set the list of negotiated capabilities between host and client. Called on the UI thread. */
+    @CalledByNative
+    public static void setCapabilities(String capabilities) {
+        sCapabilityManager.setNegotiatedCapabilities(capabilities);
+    }
+
+    //
+    // Extension Message Handling
+    //
+
+    /** Passes on the deconstructed ExtensionMessage to the app. Called on the UI thread. */
+    @CalledByNative
+    public static void handleExtensionMessage(String type, String data) {
+        sCapabilityManager.onExtensionMessage(type, data);
+    }
+

[Lambros, 2014/08/14 23:54:25]

nit: only one blank line

[aiguha, 2014/08/15 03:37:30]

Done.

+
+    public static void sendExtensionMessage(String type, String data) {

[Lambros, 2014/08/14 23:54:25]

Add some JavaDoc. And say which thread this should be called on.

[aiguha, 2014/08/15 03:37:30]

Done.

+        if (!sConnected)

[Lambros, 2014/08/14 23:54:25]

nit: Add braces, consistent with above.

[aiguha, 2014/08/15 03:37:30]

Done.

+            return;
+
+        nativeSendExtensionMessage(type, data);
+    }
+
+    private static native void nativeSendExtensionMessage(String type, String data);
 }