mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Only leave foreground lock when absolutely no more uploads to do

Browse source 
This *might* fix the service dying prematurely in low memory
conditions.
This commit is contained in:
YuviPanda 2013-03-16 02:19:19 +05:30
parent 6a99255a1e
commit cce2932a5a
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
commons/src/main/java/org/wikimedia/commons/UploadService.java
View file

@ -77,7 +77,8 @@ public class UploadService extends HandlerService<Contribution> {
} else { } else {
curProgressNotification.setProgress(100, (int) (((double) transferred / (double) total) * 100), false); curProgressNotification.setProgress(100, (int) (((double) transferred / (double) total) * 100), false);
} }
notificationManager.notify(NOTIFICATION_UPLOAD_IN_PROGRESS, curProgressNotification.build()); startForeground(NOTIFICATION_UPLOAD_IN_PROGRESS, curProgressNotification.build());
contribution.setTransferred(transferred); contribution.setTransferred(transferred);
contribution.save(); contribution.save();
} }
@ -125,7 +126,7 @@ public class UploadService extends HandlerService<Contribution> {
if (curProgressNotification != null && toUpload != 1) { if (curProgressNotification != null && toUpload != 1) {
curProgressNotification.setContentText(getResources().getQuantityString(R.plurals.uploads_pending_notification_indicator, toUpload, toUpload)); curProgressNotification.setContentText(getResources().getQuantityString(R.plurals.uploads_pending_notification_indicator, toUpload, toUpload));
Log.d("Commons", String.format("%d uploads left", toUpload)); Log.d("Commons", String.format("%d uploads left", toUpload));
notificationManager.notify(NOTIFICATION_UPLOAD_IN_PROGRESS, curProgressNotification.build()); this.startForeground(NOTIFICATION_UPLOAD_IN_PROGRESS, curProgressNotification.build());
} }
super.queue(what, contribution); super.queue(what, contribution);
@ -211,10 +212,13 @@ public class UploadService extends HandlerService<Contribution> {
return; return;
} finally { } finally {
toUpload--; toUpload--;
if(toUpload == 0) {
stopForeground(true);
}
} }
Log.d("Commons", "Response is" + Utils.getStringFromDOM(result.getDocument())); Log.d("Commons", "Response is" + Utils.getStringFromDOM(result.getDocument()));
stopForeground(true);
curProgressNotification = null; curProgressNotification = null;
@ -249,7 +253,6 @@ public class UploadService extends HandlerService<Contribution> {
} }
private void showFailedNotification(Contribution contribution) { private void showFailedNotification(Contribution contribution) {
stopForeground(true);
Notification failureNotification = new NotificationCompat.Builder(this).setAutoCancel(true) Notification failureNotification = new NotificationCompat.Builder(this).setAutoCancel(true)
.setSmallIcon(R.drawable.ic_launcher) .setSmallIcon(R.drawable.ic_launcher)
.setAutoCancel(true) .setAutoCancel(true)