Email split, part neuf: Setup, logging, attachment glue
* Make "Exchange" option in account setup depend upon availability of the
Exchange EmailService
* Make presence of Exchange logging depend upon availability of the
Exchange EmailService
* Make AttachmentDownloadService use service rather than ExchangeService
class
* Move SSLUtils to emailcommon/utility
* Move account manager type defs to emailcommon/AccountManagerTypes
* Update proguard.flags
* This is the penultimate CL for the Email package itself; the next CL
creates a clean, SDK-compatible Email application
Bug: 3442973
Change-Id: I9162cf5fa6b5a043ded0fdd1e25fd3ce5948ad8f
diff --git a/proguard.flags b/proguard.flags
index c919077..cf8bca6 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -1,11 +1,11 @@
# keep names that are used by reflection.
--keep class com.android.email.provider.EmailContent$Account
+-keep class com.android.emailcommon.provider.EmailContent$Account
-keepclasseswithmembers class * {
- public static void actionEditIncomingSettings(android.app.Activity, int, com.android.email.provider.EmailContent$Account);
+ public static void actionEditIncomingSettings(android.app.Activity, int, com.android.emailcommon.provider.EmailContent$Account);
}
-keepclasseswithmembers class * {
- public static void actionEditOutgoingSettings(android.app.Activity, int, com.android.email.provider.EmailContent$Account);
+ public static void actionEditOutgoingSettings(android.app.Activity, int, com.android.emailcommon.provider.EmailContent$Account);
}
-keepclasseswithmembers class * {
@@ -48,7 +48,7 @@
}
-keepclasseswithmembers class com.android.emailcommon.service.PolicySet {
- <init>(com.android.email.provider.EmailContent$Account);
+ <init>(com.android.emailcommon.provider.EmailContent$Account);
<init>(int, int, int, int, boolean, int, int, boolean);
}
@@ -64,11 +64,11 @@
*** log(android.database.Cursor);
}
--keepclasseswithmembers class com.android.email.provider.EmailProvider {
+-keepclasseswithmembers class com.android.emailcommon.provider.EmailProvider {
*** getReadableDatabase(android.content.Context);
}
--keepclasseswithmembers class com.android.email.provider.EmailContent$Attachment {
+-keepclasseswithmembers class com.android.emailcommon.provider.EmailContent$Attachment {
*** createUniqueFile(java.lang.String);
}
@@ -162,7 +162,7 @@
*** size();
}
--keepclasseswithmembers class com.android.email.provider.EmailContent$Account {
+-keepclasseswithmembers class com.android.emailcommon.provider.EmailContent$Account {
*** getShortcutSafeUri();
}