Revert of Refactor Chromoting JNI code to use jni/Client (Java changes only).

remoting/android/java/src/org/chromium/chromoting/Desktop.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;
 
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ skipping 13 matching lines @@
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnLayoutChangeListener;
 import android.view.View.OnTouchListener;
 import android.view.inputmethod.InputMethodManager;
 
 import org.chromium.chromoting.cardboard.DesktopActivity;
 import org.chromium.chromoting.help.HelpContext;
 import org.chromium.chromoting.help.HelpSingleton;
-import org.chromium.chromoting.jni.Client;
+import org.chromium.chromoting.jni.JniInterface;
 
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
 /**
  * A simple screen that does nothing except display a DesktopView and notify it of rotations.
  */
 public class Desktop
         extends AppCompatActivity implements View.OnSystemUiVisibilityChangeListener,
@@ skipping 17 matching lines @@
 
     /** Preference used to track the last input mode selected by the user. */
     private static final String PREFERENCE_INPUT_MODE = "input_mode";
 
     /** The amount of time to wait to hide the Actionbar after user input is seen. */
     private static final int ACTIONBAR_AUTO_HIDE_DELAY_MS = 3000;
 
     /** The surface that displays the remote host's desktop feed. */
     private DesktopView mRemoteHostDesktop;
 
-    private Client mClient;
-
     /** Set of pressed keys for which we've sent TextEvent. */
     private Set<Integer> mPressedTextKeys = new TreeSet<Integer>();
 
     private ActivityLifecycleListener mActivityLifecycleListener;
 
     /** Flag to indicate whether the current activity is switching to Cardboard desktop activity. */
     private boolean mSwitchToCardboardDesktopActivity;
 
     /** Flag to indicate whether to manually hide the system UI when the OSK is dismissed. */
     private boolean mHideSystemUIOnSoftKeyboardDismiss = false;
@@ skipping 13 matching lines @@
     /** Indicates whether the remote host supports touch injection. */
     private CapabilityManager.HostCapability mHostTouchCapability =
             CapabilityManager.HostCapability.UNKNOWN;
 
     /** Called when the activity is first created. */
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.desktop);
 
-        mClient = Client.getInstance();
-
         mToolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(mToolbar);
 
         mRemoteHostDesktop = (DesktopView) findViewById(R.id.desktop_view);
         mRemoteHostDesktop.setDesktop(this);
-        mRemoteHostDesktop.setClient(mClient);
         mSwitchToCardboardDesktopActivity = false;
 
         getSupportActionBar().setDisplayShowTitleEnabled(false);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         // For this Activity, the home button in the action bar acts as a Disconnect button, so
         // set the description for accessibility/screen readers.
         getSupportActionBar().setHomeActionContentDescription(R.string.disconnect_myself_button);
 
         // The action bar is already shown when the activity is started however calling the
         // function below will set our preferred system UI flags which will adjust the layout
         // size of the canvas and we can avoid an initial resize event.
         showActionBar();
 
         View decorView = getWindow().getDecorView();
         decorView.setOnSystemUiVisibilityChangeListener(this);
 
-        mActivityLifecycleListener = mClient.getCapabilityManager().onActivityAcceptingListener(
+        mActivityLifecycleListener = CapabilityManager.getInstance().onActivityAcceptingListener(
                 this, Capabilities.CAST_CAPABILITY);
         mActivityLifecycleListener.onActivityCreated(this, savedInstanceState);
 
         mInputMode = getInitialInputModeValue();
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
             attachKeyboardVisibilityListener();
 
             // Only create an Autohide task if the system supports immersive fullscreen mode.  Older
             // versions of the OS benefit less from this functionality and we don't want to change
@@ skipping 18 matching lines @@
             });
         } else {
             mRemoteHostDesktop.setFitsSystemWindows(true);
         }
     }
 
     @Override
     protected void onStart() {
         super.onStart();
         mActivityLifecycleListener.onActivityStarted(this);
-        mClient.enableVideoChannel(true);
+        JniInterface.enableVideoChannel(true);
         mRemoteHostDesktop.attachRedrawCallback();
-        mClient.getCapabilityManager().addListener(this);
+        CapabilityManager.getInstance().addListener(this);
     }
 
     @Override
     protected void onPause() {
         if (isFinishing()) mActivityLifecycleListener.onActivityPaused(this);
         super.onPause();
         if (!mSwitchToCardboardDesktopActivity) {
-            mClient.enableVideoChannel(false);
+            JniInterface.enableVideoChannel(false);
         }
         stopActionBarAutoHideTimer();
     }
 
     @Override
     public void onResume() {
         super.onResume();
         mActivityLifecycleListener.onActivityResumed(this);
-        mClient.enableVideoChannel(true);
+        JniInterface.enableVideoChannel(true);
         startActionBarAutoHideTimer();
     }
 
     @Override
     protected void onStop() {
-        mClient.getCapabilityManager().removeListener(this);
+        CapabilityManager.getInstance().removeListener(this);
         mActivityLifecycleListener.onActivityStopped(this);
         super.onStop();
         if (mSwitchToCardboardDesktopActivity) {
             mSwitchToCardboardDesktopActivity = false;
         } else {
-            mClient.enableVideoChannel(false);
+            JniInterface.enableVideoChannel(false);
         }
     }
 
     /** Called to initialize the action bar. */
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.desktop_actionbar, menu);
 
         mActivityLifecycleListener.onActivityCreatedOptionsMenu(this, menu);
 
@@ skipping 274 matching lines @@
         }
         if (id == R.id.actionbar_keyboard) {
             ((InputMethodManager) getSystemService(INPUT_METHOD_SERVICE)).toggleSoftInput(0, 0);
             return true;
         }
         if (id == R.id.actionbar_hide) {
             hideActionBar();
             return true;
         }
         if (id == R.id.actionbar_disconnect || id == android.R.id.home) {
-            mClient.destroy();
+            JniInterface.disconnectFromHost();
             return true;
         }
         if (id == R.id.actionbar_send_ctrl_alt_del) {
             int[] keys = {
                 KeyEvent.KEYCODE_CTRL_LEFT,
                 KeyEvent.KEYCODE_ALT_LEFT,
                 KeyEvent.KEYCODE_FORWARD_DEL,
             };
             for (int key : keys) {
-                mClient.sendKeyEvent(0, key, true);
+                JniInterface.sendKeyEvent(0, key, true);
             }
             for (int key : keys) {
-                mClient.sendKeyEvent(0, key, false);
+                JniInterface.sendKeyEvent(0, key, false);
             }
             return true;
         }
         if (id == R.id.actionbar_help) {
             HelpSingleton.getInstance().launchHelp(this, HelpContext.DESKTOP);
             return true;
         }
         return super.onOptionsItemSelected(item);
     }
 
@@ skipping 86 matching lines @@
      * Called once when a keyboard key is pressed, then again when that same key is released. This
      * is not guaranteed to be notified of all soft keyboard events: certian keyboards might not
      * call it at all, while others might skip it in certain situations (e.g. swipe input).
      */
     @Override
     public boolean dispatchKeyEvent(KeyEvent event) {
         int keyCode = event.getKeyCode();
 
         // Dispatch the back button to the system to handle navigation
         if (keyCode == KeyEvent.KEYCODE_BACK) {
-            mClient.destroy();
+            JniInterface.disconnectFromHost();
             return super.dispatchKeyEvent(event);
         }
 
         boolean pressed = event.getAction() == KeyEvent.ACTION_DOWN;
 
         // Physical keyboard must work as if it is connected to the remote host
         // and so events coming from physical keyboard never generate text
         // events. Also scan codes must be used instead of key code, so that
         // the keyboard layout selected on the client doesn't affect the key
         // codes sent to the host.
         if (event.getDeviceId() != KeyCharacterMap.VIRTUAL_KEYBOARD) {
-            return mClient.sendKeyEvent(event.getScanCode(), 0, pressed);
+            return JniInterface.sendKeyEvent(event.getScanCode(), 0, pressed);
         }
 
         // Events received from software keyboards generate TextEvent in two
         // cases:
         //   1. This is an ACTION_MULTIPLE event.
         //   2. Ctrl, Alt and Meta are not pressed.
         // This ensures that on-screen keyboard always injects input that
         // correspond to what user sees on the screen, while physical keyboard
         // acts as if it is connected to the remote host.
         if (event.getAction() == KeyEvent.ACTION_MULTIPLE) {
-            mClient.sendTextEvent(event.getCharacters());
+            JniInterface.sendTextEvent(event.getCharacters());
             return true;
         }
 
         // For Enter getUnicodeChar() returns 10 (line feed), but we still
         // want to send it as KeyEvent.
         int unicode = keyCode != KeyEvent.KEYCODE_ENTER ? event.getUnicodeChar() : 0;
 
         boolean no_modifiers = !event.isAltPressed()
                 && !event.isCtrlPressed() && !event.isMetaPressed();
 
         if (pressed && unicode != 0 && no_modifiers) {
             mPressedTextKeys.add(keyCode);
             int[] codePoints = { unicode };
-            mClient.sendTextEvent(new String(codePoints, 0, 1));
+            JniInterface.sendTextEvent(new String(codePoints, 0, 1));
             return true;
         }
 
         if (!pressed && mPressedTextKeys.contains(keyCode)) {
             mPressedTextKeys.remove(keyCode);
             return true;
         }
 
         switch (keyCode) {
             // KEYCODE_AT, KEYCODE_POUND, KEYCODE_STAR and KEYCODE_PLUS are
             // deprecated, but they still need to be here for older devices and
             // third-party keyboards that may still generate these events. See
             // https://source.android.com/devices/input/keyboard-devices.html#legacy-unsupported-keys
             case KeyEvent.KEYCODE_AT:
-                mClient.sendKeyEvent(0, KeyEvent.KEYCODE_SHIFT_LEFT, pressed);
-                mClient.sendKeyEvent(0, KeyEvent.KEYCODE_2, pressed);
+                JniInterface.sendKeyEvent(0, KeyEvent.KEYCODE_SHIFT_LEFT, pressed);
+                JniInterface.sendKeyEvent(0, KeyEvent.KEYCODE_2, pressed);
                 return true;
 
             case KeyEvent.KEYCODE_POUND:
-                mClient.sendKeyEvent(0, KeyEvent.KEYCODE_SHIFT_LEFT, pressed);
-                mClient.sendKeyEvent(0, KeyEvent.KEYCODE_3, pressed);
+                JniInterface.sendKeyEvent(0, KeyEvent.KEYCODE_SHIFT_LEFT, pressed);
+                JniInterface.sendKeyEvent(0, KeyEvent.KEYCODE_3, pressed);
                 return true;
 
             case KeyEvent.KEYCODE_STAR:
-                mClient.sendKeyEvent(0, KeyEvent.KEYCODE_SHIFT_LEFT, pressed);
-                mClient.sendKeyEvent(0, KeyEvent.KEYCODE_8, pressed);
+                JniInterface.sendKeyEvent(0, KeyEvent.KEYCODE_SHIFT_LEFT, pressed);
+                JniInterface.sendKeyEvent(0, KeyEvent.KEYCODE_8, pressed);
                 return true;
 
             case KeyEvent.KEYCODE_PLUS:
-                mClient.sendKeyEvent(0, KeyEvent.KEYCODE_SHIFT_LEFT, pressed);
-                mClient.sendKeyEvent(0, KeyEvent.KEYCODE_EQUALS, pressed);
+                JniInterface.sendKeyEvent(0, KeyEvent.KEYCODE_SHIFT_LEFT, pressed);
+                JniInterface.sendKeyEvent(0, KeyEvent.KEYCODE_EQUALS, pressed);
                 return true;
 
             default:
                 // We try to send all other key codes to the host directly.
-                return mClient.sendKeyEvent(0, keyCode, pressed);
+                return JniInterface.sendKeyEvent(0, keyCode, pressed);
         }
     }
 }