renaming/removing fingerprints should be reflected in UI if fingerprintservice lags
Bug: 30252265
Test: manual
Change-Id: I27761608e52f1437fc7a43bfb48a1f09922d1c0f
diff --git a/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java b/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java
new file mode 100644
index 0000000..e98ea4d
--- /dev/null
+++ b/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.fingerprint;
+
+import android.annotation.Nullable;
+import android.app.Activity;
+import android.content.Context;
+import android.hardware.fingerprint.Fingerprint;
+import android.hardware.fingerprint.FingerprintManager;
+import android.os.Bundle;
+import com.android.settings.Utils;
+import com.android.settings.core.lifecycle.ObservablePreferenceFragment;
+import android.os.UserHandle;
+import java.util.Queue;
+import java.util.LinkedList;
+import android.util.Log;
+
+/**
+ * Sidecar fragment to handle the state around fingerprint removal.
+ */
+public class FingerprintRemoveSidecar extends ObservablePreferenceFragment {
+
+ private static final String TAG = "FingerprintRemoveSidecar";
+ private Listener mListener;
+ private Fingerprint mFingerprintRemoving;
+ private Queue<Object> mFingerprintsRemoved;
+ FingerprintManager mFingerprintManager;
+
+ private class RemovalError {
+ Fingerprint fingerprint;
+ int errMsgId;
+ CharSequence errString;
+ public RemovalError(Fingerprint fingerprint, int errMsgId, CharSequence errString) {
+ this.fingerprint = fingerprint;
+ this.errMsgId = errMsgId;
+ this.errString = errString;
+ }
+ }
+
+ private FingerprintManager.RemovalCallback
+ mRemoveCallback = new FingerprintManager.RemovalCallback() {
+ @Override
+ public void onRemovalSucceeded(Fingerprint fingerprint) {
+ if (mListener != null) {
+ mListener.onRemovalSucceeded(fingerprint);
+ } else {
+ mFingerprintsRemoved.add(fingerprint);
+ };
+ mFingerprintRemoving = null;
+ }
+
+ @Override
+ public void onRemovalError(Fingerprint fp, int errMsgId, CharSequence errString) {
+ if (mListener != null) {
+ mListener.onRemovalError(fp, errMsgId, errString);
+ } else {
+ mFingerprintsRemoved.add(new RemovalError(fp, errMsgId, errString));
+ }
+ mFingerprintRemoving = null;
+ }
+ };
+
+ public void startRemove(Fingerprint fingerprint, int userId) {
+ if (mFingerprintRemoving != null) {
+ Log.e(TAG, "Remove already in progress");
+ return;
+ }
+ if (userId != UserHandle.USER_NULL) {
+ mFingerprintManager.setActiveUser(userId);
+ }
+ mFingerprintRemoving = fingerprint;
+ mFingerprintManager.remove(fingerprint, userId, mRemoveCallback);;
+ }
+
+ public FingerprintRemoveSidecar() {
+ mFingerprintsRemoved = new LinkedList<>();
+ }
+
+ public void setFingerprintManager(FingerprintManager fingerprintManager) {
+ mFingerprintManager = fingerprintManager;
+ }
+
+ @Override
+ public void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setRetainInstance(true);
+ }
+
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ }
+
+ @Override
+ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+ }
+
+ public void setListener(Listener listener) {
+ if (mListener == null && listener != null) {
+ while (!mFingerprintsRemoved.isEmpty()) {
+ Object o = mFingerprintsRemoved.poll();
+ if (o instanceof Fingerprint) {
+ listener.onRemovalSucceeded((Fingerprint)o);
+ } else if (o instanceof RemovalError) {
+ RemovalError e = (RemovalError) o;
+ listener.onRemovalError(e.fingerprint, e.errMsgId, e.errString);
+ }
+ }
+ }
+ mListener = listener;
+ }
+
+ public interface Listener {
+ void onRemovalSucceeded(Fingerprint fingerprint);
+ void onRemovalError(Fingerprint fp, int errMsgId, CharSequence errString);
+ }
+
+ final boolean isRemovingFingerprint(int fid) {
+ return inProgress() && mFingerprintRemoving.getFingerId() == fid;
+ }
+
+ final boolean inProgress() {
+ return mFingerprintRemoving != null;
+ }
+
+}
diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java
index 0f48f8c..5c76650 100644
--- a/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/fingerprint/FingerprintSettings.java
@@ -31,7 +31,6 @@
import android.hardware.fingerprint.FingerprintManager;
import android.hardware.fingerprint.FingerprintManager.AuthenticationCallback;
import android.hardware.fingerprint.FingerprintManager.AuthenticationResult;
-import android.hardware.fingerprint.FingerprintManager.RemovalCallback;
import android.os.Bundle;
import android.os.CancellationSignal;
import android.os.Handler;
@@ -64,11 +63,11 @@
import com.android.settings.Utils;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.widget.FooterPreference;
-import com.android.settings.widget.FooterPreferenceMixin;
import com.android.settingslib.HelpUtils;
import com.android.settingslib.RestrictedLockUtils;
import java.util.List;
+import java.util.HashMap;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -160,6 +159,10 @@
private Drawable mHighlightDrawable;
private int mUserId;
+ private static final String TAG_REMOVAL_SIDECAR = "removal_sidecar";
+ private FingerprintRemoveSidecar mRemovalSidecar;
+ private HashMap<Integer, String> mFingerprintsRenaming;
+
private AuthenticationCallback mAuthCallback = new AuthenticationCallback() {
@Override
public void onAuthenticationSucceeded(AuthenticationResult result) {
@@ -184,22 +187,30 @@
.sendToTarget();
}
};
- private RemovalCallback mRemoveCallback = new RemovalCallback() {
- @Override
+ FingerprintRemoveSidecar.Listener mRemovalListener =
+ new FingerprintRemoveSidecar.Listener() {
public void onRemovalSucceeded(Fingerprint fingerprint) {
mHandler.obtainMessage(MSG_REFRESH_FINGERPRINT_TEMPLATES,
fingerprint.getFingerId(), 0).sendToTarget();
+ updateDialog();
}
-
- @Override
public void onRemovalError(Fingerprint fp, int errMsgId, CharSequence errString) {
final Activity activity = getActivity();
if (activity != null) {
Toast.makeText(activity, errString, Toast.LENGTH_SHORT);
}
+ updateDialog();
+ }
+ private void updateDialog() {
+ RenameDeleteDialog renameDeleteDialog = (RenameDeleteDialog)getFragmentManager().
+ findFragmentByTag(RenameDeleteDialog.class.getName());
+ if (renameDeleteDialog != null) {
+ renameDeleteDialog.enableDelete();
+ }
}
};
+
private final Handler mHandler = new Handler() {
@Override
public void handleMessage(android.os.Message msg) {
@@ -263,6 +274,9 @@
}
private void retryFingerprint() {
+ if (mRemovalSidecar.inProgress()) {
+ return;
+ }
if (!mInFingerprintLockout) {
mFingerprintCancel = new CancellationSignal();
mFingerprintManager.authenticate(null, mFingerprintCancel, 0 /* flags */,
@@ -278,7 +292,31 @@
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+
+ Activity activity = getActivity();
+ mFingerprintManager = Utils.getFingerprintManagerOrNull(activity);
+
+ mRemovalSidecar = (FingerprintRemoveSidecar)
+ getFragmentManager().findFragmentByTag(TAG_REMOVAL_SIDECAR);
+ if (mRemovalSidecar == null) {
+ mRemovalSidecar = new FingerprintRemoveSidecar();
+ getFragmentManager().beginTransaction()
+ .add(mRemovalSidecar, TAG_REMOVAL_SIDECAR).commit();
+ }
+ mRemovalSidecar.setFingerprintManager(mFingerprintManager);
+ mRemovalSidecar.setListener(mRemovalListener);
+
+ RenameDeleteDialog renameDeleteDialog = (RenameDeleteDialog)getFragmentManager().
+ findFragmentByTag(RenameDeleteDialog.class.getName());
+ if (renameDeleteDialog != null) {
+ renameDeleteDialog.setDeleteInProgress(mRemovalSidecar.inProgress());
+ }
+
+ mFingerprintsRenaming = new HashMap<Integer, String>();
+
if (savedInstanceState != null) {
+ mFingerprintsRenaming = (HashMap<Integer, String>)
+ savedInstanceState.getSerializable("mFingerprintsRenaming");
mToken = savedInstanceState.getByteArray(
ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
mLaunchedConfirm = savedInstanceState.getBoolean(
@@ -287,9 +325,6 @@
mUserId = getActivity().getIntent().getIntExtra(
Intent.EXTRA_USER_ID, UserHandle.myUserId());
- Activity activity = getActivity();
- mFingerprintManager = Utils.getFingerprintManagerOrNull(activity);
-
// Need to authenticate a session token if none
if (mToken == null && mLaunchedConfirm == false) {
mLaunchedConfirm = true;
@@ -347,6 +382,12 @@
pref.setFingerprint(item);
pref.setPersistent(false);
pref.setIcon(R.drawable.ic_fingerprint_24dp);
+ if (mRemovalSidecar.isRemovingFingerprint(item.getFingerId())) {
+ pref.setEnabled(false);
+ }
+ if (mFingerprintsRenaming.containsKey(item.getFingerId())) {
+ pref.setTitle(mFingerprintsRenaming.get(item.getFingerId()));
+ }
root.addPreference(pref);
pref.setOnPreferenceChangeListener(this);
}
@@ -364,11 +405,14 @@
final int max = getContext().getResources().getInteger(
com.android.internal.R.integer.config_fingerprintMaxTemplatesPerUser);
boolean tooMany = mFingerprintManager.getEnrolledFingerprints(mUserId).size() >= max;
+ // retryFingerprint() will be called when remove finishes
+ // need to disable enroll or have a way to determine if enroll is in progress
+ final boolean removalInProgress = mRemovalSidecar.inProgress();
CharSequence maxSummary = tooMany ?
getContext().getString(R.string.fingerprint_add_max, max) : "";
Preference addPreference = findPreference(KEY_FINGERPRINT_ADD);
addPreference.setSummary(maxSummary);
- addPreference.setEnabled(!tooMany);
+ addPreference.setEnabled(!tooMany && !removalInProgress);
}
private static String genKey(int id) {
@@ -399,6 +443,7 @@
outState.putByteArray(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN,
mToken);
outState.putBoolean(KEY_LAUNCHED_CONFIRM, mLaunchedConfirm);
+ outState.putSerializable("mFingerprintsRenaming", mFingerprintsRenaming);
}
@Override
@@ -413,7 +458,7 @@
startActivityForResult(intent, ADD_FINGERPRINT_REQUEST);
} else if (pref instanceof FingerprintPreference) {
FingerprintPreference fpref = (FingerprintPreference) pref;
- final Fingerprint fp =fpref.getFingerprint();
+ final Fingerprint fp = fpref.getFingerprint();
showRenameDeleteDialog(fp);
return super.onPreferenceTreeClick(pref);
}
@@ -423,7 +468,14 @@
private void showRenameDeleteDialog(final Fingerprint fp) {
RenameDeleteDialog renameDeleteDialog = new RenameDeleteDialog();
Bundle args = new Bundle();
- args.putParcelable("fingerprint", fp);
+ if (mFingerprintsRenaming.containsKey(fp.getFingerId())) {
+ final Fingerprint f = new Fingerprint(mFingerprintsRenaming.get(fp.getFingerId()),
+ fp.getGroupId(), fp.getFingerId(), fp.getDeviceId());
+ args.putParcelable("fingerprint", f);
+ } else {
+ args.putParcelable("fingerprint", fp);
+ }
+ renameDeleteDialog.setDeleteInProgress(mRemovalSidecar.inProgress());
renameDeleteDialog.setArguments(args);
renameDeleteDialog.setTargetFragment(this, 0);
renameDeleteDialog.show(getFragmentManager(), RenameDeleteDialog.class.getName());
@@ -481,6 +533,7 @@
Log.w(TAG, "postEnroll failed: result = " + result);
}
}
+ mRemovalSidecar.setListener(null);
}
private Drawable getHighlightDrawable() {
@@ -535,11 +588,16 @@
}
private void deleteFingerPrint(Fingerprint fingerPrint) {
- mFingerprintManager.remove(fingerPrint, mUserId, mRemoveCallback);
+ mRemovalSidecar.startRemove(fingerPrint, mUserId);
+ String name = genKey(fingerPrint.getFingerId());
+ Preference prefToRemove = findPreference(name);
+ prefToRemove.setEnabled(false);
+ updateAddPreference();
}
private void renameFingerPrint(int fingerId, String newName) {
mFingerprintManager.rename(fingerId, mUserId, newName);
+ mFingerprintsRenaming.put(fingerId, newName);
updatePreferences();
}
@@ -559,7 +617,12 @@
private Boolean mTextHadFocus;
private int mTextSelectionStart;
private int mTextSelectionEnd;
+ private AlertDialog mAlertDialog;
+ private boolean mDeleteInProgress;
+ public void setDeleteInProgress(boolean deleteInProgress) {
+ mDeleteInProgress = deleteInProgress;
+ }
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
mFp = getArguments().getParcelable("fingerprint");
@@ -569,7 +632,7 @@
mTextSelectionStart = savedInstanceState.getInt("startSelection");
mTextSelectionEnd = savedInstanceState.getInt("endSelection");
}
- final AlertDialog alertDialog = new AlertDialog.Builder(getActivity())
+ mAlertDialog = new AlertDialog.Builder(getActivity())
.setView(R.layout.fingerprint_rename_dialog)
.setPositiveButton(R.string.security_settings_fingerprint_enroll_dialog_ok,
new DialogInterface.OnClickListener() {
@@ -603,10 +666,10 @@
}
})
.create();
- alertDialog.setOnShowListener(new DialogInterface.OnShowListener() {
+ mAlertDialog.setOnShowListener(new DialogInterface.OnShowListener() {
@Override
public void onShow(DialogInterface dialog) {
- mDialogTextField = (EditText) alertDialog.findViewById(
+ mDialogTextField = (EditText) mAlertDialog.findViewById(
R.id.fingerprint_rename_field);
CharSequence name = mFingerName == null ? mFp.getName() : mFingerName;
mDialogTextField.setText(name);
@@ -615,14 +678,24 @@
} else {
mDialogTextField.setSelection(mTextSelectionStart, mTextSelectionEnd);
}
+ if (mDeleteInProgress) {
+ mAlertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(false);
+ }
}
});
if (mTextHadFocus == null || mTextHadFocus) {
// Request the IME
- alertDialog.getWindow().setSoftInputMode(
+ mAlertDialog.getWindow().setSoftInputMode(
WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
}
- return alertDialog;
+ return mAlertDialog;
+ }
+
+ public void enableDelete() {
+ mDeleteInProgress = false;
+ if (mAlertDialog != null) {
+ mAlertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(true);
+ }
}
private void onDeleteClick(DialogInterface dialog) {