[Remoting Android] Fix split-screen crash

remoting/android/java/src/org/chromium/chromoting/DesktopView.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.content.Context;
 import android.text.InputType;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.SurfaceView;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
 
 import org.chromium.chromoting.jni.Client;
 
 /**
  * The class for viewing and interacting with a specific remote host.
  */
 public final class DesktopView extends SurfaceView {
 
     private final Event.Raisable<TouchEventParameter> mOnTouch = new Event.Raisable<>();
 
     /** The parent Desktop activity. */
     private Desktop mDesktop;
 
-    private RenderStub mRenderStub;
-
     private TouchInputHandler mInputHandler;
 
     private InputEventSender mInputEventSender;
 
     public DesktopView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         // Give this view keyboard focus, allowing us to customize the soft keyboard's settings.
         setFocusableInTouchMode(true);
     }
 
     /**
      * Initializes the view.
      */
     public void init(Client client, Desktop desktop, RenderStub renderStub) {
         Preconditions.isNull(mDesktop);
-        Preconditions.isNull(mRenderStub);
+        Preconditions.isNull(mInputHandler);
         Preconditions.isNull(mInputEventSender);
         Preconditions.notNull(desktop);
         Preconditions.notNull(renderStub);
+
         mDesktop = desktop;
-        mRenderStub = renderStub;
         mInputEventSender = new InputEventSender(client);
+        renderStub.setDesktopView(this);
+        mInputHandler = new TouchInputHandler(this, mDesktop, renderStub, mInputEventSender);
     }
 
-    @Override
-    public void onAttachedToWindow() {
-        Preconditions.isNull(mInputHandler);
-        super.onAttachedToWindow();
-        mRenderStub.setDesktopView(this);
-        mInputHandler = new TouchInputHandler(this, mDesktop, mRenderStub, mInputEventSender);
-    }
-
-    @Override
-    public void onDetachedFromWindow() {
+    /**
+     * Destroys the view. Should be called in {@link android.app.Activity#onDestroy()}.
+     */
+    public void destroy() {
         mInputHandler.detachEventListeners();
-        super.onDetachedFromWindow();
     }
 
     // TODO(yuweih): move showActionBar and showKeyboard out of this class.
     /** Shows the action bar. */
     public final void showActionBar() {
         mDesktop.showSystemUi();
     }
 
     /** Shows the software keyboard. */
     public final void showKeyboard() {
@@ skipping 26 matching lines @@
     }
 
     /** Called whenever the user attempts to touch the canvas. */
     @Override
     public final boolean onTouchEvent(MotionEvent event) {
         TouchEventParameter parameter = new TouchEventParameter(event);
         mOnTouch.raise(parameter);
         return parameter.handled;
     }
 }