ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Start/stop AttachmentDownloadService as needed

Browse Source 
Bug: 5033646
Change-Id: Ic0e75b28d0d8d5665c3f3ca864a9532fee05df8c
This commit is contained in:
Marc Blank 2011-07-15 09:46:28 -07:00
parent eb642812bf
commit b2a8c2ce4c
2 changed files with 53 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/email/provider/EmailProvider.java
View File

@ -1631,7 +1631,7 @@ public class EmailProvider extends ContentProvider {
flags = values.getAsInteger(Attachment.FLAGS);
}
// Report all new attachments to the download service
AttachmentDownloadService.attachmentChanged(longId, flags);
AttachmentDownloadService.attachmentChanged(getContext(), longId, flags);
}
break;
case MAILBOX_ID:
@ -2177,7 +2177,7 @@ outer:
if (match == ATTACHMENT_ID) {
if (values.containsKey(Attachment.FLAGS)) {
int flags = values.getAsInteger(Attachment.FLAGS);
AttachmentDownloadService.attachmentChanged(
AttachmentDownloadService.attachmentChanged(getContext(),
Integer.parseInt(id), flags);
}
}

81
src/com/android/email/service/AttachmentDownloadService.java
View File

@ -16,21 +16,6 @@
package com.android.email.service;
import com.android.email.AttachmentInfo;
import com.android.email.Controller.ControllerService;
import com.android.email.Email;
import com.android.email.EmailConnectivityManager;
import com.android.email.NotificationController;
import com.android.emailcommon.provider.Account;
import com.android.emailcommon.provider.EmailContent;
import com.android.emailcommon.provider.EmailContent.Attachment;
import com.android.emailcommon.provider.EmailContent.Message;
import com.android.emailcommon.service.EmailServiceProxy;
import com.android.emailcommon.service.EmailServiceStatus;
import com.android.emailcommon.service.IEmailServiceCallback;
import com.android.emailcommon.utility.AttachmentUtilities;
import com.android.emailcommon.utility.Utility;
import android.accounts.AccountManager;
import android.app.AlarmManager;
import android.app.PendingIntent;
@ -47,6 +32,21 @@ import android.os.RemoteException;
import android.text.format.DateUtils;
import android.util.Log;
import com.android.email.AttachmentInfo;
import com.android.email.Controller.ControllerService;
import com.android.email.Email;
import com.android.email.EmailConnectivityManager;
import com.android.email.NotificationController;
import com.android.emailcommon.provider.Account;
import com.android.emailcommon.provider.EmailContent;
import com.android.emailcommon.provider.EmailContent.Attachment;
import com.android.emailcommon.provider.EmailContent.Message;
import com.android.emailcommon.service.EmailServiceProxy;
import com.android.emailcommon.service.EmailServiceStatus;
import com.android.emailcommon.service.IEmailServiceCallback;
import com.android.emailcommon.utility.AttachmentUtilities;
import com.android.emailcommon.utility.Utility;
import java.io.File;
import java.io.FileDescriptor;
import java.io.PrintWriter;
@ -89,6 +89,9 @@ public class AttachmentDownloadService extends Service implements Runnable {
// Limit on the number of attachments we'll check for background download
private static final int MAX_ATTACHMENTS_TO_CHECK = 25;
private static final String EXTRA_ATTACHMENT =
"com.android.email.AttachmentDownloadService.attachment";
// sRunningService is only set in the UI thread; it's visibility elsewhere is guaranteed
// by the use of "volatile"
/*package*/ static volatile AttachmentDownloadService sRunningService = null;
@ -300,6 +303,10 @@ public class AttachmentDownloadService extends Service implements Runnable {
return null;
}
public synchronized boolean isEmpty() {
return super.isEmpty() && mDownloadsInProgress.isEmpty();
}
/**
* Run through the AttachmentMap and find DownloadRequests that can be executed, enforcing
* the limit on maximum downloads
@ -772,22 +779,22 @@ public class AttachmentDownloadService extends Service implements Runnable {
/**
* Called directly by EmailProvider whenever an attachment is inserted or changed
* @param context the caller's context
* @param id the attachment's id
* @param flags the new flags for the attachment
*/
public static void attachmentChanged(final long id, final int flags) {
final AttachmentDownloadService service = sRunningService;
if (service == null) return;
public static void attachmentChanged(final Context context, final long id, final int flags) {
Utility.runAsync(new Runnable() {
public void run() {
final Attachment attachment =
Attachment.restoreAttachmentWithId(service, id);
Attachment attachment = Attachment.restoreAttachmentWithId(context, id);
if (attachment != null) {
// Store the flags we got from EmailProvider; given that all of this
// activity is asynchronous, we need to use the newest data from
// EmailProvider
attachment.mFlags = flags;
service.onChange(attachment);
Intent intent = new Intent(context, AttachmentDownloadService.class);
intent.putExtra(EXTRA_ATTACHMENT, attachment);
context.startService(intent);
}
}});
}
@ -877,6 +884,11 @@ public class AttachmentDownloadService extends Service implements Runnable {
// Here's where we run our attachment loading logic...
mConnectivityManager.waitForConnectivity();
mDownloadSet.processQueue();
if (mDownloadSet.isEmpty()) {
Log.d(TAG, "*** All done; shutting down service");
stopSelf();
break;
}
synchronized(mLock) {
try {
mLock.wait(PROCESS_QUEUE_WAIT_TIME);
@ -887,23 +899,27 @@ public class AttachmentDownloadService extends Service implements Runnable {
}
// Unregister now that we're done
mConnectivityManager.unregister();
if (mConnectivityManager != null) {
mConnectivityManager.unregister();
}
}
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
sRunningService = this;
if (sRunningService == null) {
sRunningService = this;
}
if (intent.hasExtra(EXTRA_ATTACHMENT)) {
Attachment att = (Attachment)intent.getParcelableExtra(EXTRA_ATTACHMENT);
Log.d(TAG, "*** ONSTARTCOMMAND, changed: " + att.mId);
onChange(att);
}
return Service.START_STICKY;
}
/**
* The lifecycle of this service is managed by Email.setServicesEnabled(), which is called
* throughout the code, in particular 1) after boot and 2) after accounts are added or removed
* The goal is that this service should be running at all times when there's at least one
* email account present.
*/
@Override
public void onCreate() {
Log.d(TAG, "**** ON CREATE!");
// Start up our service thread
new Thread(this, "AttachmentDownloadService").start();
}
@ -914,12 +930,17 @@ public class AttachmentDownloadService extends Service implements Runnable {
@Override
public void onDestroy() {
// STOPSHIP Remove this, and other, lifecycle logging
Log.d(TAG, "**** ON DESTROY!");
if (sRunningService != null) {
mStop = true;
kick();
sRunningService = null;
}
if (mConnectivityManager != null) {
mConnectivityManager.unregister();
mConnectivityManager = null;
}
sRunningService = null;
}
@Override