Remove direct entry points to AccountSettings

b/16240332

Change-Id: I9bc3f9a2e0b7faa4d8875a9ac7d6d585a65d9733

6 files changed, 6 insertions, 29 deletions

diff --git a/src/com/android/email/service/AccountService.java b/src/com/android/email/service/AccountService.java
index fa0eef46d..5cd37603c 100644
--- a/src/com/android/email/service/AccountService.java
+++ b/src/com/android/email/service/AccountService.java
@@ -41,22 +41,6 @@ public class AccountService extends Service {
     private final IAccountService.Stub mBinder = new IAccountService.Stub() {
 
         @Override
-        public void notifyLoginFailed(long accountId, String reason) {
-            NotificationController nc = NotificationController.getInstance(mContext);
-            nc.showLoginFailedNotification(accountId, reason);
-        }
-
-        @Override
-        public void notifyLoginSucceeded(long accountId) {
-            NotificationController.getInstance(mContext).cancelLoginFailedNotification(accountId);
-        }
-
-        @Override
-        public void reconcileAccounts(String protocol, String accountManagerType) {
-            // TODO: No longer used, delete this.
-        }
-
-        @Override
         public int getAccountColor(long accountId) {
             return ResourceHelper.getInstance(mContext).getAccountColor(accountId);
         }
diff --git a/src/com/android/email/service/AttachmentService.java b/src/com/android/email/service/AttachmentService.java
index f4f6d0bc0..f8871688a 100644
--- a/src/com/android/email/service/AttachmentService.java
+++ b/src/com/android/email/service/AttachmentService.java
@@ -1134,7 +1134,7 @@ public class AttachmentService extends Service implements Runnable {
                     EmailContent.delete(this, Attachment.CONTENT_URI, attachment.mId);
                     // TODO: Talk to UX about whether this is even worth doing
                     NotificationController nc = NotificationController.getInstance(this);
-                    nc.showDownloadForwardFailedNotification(attachment);
+                    nc.showDownloadForwardFailedNotificationSynchronous(attachment);
                     deleted = true;
                     LogUtils.w(LOG_TAG, "Deleting forwarded attachment #%d for message #%d",
                         attachmentId, attachment.mMessageKey);
diff --git a/src/com/android/email/service/EmailBroadcastProcessorService.java b/src/com/android/email/service/EmailBroadcastProcessorService.java
index b3a151099..b967121ac 100644
--- a/src/com/android/email/service/EmailBroadcastProcessorService.java
+++ b/src/com/android/email/service/EmailBroadcastProcessorService.java
@@ -38,7 +38,6 @@ import com.android.email.EmailIntentService;
 import com.android.email.Preferences;
 import com.android.email.R;
 import com.android.email.SecurityPolicy;
-import com.android.email.activity.setup.AccountSettings;
 import com.android.email.provider.AccountReconciler;
 import com.android.emailcommon.Logging;
 import com.android.emailcommon.VendorPolicyLoader;
@@ -74,10 +73,6 @@ public class EmailBroadcastProcessorService extends IntentService {
     // Action used for BroadcastReceiver entry point
     private static final String ACTION_BROADCAST = "broadcast_receiver";
 
-    // Dialing "*#*#36245#*#*" to open the debug screen.   "36245" = "email"
-    private static final String ACTION_SECRET_CODE = "android.provider.Telephony.SECRET_CODE";
-    private static final String SECRET_CODE_HOST_DEBUG_SCREEN = "36245";
-
     // This is a helper used to process DeviceAdminReceiver messages
     private static final String ACTION_DEVICE_POLICY_ADMIN = "com.android.email.devicepolicy";
     private static final String EXTRA_DEVICE_POLICY_ADMIN = "message_code";
@@ -133,9 +128,6 @@ public class EmailBroadcastProcessorService extends IntentService {
 
             if (Intent.ACTION_BOOT_COMPLETED.equals(broadcastAction)) {
                 onBootCompleted();
-            } else if (ACTION_SECRET_CODE.equals(broadcastAction)
-                    && SECRET_CODE_HOST_DEBUG_SCREEN.equals(broadcastIntent.getData().getHost())) {
-                AccountSettings.actionSettingsWithDebug(this);
             } else if (AccountManager.LOGIN_ACCOUNTS_CHANGED_ACTION.equals(broadcastAction)) {
                 onSystemAccountChanged();
             } else if (Intent.ACTION_LOCALE_CHANGED.equals(broadcastAction) ||
diff --git a/src/com/android/email/service/EmailServiceStub.java b/src/com/android/email/service/EmailServiceStub.java
index b64abdcd5..9301e9db4 100644
--- a/src/com/android/email/service/EmailServiceStub.java
+++ b/src/com/android/email/service/EmailServiceStub.java
@@ -472,7 +472,8 @@ public abstract class EmailServiceStub extends IEmailService.Stub implements IEm
                 } catch (MessagingException me) {
                     // report error for this message, but keep trying others
                     if (me instanceof AuthenticationFailedException) {
-                        nc.showLoginFailedNotification(account.mId);
+                        nc.showLoginFailedNotificationSynchronous(account.mId,
+                                false /* incoming */);
                     }
                     continue;
                 }
@@ -509,7 +510,7 @@ public abstract class EmailServiceStub extends IEmailService.Stub implements IEm
             nc.cancelLoginFailedNotification(account.mId);
         } catch (MessagingException me) {
             if (me instanceof AuthenticationFailedException) {
-                nc.showLoginFailedNotification(account.mId);
+                nc.showLoginFailedNotificationSynchronous(account.mId, false /* incoming */);
             }
         } finally {
             c.close();
diff --git a/src/com/android/email/service/ImapService.java b/src/com/android/email/service/ImapService.java
index 9efed3be9..5abd05d91 100644
--- a/src/com/android/email/service/ImapService.java
+++ b/src/com/android/email/service/ImapService.java
@@ -178,7 +178,7 @@ public class ImapService extends Service {
             }
             if (e instanceof AuthenticationFailedException) {
                 // Generate authentication notification
-                nc.showLoginFailedNotification(account.mId);
+                nc.showLoginFailedNotificationSynchronous(account.mId, true /* incoming */);
             }
             throw e;
         } finally {
diff --git a/src/com/android/email/service/Pop3Service.java b/src/com/android/email/service/Pop3Service.java
index d94146ed9..ebd748be1 100644
--- a/src/com/android/email/service/Pop3Service.java
+++ b/src/com/android/email/service/Pop3Service.java
@@ -118,7 +118,7 @@ public class Pop3Service extends Service {
             }
             if (e instanceof AuthenticationFailedException) {
                 // Generate authentication notification
-                nc.showLoginFailedNotification(account.mId);
+                nc.showLoginFailedNotificationSynchronous(account.mId, true /* incoming */);
             }
             throw e;
         }