commit 386243fd5fd2974133ba661ba43e47eb3d2bfcdf
author Marc Blank <mblank@google.com> Fri May 25 10:40:59 2012 -0700
committer Marc Blank <mblank@google.com> Fri May 25 11:06:19 2012 -0700
tree af78e17c7314fb3a223d8a4b0c953196d2b017e2
parent 2e1b661af0517cc877b40ae4c95dd8050c5c3c9c

Add folder capability for non-undoable deletes

* For trash folders in Email app (and elsewhere, if needed)

Bug: 6282899

Change-Id: I50ff4c4cf1e2d0ef56cffd22e43736e992b1e01e

src/com/android/mail/providers/UIProvider.java

diff --git a/src/com/android/mail/providers/UIProvider.java b/src/com/android/mail/providers/UIProvider.java
index a283c26..228530e 100644
--- a/src/com/android/mail/providers/UIProvider.java
+++ b/src/com/android/mail/providers/UIProvider.java
@@ -568,6 +568,10 @@
          * All the messages in this folder are important.
          */
         public static final int ONLY_IMPORTANT = 0x0100;
+        /**
+         * Deletions in this folder can't be undone (could include archive if desirable)
+         */
+        public static final int DELETE_ACTION_FINAL = 0x0200;
     }
 
     public static final class FolderColumns {

src/com/android/mail/ui/AbstractActivityController.java

diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index 55a5d0b..79cc955 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -1517,6 +1517,9 @@
                 case R.id.delete:
                     LogUtils.d(LOG_TAG, "Deleting");
                     mConversationListCursor.delete(mContext, mTarget);
+                    if (!mFolder.supportsCapability(FolderCapabilities.DELETE_ACTION_FINAL)) {
+                        undoEnabled = false;
+                    }
                     break;
                 case R.id.mute:
                     LogUtils.d(LOG_TAG, "Muting");