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

Make UploadService a purely bound service

Browse source
This commit is contained in:
YuviPanda 2013-02-18 15:41:20 +05:30
parent 5c8c5848cf
commit 6b20dcecb1
2 changed files with 83 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

96
commons/src/main/java/org/wikimedia/commons/ShareActivity.java
View file

@ -1,5 +1,12 @@
package org.wikimedia.commons; package org.wikimedia.commons;
import android.content.ComponentName;
import android.content.ServiceConnection;
import android.database.Cursor;
import android.os.AsyncTask;
import android.os.IBinder;
import android.provider.MediaStore;
import android.util.Log;
import org.wikimedia.commons.auth.AuthenticatedActivity; import org.wikimedia.commons.auth.AuthenticatedActivity;
import org.wikimedia.commons.auth.WikiAccountAuthenticator; import org.wikimedia.commons.auth.WikiAccountAuthenticator;
@ -16,6 +23,9 @@ import android.widget.*;
import android.view.*; import android.view.*;
import org.wikimedia.commons.contributions.Contribution; import org.wikimedia.commons.contributions.Contribution;
import java.io.IOException;
import java.util.Date;
public class ShareActivity extends AuthenticatedActivity { public class ShareActivity extends AuthenticatedActivity {
@ -30,8 +40,73 @@ public class ShareActivity extends AuthenticatedActivity {
private EditText titleEdit; private EditText titleEdit;
private EditText descEdit; private EditText descEdit;
private String source;
private String mimeType;
private Uri mediaUri; private Uri mediaUri;
private UploadService uploadService;
private ServiceConnection uploadServiceConnection = new ServiceConnection() {
public void onServiceConnected(ComponentName componentName, IBinder binder) {
uploadService = (UploadService) ((HandlerService.HandlerServiceLocalBinder)binder).getService();
}
public void onServiceDisconnected(ComponentName componentName) {
// this should never happen
throw new RuntimeException("UploadService died but the rest of the process did not!");
}
};
private class StartUploadTask extends AsyncTask<Void, Void, Contribution> {
@Override
protected void onPreExecute() {
Toast startingToast = Toast.makeText(getApplicationContext(), R.string.uploading_started, Toast.LENGTH_LONG);
startingToast.show();
}
@Override
protected Contribution doInBackground(Void... voids) {
String title = titleEdit.getText().toString();
String description = descEdit.getText().toString();
Date dateCreated = null;
Long length = null;
try {
length = getContentResolver().openAssetFileDescriptor(mediaUri, "r").getLength();
if(length == -1) {
// Let us find out the long way!
length = Utils.countBytes(getContentResolver().openInputStream(mediaUri));
}
} catch(IOException e) {
throw new RuntimeException(e);
}
if(mimeType.startsWith("image/")) {
Cursor cursor = getContentResolver().query(mediaUri,
new String[]{MediaStore.Images.ImageColumns.DATE_TAKEN}, null, null, null);
if(cursor != null && cursor.getCount() != 0) {
cursor.moveToFirst();
dateCreated = new Date(cursor.getLong(0));
} // FIXME: Alternate way of setting dateCreated if this data is not found
} /* else if (mimeType.startsWith("audio/")) {
Removed Audio implementationf or now
} */
Contribution contribution = new Contribution(mediaUri, null, title, description, length, dateCreated, null, app.getCurrentAccount().name, CommonsApplication.DEFAULT_EDIT_SUMMARY);
contribution.setSource(source);
return contribution;
}
@Override
protected void onPostExecute(Contribution contribution) {
uploadService.queue(UploadService.ACTION_UPLOAD_FILE, contribution);
finish();
}
}
@Override @Override
public void onBackPressed() { public void onBackPressed() {
super.onBackPressed(); super.onBackPressed();
@ -52,33 +127,28 @@ public class ShareActivity extends AuthenticatedActivity {
if(intent.getAction().equals(Intent.ACTION_SEND)) { if(intent.getAction().equals(Intent.ACTION_SEND)) {
mediaUri = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM); mediaUri = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM);
final String source;
if(intent.hasExtra(UploadService.EXTRA_SOURCE)) { if(intent.hasExtra(UploadService.EXTRA_SOURCE)) {
source = intent.getStringExtra(UploadService.EXTRA_SOURCE); source = intent.getStringExtra(UploadService.EXTRA_SOURCE);
} else { } else {
source = Contribution.SOURCE_EXTERNAL; source = Contribution.SOURCE_EXTERNAL;
} }
final String mimeType = intent.getType(); mimeType = intent.getType();
if(mimeType.startsWith("image/")) { if(mimeType.startsWith("image/")) {
ImageLoaderTask loader = new ImageLoaderTask(backgroundImageView); ImageLoaderTask loader = new ImageLoaderTask(backgroundImageView);
loader.execute(mediaUri); loader.execute(mediaUri);
} }
Intent uploadServiceIntent = new Intent(getApplicationContext(), UploadService.class);
uploadServiceIntent.setAction(UploadService.ACTION_START_SERVICE);
startService(uploadServiceIntent);
bindService(uploadServiceIntent, uploadServiceConnection, Context.BIND_AUTO_CREATE);
uploadButton.setOnClickListener(new View.OnClickListener() { uploadButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Intent uploadIntent = new Intent(getApplicationContext(), UploadService.class); StartUploadTask task = new StartUploadTask();
uploadIntent.putExtra(UploadService.EXTRA_MEDIA_URI, mediaUri); task.execute();
uploadIntent.putExtra(UploadService.EXTRA_TARGET_FILENAME, titleEdit.getText().toString());
uploadIntent.putExtra(UploadService.EXTRA_DESCRIPTION, descEdit.getText().toString());
uploadIntent.putExtra(UploadService.EXTRA_MIMETYPE, mimeType);
uploadIntent.putExtra(UploadService.EXTRA_EDIT_SUMMARY, "Mobile upload from Wikimedia Commons Android app");
uploadIntent.putExtra(UploadService.EXTRA_SOURCE, source);
startService(uploadIntent);
Toast startingToast = Toast.makeText(that, R.string.uploading_started, Toast.LENGTH_LONG);
startingToast.show();
finish();
} }
}); });
} }

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

@ -112,44 +112,6 @@ public class UploadService extends HandlerService<Contribution> {
contributionsProviderClient = this.getContentResolver().acquireContentProviderClient(ContributionsContentProvider.AUTHORITY); contributionsProviderClient = this.getContentResolver().acquireContentProviderClient(ContributionsContentProvider.AUTHORITY);
} }
private Contribution mediaFromIntent(Intent intent) {
Bundle extras = intent.getExtras();
Uri mediaUri = (Uri) extras.getParcelable(EXTRA_MEDIA_URI);
String filename = intent.getStringExtra(EXTRA_TARGET_FILENAME);
String description = intent.getStringExtra(EXTRA_DESCRIPTION);
String editSummary = intent.getStringExtra(EXTRA_EDIT_SUMMARY);
String mimeType = intent.getStringExtra(EXTRA_MIMETYPE);
String source = intent.getStringExtra(EXTRA_SOURCE);
Date dateCreated = null;
Long length = null;
try {
length = this.getContentResolver().openAssetFileDescriptor(mediaUri, "r").getLength();
if(length == -1) {
// Let us find out the long way!
length = Utils.countBytes(this.getContentResolver().openInputStream(mediaUri));
}
} catch(IOException e) {
throw new RuntimeException(e);
}
Log.d("Commons", "MimeType is " + mimeType);
if(mimeType.startsWith("image/")) {
Cursor cursor = this.getContentResolver().query(mediaUri,
new String[]{MediaStore.Images.ImageColumns.DATE_TAKEN}, null, null, null);
if(cursor != null && cursor.getCount() != 0) {
cursor.moveToFirst();
dateCreated = new Date(cursor.getLong(0));
} // FIXME: Alternate way of setting dateCreated if this data is not found
} /* else if (mimeType.startsWith("audio/")) {
Removed Audio implementationf or now
} */
Contribution contribution = new Contribution(mediaUri, null, filename, description, length, dateCreated, null, app.getCurrentAccount().name, editSummary);
contribution.setSource(source);
return contribution;
}
@Override @Override
protected void handle(int what, Contribution contribution) { protected void handle(int what, Contribution contribution) {
switch(what) { switch(what) {
@ -199,10 +161,6 @@ public class UploadService extends HandlerService<Contribution> {
new String[]{ String.valueOf(Contribution.STATE_QUEUED), String.valueOf(Contribution.STATE_IN_PROGRESS) } new String[]{ String.valueOf(Contribution.STATE_QUEUED), String.valueOf(Contribution.STATE_IN_PROGRESS) }
); );
Log.d("Commons", "Set " + updated + " uploads to failed"); Log.d("Commons", "Set " + updated + " uploads to failed");
} else {
Contribution contribution = mediaFromIntent(intent);
queue(ACTION_UPLOAD_FILE, contribution);
} }
return START_REDELIVER_INTENT; return START_REDELIVER_INTENT;
} }