Cleanups in ChromotingClient

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 268 matching lines @@
      * @param pin The entered PIN.
      * @param createPair Whether to create a new pairing for this client.
      * @param deviceName The device name to appear in the pairing registry. Only used if createPair
      *                   is true.
      */
     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, byte[] id, byte[] secret) {
-        sContext.getPreferences(Activity.MODE_PRIVATE).edit().
-                putString(host + "_id", new String(id)).
-                putString(host + "_secret", new String(secret)).
-                apply();
+    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();
+        }
     }
 
     /**
      * Moves the mouse cursor, possibly while clicking the specified (nonnegative) button. Called
      * on the UI thread.
      */
     public static void sendMouseEvent(int x, int y, int whichButton, boolean buttonDown) {
         if (!sConnected) {
             return;
         }
@@ skipping 140 matching lines @@
     public static void fetchThirdPartyToken(String tokenUrl, String clientId, String scope) {
         Chromoting app = (Chromoting) sContext;
         app.fetchThirdPartyToken(tokenUrl, clientId, scope);
     }
 
     /**
      * Notify the native code to continue authentication with the |token| and the |sharedSecret|.
      */
     public static native void nativeOnThirdPartyTokenFetched(String token, String sharedSecret);
 }