2 files changed, 145 insertions, 10 deletions

diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
new file mode 100644
index 0000000..7b07c64
--- /dev/null
+++ b/src/com/android/settings/CryptKeeper.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2011 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;
+
+import com.android.internal.widget.PasswordEntryKeyboardHelper;
+import com.android.internal.widget.PasswordEntryKeyboardView;
+
+import android.app.Activity;
+import android.app.StatusBarManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.inputmethodservice.KeyboardView;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.ServiceManager;
+import android.os.SystemProperties;
+import android.os.storage.IMountService;
+import android.text.format.DateFormat;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.inputmethod.EditorInfo;
+import android.widget.TextView;
+
+import java.util.Date;
+
+public class CryptKeeper extends Activity implements TextView.OnEditorActionListener {
+    private static final String DECRYPT_STATE = "trigger_restart_framework";
+    
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.crypt_keeper);
+        
+        String state = SystemProperties.get("vold.decrypt");
+        if ("".equals(state) || DECRYPT_STATE.equals(state)) {
+            PackageManager pm = getPackageManager();
+            ComponentName name = new ComponentName(this, CryptKeeper.class);
+            pm.setComponentEnabledSetting(name, PackageManager.COMPONENT_ENABLED_STATE_DISABLED, 0);
+            return;
+        }
+        
+        TextView passwordEntry = (TextView) findViewById(R.id.passwordEntry);
+        passwordEntry.setOnEditorActionListener(this);
+        
+        KeyboardView keyboardView = (PasswordEntryKeyboardView) findViewById(R.id.keyboard);
+        
+        PasswordEntryKeyboardHelper keyboardHelper = new PasswordEntryKeyboardHelper(this,
+                keyboardView, passwordEntry, false);
+        keyboardHelper.setKeyboardMode(PasswordEntryKeyboardHelper.KEYBOARD_MODE_ALPHA);
+
+
+        passwordEntry.setCompoundDrawablesWithIntrinsicBounds(android.R.drawable.ic_lock_idle_lock,
+                0, 0, 0);
+
+        String dateFormatString = getString(com.android.internal.R.string.full_wday_month_day_no_year);
+        TextView date = (TextView) findViewById(R.id.date);
+        date.setText(DateFormat.format(dateFormatString, new Date()));
+
+        // Disable the status bar
+        StatusBarManager sbm = (StatusBarManager) getSystemService(Context.STATUS_BAR_SERVICE);
+        sbm.disable(StatusBarManager.DISABLE_EXPAND | StatusBarManager.DISABLE_NOTIFICATION_ICONS
+                | StatusBarManager.DISABLE_NOTIFICATION_ALERTS
+                | StatusBarManager.DISABLE_SYSTEM_INFO | StatusBarManager.DISABLE_NAVIGATION);
+    }
+
+    private IMountService getMountService() {
+        IBinder service = ServiceManager.getService("mount");
+        if (service != null) {
+            return IMountService.Stub.asInterface(service);
+        }
+        return null;
+    }
+
+    @Override
+    public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+        if (actionId == EditorInfo.IME_NULL) {
+            // Get the password
+            String password = v.getText().toString();
+
+            // Now that we have the password clear the password field.
+            v.setText(null);
+
+            IMountService service = getMountService();
+            try {
+                service.decryptStorage(password);
+
+                // For now the only way to get here is for the password to be
+                // wrong.
+
+                TextView tv = (TextView) findViewById(R.id.status);
+                tv.setText(R.string.try_again);
+
+            } catch (Exception e) {
+                Log.e("CryptKeeper", "Error while decrypting...", e);
+            }
+            
+            return true;
+        }
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index 9ada710..28dc93a 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -50,7 +50,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements
     private PreferenceScreen mConfigure;
 
     private static final int DIALOG_ERASE_BACKUP = 2;
-    private int     mDialogType;
+    private int mDialogType;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -74,6 +74,14 @@ public class PrivacySettings extends SettingsPreferenceFragment implements
     }
 
     @Override
+    public void onResume() {
+        super.onResume();
+
+        // Refresh UI
+        updateToggles();
+    }
+
+    @Override
     public void onStop() {
         if (mConfirmDialog != null && mConfirmDialog.isShowing()) {
             mConfirmDialog.dismiss();
@@ -105,7 +113,6 @@ public class PrivacySettings extends SettingsPreferenceFragment implements
                 }
             }
         }
-
         return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
 
@@ -147,25 +154,36 @@ public class PrivacySettings extends SettingsPreferenceFragment implements
                 Settings.Secure.BACKUP_AUTO_RESTORE, 1) == 1);
         mAutoRestore.setEnabled(backupEnabled);
 
-        mConfigure.setEnabled(configIntent != null);
+        final boolean configureEnabled = (configIntent != null) && backupEnabled;
+        mConfigure.setEnabled(configureEnabled);
         mConfigure.setIntent(configIntent);
-        if (configSummary != null) {
-            mConfigure.setSummary(configSummary);
+        setConfigureSummary(configSummary);
+    }
+
+    private void setConfigureSummary(String summary) {
+        if (summary != null) {
+            mConfigure.setSummary(summary);
         } else {
             mConfigure.setSummary(R.string.backup_configure_account_default_summary);
         }
     }
 
+    private void updateConfigureSummary() {
+        try {
+            String transport = mBackupManager.getCurrentTransport();
+            String summary = mBackupManager.getDestinationString(transport);
+            setConfigureSummary(summary);
+        } catch (RemoteException e) {
+            // Not much we can do here
+        }
+    }
+
     public void onClick(DialogInterface dialog, int which) {
         if (which == DialogInterface.BUTTON_POSITIVE) {
             //updateProviders();
             if (mDialogType == DIALOG_ERASE_BACKUP) {
                 setBackupEnabled(false);
-            }
-        } else {
-            if (mDialogType == DIALOG_ERASE_BACKUP) {
-                mBackup.setChecked(true);
-                mAutoRestore.setEnabled(true);
+                updateConfigureSummary();
             }
         }
         mDialogType = 0;
@@ -188,5 +206,6 @@ public class PrivacySettings extends SettingsPreferenceFragment implements
         }
         mBackup.setChecked(enable);
         mAutoRestore.setEnabled(enable);
+        mConfigure.setEnabled(enable);
     }
 }