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

Abstract out the handler code in UploadService

Browse source 
Should make building other services much easier
This commit is contained in:
YuviPanda 2013-02-10 00:44:34 +05:30
parent e6a8f4d626
commit ea509a7847
3 changed files with 99 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

63
commons/src/main/java/org/wikimedia/commons/HandlerService.java Normal file
View file

@ -0,0 +1,63 @@
package org.wikimedia.commons;
import android.app.*;
import android.content.*;
import android.os.*;
public abstract class HandlerService<T> extends Service {
private volatile Looper threadLooper;
private volatile ServiceHandler threadHandler;
private final class ServiceHandler extends Handler {
public ServiceHandler(Looper looper) {
super(looper);
}
@Override
public void handleMessage(Message msg) {
handle(msg.what, (T)msg.obj);
stopSelf(msg.arg1);
}
}
@Override
public void onDestroy() {
super.onDestroy();
threadLooper.quit();
}
public class HandlerServiceLocalBinder extends Binder {
public HandlerService getService() {
return HandlerService.this;
}
}
private final IBinder localBinder = new HandlerServiceLocalBinder();
@Override
public IBinder onBind(Intent intent) {
return localBinder;
}
@Override
public void onCreate() {
super.onCreate();
HandlerThread thread = new HandlerThread("UploadService");
thread.start();
threadLooper = thread.getLooper();
threadHandler = new ServiceHandler(threadLooper);
}
private void postMessage(int type, Object obj) {
Message msg = threadHandler.obtainMessage(type);
msg.obj = obj;
threadHandler.sendMessage(msg);
}
public void queue(int what, T t) {
postMessage(what, t);
}
protected abstract void handle(int what, T t);
}

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

@ -21,7 +21,7 @@ import android.widget.RemoteViews;
import android.widget.Toast;
import android.net.*;
public class UploadService extends Service {
public class UploadService extends HandlerService<Contribution> {
private static final String EXTRA_PREFIX = "org.wikimedia.commons.upload";
@ -31,7 +31,7 @@ public class UploadService extends Service {
public static final String EXTRA_EDIT_SUMMARY = EXTRA_PREFIX + ".summary";
public static final String EXTRA_MIMETYPE = EXTRA_PREFIX + ".mimetype";
private static final int ACTION_UPLOAD_FILE = 1;
public static final int ACTION_UPLOAD_FILE = 1;
public static final String ACTION_START_SERVICE = EXTRA_PREFIX + ".upload";
@ -43,27 +43,6 @@ public class UploadService extends Service {
private int toUpload;
private volatile Looper uploadThreadLooper;
private volatile ServiceHandler uploadThreadHandler;
private final class ServiceHandler extends Handler {
public ServiceHandler(Looper looper) {
super(looper);
}
@Override
public void handleMessage(Message msg) {
switch(msg.what) {
case ACTION_UPLOAD_FILE:
Contribution contrib = (Contribution)msg.obj;
uploadContribution(contrib);
break;
}
stopSelf(msg.arg1);
}
}
// DO NOT HAVE NOTIFICATION ID OF 0 FOR ANYTHING
// See http://stackoverflow.com/questions/8725909/startforeground-does-not-show-my-notification
// Seriously, Android?
@ -119,32 +98,14 @@ public class UploadService extends Service {
@Override
public void onDestroy() {
super.onDestroy();
uploadThreadLooper.quit();
contributionsProviderClient.release();
Log.d("Commons", "ZOMG I AM BEING KILLED HALP!");
}
public class UploadServiceLocalBinder extends Binder {
public UploadService getService() {
return UploadService.this;
}
}
private final IBinder localBinder = new UploadServiceLocalBinder();
@Override
public IBinder onBind(Intent intent) {
return localBinder;
}
@Override
public void onCreate() {
super.onCreate();
HandlerThread thread = new HandlerThread("UploadService");
thread.start();
uploadThreadLooper = thread.getLooper();
uploadThreadHandler = new ServiceHandler(uploadThreadLooper);
notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
app = (CommonsApplication) this.getApplicationContext();
contributionsProviderClient = this.getContentResolver().acquireContentProviderClient(ContributionsContentProvider.AUTHORITY);
@ -185,30 +146,44 @@ public class UploadService extends Service {
Contribution contribution = new Contribution(mediaUri, null, filename, description, length, dateCreated, null, app.getCurrentAccount().name, editSummary);
return contribution;
}
private void postMessage(int type, Object obj) {
Message msg = uploadThreadHandler.obtainMessage(type);
msg.obj = obj;
uploadThreadHandler.sendMessage(msg);
@Override
protected void handle(int what, Contribution contribution) {
switch(what) {
case ACTION_UPLOAD_FILE:
uploadContribution(contribution);
break;
default:
throw new IllegalArgumentException("Unknown value for what");
}
}
@Override
public void queue(int what, Contribution contribution) {
switch (what) {
case ACTION_UPLOAD_FILE:
public void queueContribution(Contribution contribution) {
contribution.setState(Contribution.STATE_QUEUED);
contribution.setTransferred(0);
contribution.setContentProviderClient(contributionsProviderClient);
contribution.setState(Contribution.STATE_QUEUED);
contribution.setTransferred(0);
contribution.setContentProviderClient(contributionsProviderClient);
contribution.save();
toUpload++;
if (curProgressNotification != null && toUpload != 1) {
curProgressNotification.contentView.setTextViewText(R.id.uploadNotificationsCount, String.format(getString(R.string.uploads_pending_notification_indicator), toUpload));
Log.d("Commons", String.format("%d uploads left", toUpload));
notificationManager.notify(NOTIFICATION_UPLOAD_IN_PROGRESS, curProgressNotification);
contribution.save();
toUpload++;
if (curProgressNotification != null && toUpload != 1) {
curProgressNotification.contentView.setTextViewText(R.id.uploadNotificationsCount, String.format(getString(R.string.uploads_pending_notification_indicator), toUpload));
Log.d("Commons", String.format("%d uploads left", toUpload));
notificationManager.notify(NOTIFICATION_UPLOAD_IN_PROGRESS, curProgressNotification);
}
super.queue(what, contribution);
break;
default:
throw new IllegalArgumentException("Unknown value for what");
}
postMessage(ACTION_UPLOAD_FILE, contribution);
}
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
if(intent.getAction() == ACTION_START_SERVICE) {
@ -224,12 +199,12 @@ public class UploadService extends Service {
} else {
Contribution contribution = mediaFromIntent(intent);
queueContribution(contribution);
queue(ACTION_UPLOAD_FILE, contribution);
}
return START_REDELIVER_INTENT;
}
void uploadContribution(Contribution contribution) {
private void uploadContribution(Contribution contribution) {
MWApi api = app.getApi();
ApiResult result;
@ -261,8 +236,6 @@ public class UploadService extends Service {
this.startForeground(NOTIFICATION_UPLOAD_IN_PROGRESS, curProgressNotification);
Log.d("Commons", "Just before");
try {
if(!api.validateLogin()) {
// Need to revalidate!

4
commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java
View file

@ -54,7 +54,7 @@ public class ContributionsActivity extends AuthenticatedActivity implements Load
private UploadService uploadService;
private ServiceConnection uploadServiceConnection = new ServiceConnection() {
public void onServiceConnected(ComponentName componentName, IBinder binder) {
uploadService = ((UploadService.UploadServiceLocalBinder)binder).getService();
uploadService = (UploadService) ((HandlerService.HandlerServiceLocalBinder)binder).getService();
}
public void onServiceDisconnected(ComponentName componentName) {
@ -185,7 +185,7 @@ public class ContributionsActivity extends AuthenticatedActivity implements Load
Cursor cursor = (Cursor)adapterView.getItemAtPosition(position);
Contribution c = Contribution.fromCursor(cursor);
if(c.getState() == Contribution.STATE_FAILED) {
uploadService.queueContribution(c);
uploadService.queue(UploadService.ACTION_UPLOAD_FILE, c);
Log.d("Commons", "Restarting for" + c.toContentValues().toString());
}
Log.d("Commons", "You clicked on:" + c.toContentValues().toString());