Pull authentication UX code out of JniInterface

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

Index: remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java
diff --git a/remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java b/remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java
index a4f2fc5c01d86d1d36fd4882fe2824a436f8abd1..db2e3b2aeb8df2c4751e34ca17cf89ac5c93d766 100644
--- a/remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java
+++ b/remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java
@@ -4,27 +4,18 @@
 
 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 org.chromium.chromoting.SessionAuthenticator;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -41,8 +32,8 @@ public class JniInterface {
     /** Whether the library has been loaded. Accessed on the UI thread. */
     private static boolean sLoaded = false;
 
-    /** The application context. Accessed on the UI thread. */
-    private static Activity sContext = null;
+    /** Used for authentication-related UX during connection. Accessed on the UI thread. */
+    private static SessionAuthenticator sAuthenticator = null;
 
     /** Interface used for connection state notifications. */
     public interface ConnectionListener {
@@ -152,8 +143,8 @@ public class JniInterface {
      * 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;
+    public static void loadLibrary(Chromoting context) {
+        sAuthenticator = new SessionAuthenticator(context);

[Sergey Ulanov, 2015/03/09 18:14:53]

Ideally SessionAuthenticator should be an interface and JNI layer shouldn't be
responsible for creating it.

I think it's better to pass authenticator from the activity and it belongs to
connectoToHost(), not here. This would also allow to remove dependency on
Chromoting class

[Lambros, 2015/03/14 00:42:18]

Done, except for making SessionAuthenticator an interface. Can that wait, or
shall I do it here?

 
         if (sLoaded) return;
 
@@ -173,15 +164,19 @@ public class JniInterface {
     public static native String nativeGetClientId();
     public static native String nativeGetClientSecret();
 
+    /** Returns whether the client is connected. */
+    public static boolean isConnected() {
+        return sConnected;
+    }
+
     /** 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", ""),
+                sAuthenticator.getPairingId(hostId), sAuthenticator.getPairingSecret(hostId),
                 sCapabilityManager.getLocalCapabilities());
         sConnected = true;
     }
@@ -238,69 +233,7 @@ public class JniInterface {
     /** Prompts the user to enter a PIN. Called on the UI thread. */
     @CalledByNative
     private static void displayAuthenticationPrompt(boolean pairingSupported) {
-        AlertDialog.Builder pinPrompt = new AlertDialog.Builder(sContext);
-        pinPrompt.setTitle(sContext.getString(R.string.title_authenticate));
-        pinPrompt.setMessage(sContext.getString(R.string.pin_message_android));
-        pinPrompt.setIcon(android.R.drawable.ic_lock_lock);
-
-        final View pinEntry = sContext.getLayoutInflater().inflate(R.layout.pin_dialog, null);
-        pinPrompt.setView(pinEntry);
-
-        final TextView pinTextView = (TextView) pinEntry.findViewById(R.id.pin_dialog_text);
-        final CheckBox pinCheckBox = (CheckBox) pinEntry.findViewById(R.id.pin_dialog_check);
-
-        if (!pairingSupported) {
-            pinCheckBox.setChecked(false);
-            pinCheckBox.setVisibility(View.GONE);
-        }
-
-        pinPrompt.setPositiveButton(
-                R.string.connect_button, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        Log.i("jniiface", "User provided a PIN code");
-                        if (sConnected) {
-                            nativeAuthenticationResponse(String.valueOf(pinTextView.getText()),
-                                    pinCheckBox.isChecked(), Build.MODEL);
-                        } else {
-                            String message = sContext.getString(R.string.error_network_error);
-                            Toast.makeText(sContext, message, Toast.LENGTH_LONG).show();
-                        }
-                    }
-                });
-
-        pinPrompt.setNegativeButton(
-                R.string.cancel, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        Log.i("jniiface", "User canceled pin entry prompt");
-                        disconnectFromHost();
-                    }
-                });
-
-        final AlertDialog pinDialog = pinPrompt.create();
-
-        pinTextView.setOnEditorActionListener(
-                new TextView.OnEditorActionListener() {
-                    @Override
-                    public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                        // The user pressed enter on the keypad (equivalent to the connect button).
-                        pinDialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick();
-                        pinDialog.dismiss();
-                        return true;
-                    }
-                });
-
-        pinDialog.setOnCancelListener(
-                new DialogInterface.OnCancelListener() {
-                    @Override
-                    public void onCancel(DialogInterface dialog) {
-                        // The user backed out of the dialog (equivalent to the cancel button).
-                        pinDialog.getButton(AlertDialog.BUTTON_NEGATIVE).performClick();
-                    }
-                });
-
-        pinDialog.show();
+        sAuthenticator.displayAuthenticationPrompt(pairingSupported);
     }
 
     /**
@@ -310,24 +243,20 @@ public class JniInterface {
      * @param deviceName The device name to appear in the pairing registry. Only used if createPair
      *                   is true.
      */
+    public static void handleAuthenticationResponse(String pin, boolean createPair,
+            String deviceName) {
+        assert sConnected;
+        nativeAuthenticationResponse(pin, createPair, deviceName);
+    }
+
+    /** Native implementation of handleAuthenticationResponse(). */
     private static native void nativeAuthenticationResponse(String pin, boolean createPair,
             String deviceName);
 
     /** Saves newly-received pairing credentials to permanent storage. Called on the UI thread. */
     @CalledByNative
     private static void commitPairingCredentials(String host, String id, String secret) {
-        // Empty |id| indicates that pairing needs to be removed.
-        if (id.isEmpty()) {
-            sContext.getPreferences(Activity.MODE_PRIVATE).edit()
-                    .remove(host + "_id")
-                    .remove(host + "_secret")
-                    .apply();
-        } else {
-            sContext.getPreferences(Activity.MODE_PRIVATE).edit()
-                    .putString(host + "_id", id)
-                    .putString(host + "_secret", secret)
-                    .apply();
-        }
+        sAuthenticator.commitPairingCredentials(host, id, secret);
     }
 
     /**
@@ -498,8 +427,7 @@ public class JniInterface {
     /** Pops up a third party login page to fetch the token required for authentication. */
     @CalledByNative
     public static void fetchThirdPartyToken(String tokenUrl, String clientId, String scope) {
-        Chromoting app = (Chromoting) sContext;
-        app.fetchThirdPartyToken(tokenUrl, clientId, scope);
+        sAuthenticator.fetchThirdPartyToken(tokenUrl, clientId, scope);
     }
 
     /**