Hook up real compose uri for gmail.
Change-Id: I0273ce0f7270807de6ca325503c5b8a1339b3eae
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 92a427a..8e0a831 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -76,6 +76,7 @@
<service android:name=".providers.protos.boot.GmailAccountService"/>
<service android:name=".providers.protos.boot.EmailAccountService"/>
+ <service android:name=".compose.EmptyService"/>
</application>
</manifest>
diff --git a/src/com/android/mail/providers/protos/boot/GmailAccountService.java b/src/com/android/mail/providers/protos/boot/GmailAccountService.java
index 24739e5..3be59b2 100644
--- a/src/com/android/mail/providers/protos/boot/GmailAccountService.java
+++ b/src/com/android/mail/providers/protos/boot/GmailAccountService.java
@@ -17,13 +17,7 @@
import com.android.mail.providers.AccountCacheProvider;
import com.android.mail.providers.protos.mock.MockUiProvider;
-import com.android.mail.providers.UIProvider.AccountCapabilities;
import com.android.mail.providers.UIProvider.AccountColumns;
-import com.android.mail.providers.UIProvider.AttachmentColumns;
-import com.android.mail.providers.UIProvider.ConversationColumns;
-import com.android.mail.providers.UIProvider.FolderCapabilities;
-import com.android.mail.providers.UIProvider.FolderColumns;
-import com.android.mail.providers.UIProvider.MessageColumns;
import android.accounts.Account;
import android.accounts.AccountManager;
@@ -56,6 +50,10 @@
return Uri.parse(GMAIL_UI_PROVIDER_BASE_URI_STRING + "/" + account + "/labels");
}
+ private static Uri getAccountSendMessageUri(String account) {
+ return Uri.parse(GMAIL_UI_PROVIDER_BASE_URI_STRING + "/" + account + "/messages");
+ }
+
public GmailAccountService() {
super("GmailAccountService");
}
@@ -114,7 +112,7 @@
(String)mockAccountMap.get(AccountColumns.SEARCH_URI),
(String)mockAccountMap.get(AccountColumns.ACCOUNT_FROM_ADDRESSES_URI),
(String)mockAccountMap.get(AccountColumns.SAVE_DRAFT_URI),
- (String)mockAccountMap.get(AccountColumns.SEND_MESSAGE_URI));
+ getAccountSendMessageUri(account.name).toString());
AccountCacheProvider.addAccount(cachedAccount);
}