Fix "method not found" unit test errors

Not only were needed methods added to the proguard.flags file, but, the file
was generally cleaned up so that only the methods absolutely required by the
unit tests are specified.

Change-Id: If888d69325c3138815e39218d05eec473d5d72b6

AndroidManifest.xml

@@ -166,11 +166,6 @@
             >
         </activity>
 
-        <activity
-            android:name=".activity.Debug"
-            android:label="@string/debug_title"
-            >
-        </activity>
         <activity
             android:name=".activity.AccountFolderList"
             android:launchMode="singleTop"

proguard.flags

@@ -12,15 +12,14 @@
   public *** newInstance(android.content.Context, java.lang.String);
 }
 
--keep class com.android.email.mail.Store$PersistentDataCallbacks {
-  *** getPersistentString(...);
-  *** setPersistentString(...);
-}
-
 -keepclasseswithmembers class * {
   public *** newInstance(java.lang.String, android.content.Context, com.android.email.mail.Store$PersistentDataCallbacks);
 }
 
+-keepclasseswithmembers class android.content.SharedPreferences$Editor {
+  *** apply();
+}
+
 -keep class * extends org.apache.james.mime4j.util.TempStorage
 
 # Keep names that are used only by unit tests or by animators
@@ -38,7 +37,8 @@
 }
 
 -keepclasseswithmembers class com.android.email.mail.Address {
-  <init>(...);
+  <init>(java.lang.String);
+  <init>(java.lang.String,java.lang.String);
   *** parseAndPack(java.lang.String);
   *** legacyUnpack(java.lang.String);
 }
@@ -48,13 +48,22 @@
 }
 
 -keepclasseswithmembers class com.android.email.SecurityPolicy$PolicySet {
-  <init>(...);
+  <init>(com.android.email.provider.EmailContent$Account);
+  <init>(int, int, int, int, boolean, int, int, boolean);
 }
 
 -keepclasseswithmembers class com.android.email.MessagingController {
   *** injectMockController(com.android.email.MessagingController);
 }
 
+-keepclasseswithmembers class com.android.email.Utility {
+  *** dumpCursor(android.database.Cursor);
+}
+-keepclasseswithmembers class com.android.email.Utility$CloseTraceCursorWrapper {
+  *** getTraceIfAvailable(android.database.Cursor);
+  *** log(android.database.Cursor);
+}
+
 -keepclasseswithmembers class com.android.email.provider.EmailProvider {
   *** getReadableDatabase(android.content.Context);
 }
@@ -63,6 +72,14 @@
   *** createUniqueFile(java.lang.String);
 }
 
+-keepclasseswithmembers class com.android.email.service.AttachmentDownloadService {
+  *** addServiceClass(long, java.lang.Class);
+}
+
+-keepclasseswithmembers class com.android.email.service.AttachmentDownloadService$AccountManagerStub {
+  *** setNumberOfAccounts(int);
+}
+
 -keepclasseswithmembers class com.android.email.Account {
   *** getContentUri();
 }
@@ -74,21 +91,26 @@
 -keep class com.android.email.mail.Message$RecipientType
 
 -keepclasseswithmembers class com.android.email.mail.Message {
-  *** setRecipient(...);
+  *** setRecipient(com.android.email.mail.Message$RecipientType, com.android.email.mail.Address);
 }
 
 -keepclasseswithmembers class com.android.email.mail.internet.MimeMessage {
-  <init>(...);
+  *** writeToString();
-  *** getExtendedHeader(java.lang.String);
-  *** setExtendedHeader(java.lang.String, java.lang.String);
 }
 
--keep class com.android.email.mail.Part
+-keepclasseswithmembers class com.android.email.mail.internet.MimeMessage {
+  <init>();
+  <init>(java.io.InputStream);
+  *** getExtendedHeader(java.lang.String);
+  *** setExtendedHeader(java.lang.String, java.lang.String);
+  *** getExtendedHeaders();
+  *** setExtendedHeaders(java.lang.String);
+}
 
 -keepclasseswithmembers class com.android.email.mail.internet.MimeUtility {
-  *** foldAndEncode(...);
+  *** foldAndEncode(java.lang.String);
-  *** findPartByContentId(...);
+  *** findPartByContentId(com.android.email.mail.Part, java.lang.String);
-  *** findFirstPartByMimeType(...);
+  *** findFirstPartByMimeType(com.android.email.mail.Part, java.lang.String);
 }
 
 -keepclasseswithmembers class com.android.email.mail.transport.SmtpSender {
@@ -104,25 +126,10 @@
 }
 
 -keepclasseswithmembers class com.android.email.mail.store.ImapStore$ImapFolder {
-  *** getUnreadMessageCount(...);
+  *** getMessages(int, int, com.android.email.mail.Folder$MessageRetrievalListener);
-  *** getRole(...);
+  *** getMessages(com.android.email.mail.Folder$MessageRetrievalListener);
-}
+  *** getMessages(java.lang.String[], com.android.email.mail.Folder$MessageRetrievalListener);
-
+  *** getUnreadMessageCount();
--keepclasseswithmembers class com.android.email.mail.store.LocalStore {
-  *** resetVisibleLimits(...);
-  *** getPersistentCallbacks(...);
-  *** getPersistentString(...);
-  *** setPersistentString(...);
-}
-
--keepclasseswithmembers class com.android.email.mail.store.LocalStore$LocalFolder {
-  *** updateMessage(...);
-  *** getMessages(...);
-  *** getPersistentCallbacks(...);
-  *** getVisibleLimit(...);
-  *** setVisibleLimit(...);
-  *** getId(...);
-  *** getPersistentString(...);
 }
 
 -keepclasseswithmembers class com.android.email.mail.store.Pop3Store {
@@ -130,35 +137,45 @@
 }
 
 -keepclasseswithmembers class com.android.email.mail.store.Pop3Store$Pop3Folder {
-  *** getUnreadMessageCount(...);
+  *** getMessages(int, int, com.android.email.mail.Folder$MessageRetrievalListener);
-  *** isOpen(...);
+  *** getMessages(com.android.email.mail.Folder$MessageRetrievalListener);
-}
+  *** getMessages(java.lang.String[], com.android.email.mail.Folder$MessageRetrievalListener);
-
+  *** getUnreadMessageCount();
--keepclasseswithmembers class com.android.email.mail.Folder {
+  *** isOpen();
-  *** getUnreadMessageCount(...);
-  *** delete(...);
-  *** getRole(...);
-}
-
--keep class com.android.email.mail.Folder$FolderRole
-
--keepclasseswithmembers class com.android.email.mail.Folder$PersistentDataCallbacks {
-  *** getPersistentString(...);
-  *** setPersistentString(...);
-  *** setPersistentStringAndMessageFlags(...);
-}
-
--keep class com.android.email.mail.MessageRetrievalListener
-
--keepclasseswithmembers class com.android.exchange.adapter.Parser {
-  *** resetInput(...);
 }
 
 -keep class com.android.email.mail.Flag
 
+-keepclasseswithmembers class com.android.email.mail.Folder {
+  *** getUnreadMessageCount();
+  *** delete(boolean);
+  *** getRole();
+}
+
+-keep class com.android.email.mail.Folder$FolderRole
+
 -keepclasseswithmembers class com.android.email.mail.PackedString$Builder {
-  <init>(...);
+  <init>();
-  *** get(...);
+  <init>(java.lang.String);
+  *** get(java.lang.String);
+}
+
+-keepclasseswithmembers class com.android.email.provider.ContentCache$CounterMap {
+  *** getCount(...);
+  *** size();
+}
+
+-keepclasseswithmembers class com.android.email.provider.EmailContent$Account {
+  *** getShortcutSafeUri();
+}
+
+-keepclasseswithmembers class com.android.exchange.adapter.Parser {
+  *** resetInput(java.io.InputStream);
+}
+
+-keepclasseswithmembers class com.android.exchange.provider.GalResult {
+  *** addGalData(com.android.exchange.provider.GalResult$GalData);
+  *** addGalData(long, java.lang.String, java.lang.String);
 }
 
 -keep class org.apache.james.mime4j.field.Field {